From patchwork Fri Apr 18 16:57:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Ni X-Patchwork-Id: 14057508 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C44F0C369AB for ; Fri, 18 Apr 2025 17:09:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 65A6628014A; Fri, 18 Apr 2025 13:09:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 632A9280147; Fri, 18 Apr 2025 13:09:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AFD928014A; Fri, 18 Apr 2025 13:09:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2B622280147 for ; Fri, 18 Apr 2025 13:09:58 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9F2521209CA for ; Fri, 18 Apr 2025 17:09:58 +0000 (UTC) X-FDA: 83347802076.10.7CB9725 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf27.hostedemail.com (Postfix) with ESMTP id B5AFB4000A for ; Fri, 18 Apr 2025 17:09:56 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=m+ljLM59; spf=pass (imf27.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744996196; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=dORA6h0/+ces654lrs2Yc6m0QPEnXEtlk4fV98OxVqk=; b=gZfnENvEh5MmCbKSGmZ26FrhhnaTcVPdSPiNm8gYFgocLjWYI4YG4kxDqNsyzPyX215woh XZHSj32gxxGch6GAXdMSzfTgMJHMH4aFX+hMGf8gDhiHyB++eOXA4sCUHnGkgtkJcktIhk CigFD3juUAi5FNzsOvLeoUJsG+pwikE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=m+ljLM59; spf=pass (imf27.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744996196; a=rsa-sha256; cv=none; b=zsXFvvaXMxtoWX86eW2V6ybkWvh4MPnlMR6yeTDnrmkARYCVL58p49eagWj7ORJiZRmqXL nLzoULo9iVSNMfVoiOjye6N6cukyoFLy1AS1vFf2SlShhosdz9iQgye9H/oRAdXovubtUE ZUheDHXB1gcS8GW47Rbd9eyzwIWPYR8= Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7369ce5d323so1766222b3a.1 for ; Fri, 18 Apr 2025 10:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744996196; x=1745600996; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dORA6h0/+ces654lrs2Yc6m0QPEnXEtlk4fV98OxVqk=; b=m+ljLM59eNygirZxfMKcihwo7CCaPx4T7xud326PcK3qVLmVKBbw0Ak2+z1CORScmJ MUOWe4pWM5e6PQnt6X6yng20tTA+khQ/CduOkBFIZx/Mqg/xGOPcyom9r72PAn199XQ2 tu3P+UZ8scDKwjYDWni/DrF93KyFhHFRcdKk5AuXE5uhdusFcNFDBRYTUYUizFcPBKKv VhZTzc6re7LO1GmJATg9VtadEnvG9PGqlwm2GtSl7t3oM0i+9YwdAJM5QTY1lzRAXgps 9f+i29yZCRyGnuU4hN4LpXcMrgEegmX22ZIFZyXsclGXxakC4G9F8FGBqYjTZN39Qch8 MnLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744996196; x=1745600996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dORA6h0/+ces654lrs2Yc6m0QPEnXEtlk4fV98OxVqk=; b=ORXpu4kuNJgcDP36/qgYZYOj8GRlI5YXaUG/Ghjt9XvBMw+zfQpgmPzYFIbsWOSNj/ 92Nsy7vR5nejL9vhDSPqxkJnGklQPK7CCZ/QJyySsdlzIC5kkW2QRXiANJlAf1mafAOg JViUY8F5xb7xSTzyZZU+422yHl5fWCb/TwQXSYXRE5Cs4E3fQSiXvllxBJr4XD0xq/v8 BTGR86Rh9I+SM3fMtFc9olmVw4glICqNEgJVnU+oObNoleR+uyTciElf+jN60Ce9CmP5 BdcWgI282omjBjmYxMWiYe9s9sgEAJq2quDClmxi+a+XP5eAAss7DvNHU+5WEWAHsqPB vTTQ== X-Forwarded-Encrypted: i=1; AJvYcCXOzB9wBhoQOJn86fr7EzNXRAEukjHWnex6JWLJ+G/UtEBCjHDgoNrGFnNiYqiRGH8VpkWUR3dPSg==@kvack.org X-Gm-Message-State: AOJu0YybWkykFk/pnu+zVxWVLBAZfnL3ZOFD4gEt6b5+0hff77jZf6x0 F2FhUBBnHqUahawirOe66RxrXd+9vsC7gt9vuVDZURW8xW6pYAzLRg/DNw== X-Gm-Gg: ASbGncsDirNA/Hek279sitzpmueX4Og56WQq//g3ne70QKcxDfFOtphN8WMDzAtoyjp jAHgVmfZKC+WCRCtzWprFiyUHzYpU9ny0KtbmTJgEO3Duibk4ETSnLXN8nkgl3EWOlYZKsUAJqQ hHAJFgBItn2VH9doOC9aXKV4EhUoGCvmtKp7L70+KJmJpon1yPLoZN3d+Skn1FEcyeY+7meDKEH FGULJfZ1UmNCSf/mM4nngscdl5ujkAmlcLusqLjA7wqkW9WvNlN9+QwhRLkH1/fqR+UaYG0Oksu WEhYAKrDx0AafDaNJgvi7P1rtQJJ0pUDFZvuIXKj+3KOKZ0jrfqiQMC/Lg== X-Google-Smtp-Source: AGHT+IHe47+XozfXlstD4wDnTplU1ezUObVgQzHvnY/0V70xzfLWwjEmiGf1MJ9togB+8xEfuiChvA== X-Received: by 2002:a05:6a20:2d0b:b0:1f5:5ed0:4d75 with SMTP id adf61e73a8af0-203cbd213c1mr5795554637.31.1744996195645; Fri, 18 Apr 2025 10:09:55 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8f03:9fee:5e33:e006:dcd5:852d]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73dbfa59176sm1834069b3a.113.2025.04.18.10.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 10:09:55 -0700 (PDT) From: nifan.cxl@gmail.com To: muchun.song@linux.dev, willy@infradead.org Cc: mcgrof@kernel.org, a.manzanares@samsung.com, dave@stgolabs.net, akpm@linux-foundation.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Fan Ni , Sidhartha Kumar Subject: [PATCH v2 2/4] mm/hugetlb: Refactor unmap_hugepage_range() to take folio instead of page Date: Fri, 18 Apr 2025 09:57:40 -0700 Message-ID: <20250418170834.248318-3-nifan.cxl@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250418170834.248318-2-nifan.cxl@gmail.com> References: <20250418170834.248318-2-nifan.cxl@gmail.com> MIME-Version: 1.0 X-Stat-Signature: yz4n93dasip4urwgqzxg8aei4ip6s8pd X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: B5AFB4000A X-Rspam-User: X-HE-Tag: 1744996196-909835 X-HE-Meta: U2FsdGVkX19wL3J3DQSAeMYH5HakxVSv9x8EwsbFYgDCOXZPMnaCFc8hX+UqMfZ2gfKnkbha2suDS2kzhXwb4nfo/z9qVXhnh4693zqaKQpVl4kPBLvI6Bdllib3HTdq7UVPE7D0mz0yKRybBWJp1Jcq7MjZWcwbJ5MdDz+RHUE92MqCsmVBbWAUOqkavcOmNBQri+9Mkv4KNneQnTxRQB0sTGfWwgL50rDqK3DiEtmQ+Zlx5bIs/RuaQekiIVZGYoISRuM0O30jRTa1aGctLiYIBANy1WbBfhRTL6zxXA7SZc4iVcv04wgoYKs+M8+B6iw2Svdttcz6X12sFTGJDwRGY6PWNqC1I4nWcTYebBgXNpkCnSsdzCq+tMmW8Es2p9d2t/epsh2AcgsSpAO+YpZspa+m9hk+oLCL2jgAsMR3KWzfktmntrG7dgAEnPYVSy2bJwofhJpxHpETdm7ZX1FCo0ooUxPXt0yzLOS4kbv5uaP+XGG6ZWEhF5+6rGswFptJDrfTpNblTOOPBRIlZqYUcZFtMjEjtfUL3tcxRa25BgAAgNA5Rabilb2IrPUl8TSFb+sFPhYw7zBBSBoLSMzIfz/GikOCO6AUOtF0/UwljFziQ8X3v353mabmQwkyGYxOLbS6x464VnzDkHcUPlff07A/WJxKumK6D+jC+xbZQrvUhBGr+auGGoqui8HVNn6Qr5UUSc+R328IVcRAlbgiXmS3aaOC1eO0cAbUbwoKxDjtB/reRPeei5TEq2SJe+zRbychTT3RUo9ZTYaMWYxOdtDxqAXBOGFfskPWxHfUTKBWxV297zUBPweWK8YiHK3HNIsk4xiaAGrzfyOcJKFZDhpt1sPP12xkM1/oZjHhXW2SZlzp1Z4NWUaMsyzcovgPnQkKQHk1jA7YRRK/vrFYH+Y40hmTxd0mwYPs847ygFdSMjXZ+7qRSSK+/AzszJP7S5ibf9J5C9otzIB 2t++ZIgP O1CF8WnQPq0ThVqYidLzkMbnRGnyg+0ulJSuMUsOhUgHM6GvdZBfXG9LRVMQM8FlDpuS/F0yhO3BmF51Hp5BXWYgMI8wdgpSO5u5GJtGXBsJv266ZFDgH0mqSmjvwEUhahSIzwW3b8W0V/0cNlcxlXfer0d8fFQQwyyglBi22ym7np8sdZub6zAigm78NWlm5IEIQobNr16QHtDaSIVZqU/y5eqIyCXVFekTatvLzpJyjNuLrhsXyhunO8nuq2THhlBP8onFMj6rYPa6Qk04SG5HvV8MnisDABtPNtHyCSyubuFwmw5bK5XNfyzRDCpYmj9LTdl7mjAKlRIQxj/iSuLvG03h5UzQi3nI0qI9IkbQMpEuQCw+8S10jIG9hRM4Bf7/UasWcvx2suV/CjTZGFzhAQEIvIiTrDj/PNRO9mzaNkRVccaQyG+JaHwmq1ni7g7K2DsTyJs2PrZmY5GG+9AjCRTnWZfqWvybLDm+q3cVz/Z2hGSnsYPadS7nPaULv+yo8N9X4qZTSue7nZ42JQCP8MuHAdKi7giiN X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Fan Ni The function unmap_hugepage_range() has two kinds of users: 1) unmap_ref_private(), which passes in the head page of a folio. Since unmap_ref_private() already takes folio and there are no other uses of the folio struct in the function, it is natural for unmap_hugepage_range() to take folio also. 2) All other uses, which pass in NULL pointer. In both cases, we can pass in folio. Refactor unmap_hugepage_range() to take folio. Signed-off-by: Fan Ni Reviewed-by: Muchun Song Reviewed-by: Sidhartha Kumar --- v2: Picked up Reviewed-by tags; v1: https://lore.kernel.org/linux-mm/aAHUluy7T32ZlYg7@debian/T/#m7ba630d783e08ae708453279579093d481c6e721 --- include/linux/hugetlb.h | 2 +- mm/hugetlb.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index a57bed83c657..b7699f35c87f 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -128,7 +128,7 @@ int move_hugetlb_page_tables(struct vm_area_struct *vma, int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *, struct vm_area_struct *); void unmap_hugepage_range(struct vm_area_struct *, - unsigned long, unsigned long, struct page *, + unsigned long, unsigned long, struct folio *folio, zap_flags_t); void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b5d1ac8290a7..3181dbe0c4bb 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6039,7 +6039,7 @@ void __hugetlb_zap_end(struct vm_area_struct *vma, } void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, - unsigned long end, struct page *ref_page, + unsigned long end, struct folio *ref_folio, zap_flags_t zap_flags) { struct mmu_notifier_range range; @@ -6051,7 +6051,8 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, mmu_notifier_invalidate_range_start(&range); tlb_gather_mmu(&tlb, vma->vm_mm); - __unmap_hugepage_range(&tlb, vma, start, end, ref_page, zap_flags); + __unmap_hugepage_range(&tlb, vma, start, end, + folio_page(ref_folio, 0), zap_flags); mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb); @@ -6109,7 +6110,7 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma, if (!is_vma_resv_set(iter_vma, HPAGE_RESV_OWNER)) unmap_hugepage_range(iter_vma, address, address + huge_page_size(h), - folio_page(folio, 0), 0); + folio, 0); } i_mmap_unlock_write(mapping); }