Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
To:     linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc:     akpm@linux-foundation.org, songmuchun@bytedance.com,
        mike.kravetz@oracle.com, willy@infradead.org, jhubbard@nvidia.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH mm-unstable v2 2/8] mm/hugetlb: convert __update_and_free_page() to folios
Date:   Tue, 10 Jan 2023 15:28:15 -0600
Message-Id: <20230110212821.984047-3-sidhartha.kumar@oracle.com>
In-Reply-To: <20230110212821.984047-1-sidhartha.kumar@oracle.com>
References: <20230110212821.984047-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1pf4ss0ZXrngEpP3s6Fad79txZOqDpBBGjLpdipeLg6G8e9jy+polv57fGNI?=
 =?us-ascii?Q?xaCl0sH+r81aV/734H5ZSrhKMseLeczA6POCv6P64E/rR33aI33+eDIow7P8?=
 =?us-ascii?Q?M6hxIdZxcbCawbgZeuAZPSYHs+9Iwm0aet+CQSYu/YF/inxuRys2xXV1fuId?=
 =?us-ascii?Q?gv5rdJKdlGDJPcfZxPxE7G30NB1ZuIYDrruavIeWDkm0L6s8dLO1d/C77HsS?=
 =?us-ascii?Q?fgEF5VOXHRpoPb7bc1FruBO8Fgh2FYp63PNxQqpQbX8c/eiu9QVQK4aJK/P7?=
 =?us-ascii?Q?jiwvRw6FsIimWAj4uRMy5G9qvlNV/taaLrIaq3Jw6Z/W2tSa9VksuMDIaGQv?=
 =?us-ascii?Q?XiZ1WqahA3MHzur/f61XnJ3CKM1mnXbyTlMs2KbPQv8chO3UiKOFCRGf5BjJ?=
 =?us-ascii?Q?Kh15rz5VeloitGZGJnE5OQNqni1nbd7Y0OAszuPJrYQ37gTwP3/i7YJoRz6a?=
 =?us-ascii?Q?A7mr1t6XI8pagzgtkX4GEgLvQzHj3XAMWeYD5RHdoTtJdat/Bfb/sYGOKSX9?=
 =?us-ascii?Q?iUv68mz9wiVRmERmIzwMpzMRT4bYuMjn+rKKhtdqFY72+5WKFmwv7SXMERkI?=
 =?us-ascii?Q?IyetDrvupWWQIg9Z29tmbDt2LTFMa9MU2bYvBvav5H7kOrTKiKhsLigKaVet?=
 =?us-ascii?Q?OPaBBl3h3scQeivRld7O2VCNhdiBIQEtJ+lGfuNiJSVFxs0uw/MMZgPxQ/3W?=
 =?us-ascii?Q?gW3BgzOkPFTYpgQDzYnncuBPv8rYXZV0mLEUeaseHEC0z5bMC6t6oTxbPwx6?=
 =?us-ascii?Q?pmP9FtPmdTI+2Ar1phCzyRazol7Oix6jN2CUwL9QaN6d27C3nkWXiwkV17Pq?=
 =?us-ascii?Q?CA4HAsfunv9l/iPJ2kpH0opmYGQ+o5vLwIKBCvIGfuY2AoYpk/LOATbXqG/s?=
 =?us-ascii?Q?E2n8+vLjkR+Uz9asjVr7/6VO4AKqFavH+ieLXe0y3Bj2q/NY9Zvsv2WnmbB3?=
 =?us-ascii?Q?l40vTCoviJaqgHFpJnwjIqNqZMUEVXWrg9CwjTPnN7/PiIOeaMta/EkV4+cm?=
 =?us-ascii?Q?yfh1eaTSGv4alWfipjxmQReL2l1bzyMtWXGv1fhP2FH6atSxVvpGEAbGttom?=
 =?us-ascii?Q?TYqnNjnJiSsDVnbuDeKR1pT2+5/4QNVkFdj40buooaCZ/I7eFSdu4hCRJvey?=
 =?us-ascii?Q?VxauUXp/n8w+Eutgyhhi+Uq30IhWhjmg2q31iOsmKEzDD/UNogmlY8E57jxy?=
 =?us-ascii?Q?lTw3dfZ1nfiMLh7Xl3y+U+Q7b15Y8Ml+6jxws98poPpYCQZQ0gPRZhTYmzYB?=
 =?us-ascii?Q?yI9tFp2NAPqjVo73NzSwZFuKC3moA3vHKbLwK99YiSksp0gM+UW4H7cKJrhY?=
 =?us-ascii?Q?rDbGJSYaShoKAfT2oIzz4KdaweLPwzy4RibS0VasFjmhKA6+ZWZdM17P4Pjf?=
 =?us-ascii?Q?R/EYIPsm0/y5TxRgEvw5JM49++eZ3o00WXktyjyGmn4vIgbboTvHZOOtiQEo?=
 =?us-ascii?Q?fCwRcgGnuD5KjdbRAHf0mrqpUwBEAiNjsQRZOxQP7GZjIysAe/P+lJgVi4jf?=
 =?us-ascii?Q?yukv4Zn1g5LE3w7noVMUnOeTQBShbcMa3lYOILCe2H3ssMZOn18Y4R/JYyYg?=
 =?us-ascii?Q?wzfUXNnoy1HEAyenLOdFknaLaMISAOSK5VPTkNlVXqWHegoA9kbTFpNJ5vO1?=
 =?us-ascii?Q?WXBRikyjrnyHSycGTHV8T/0=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?JSxArzg/iEwXMYb7PqUj78oZCdfqdmOiDDVqEj3AtaJWGs8gVz6eq+pViM5s?=
 =?us-ascii?Q?rd+6qv9IjlJtU0l+FkA0Gc/7uCmUctofGpJs77Xy7tgvCNWLYZNc72Qmzgli?=
 =?us-ascii?Q?GIfgKZVtrLHN4S2bUJy+8oT6n0lfjAAuOjDG5eb5/uPCIlFBkqcQ/f5mEvdv?=
 =?us-ascii?Q?cbKJNxfEw3qhzf2v3F47ow6cz4DZRurr80e/ukoLjyB8uxbPJKglycSLSBa8?=
 =?us-ascii?Q?0aqYHclQdbflqXg0WkjEwhp7Y3iiULxMg+hBzcnjiNz7FhdWGV+kI9GYVEGT?=
 =?us-ascii?Q?TeYVpYGi/jb4GSUux6lj+a2jlMbJhjV4suKRNiYf8z2YbRQ/amaEq+7tAVxi?=
 =?us-ascii?Q?Zm1a8xdianEXaCkJJ3qKGvKfDXy8JQBeS/mPth/EVEfXvjZKyay79zVHoBVI?=
 =?us-ascii?Q?65xsQC4m0h/jOpg67Xva5dEe2uLgTy3HZ5ipfM3UsRU/wUri2GSUcE7x4m1H?=
 =?us-ascii?Q?ISrtY9ehWdl2F0aowd9g1gd0Xxw8P2CSYuFKT7OUzgWZtcV5G7Eg2EWkkZXW?=
 =?us-ascii?Q?l6JMFU4bi2mCp/mPM4bjEB/idpKTIQZhSUeZZmdDJ0L080ZzFzB+iOcRUctY?=
 =?us-ascii?Q?/hj0xnPnuKKAkH/o38PbwDOpZgwZkWBKn9erlSYGSboK9MK4XOW6/uBRJlJI?=
 =?us-ascii?Q?v9A6lRoZbRt/VBJ7XnolW3W8FKlIdAXpFXqXQCXB1Llul1CFXVmsaIVPMG0B?=
 =?us-ascii?Q?Cnf5m1fxoUomItkW+PXeOghyGMI90OoFTPA1vEWEtxEaBt78mD57VYTEGqMg?=
 =?us-ascii?Q?zIUYdj/BrJEYdQTl82lSXK7i1Vfts5O+LmcUEMo9KUvXIlOUozRcvvki7xXw?=
 =?us-ascii?Q?WR+QEpfCG92smTUX73XdP5pSz8oqKAI4MWa8YiqLLY/LLa+iON5Op0vFveD+?=
 =?us-ascii?Q?BCINdO+BMeMpR7yzITXxz4J6ZziyYQePY2SqmMqXBNT+EG8vK8Lps1eQbuGw?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bdae4b27-ffaa-4b77-deea-08daf351a15b
