From mboxrd@z Thu Jan 1 00:00:00 1970 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 97149C3ABBC for ; Mon, 5 May 2025 18:25:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BBD716B0093; Mon, 5 May 2025 14:25:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B70AC6B0095; Mon, 5 May 2025 14:25:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C1546B0096; Mon, 5 May 2025 14:25:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 78F586B0093 for ; Mon, 5 May 2025 14:25:26 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D5794C05BE for ; Mon, 5 May 2025 18:25:26 +0000 (UTC) X-FDA: 83409681852.10.4C1E2D6 Received: from mail-yb1-f171.google.com (mail-yb1-f171.google.com [209.85.219.171]) by imf10.hostedemail.com (Postfix) with ESMTP id F3DA1C0002 for ; Mon, 5 May 2025 18:25:24 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Oc6mBdjA; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.219.171 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746469525; a=rsa-sha256; cv=none; b=vsXYJzmeUqM1U1Sf0SUcxz2kLsauTwZSiwgbAwOFg2s/QlHEL/eqhCYpOD5+BezwVkUeol T3y5cB9zS1IcXFtk5OORS5p5SBcpHXG5nhQzJXJP4dm4OeCWzHPdH/c/Sj/Cuh0r3Q74oV lLEc8kFs9cfCKQ7TMxMX4XnUmXmTVvc= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Oc6mBdjA; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.219.171 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=1746469525; 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=hwqgkNEYXyHkWyB1qk5+iP2RABWt8GbLuKvUfRd5GZM=; b=XZnJ6xEFBJgaYAdSEt1gaNZsINLvlCxZgY0wlQcjIM/mXtPb3dJxuQtf8a4edvLhGpha0Q 901mrvO/VF6QfotaV2T1XPc0VFkdspmznXrwtB4z8TEHnIvam8QFAFpy4vuYlcazDCgf2B dMA7w3U25imO4yg6v2f1X1S/fWYnH4c= Received: by mail-yb1-f171.google.com with SMTP id 3f1490d57ef6-e6e1cd3f451so4062148276.2 for ; Mon, 05 May 2025 11:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746469524; x=1747074324; 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=hwqgkNEYXyHkWyB1qk5+iP2RABWt8GbLuKvUfRd5GZM=; b=Oc6mBdjAQPqxbbL1JtcnIzxSB1CDrHgvEqiLDzuOVK2KjdaGiduz5pctErDkkt7UX2 8gDpZHEQ8//pMi+0ScH4vyaXWXe5xA4ctSd0KySeQKbg/PSd21K1vhxl3j/DO6RBNBRm HJEJni/MZwvxMccjiqN9V4ByCw2h049PkVJysQK8lpbnNDNOlOa46dOm64OO7+zWzFOs +kYHLcsT8GI2iAssbzV01Tbhp/fqUXxEHj4LZkmQ5qu2trmW1r1ap1XVLfPULaV1nCTo PniRPTBSiXKYkHjCpDJUmkd7LySlkbZvBqiH9xIzzuCmE45LzP4T4jzTzrQIQOS3aV4E a3OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746469524; x=1747074324; 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=hwqgkNEYXyHkWyB1qk5+iP2RABWt8GbLuKvUfRd5GZM=; b=BUilB8GgGDTdkAL6kWl3GOVNya8bWX9KshIam6EUyGTRhrdAavpKzkl/4C6CuSvrST 84zDLmd4aOnT6yWW4KZ/TTAsOJzKvkJTl7ksOEl/Vy6w45shq82qQXS+zjodzmb/zZT7 E03CfvVR8T0Z1oEzThe6lGAOq4t9jcVILE96n4wdrjSrr14kDlojabaKQiDcP4aMy6BJ eFLvn8hVL/F1LzdDsbgYo0CWfpTzQwr8dKAvJAE2gcFwHSluU7m51fR52yC8vcmzKLhh 9uRvaJTQMWR6b6Mcs6O0sIA6dzpIgdc8QqkK6ptGbwYFoBRULF41pqZgdOO05NvhihOs +brw== X-Forwarded-Encrypted: i=1; AJvYcCUX/ZlO+Fg42pU6F+h6T3aLe/TjK+s/WWUDhwMY58RRY+WZcXhU8WHPphTfEpDYpXewTN5Sii4zSA==@kvack.org X-Gm-Message-State: AOJu0Yz50N6htxhMDQfiL/md2DgS3OXTUuHY+zcyKlWrJ8NEXJ4Cb5TB Ptl13/VGaBTvRwD+qpaFTdH03AcrsW6XyCD6ZcJF+yBSpJEyoEV7 X-Gm-Gg: ASbGncsnIldRNAP9SuJ5kkEHCn84vlgUYwkU7gWB8KWvd/Gcq9ecU2Xz8szwTEHfj/+ jobd9RCsnac2fPRZ/qDuhmhqpVe/O9sbBxn7mlxg1SZrO19/L28ybA8nQ5lRluPDUQHWw30M2qa IWnemaXNK1p2RK8b5yV8pLkQOeRqGnfEbcY6JqSQG8fVnaRftvHsJXucXXyJS2ITk+ym6fIh2jx HHYJRAmS+4S9vAU7e+ehoVfTVWdRyd8s6RkvgrbrvGLXzAeUI8B49CDtI/Q5/H64XiIi1rcVtOF MdGcw9MOe3zxbLEzaza0Coek308EbpDUVNDl5gQA70J8DfD6pcM= X-Google-Smtp-Source: AGHT+IE2+UpQqJEfjCrdtdiWhaN6CoBtUcm6sMMIYpKWlJ/i479Wjm6/BZbUBkpHYu7GG5xJuDO0gw== X-Received: by 2002:a05:6902:2183:b0:e72:8957:328d with SMTP id 3f1490d57ef6-e757d350a3cmr9673327276.34.1746469524067; Mon, 05 May 2025 11:25:24 -0700 (PDT) Received: from localhost.localdomain ([50.205.20.42]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e755e7a897asm2113429276.38.2025.05.05.11.25.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 11:25:23 -0700 (PDT) From: nifan.cxl@gmail.com To: muchun.song@linux.dev, willy@infradead.org, osalvador@suse.de 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, nifan.cxl@gmail.com, Fan Ni Subject: [PATCH v4 3/4] mm/hugetlb: Refactor __unmap_hugepage_range() to take folio instead of page Date: Mon, 5 May 2025 11:22:43 -0700 Message-ID: <20250505182345.506888-5-nifan.cxl@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505182345.506888-2-nifan.cxl@gmail.com> References: <20250505182345.506888-2-nifan.cxl@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: F3DA1C0002 X-Stat-Signature: 57urkk4au7paqfdfec6knbog4r35gw5n X-HE-Tag: 1746469524-452247 X-HE-Meta: U2FsdGVkX1/AcXKZkZbH/KBbmQiROvaOBO6FTmo/rYDYz2bU9yzaP3pQLU1XMnSDxtOaaXRyoTeUcPIz/rSViDd7rYLs4ioF7iH2JlxSimrzJFPzFYVPV2A9361mfTfBtl6GguAY1S7DNQZJj0lohWd5T0Kd7PzDfAvF9Jvwxi6InQ7XknDQM98aj5772Oss6KHj6KGtkL3O2pzoBU5N8fQ7utFg/PEG7gK1oLZwj/J5bft18M8lteffTp0Vc0fvxSLdB2QhXxtzyPyUxLPunAlwIbPhZzcqUtavgXQlq7DG+mrIYF/pR3TOJYADSBdhWzO6w4K2EMnYTr5d6gtF6l+7sjQfyDQFiE6uZI5GGqiJHMM9JEWYUa4n9DO2J3PdLMPuFj2zsgEXYy2aomZsoJMC5XmLI15/rTjtN5yizOIIKecnI2S/VUcJlfEs82D5ZRkeE63YTbUV3oJRnn3MXNrZMckKN69it7Inlh7fmSLJX9obPrQapsZZEXuq5dv4xuVh2yUTM6qvlN7w26YNA1D/2fUD2yvudLzvOOUx1JVJ47gXna+crIHm4+ep18tBN7/HbrTSnlZ7R34E9fzqOw6L6Gh1AQN8eILTqV6UBLYefYeLqVojzyPPDrcVJp2z+pVerMik+A5mw5R3vEkUbPoMBB6qLAeFCEao08//bkoSiD0Zw8YGdf6viUpiathVe7xeHA8AtB63cIsNKSYilM1oWdda7Px0RwHeQZJQjh+Se4iMXlwegaj81b/c/lDGrP0QtHOMw1ua7tHb2Si0GR4W2JI4Vu6qrhng0NjqyiVJRHj1C5CZgsJW9VYarXXyv93Kr2Xil7y7cAykfZG+BGsa5FIiaNm378w/jsWdLAOmjhBdM9syPIb5+fNww1FXijd1bc7ino9cBHmdXuWjjgDUAoVSdfhTLZg0/628c3sw9csnMHdCtzhDlgq7CMj62UJla53oRuiOBElhu7r 64MeLSJn R4YUuH3NkhSMD8yavWB+18rFNeVBcqbl1UxUAEsAKy9G3iM41M/spp1U5vNJDUcbtgvitoeKNaPWEk98tfrgkMT+iKR3J4HxjG5cu6fPYEPLibGwQqeLiwjkhAxKM8DyR5i1gnI7+P66W6PSNIh5P6uy0jzC5Xtk+V23GxCRwK5mYJN7uyeti2t8qMQ3808BY98DN5wyFiDPzPnZcx5/3hpJH2MjDwzxp2TJYJvCeVNGzFiD/vqpp0ku3YDCAo0qjlZAMsUfa3SfL5RgvZoiSVUBnFVI45X5OhK5etoHSLvHvt+MMhQdxerDGLE5raG++IVpiukpgxTBg8IlfSXI/lxMeyDMzmzEyXKBSsP9RcbpfBAbpJQnM7d/vInjlH2Y5+ctr7GKtNAkq//TKXAOgoNzWmT5sJ27dosZcuq4Tc0kKDkdr6rLbBOYhNd73AzYsiebenDRjEORLgzgw8vtCk5p/9fty9oq8Wfg1EJL73Svk1TSXG0pdPW8rZCDziwPmJveDnQRnqWA82PW6Rr/oQSOPmEr10icvB9xPzxqpUvx6ZLg= 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_hugepage_range(), which passes in the head page of a folio. Since unmap_hugepage_range() 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 Acked-by: David Hildenbrand Reviewed-by: Oscar Salvador --- include/linux/hugetlb.h | 4 ++-- mm/hugetlb.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index f6d5f24e793c..eb21619206af 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -134,7 +134,7 @@ void unmap_hugepage_range(struct vm_area_struct *, void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, - struct page *ref_page, zap_flags_t zap_flags); + struct folio *, zap_flags_t zap_flags); void hugetlb_report_meminfo(struct seq_file *); int hugetlb_report_node_meminfo(char *buf, int len, int nid); void hugetlb_show_meminfo_node(int nid); @@ -455,7 +455,7 @@ static inline long hugetlb_change_protection( static inline void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, - unsigned long end, struct page *ref_page, + unsigned long end, struct folio *folio, zap_flags_t zap_flags) { BUG(); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index c339ffe05556..443b75e116cf 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5840,7 +5840,7 @@ int move_hugetlb_page_tables(struct vm_area_struct *vma, void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, - struct page *ref_page, zap_flags_t zap_flags) + struct folio *folio, zap_flags_t zap_flags) { struct mm_struct *mm = vma->vm_mm; unsigned long address; @@ -5913,12 +5913,12 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, page = pte_page(pte); /* - * If a reference page is supplied, it is because a specific - * page is being unmapped, not a range. Ensure the page we - * are about to unmap is the actual page of interest. + * If a folio is supplied, it is because a specific + * folio is being unmapped, not a range. Ensure the folio we + * are about to unmap is the actual folio of interest. */ - if (ref_page) { - if (page != ref_page) { + if (folio) { + if (page_folio(page) != folio) { spin_unlock(ptl); continue; } @@ -5982,9 +5982,9 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, tlb_remove_page_size(tlb, page, huge_page_size(h)); /* - * Bail out after unmapping reference page if supplied + * If we were instructed to unmap a specific folio, we're done. */ - if (ref_page) + if (folio) break; } tlb_end_vma(tlb, vma); @@ -6059,7 +6059,7 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, tlb_gather_mmu(&tlb, vma->vm_mm); __unmap_hugepage_range(&tlb, vma, start, end, - &folio->page, zap_flags); + folio, zap_flags); mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb); -- 2.47.2