From patchwork Tue Apr 8 11:23:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shivank Garg X-Patchwork-Id: 14042857 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 1FC0EC369A1 for ; Tue, 8 Apr 2025 11:24:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A437D6B0008; Tue, 8 Apr 2025 07:24:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F0DD6B000A; Tue, 8 Apr 2025 07:24:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86B606B000C; Tue, 8 Apr 2025 07:24:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 68B9C6B0008 for ; Tue, 8 Apr 2025 07:24:54 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3279059227 for ; Tue, 8 Apr 2025 11:24:55 +0000 (UTC) X-FDA: 83310644550.03.F027F2C Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2057.outbound.protection.outlook.com [40.107.220.57]) by imf28.hostedemail.com (Postfix) with ESMTP id 33DD5C0004 for ; Tue, 8 Apr 2025 11:24:51 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=5I1Qyx2g; dmarc=pass (policy=quarantine) header.from=amd.com; spf=pass (imf28.hostedemail.com: domain of shivankg@amd.com designates 40.107.220.57 as permitted sender) smtp.mailfrom=shivankg@amd.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744111492; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=6uqbzL6FNYPIGoO2HURWE8xG/C+IhaKcZleIt9i+uj0=; b=oTSvQbUXU4lnzgzdaT20HWo2Fdcu1X88sUrPaDRKC/Xpk1x59pE+cV4pF3KOvwEp1z+t2w tWXUaqzRaOc9gPOstMP9Oz0gs6a34qfCQG01qIBjP/jDvWt8FB9GRZV8A/wN+uDQGSFyA8 bm3XSKMAp4VmWhHShS/WR1jukvnDf2Y= ARC-Authentication-Results: i=2; imf28.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=5I1Qyx2g; dmarc=pass (policy=quarantine) header.from=amd.com; spf=pass (imf28.hostedemail.com: domain of shivankg@amd.com designates 40.107.220.57 as permitted sender) smtp.mailfrom=shivankg@amd.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1744111492; a=rsa-sha256; cv=pass; b=tc/WLtWyZrlvXcAxY7iIFMM1BXLL5J/6qbV7/43pO18UgT4JyyspeRRMNiHjhsmj3jCqfu 2MjJcukk3g06XMlYRxWFW7DX/EScy12cC6bXdGcCZw9pf2QP8A5NXhNgT6b4hX9I4fOKmR FO/0v292Hau/oGysNB591lG1tBL5dEs= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ma7VyaPSV91rzRbB+XnuhgDa2xD0rCM1iRsbdb5A73AxS87XceqkJ/LUGHbSa/9d7fkDDT93hrfqrk3iAAM3tqeQWY28/hfP+XzZwjuThcYeJSCOebV9MHxk3XoTQsUuMEnSae2sXnjTMzP9vfdBL+8UieNydR/ErC7iiu294b0xZrQZ13iFrzHNEXrKQOeMQXAAMpIBPfc29zQY9paxFfWNZUBzlBcOHUoO7VlX/VSUSdesdeE70huL+69WaMFEES1MIRKqUibscCJzCS33LnCyy+4OGRg1thc1uTDBV5ZEDHyOSun48SEJ7v2qOKpJvOIeh8Cw5qTw4dU25UKVJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6uqbzL6FNYPIGoO2HURWE8xG/C+IhaKcZleIt9i+uj0=; b=lIxVn+0NdyEc3wEWssHCg4B91LOK5aKx4ogDN2wmoq6nHolqkorxuDVS6UHqQAbTk9qAbdB04bmkKYccbIboTb1BImZ5uK3AJHZ2Vmh5tFtd6mj2feZ2muRdecRyGcKWJoQOKtb4PxuL7qdnZeKoIgd/b4Ff6rerWo54N/BEtnBOQH6TzQ/43rUl2hZbwnpFq3ODIslas56tf3X4NRdLJWjrafCd/py3YrHbRFkq/7t0fdbTVqWvYMUkZKaUoygA1mdi/5HON0McGoTjImE4Wn1YWV6ijBBW0qVaUQo2PWoyuJ03D8oCfadLIk4JewMZfqJzOze9pPRS4AZXoROsnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=google.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6uqbzL6FNYPIGoO2HURWE8xG/C+IhaKcZleIt9i+uj0=; b=5I1Qyx2gGZ6uU337zhKvyiXTra0NF3laN29ukOk6FuFUnZuzZJtYAP0sKyQDdNcoKhwcCB/TrUHqIND+eYlbUbMO1PUgy2RFT4AdVlqfUNp1xFIbm0wmw868x6XS2rx+ghs5bFmoMoeQzmjNM5Wt0Od+y7aMTXtcQirxB3OGOLE= Received: from PH8PR02CA0001.namprd02.prod.outlook.com (2603:10b6:510:2d0::19) by BL1PR12MB5899.namprd12.prod.outlook.com (2603:10b6:208:397::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.20; Tue, 8 Apr 2025 11:24:46 +0000 Received: from SN1PEPF000397B2.namprd05.prod.outlook.com (2603:10b6:510:2d0:cafe::49) by PH8PR02CA0001.outlook.office365.com (2603:10b6:510:2d0::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.28 via Frontend Transport; Tue, 8 Apr 2025 11:24:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF000397B2.mail.protection.outlook.com (10.167.248.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8632.13 via Frontend Transport; Tue, 8 Apr 2025 11:24:45 +0000 Received: from kaveri.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 8 Apr 2025 06:24:37 -0500 From: Shivank Garg To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH RFC v7 1/8] mm/filemap: Add mempolicy support to the filemap layer Date: Tue, 8 Apr 2025 11:23:55 +0000 Message-ID: <20250408112402.181574-2-shivankg@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408112402.181574-1-shivankg@amd.com> References: <20250408112402.181574-1-shivankg@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B2:EE_|BL1PR12MB5899:EE_ X-MS-Office365-Filtering-Correlation-Id: c29eabd2-7db3-4997-df96-08dd768ff718 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|7416014|376014|36860700013; X-Microsoft-Antispam-Message-Info: 32Iwbid+0ZejXpHMtNBHQ4k/qVG6Nt+x5G3Mn7hsEbuHlOjTmvAw/+oTx7FgtHXwq/tBH97WeQWp6esUrQOA3t7tXvgiFFPmohr4ouWsWZsX4XwNHNLzq/3p1b6/88l5YiJW0XHvO0n8o6ffq8rtJkOYrkeXgrfIxc7cOX9yUkZhhyRyTOhbYhluq5t4smjR3TTPZlBzEfTDIQ93CzHKA/swcwHMpbOJ5BGt8c5ki3vcrjyWkOVkq2ZTrjbvBvZ6dV/uQRUoRcc0OcWEGdE4iPR+1AkN09Ese9hxz2RTcDBeWLuJ1Qgh7nrpUeOh11NQJkp5DTpZPaEkFixjd6HmfhIq+igetmvfjqa6ra1HGfkFEJhvSZ/6Dl4BAzVOPEMY9WtDZr/CHqCsO07wwfoORoMinGpJYRBe83NMfqVEEW9lBQQkJsriNMtnJNLHoP4+Pg70jHR1l2FVmidBo32yGRYD545AvnF6wG5HUKvbBXRe0XnBAuMBn3SgRSs/tjwnCeCL8hSRClbEIuaFzHZt6XCKuQyQimyN6HqaXrKOKNa7UXzzkMj7ieVPpF0d0grCjACyfA7S2noH0k72PW3hmmyj7JGpN3h7WkePuMB4JU8/fESj6wT9hUD6BLrMakihToeaPloIZDCWT2l2zYsfr3gM/mKMtNWXVjQBbzY4pIgP6/TSEzQXSxkpZ2FfC8JwRdCsP+NzX0eqXHT85NMPK6OqFcHTbz8sPrhiXdSJcKiOyb2cV4jTr/Ab9bkMShV5Bg6+3q2kq4ZohcItCExKuSeng99tHcbpO7uqqlYvA7sgdZBXGeg5nQ5I5A1hRZKdKK3I05YpjtKJ4lXUN9IROJ1za3lcS3d3BmSxqg10jt3GnJlMNInVUKDMjFNnO9V1RC2K5odjMN0xDpqVL8HVrVvQ+Y6k1/36z20XchM3DumQr/S8ICGO+oTVnwk/36MWyIutIhoJX/VZGk62E35TJ6GG6hzo0gHB6Tk87nL0vUqHulcgoy5e2+GmWYysVZPVKqX5TXo6qM6wx7iG1J0p5kuI/MypGTZ1Qa8egj+P52JjNzGgOjs2Oc/Lw/StanNJ0nJuind4EBRKFpQ4HnwOmdVnpEz7DltMtfV2+4Rt4pxjRR+QCrmDdfEo+L5EeDqUfXtyIrbX0Xp4EskG9JoSvnAesX3NW0wHbi38Tg1/qEsuxnd7DDhkJEjSR7lO904BEMFne7WonOEavkx2xXkz5+r9C9EIM0VI/eFqeVnxMCFzBlgHNFCZqEP2vdl6MHsP4ZAyakCtqeOjfPnsnQEmZphgX3OoB/6b+qQYmG7DF/F0+QgzQUCVQ14rGqDH+2vVyBmMVBE9YOSKKP3YEjM3IreFZYcm/SosTBFuG4dxnT/uCWtYiACSth7HSbpNTinRM9G/kUSR/WjOlOaLY00xT20CGhbyuJIDw3i8mdyc5lGuTyBs0LOEjpK76ZkVphYCZODzU0DViIvmvcYNRKiomk2bGrDeP6i99qRdPwq2vup7EczBfmjlz80+kHNIasSy X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(7416014)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 11:24:45.4013 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c29eabd2-7db3-4997-df96-08dd768ff718 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397B2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5899 X-Rspamd-Server: rspam01 X-Stat-Signature: sjttwtwz73yd5sy6zox38xxod488b6xk X-Rspam-User: X-Rspamd-Queue-Id: 33DD5C0004 X-HE-Tag: 1744111491-96009 X-HE-Meta: U2FsdGVkX1/JcWJimzJXaTr1NUxNp59MBaD80jjKfsfhRQrqBNT95yfGYEDnJ/udLgjiqJsXe8VwEmRG/jIgv7wun5or3DPXqvb84Rfj35aN+D7wDp0wmqxfYK9NKjyUz3/CV2CIL9Rp2yuD554RHzkVigq0KTyZ8Zt/aQtWr1CuQDUcOxQ0ytdOJ7BQWD+zkMZ7fBBxho0mFI7b65KQ61FvXorJfhrzFZ+02luM5TVTEoT6v589I6RvbH6ZE1u2Lv7wvJoicR+RBjhZKyQ4fHo69AFm3lNrCdQHFMeQCbpkARDkSuJaYMsO4wLcHr8A4qqE5xNDxM8l32sfOaZSBhRena3d+jpIilF76qujzGpck5xHk8TQ3lDqUHTGSodo1G/Bc/IVCm7hHYUqn+9taGO08zp9cl4nOCHbtwDmw1gWEoYis913xkvO/mVsSU0h+OUCRzYAatG8wnd3qbQVAm+tRJFcy8TReAM1RTgNPnGogeU40wYcPCMXSAD2nPOuqIxHTpn3dGkJK9mfyYpY+Hk3AptnmqxkVn0E3x9faPQ3L5UsqJRQqdbPYsKUX88cKRBUub+abkS4uRv1bTz2mxT1KuPPAlzaUOek0F/OrZ0rpxE73EQDS8jMz7MWF2sWPYF7j/u0XGllJ3ep6AamlGq4QxriToL+StsUcMiJtNztaRr4HVHjgzXoZTQaHcsBT0VsjJ5vgmMDOnNeCMCT8lR7zbNouv5tKp0bSmxQz0mtD4uXcmnJpgguQ39Lg4Sy8cHKPyY2nkDoKmTmCJCMxf5x5WBrGxoP66iaZiME4bSA13RqNvW87+vmQkrRJcTYNKg71r0nxaR9KZlyOlva/EEEZDEHRrNHryBSV1gvd0zDo1Lb80icuyrovlXQVPofwKLhsDkfp156tXiEFWY+KWYDeMLnwJCgVGr6uU+w26G6w2iEozGKk7BmgHRftSiasOSQXkB1q0ebCerKzOf qf4O3x3V U0urLOE1O2Iy+pH03PplgVXcUyY8PZtc4fiOyh9PdzdZCIlJa3edGSvuernXZ/tz9XBtx4PJ1hATGWpBVne/+4uVwOJ4fTjYOivs1sw24i/sljBUqTnQ5+6NKNQODfhIMVxsOkfPfH3OOarcr7PMtTIKNAKjYsz3Y3pTuXI3+kL8z6lVCJwe3BxLOGuaN8AlFUJR/JClL7FVjMEeTzmMX3h7GZ3hZ5qMBc26MgAKM+gDzaP8VW4qtj6uCO1txfZxKRg7MVkth0ffMikmB7kEG6vvQ7ujewGDdUwv8F88ScK/w54lzofeIduI19oKpKcGzJUKVidhP3arRHiRFwuHAHmHe2N73tHmt0Wv0QDmc12Av6Lrsm7873NhcPdfxxh0LDaWksuTLVgaBhIOmZTgH0pK0+fQfU/v2j5OBQiOvnhGIxjygn3IRtB+n3H1lJmqAoaj5bQcHGh6gUeKjGd44xNfzOJTERJMLTY5tqGj/U8V4/5gM1hmFXnD1Qw== 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: Shivansh Dhiman Add NUMA mempolicy support to the filemap allocation path by introducing new APIs that take a mempolicy argument: - filemap_grab_folio_mpol() - filemap_alloc_folio_mpol() - __filemap_get_folio_mpol() These APIs allow callers to specify a NUMA policy during page cache allocations, enabling fine-grained control over memory placement. This is particularly needed by KVM when using guest-memfd memory backends, where the guest memory needs to be allocated according to the NUMA policy specified by VMM. The existing non-mempolicy APIs remain unchanged and continue to use the default allocation behavior. Signed-off-by: Shivansh Dhiman Signed-off-by: Shivank Garg --- include/linux/pagemap.h | 41 +++++++++++++++++++++++++++++++++++++++++ mm/filemap.c | 27 +++++++++++++++++++++++---- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 26baa78f1ca7..bc5231626557 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -637,15 +637,24 @@ static inline void *detach_page_private(struct page *page) #ifdef CONFIG_NUMA struct folio *filemap_alloc_folio_noprof(gfp_t gfp, unsigned int order); +struct folio *filemap_alloc_folio_mpol_noprof(gfp_t gfp, unsigned int order, + struct mempolicy *mpol, pgoff_t ilx); #else static inline struct folio *filemap_alloc_folio_noprof(gfp_t gfp, unsigned int order) { return folio_alloc_noprof(gfp, order); } +static inline struct folio *filemap_alloc_folio_mpol_noprof(gfp_t gfp, + unsigned int order, struct mempolicy *mpol, pgoff_t ilx) +{ + return filemap_alloc_folio_noprof(gfp, order); +} #endif #define filemap_alloc_folio(...) \ alloc_hooks(filemap_alloc_folio_noprof(__VA_ARGS__)) +#define filemap_alloc_folio_mpol(...) \ + alloc_hooks(filemap_alloc_folio_mpol_noprof(__VA_ARGS__)) static inline struct page *__page_cache_alloc(gfp_t gfp) { @@ -737,6 +746,8 @@ static inline fgf_t fgf_set_order(size_t size) void *filemap_get_entry(struct address_space *mapping, pgoff_t index); struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, fgf_t fgp_flags, gfp_t gfp); +struct folio *__filemap_get_folio_mpol(struct address_space *mapping, + pgoff_t index, fgf_t fgp_flags, gfp_t gfp, struct mempolicy *mpol, pgoff_t ilx); struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index, fgf_t fgp_flags, gfp_t gfp); @@ -795,6 +806,36 @@ static inline struct folio *filemap_grab_folio(struct address_space *mapping, mapping_gfp_mask(mapping)); } +/** + * filemap_grab_folio_mpol - grab a folio from the page cache. + * @mapping: The address space to search. + * @index: The page index. + * @mpol: The mempolicy to apply when allocating a new folio. + * @ilx: The interleave index, for use only with MPOL_INTERLEAVE or + * MPOL_WEIGHTED_INTERLEAVE. + * + * Same as filemap_grab_folio(), except that it allocates the folio using + * given memory policy. + * + * Return: A found or created folio. ERR_PTR(-ENOMEM) if no folio is found + * and failed to create a folio. + */ +#ifdef CONFIG_NUMA +static inline struct folio *filemap_grab_folio_mpol(struct address_space *mapping, + pgoff_t index, struct mempolicy *mpol, pgoff_t ilx) +{ + return __filemap_get_folio_mpol(mapping, index, + FGP_LOCK | FGP_ACCESSED | FGP_CREAT, + mapping_gfp_mask(mapping), mpol, ilx); +} +#else +static inline struct folio *filemap_grab_folio_mpol(struct address_space *mapping, + pgoff_t index, struct mempolicy *mpol, pgoff_t ilx) +{ + return filemap_grab_folio(mapping, index); +} +#endif /* CONFIG_NUMA */ + /** * find_get_page - find and get a page reference * @mapping: the address_space to search diff --git a/mm/filemap.c b/mm/filemap.c index b5e784f34d98..7b06ee4b4d63 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1007,6 +1007,15 @@ struct folio *filemap_alloc_folio_noprof(gfp_t gfp, unsigned int order) return folio_alloc_noprof(gfp, order); } EXPORT_SYMBOL(filemap_alloc_folio_noprof); + +struct folio *filemap_alloc_folio_mpol_noprof(gfp_t gfp, unsigned int order, + struct mempolicy *mpol, pgoff_t ilx) +{ + if (mpol) + return folio_alloc_mpol_noprof(gfp, order, mpol, + ilx, numa_node_id()); + return filemap_alloc_folio_noprof(gfp, order); +} #endif /* @@ -1880,11 +1889,14 @@ void *filemap_get_entry(struct address_space *mapping, pgoff_t index) } /** - * __filemap_get_folio - Find and get a reference to a folio. + * __filemap_get_folio_mpol - Find and get a reference to a folio. * @mapping: The address_space to search. * @index: The page index. * @fgp_flags: %FGP flags modify how the folio is returned. * @gfp: Memory allocation flags to use if %FGP_CREAT is specified. + * @mpol: The mempolicy to apply when allocating a new folio. + * @ilx: The interleave index, for use only with MPOL_INTERLEAVE or + * MPOL_WEIGHTED_INTERLEAVE. * * Looks up the page cache entry at @mapping & @index. * @@ -1895,8 +1907,8 @@ void *filemap_get_entry(struct address_space *mapping, pgoff_t index) * * Return: The found folio or an ERR_PTR() otherwise. */ -struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, - fgf_t fgp_flags, gfp_t gfp) +struct folio *__filemap_get_folio_mpol(struct address_space *mapping, pgoff_t index, + fgf_t fgp_flags, gfp_t gfp, struct mempolicy *mpol, pgoff_t ilx) { struct folio *folio; @@ -1966,7 +1978,7 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, err = -ENOMEM; if (order > min_order) alloc_gfp |= __GFP_NORETRY | __GFP_NOWARN; - folio = filemap_alloc_folio(alloc_gfp, order); + folio = filemap_alloc_folio_mpol(alloc_gfp, order, mpol, ilx); if (!folio) continue; @@ -2013,6 +2025,13 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, folio_clear_dropbehind(folio); return folio; } +EXPORT_SYMBOL(__filemap_get_folio_mpol); + +struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, + fgf_t fgp_flags, gfp_t gfp) +{ + return __filemap_get_folio_mpol(mapping, index, fgp_flags, gfp, NULL, 0); +} EXPORT_SYMBOL(__filemap_get_folio); static inline struct folio *find_get_entry(struct xa_state *xas, pgoff_t max,