From patchwork Mon Aug 5 16:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aruna Ramakrishna X-Patchwork-Id: 13753821 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 06E37C3DA4A for ; Mon, 5 Aug 2024 16:31:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B0B66B00A4; Mon, 5 Aug 2024 12:31:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 55FE46B00A8; Mon, 5 Aug 2024 12:31:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4276F6B00AA; Mon, 5 Aug 2024 12:31:31 -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 1F3CA6B00A4 for ; Mon, 5 Aug 2024 12:31:31 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 5DBDEA217E for ; Mon, 5 Aug 2024 16:31:30 +0000 (UTC) X-FDA: 82418732340.21.AE737CF Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf08.hostedemail.com (Postfix) with ESMTP id 55FEB160012 for ; Mon, 5 Aug 2024 16:31:27 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=nMNye1oV; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf08.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=1722875419; 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:references:dkim-signature; bh=Od6tdgsKPJMjGN18upXQn/G2mVuedNwUlfV18/Qb/9w=; b=S3cBav564/u4ZRK4x+p33c+giVkdvKLy4R/v8W/ABTrOuFOqshl1nkMtEakGDC8wAC/Ti2 jFBFwS5E1Bg/3OzyV2kE1ITAlIa6UVVkOZejZ67LUR5s2vziajKOC7tAOx3OpQcj4yT3zg kIx+ygn6IlJlOo8O58CyMMIdPL138Kg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722875419; a=rsa-sha256; cv=none; b=3JC0uW0n7hoEB1LUj7xN9cOdFvE+3ln2c7hymksTxQ3UUS//A94f/gSvwRmCapxt5Dtu1V AHrkhoW+Dw20kGoScycQKqD2h1BnKDemGMBNM/pjl1zpr37S8Wfc4iNm5bhy4afgtwMewA qABtTai6sNUQsHNDYAiFGsF/u6EUcEk= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=nMNye1oV; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf08.hostedemail.com: domain of aruna.ramakrishna@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=aruna.ramakrishna@oracle.com Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 475FtXiE007446; Mon, 5 Aug 2024 16:31:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=corp-2023-11-20; bh=Od6tdgsKPJMjGN 18upXQn/G2mVuedNwUlfV18/Qb/9w=; b=nMNye1oVYTC4WBz48tH/Du0NEJ+Xp4 FsjySV9EX1Ut6K9WZ36GznE5IQaHo4+n9MDs/tJ5NxQyt9TV7qs97XHU2ZblMrQy zwyWfS0u9447WO/l4p9hQ55/XOQrZmAMp/Isz/DVAOMCx7GVBNKmNk35N2wXQr+e 2Uh5WLrohR6tyB7YcYEpZskG+Hcj8u+Lt9wza7XK5O9iDnCAH5PWn5bLWyBaOxgi jEawR9FGAvQl1UEr0IfSSryPn7Irlak37Z4nBhjhPKMBJ5ASZCcYDmvK2tWeHwub DkIE6BZgusfOsQEKCF89jiCkyRduyXfFV1gUdZ4BwX0sAxytSvVExHUg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40sce931fy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Aug 2024 16:31:23 +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 475FFp7X035030; Mon, 5 Aug 2024 16:31:23 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40sb07mdd8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Aug 2024 16:31:23 +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 475GPvBX002152; Mon, 5 Aug 2024 16:31:22 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-1; Mon, 05 Aug 2024 16:31:22 +0000 From: Aruna Ramakrishna To: linux-mm@kvack.org Cc: willy@infradead.org, aruna.ramakrishna@oracle.com Subject: [PATCH 1/4] mm/mempolicy: Use folio_alloc_mpol_noprof() in alloc_pages_noprof() Date: Mon, 5 Aug 2024 16:31:17 +0000 Message-ID: <20240805163120.5971-1-aruna.ramakrishna@oracle.com> X-Mailer: git-send-email 2.43.5 MIME-Version: 1.0 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: 4U1LaNqbcZYJjQ1n5tVyMl8HGO-JbONY X-Proofpoint-ORIG-GUID: 4U1LaNqbcZYJjQ1n5tVyMl8HGO-JbONY X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 55FEB160012 X-Stat-Signature: gggycw8wix4k8ipfyih9sb15k71pbkz5 X-Rspam-User: X-HE-Tag: 1722875487-883307 X-HE-Meta: U2FsdGVkX19Mlvc+Znvn1hd99d1RzMCd5EHpXd5/I5BAN2S6A7LWP7NhU1skrwzGGqEXDUq6+fE5DnROZp8eFdZDpBEe5sBcFEcU6/Ms0wiGfmvZEq1WKd1Fo4PW4QgZUzFBtpDjql8pebqOJDZkZ7RObVfk4XrYItKvQ15bZtQJvCRQfG56KLVA+uqbq9tkWgoGC5/3PcDcqzk0mM+XpIsaC2oVtJ/YszVDuQ3FMAzes99aYhNCqtiPKqLr+nReMHVUTLYEZXsKNo92xjqowGioixNd0NgrbJC4wGU7ygmdTMaYGO17Ucg4mZ/gi8tXZA5Y36jG8uAz/ntxJbsXQn3vAz1bch+06dFU0izaCxYVRzg+Dyb+wQALTK2iOUgl6wuQyJUMb2ZutrtkAXPh+T9qwChyrqS1f4weMZAk4ZD9LOOszYoVTQAKC52pibqEaJFl/P1S7aNkYkdzeAYt4rZAxC0VNyx7sb5F63VhRe2bHukrMnSpg1Udpkz3J6hOOy98v16N6fTCe94riVSXSkpEA1kdqUVTW5vzME0PjUO0HpVXpC9JUZ4G2F8W7TEFIQFZ2Bde2deIGYPuvaHtdu2GZ/Y/3lyr8YtwxTHZmvX9Dq/bCOJjBXGCbzDWpC/XZTFc9ihFC15SZS/5d0eEsf484rMfVu+mKjZfWl0F9lt66eJHC5VVG0MJakPu5+msfaOXoijuB8n9023ztcTcYiGttpgXHZobbSDFQMy/E/MGbfa1q34Dj/hF/aImr8flXzFSnKuGjo2l+YiTQXyL147d48DMgA0xo3DP12I/FAOGRf7NRbDFBwYQQqrLoGO6uHfg2zf+ojdZ01Vw6GBHl+9Meevzz3fN4nd6Mp4ru9EuXn/fNqn3NYuZpNOVuC6LKUZUhvzJ188VclB2TzbW3EcPVNtW8Ov6MNrJPA3QDEs0NLz/8qxuh/gO9xrfPQxHX4H5xgq2jj2QN4QI1ly ylujWXu9 uPJIGiAnY5veac1Ld1dnPeYMiKeFNHdL/wpgucH3snV5uPol9XP59HHCjfajRFfJxX8sGZQuulkw0EIRHxvZjvoV2A5DAuqJ4h5QD679sLSRqmZ92S6L2OIQrPNgoaB7fvsxVUkIgGNSbNnlZxvK7SVYqBhnzxM//OWFU+uoP7soxJhcKsgz4qp93piyvHma4V+TnX16ztg57NKzfaDdGwNI187jQhH6m0YpGiyyEDF59ghgV2lX7dLK0l07EqWYY7/VF0e5QnWPixu6+KHGr0bDPGeIm18tmcjsaNOaaR9P/q44= 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: Convert alloc_pages_noprof() to use folio_alloc_mpol_noprof() so that alloc_pages_mpol(_noprof)() can be removed in a future commit. Signed-off-by: Aruna Ramakrishna --- mm/mempolicy.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) base-commit: 2b820b576dfc4aa9b65f18b68f468cb5b38ece84 diff --git a/mm/mempolicy.c b/mm/mempolicy.c index b3b5f376471f..2d367ef15d0f 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2332,6 +2332,7 @@ EXPORT_SYMBOL(vma_alloc_folio_noprof); struct page *alloc_pages_noprof(gfp_t gfp, unsigned int order) { struct mempolicy *pol = &default_policy; + struct folio *folio; /* * No reference counting needed for current->mempolicy @@ -2340,8 +2341,10 @@ struct page *alloc_pages_noprof(gfp_t gfp, unsigned int order) if (!in_interrupt() && !(gfp & __GFP_THISNODE)) pol = get_task_policy(current); - return alloc_pages_mpol_noprof(gfp, order, pol, NO_INTERLEAVE_INDEX, - numa_node_id()); + folio = folio_alloc_mpol_noprof(gfp, order, pol, NO_INTERLEAVE_INDEX, + numa_node_id()); + + return &folio->page; } EXPORT_SYMBOL(alloc_pages_noprof); From patchwork Mon Aug 5 16:31:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aruna Ramakrishna X-Patchwork-Id: 13753823 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 A8566C52D71 for ; Mon, 5 Aug 2024 16:31:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 429996B00AE; Mon, 5 Aug 2024 12:31:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D9876B00AF; Mon, 5 Aug 2024 12:31:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A19C6B00B2; Mon, 5 Aug 2024 12:31:47 -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 03ECB6B00AE for ; Mon, 5 Aug 2024 12:31:46 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id CED8EA8FCC for ; Mon, 5 Aug 2024 16:31:29 +0000 (UTC) X-FDA: 82418732298.18.5FF1B4F Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf15.hostedemail.com (Postfix) with ESMTP id 6E36CA0009 for ; Mon, 5 Aug 2024 16:31:27 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=JsYruA3v; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf15.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=1722875418; 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=eefc9Mh53KRORsZjpXCTu+A860TC+S6vfh2bZP8GZ6M=; b=VLgdoAvOVUVPxZhU4+g6Gnzv1RMiULt7dPqtEC6t0w5oNEDGjPi1m3ppthGFhKp1uMf383 shShFU7BSnkfxQu8cKRMp0yxqxev3IxpavX4pADT7I4TRuL1oXMq2P91duh+qSikcEeB0Q S7RroSQhy5q7aHXRVSKeGxwkHjjMHTA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722875418; a=rsa-sha256; cv=none; b=4s/d89amiJszQrqvvjA5tV/cxVyjxaMYaZewIMcQyyiVExCztZ1zFuPpf1xrK6KyNio+lP F6Oge+SgbZdc8weTsRxeLoyhSIFKtzrA0pBWyQe2KtDBD7Bq9x6HuYy5ggpl22SYegzn9P r/88fJPuoYrcEnmnm0yggRncCDIX+kg= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=JsYruA3v; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf15.hostedemail.com: domain of aruna.ramakrishna@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=aruna.ramakrishna@oracle.com Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 475FtVbW012878; Mon, 5 Aug 2024 16:31:24 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=e efc9Mh53KRORsZjpXCTu+A860TC+S6vfh2bZP8GZ6M=; b=JsYruA3vXDzAi6RPu k0QIl+BW79eJZL1ReU6LMRAHjaxm6zr5Z43rzvNI93lfGFBLnMSAiA6pD0lh7xoc YUe2QNjC1JopmzSzJT8tgdI7iPTwwevFajnpItMEhhhbpjvves2BycusOrai5B1e NLVMyb+3fponaJ9JsCdyDjeIFAK/A+F3Q3rpGopDFJEcgmV5ATEw++WEgkuxatE4 YCzcXJZVttUVjwcKBs9KM5cIA/JeUph0eQHOvO5wrwGNqvCDOjWaG30xJgoGH/DC 7QTOtLEfQLoV7w75sFlCdTD7oZSwUlz2SN1BDIDv1QkkCMvCgW04CvPEgn+jFdNS EHXag== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40sd3uk18n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Aug 2024 16:31:24 +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 475FVmJf035245; Mon, 5 Aug 2024 16:31:23 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40sb07mddd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Aug 2024 16:31:23 +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 475GPvBZ002152; Mon, 5 Aug 2024 16:31:23 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-2; Mon, 05 Aug 2024 16:31:23 +0000 From: Aruna Ramakrishna To: linux-mm@kvack.org Cc: willy@infradead.org, aruna.ramakrishna@oracle.com Subject: [PATCH 2/4] mm/mempolicy: Make alloc_pages_mpol_noprof() static Date: Mon, 5 Aug 2024 16:31:18 +0000 Message-ID: <20240805163120.5971-2-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 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-ORIG-GUID: 6t-TxLD0Cmj-56PBm_2341KuPBjFdHuf X-Proofpoint-GUID: 6t-TxLD0Cmj-56PBm_2341KuPBjFdHuf X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 6E36CA0009 X-Stat-Signature: b7oc4wzxdstocceaxksprriy9jmqw8y8 X-Rspam-User: X-HE-Tag: 1722875487-928185 X-HE-Meta: U2FsdGVkX19iNK6G5VtgEDsnxhQa6w4ZHO4weLHInDoy7y/Ur6AzAWa+RJfDiYU19kDYcxBtn4Jy8kkjAScbBST7pd748nbNsM3ELq1/h6v23+Ew2C0oIzGsyD8F2wt6S+sl7KyYhffTj4wPRDKBQU0nqrZUzI8rAAtAKGKHsKquNNsEzQWSMlJMtCJiVVhNjPYFCmmqyVAzdPwpb0sSKZyorGGD3mpDqWsvOZ2N8zUzGs35ydo34JCJpg+BbbGW+PcCyD+7aRYYX0dqa91CETNr+4bEaOcGrgqWCBCJ7Qn6cerbUNogUR8J3Jk4OY3ZSVYXWVO1itK7X+V5pwARhNf0su1H6skUXPG0IA+8wXYY1lEny9/Q9CdQJ4sBLXZU7IEwpMX/5GlAKe5HfWOoMENsdzjBabBC5SklnZsefD9WHeZAg2Y3IiLKWSbZDw0rVcBilAs0MpRoYkIr5lfRAYh7UDxINGjB9cpIuQWS+ujot0xr0FoG4iD4T2gU9wZt4aX5ywIf4eYyDzBARGUZIOYvwlocNd4GCzFMrk4UKG7ytWNXelqjmAgdC53PovWlcdXXts3R4fIUY5XuGCDiHMcsdpjB0Rc1jfx95W2J+UVQoFlCQ0wj1q71Z1wT6+6u5sGzesMaD3eETDa2f5x+oHtBZmMo/n7WUrP1oZSfvWIhXGbpvYVCl2qZqEMgWxNnnizyTRjRgiM5Jfv5VJoVXLcIm69bkZ3akUqLX/56KV2nTbpS5mNtOZZIpkhovpg4J9TIhKCNyRNQPiIvy4D3f4o098h5sfQxcbHgNOceD33gPVJCQ4WOR2Gft/WNs0VBASbbb2ZWeUb3UIjBgrk6c2JSB2fewqRdXMOP2Kd3dJYXWasnamQZfZKp1oT6jGe2heb32i/Le19WLk9Sc3Cy810JlUkCTCqx5gsHINSII/VPc0kInYQmOA4HaiJnA5RG5OD/3aPbzhSThGBrngg HLQZnp8j LwcM5m373jI2rsx0IQGtVjxjpEYt5xY5/6nSJB8/QxTNys0hN1COQl7VhK5bLKYSBnE4U1TvbotU+P1Vwvalp0yro7qOiGHJ/rdkzruR9MErv3JrnlMLW1hS5SzOhQsebttJcCXqlSNW8G2rYTOsY6HSCXyT7oFDGxxHUBvibJIlRx9BzYON0eY+4OrTxqN4D2xvkjGuTR/AaQFfXHo0tpjDXXk+WX8w4HVjIKN0/udVir4HWp3QBHs6BGDkYa3qkLWe/ 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: As a first step to removing/replacing alloc_pages_mpol() and alloc_pages_mpol_noprof() with their folio equivalents, make alloc_pages_mpol_noprof() static. Signed-off-by: Aruna Ramakrishna --- include/linux/gfp.h | 7 ------- mm/mempolicy.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index f53f76e0b17e..f5ce91ccc954 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -300,8 +300,6 @@ static inline struct page *alloc_pages_node_noprof(int nid, gfp_t gfp_mask, #ifdef CONFIG_NUMA struct page *alloc_pages_noprof(gfp_t gfp, unsigned int order); -struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order, - struct mempolicy *mpol, pgoff_t ilx, int nid); struct folio *folio_alloc_noprof(gfp_t gfp, unsigned int order); struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order, struct mempolicy *mpol, pgoff_t ilx, int nid); @@ -312,11 +310,6 @@ static inline struct page *alloc_pages_noprof(gfp_t gfp_mask, unsigned int order { return alloc_pages_node_noprof(numa_node_id(), gfp_mask, order); } -static inline struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order, - struct mempolicy *mpol, pgoff_t ilx, int nid) -{ - return alloc_pages_noprof(gfp, order); -} static inline struct folio *folio_alloc_noprof(gfp_t gfp, unsigned int order) { return __folio_alloc_node(gfp, order, numa_node_id()); diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 2d367ef15d0f..6132a230a3b9 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2216,7 +2216,7 @@ static struct page *alloc_pages_preferred_many(gfp_t gfp, unsigned int order, * * Return: The page on success or NULL if allocation fails. */ -struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order, +static struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order, struct mempolicy *pol, pgoff_t ilx, int nid) { nodemask_t *nodemask; From patchwork Mon Aug 5 16:31:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aruna Ramakrishna X-Patchwork-Id: 13753824 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 DE7C5C3DA7F for ; Mon, 5 Aug 2024 16:31:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 736C46B0095; Mon, 5 Aug 2024 12:31:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E6C26B00B2; Mon, 5 Aug 2024 12:31:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 587AC6B00B3; Mon, 5 Aug 2024 12:31:59 -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 3947D6B0095 for ; Mon, 5 Aug 2024 12:31:59 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E3611A8820 for ; Mon, 5 Aug 2024 16:31:31 +0000 (UTC) X-FDA: 82418732382.11.0A1B6AD Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf16.hostedemail.com (Postfix) with ESMTP id 200CD180002 for ; Mon, 5 Aug 2024 16:31:28 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=oWETe251; spf=pass (imf16.hostedemail.com: domain of aruna.ramakrishna@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=aruna.ramakrishna@oracle.com; dmarc=pass (policy=reject) header.from=oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722875428; 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=WTesXWDvFqfiAEvXeDVQR6yDba0aO0GMwRau1vV1WWQ=; b=CLfbgQUefDy2Xalsl0XJRs+Vdlv9LH0UZ4X8XFGimC7VwROgqOliUaW7qnDKr+N41pPI2e j5G/shspWSkoEijY7QQwZJmP9j1DfigYb96W5CxmCxzl38//KlQYVJu+KIMoUlWzqusu56 s6LdUr9NWaCgaDyicSFdlUmmN+okziA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722875428; a=rsa-sha256; cv=none; b=QSH00wtXHZfXn5rjSWOZriXRK3j+0eVsyYkolD8JCvMpM1Ca1brSLdrus01QDLYg2P09xt TPymdDknRfk+EwfZIDAwkUwKfDVSJ34XobA+mPWl90Rf27gvNZdLBN/r6jbw3uwvjLNTGN 0ZAH5QlIksk7dmgeOz1qqdxjRHaMX5c= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=oWETe251; spf=pass (imf16.hostedemail.com: domain of aruna.ramakrishna@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=aruna.ramakrishna@oracle.com; dmarc=pass (policy=reject) header.from=oracle.com Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 475FtS5O004999; Mon, 5 Aug 2024 16:31:25 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 TesXWDvFqfiAEvXeDVQR6yDba0aO0GMwRau1vV1WWQ=; b=oWETe251TLPBzoGc+ L6gZU9nfoxb3aSvWzPFYOFQRI4QzPaCZE2b9rBdOWfBj6RcbPg1d2jepuMlDOSUK M+spkE+W3zaGxGaofzSwSly7mIb+l8BMS86x3Yluc5ip0kBXxXB4MmO4spaS+Lil WQPa6X5BHVo9jsiriTLNXO/PwE8yQ+p07KpcxtUbjSprAFKvC8CWRpMLGPxETBk0 87M21cnoLOOxz2XMlwhCRhRzDjuQmGSRlt/zepNKWd3U++D5tYdJNvQPjsSQKxgg MivSdvDBkU9BIALYUsXqP85e9EEMyKdQA7TKuKpwSHpdCBskN7f99qe/nZEjk5wP IOkIg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40sckcb3f8-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 475Faxda035130; Mon, 5 Aug 2024 16:31:24 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40sb07mddm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Aug 2024 16:31:24 +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 475GPvBb002152; 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-3; 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 3/4] mm/mempolicy: Remove alloc_pages_mpol_noprof() Date: Mon, 5 Aug 2024 16:31:19 +0000 Message-ID: <20240805163120.5971-3-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 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: beQeBipEYqckHiR6dh8VPeTNu5blOieZ X-Proofpoint-ORIG-GUID: beQeBipEYqckHiR6dh8VPeTNu5blOieZ X-Rspamd-Queue-Id: 200CD180002 X-Stat-Signature: 7eoy5g8gaszm9f4z7zeq9yi9odaym41p X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1722875488-409175 X-HE-Meta: U2FsdGVkX1+5Ejht36kmmnoVvPROfESrxPr3ejvhwDl6wPv6et0qFW+gup8qpThBhlwSOATy4EYuNcfRPAP1gEz2yMzlUoR+9/0/kvYpPey86SUOMmCrz9t1tCMKsu8UHKEhU59se4Cpr/VYqb0i3YFpxXSGB3bAoiJbJyUboOVT2Pii1GlIN9iJwOUTpn6IkvTfw8c58dfA0G/nmDJnsfxdgP5AViQYogAwJDpij/O+FgaQUAUBYrJqH9azgDqI+vWz+4RWO8TOps+LuXMD7yU0LZlDdWrkY1NczRAo+48RFjzNzdG3wO7r1uN7VOEk4K+jOx9nZmWsejKrnQKEFznvBhaJ7djrt4DmPLwfmALy/SLh6aE1cUCm8q4OEJs8nhu3u4N1XHfMIWMzFZheP4q1fdDRh4TAD7XFOasyyhDK6LWqdDVAXi0GCOVKLQQknUP618N/se3dZ4T+64XSUHwFOGzlhWJyUJoUS1TyEM1oAHZPPAipA15Zm5itnFtv1yZEdynD0OMEWv/wJ0CBVn1o865Ms6pZMif44kbpAxkghOSEbL+sZhbnXc/xMlKv07IJ1e6Qgs96o6PLd6cX6KKRhj2ILmOZMdfWqPKjaR892trO7il7VePWhtM2SriLhT68p6uV989FQg0TBVAtg/zzCLvppLa8v73PVFHlyt5v4RK742Q8Mf09kzPCtrnbWmb3wU3KFSEHadB4+gidnwENInOG3A4RN14SYbABQp24s4fkeN4WSeragKeMDakouGupng3mTj2eBgPCgMgp0TpyHOf+QJZP8QOJ9nPCCp9F+hnRez4PaBIa0CVgHtqfzGWuxFw8d+avYX3YSR2ge7mE53iaTeqJzArMJdJd7otNVJ18PPo7fdP2Ai658MOMFOLSd2QvUvgoKH0+7c9D8gFBDh41wwF20ROMSCjP7pVxZFodXWs2J3v4H9kcBJLY7b2u8nKQxSx6s07ngYw Kj3sE+ei 4OUqC+3s7x+RychUzzJ2U8ToZEb0NknxjOg9wkgwoxRGGhv1MGQTaVUPrnL4zlad9eZ/o0w6ovnnPfDN2OH9PcMSJ3+cdgmIM3w2Pj03+lO1NYAVHDiDP1i1nfcHq1eGcckoOWePLCKPPpd5xhqOF3B0xBuxzhXDpvsVoj9rTqE2B3G5ju2A8V1oyinu1eRvhSF0pxMLqMeokURtLcgqSUMkSQhfb0t1rPooKCPwdK7O8Tp7FojNlptw6AtZ3rYHnTkKi 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 are now no callers of either alloc_pages_mpol() or alloc_pages_mpol_noprof(). Remove both functions, and fully convert the body of folio_alloc_mpol_nprof() to use folios. Signed-off-by: Aruna Ramakrishna --- include/linux/gfp.h | 1 - mm/mempolicy.c | 42 ++++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index f5ce91ccc954..58f23f15a71a 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -324,7 +324,6 @@ static inline struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int orde #endif #define alloc_pages(...) alloc_hooks(alloc_pages_noprof(__VA_ARGS__)) -#define alloc_pages_mpol(...) alloc_hooks(alloc_pages_mpol_noprof(__VA_ARGS__)) #define folio_alloc(...) alloc_hooks(folio_alloc_noprof(__VA_ARGS__)) #define folio_alloc_mpol(...) alloc_hooks(folio_alloc_mpol_noprof(__VA_ARGS__)) #define vma_alloc_folio(...) alloc_hooks(vma_alloc_folio_noprof(__VA_ARGS__)) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 6132a230a3b9..9be32c3bfff2 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2207,25 +2207,28 @@ static struct page *alloc_pages_preferred_many(gfp_t gfp, unsigned int order, } /** - * alloc_pages_mpol - Allocate pages according to NUMA mempolicy. + * folio_alloc_mpol_noprof - Allocate pages according to NUMA mempolicy. * @gfp: GFP flags. - * @order: Order of the page allocation. + * @order: Order of the folio allocation. * @pol: Pointer to the NUMA mempolicy. * @ilx: Index for interleave mempolicy (also distinguishes alloc_pages()). * @nid: Preferred node (usually numa_node_id() but @mpol may override it). * - * Return: The page on success or NULL if allocation fails. + * Return: The folio on success or NULL if allocation fails. */ -static struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order, +struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order, struct mempolicy *pol, pgoff_t ilx, int nid) { nodemask_t *nodemask; - struct page *page; + struct folio *folio; + gfp |= __GFP_COMP; nodemask = policy_nodemask(gfp, pol, ilx, &nid); if (pol->mode == MPOL_PREFERRED_MANY) - return alloc_pages_preferred_many(gfp, order, nid, nodemask); + return page_rmappable_folio( + alloc_pages_preferred_many(gfp, order, + nid, nodemask)); if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && /* filter "hugepage" allocation, unless from alloc_pages() */ @@ -2247,10 +2250,12 @@ static struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order, * First, try to allocate THP only on local node, but * don't reclaim unnecessarily, just compact. */ - page = __alloc_pages_node_noprof(nid, - gfp | __GFP_THISNODE | __GFP_NORETRY, order); - if (page || !(gfp & __GFP_DIRECT_RECLAIM)) - return page; + folio = __folio_alloc_node_noprof( + gfp | __GFP_THISNODE | __GFP_NORETRY, + order, nid); + + if (folio || !(gfp & __GFP_DIRECT_RECLAIM)) + return folio; /* * If hugepage allocations are configured to always * synchronous compact or the vma has been madvised @@ -2260,26 +2265,19 @@ static struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order, } } - page = __alloc_pages_noprof(gfp, order, nid, nodemask); + folio = __folio_alloc_noprof(gfp, order, nid, nodemask); - if (unlikely(pol->mode == MPOL_INTERLEAVE) && page) { + if (unlikely(pol->mode == MPOL_INTERLEAVE) && folio) { /* skip NUMA_INTERLEAVE_HIT update if numa stats is disabled */ if (static_branch_likely(&vm_numa_stat_key) && - page_to_nid(page) == nid) { + folio_nid(folio) == nid) { preempt_disable(); - __count_numa_event(page_zone(page), NUMA_INTERLEAVE_HIT); + __count_numa_event(folio_zone(folio), NUMA_INTERLEAVE_HIT); preempt_enable(); } } - return page; -} - -struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order, - struct mempolicy *pol, pgoff_t ilx, int nid) -{ - return page_rmappable_folio(alloc_pages_mpol_noprof(gfp | __GFP_COMP, - order, pol, ilx, nid)); + return folio; } /** From patchwork Mon Aug 5 16:31:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aruna Ramakrishna X-Patchwork-Id: 13753822 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 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() */