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 B487DC3DA7F for ; Mon, 5 Aug 2024 16:31:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3666D6B00AA; Mon, 5 Aug 2024 12:31:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 315D96B00AC; Mon, 5 Aug 2024 12:31:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B6C56B00AE; Mon, 5 Aug 2024 12:31:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E9B596B00AA for ; Mon, 5 Aug 2024 12:31:35 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 372EC1C595E for ; Mon, 5 Aug 2024 16:31:32 +0000 (UTC) X-FDA: 82418732424.28.97CE239 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf29.hostedemail.com (Postfix) with ESMTP id 97A0C120006 for ; Mon, 5 Aug 2024 16:31:28 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b="Aqi/qSpx"; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf29.hostedemail.com: domain of aruna.ramakrishna@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=aruna.ramakrishna@oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722875443; a=rsa-sha256; cv=none; b=pA+Nts2oNZb8USp7C1QdMjkJlvaWhTDK8Tchnf24SinJpl6SkMI18vlM5YWEm1Pg9cPNVN 4wnoIRfCZgWCBZewdSr7qh6F+FHONolPWr02Kn1loQkDSt314mDK9obY+ts6ljI0TNQzGi YRlxZv55Uk097LZhoVkGOuzGzB4VIkk= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b="Aqi/qSpx"; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf29.hostedemail.com: domain of aruna.ramakrishna@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=aruna.ramakrishna@oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722875443; 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=W0i83NbyKEGCAGqUWVfF4lWbnk+wYbMMgwKGbu5IKkc=; b=b5YrqDXVhQ338646wDDQ0z8czW+qLzOo7RReuQ2lIHgjSQq3scY0HDJrDk6xh+Fe6P9L2b qOZBFcu0MuT5nk//8C//ywvjHxPXgPsq4S6ZCXG6KSIsQkGPA4JOvEcaANFIFV91ved2f6 gIqcXbIOf5dLGcgjlPccVf/Thz54kG4= Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 475FtWxq013505; Mon, 5 Aug 2024 16:31:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=corp-2023-11-20; bh=W 0i83NbyKEGCAGqUWVfF4lWbnk+wYbMMgwKGbu5IKkc=; b=Aqi/qSpxqEiz8n65c i3Drmv36Ivkt2ZTRxZMdTQ7npitO0mC/UnNTHaEI5j8HislCttcFD4hwqyg28+J6 Ie6UNjiUgHjFtkL/IJdU6n3JJwtf35jEL68UumErPcED2ps0afhSYO2p/paoPt6H BZuessn7ar38XimIdNQk+kTtAzfvddhAD6Ed2xjv1iUZ0mhosar1zrFn9GYYVA1a DHutE8mHUeTbiKl02LFmpc5Wy7Lv9bSsSeYMN2N1WYTu4pW5Ja7ZuR+wgsOWlTBe gmYJRKi6UTQiTdACUoGO6hT9mpxpQrW3/y/XQIx8rmZ240IZUAjAyEcFl1fvgyY5 myfeg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40sbfak3rq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Aug 2024 16:31:25 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 475FHjIM035068; Mon, 5 Aug 2024 16:31:25 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40sb07mddw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Aug 2024 16:31:25 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 475GPvBd002152; Mon, 5 Aug 2024 16:31:24 GMT Received: from aruramak-ol9.osdevelopmeniad.oraclevcn.com (aruramak-ol9.allregionaliads.osdevelopmeniad.oraclevcn.com [100.100.250.99]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 40sb07mdcs-4; Mon, 05 Aug 2024 16:31:24 +0000 From: Aruna Ramakrishna To: linux-mm@kvack.org Cc: willy@infradead.org, aruna.ramakrishna@oracle.com Subject: [PATCH 4/4] mm/mempolicy: Convert alloc_pages_preferred_many() to return a folio Date: Mon, 5 Aug 2024 16:31:20 +0000 Message-ID: <20240805163120.5971-4-aruna.ramakrishna@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20240805163120.5971-1-aruna.ramakrishna@oracle.com> References: <20240805163120.5971-1-aruna.ramakrishna@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-08-05_05,2024-08-02_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408050119 X-Proofpoint-GUID: q4CmtGdBbBsgg0APDE2Q5MbsKyOxPGgE X-Proofpoint-ORIG-GUID: q4CmtGdBbBsgg0APDE2Q5MbsKyOxPGgE X-Rspamd-Queue-Id: 97A0C120006 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 3ta7twoa9afis6i5kpms8thwa8r3zww9 X-HE-Tag: 1722875488-534294 X-HE-Meta: U2FsdGVkX19clFLUzgQbEcFDyKzRHkiJLSqA7/nOeE/XVfEKVUrYqhy18HEYP+e+2zT/wcZvz5mWRVflgWYLuWAwjEPAk1weqM12Kbukn80tXLcYfZ8h4fHOw73ZRWkn1SR7ngCvZuO7CCdaKHu1BnumSHb0XNom3pcfDQ3/Hd7x18jkZkHGdHw3XjAdBrFYuWkBmhbyMlw9q7O30vKrOr2/YhMkUKmDhAjRo5kP6sTH1nDL2vY1JavG+o553+lb+fopKfh4CnEN2GJ9qAk+/KMKl2AC/v18oRhmXDgggBMzQZ59kfPP/7tRiBvyNH6hRev4eXzUuuFCCCWn4iRsVkelHYipQbxXBD6fs42Rhf9MFyorbfZwroMvoK2xWXuJfWhUdN5yak5ALio0nB3D7gFkWbN9nJpA1jyqkk2JslWGARDCjV7FAE+C7glPcDE2x8aFwxIkSY2naRq0AanYBhwFx87wnnnfRO2l39PszvEcFS9iudzcRSLLti6NSv4eVq0VBd3l4EUgVDC/nhiRM3Lqdc1oNhdGSwYpVuHcN0y5uE6Iwtz0q2DZ0AYd4qGtB4Sc44PMV/Vn6mDebUt9rG+1aPTBLHDaOI6RIbjP3CuD+tYLJqe/R1uTkwItkhNBw3bGy7yzYwhpnGfbKenI6kkO319ju4kQjjYphf6WSG5GWIKIkABs0twMnnL5ECJmRGoZdcRr4W1PSy5CZ+6Xc4kkgC0FBnFfvv1o0aEiltRfq3fRzTg/oRATn5hiI6dU0uqyS2tkJmMY4nQSmjVmKzK27Y/ZKZVAowkGZto23eCjk/fSxaYanj16DWAdciyaSwGtqAMAuWYlark5WR2IEXMIq69zIaR9acOyoPVwg04+2hVlRw1NNwoHYlRL01zjcXvqhchwpwMinaysHAkiz3YbJ1/lwFQ3AEjE6bhLv3r1VaCtHIpvo+vAxNizUisZv6liDZOso2qQ3xbJRsH ejZa9+rt k8HEIgWXr9XDET2IhanoKLeofW5oS8xTzEgz04viufIBjgIzaGOxagnQ8mRga+GIntL/B5OIeZZRA8si3RLXwbB+SRgv2dnmuYhlS2r/bXxkgIWbITGo9W/gdgB84yfUCRoM2bov0wY9kELGsFiF+QZGufAY69a1Le/pofYzrqz5Q+wXr9VGE2vp+DnQiU7S15mZIV4cN3sNc3c1FR8V+pa4ftz3aH6vyXLpmNmmP2T1meIHM1oUqZNpqlBMmNyP5tj1X 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: There is only one caller of alloc_pages_preferred_many(), which already expects a folio. Rename the function and convert the body of alloc_pages_preferred_many() to work with folios too. Signed-off-by: Aruna Ramakrishna --- mm/mempolicy.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 9be32c3bfff2..33074ffd59fe 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2185,10 +2185,10 @@ bool mempolicy_in_oom_domain(struct task_struct *tsk, return ret; } -static struct page *alloc_pages_preferred_many(gfp_t gfp, unsigned int order, - int nid, nodemask_t *nodemask) +static struct folio *folio_alloc_preferred_many(gfp_t gfp, unsigned int order, + int nid, nodemask_t *nodemask) { - struct page *page; + struct folio *folio; gfp_t preferred_gfp; /* @@ -2199,11 +2199,11 @@ static struct page *alloc_pages_preferred_many(gfp_t gfp, unsigned int order, */ preferred_gfp = gfp | __GFP_NOWARN; preferred_gfp &= ~(__GFP_DIRECT_RECLAIM | __GFP_NOFAIL); - page = __alloc_pages_noprof(preferred_gfp, order, nid, nodemask); - if (!page) - page = __alloc_pages_noprof(gfp, order, nid, NULL); + folio = __folio_alloc_noprof(preferred_gfp, order, nid, nodemask); + if (!folio) + folio = __folio_alloc_noprof(gfp, order, nid, NULL); - return page; + return folio; } /** @@ -2226,9 +2226,7 @@ struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order, nodemask = policy_nodemask(gfp, pol, ilx, &nid); if (pol->mode == MPOL_PREFERRED_MANY) - return page_rmappable_folio( - alloc_pages_preferred_many(gfp, order, - nid, nodemask)); + return folio_alloc_preferred_many(gfp, order, nid, nodemask); if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && /* filter "hugepage" allocation, unless from alloc_pages() */ -- 2.43.5