X-MS-Exchange-CrossTenant-AuthSource: DS7PR10MB5117.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2023 21:28:35.4055
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 4gd9ZhhDq8ibECPYdu307LtwCie3V4cksyW2DRS9ZjCXfrypo9HejW878+QpbCFwjE5bN0FPnewofDgZDAJEcimmPFKNQX/E1zKu4VdamcU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5133
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-10_09,2023-01-10_03,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 mlxlogscore=999
 adultscore=0 phishscore=0 suspectscore=0 bulkscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301100143
X-Proofpoint-ORIG-GUID: krBTCGsmoZ1qLCk89MOoVIMewxOellAd
X-Proofpoint-GUID: krBTCGsmoZ1qLCk89MOoVIMewxOellAd
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Change __update_and_free_page() to __update_and_free_hugetlb_folio() by
changing its callers to pass in a folio.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
---
 mm/hugetlb.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 540f33d8cc51..9155bb5ee570 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1556,10 +1556,10 @@ static void add_hugetlb_folio(struct hstate *h, struct folio *folio,
 	enqueue_hugetlb_folio(h, folio);
 }
 
-static void __update_and_free_page(struct hstate *h, struct page *page)
+static void __update_and_free_hugetlb_folio(struct hstate *h,
+						struct folio *folio)
 {
 	int i;
-	struct folio *folio = page_folio(page);
 	struct page *subpage;
 
 	if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported())
@@ -1572,7 +1572,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
 	if (folio_test_hugetlb_raw_hwp_unreliable(folio))
 		return;
 
-	if (hugetlb_vmemmap_restore(h, page)) {
+	if (hugetlb_vmemmap_restore(h, &folio->page)) {
 		spin_lock_irq(&hugetlb_lock);
 		/*
 		 * If we cannot allocate vmemmap pages, just refuse to free the
@@ -1608,7 +1608,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
 		destroy_compound_gigantic_folio(folio, huge_page_order(h));
 		free_gigantic_folio(folio, huge_page_order(h));
 	} else {
-		__free_pages(page, huge_page_order(h));
+		__free_pages(&folio->page, huge_page_order(h));
 	}
 }
 
@@ -1648,7 +1648,7 @@ static void free_hpage_workfn(struct work_struct *work)
 		 */
 		h = size_to_hstate(page_size(page));
 
-		__update_and_free_page(h, page);
+		__update_and_free_hugetlb_folio(h, page_folio(page));
 
 		cond_resched();
 	}
@@ -1665,7 +1665,7 @@ static void update_and_free_hugetlb_folio(struct hstate *h, struct folio *folio,
 				 bool atomic)
 {
 	if (!folio_test_hugetlb_vmemmap_optimized(folio) || !atomic) {
-		__update_and_free_page(h, &folio->page);
+		__update_and_free_hugetlb_folio(h, folio);
 		return;
 	}
 
-- 
2.39.0