From patchwork Thu Apr 17 15:43:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Ni X-Patchwork-Id: 14055815 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 B499CC369C2 for ; Thu, 17 Apr 2025 15:56:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 279BC280059; Thu, 17 Apr 2025 11:56:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 24F6E28001A; Thu, 17 Apr 2025 11:56:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0F07B280059; Thu, 17 Apr 2025 11:56:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DF0FC28001A for ; Thu, 17 Apr 2025 11:56:04 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8E0D0121AA9 for ; Thu, 17 Apr 2025 15:56:06 +0000 (UTC) X-FDA: 83343987132.12.70C77A2 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf10.hostedemail.com (Postfix) with ESMTP id DB3ABC0009 for ; Thu, 17 Apr 2025 15:56:04 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=K2ALKRTq; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744905364; a=rsa-sha256; cv=none; b=w4vbdD1Z81ERCdRsX5oqi4idRHNPAwFVveSIEXPicyW4tC7hm3TShnESULg5HmQwxp+WiY MAyX1nIfIEQ51F+Vsy25p3KboEkikJ4fWt9Ps88O8UsEHruTUSN5mB7OJ+eydRtM/65zHy fSLf90T5MdYpbVEe2Kx9ooMsHExbk8w= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=K2ALKRTq; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744905364; 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=oSEcAr/Nninfs8xf/2CKsjzTEjL1N076YIJRTQ8WFqg=; b=dRrpMv+Ipjkzh/IbtYC2OSKKsYCrhp9BHKM1n6ngXQUK0tGATgqqXhgfXuefY1d3a+4em9 jMQBSYyig6oV+u5Rdw7grsFe+nmnvCFO1P5zcddmezXA/zWIUZYjxJ3s+AfNdphn6KWoyI uJsR4298mARhQURZ5RMGBem+1O+xOsU= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-227a8cdd241so12886835ad.3 for ; Thu, 17 Apr 2025 08:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744905364; x=1745510164; 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=oSEcAr/Nninfs8xf/2CKsjzTEjL1N076YIJRTQ8WFqg=; b=K2ALKRTqrfMsaU1As0QQXkGzBpSYXWLccThNwnj+9/9C7Y4BnBRkxziQoIeSRPQqC/ WUvXmyLdf9LekOjqNEXsJuia07KupPmN1TqikyuT6UdZjBy08bd5ArfJk/my0zUSNmkq kBleA6AaQVpz9QOXdG9EU8U3Vu4xx5J1bmO2BPqoXY2FgY5JhXoTrhc5pR8TSk4/Wfmu yOYRfUlQ1Y/WMl9xBD0KjKBgkP+LRWJeCoYpctsONn7pgUC4/2bb/+daw6TXt6DZHNsf VamfF3JO6UiN8x5lp882cGE4NUETVJPI+l2N6B+BXe7qaGVtLbGVEB/vtcjREkNTUaOV zMhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744905364; x=1745510164; 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=oSEcAr/Nninfs8xf/2CKsjzTEjL1N076YIJRTQ8WFqg=; b=boSNutQIlQ6kf5gWnJoAj/a2iX5XqlCaPLiAM0KjiISK6FJ/hvBNlQktn/91r72MbA gzbPu4JSna9RWtEjZC+bLVCvYTxxv/TSWDucdMxyLLs36HPB1Zd/KBZsW9uaiJh75ES3 CdTJkry9MhUSrz0J9qCyAJfhUpf7CEdhLy/WYHioA6ipobrEnfgiV0FXsof40e5Orubp AQCcyfuY4+y6kNA6lMuqLKR645Q25O2C3YPwy0roM7ECwxgMb5rLFBIxtdnBDcDJJzNu 8C+tL8iD1DudCl/SB8OHlllLcSfLp7bLLsHcejpsuVxvB//vzgMjRUxnfizg8LUoK0sC VElQ== X-Forwarded-Encrypted: i=1; AJvYcCVi9oxD0+j9Hrou15pP3Cwf4PMQoqSlo8hwaCAeg8MTg/Ijk2PWPGrTRj0Z46rklz6rBesxQagM/w==@kvack.org X-Gm-Message-State: AOJu0Yykjq4CiS1fBBfsSj2+uBE8XoIy73vLiBgKmBO8XvXP/eosOAJM i/l7q/JCItyKmnuT+GXjowryrKG2RCiTVKEqyWKVTK4NmWkvfN+T X-Gm-Gg: ASbGncvoHskDI5TMu53SvgFziLEJ8ocQTXYnc3m5rNnHXNPWTDQD24htBHGkXcVh+HG ajaI/VGK0aBkGD8E8wUWf8bEU3TCJ6PynfPopOyL7hjvj/TTQ4D6cuxNEs6XztvOlPlYyjwDQv0 ycEWooe+qzzna6xeh85mMiZZ2c77w1KPyfdq2cpOdK+/34GyO7BMbPjoVjKTOP5eppsO1FP0C4U Y75mAVGFzf6ftHQrABCPgOejrNHpphH+JUJYlBrTYR441ObD+e+rbzKbF1MrJwNbmxl6xi3ITaa zUltEOybD1ZD+s+u2sAL5lCseoa78NFamjYuOzJ97e4wp3IbAVk2d6Nf3Zepa21Sfy0f X-Google-Smtp-Source: AGHT+IFJwKldYasU+o6JJFWYYy0XlsU/CWvQYjmAL/nLwbGDvCRVFchUBxwoQWEx+LafDXC37seMbQ== X-Received: by 2002:a17:902:e542:b0:224:7a4:b2a with SMTP id d9443c01a7336-22c358c50e6mr100309045ad.11.1744905363815; Thu, 17 Apr 2025 08:56:03 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8f03:9fee:5e33:e006:dcd5:852d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50bdaae7sm1636085ad.36.2025.04.17.08.56.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 08:56:03 -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 Subject: [PATCH 2/3] mm/hugetlb: Refactor unmap_hugepage_range() to take folio instead of page Date: Thu, 17 Apr 2025 08:43:14 -0700 Message-ID: <20250417155530.124073-2-nifan.cxl@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250417155530.124073-1-nifan.cxl@gmail.com> References: <20250417155530.124073-1-nifan.cxl@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: DB3ABC0009 X-Stat-Signature: bqkhindjbwgxy9wptue5kpz56tayyari X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1744905364-418524 X-HE-Meta: U2FsdGVkX1++NwyAysXES5P/pJ85R7G90xXbF7O6ps65+U4C45r1mdmYzZX1amVefNslKsWyj1zX9BoktKmQiDr78joB5V31R8YABlToJ0IWc0WN41lgr4Axusz/3F72Fjnr0ilu8IbYzDLss0ocwIc2nuoFtV9OGEB0sRfZczC8wumGvxy1bqDdOladc+g9Rq0nXFQk9JDKApjzaQyBx35yoSTp/koQvTGhNuQ6QKDcQmkjo8j9M6ugTFiQSIb6QRHl6hxyE5paJfiL6KKbCxzhgt5cXbNM83KYXf/9HB6RSQm/yANRVobwJXb9QnXRgP6lzAcy/2SjlonrndTW7KGmuZr/hW2cR320AzvmdMkKSfbsMhNM4p5uiwA85lxhIOo+fbBdeQ57VbhWcRaVQbk1Ay8zhwKEvfrnUfo6tOYApyZ+b5O8/UDceaIvXJlemK8ZBLEGsT3bG8IxputqfP862SF6erF5gsh5Oug2LeE9p3rgVq0Jxf+rnHS6Qcdp6/bybBhrScrdmmCZODKm+7z1Cih0AGQPQvVbToXEQ+rkGanlN8EIen5APj+MWlX05YgMn5jjbVo6DfhRpTJVVTVOD+p6YjUmapOjuvIcZ3H6QAjlkj1uDpdA7rrgRdVbhUHMlnWAC7Gz6aKMjUZ9z0fmqei6YFLlnlCd77NFfvRHPRypDErYBmZk8/yIOLzvzPpsuAdP0rQIQXk2eG8PkSaTEPbHYc5ox26J5VdrRsbmpLuyUz6FK6wS2VMIvsHLjhMLoGfwSZe0FJ7osU0vPRV11qDWFSonu3MesCgT4j+FQLCYer/A2JY2vErlqsQGr5N4nNSpuKtMPoRnnotLYQGAatvi+weJ/VTQ2CS4vh04i0Oci6dv9IxbJA4ptI5u2N2K5zjjDlXDlEP9W121912O5sgoSF0WPTufN70CShg5Doz3nC3H1C6qPmf83amgX/DH3GglEeoHwXigfLa oLa6eK1Y 6eekKro4EQD3BeZeclhiZf50Os6GDKrbELocy3FKIEWbeOSw4zxN7pATy6yMk2hCvGBZHaSwimIo+yyIc+13XDm889MtvanqO3YbG 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: Sidhartha Kumar Reviewed-by: Muchun Song --- 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); }