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 B0ADDC71157 for ; Wed, 18 Jun 2025 11:31:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 545BF6B009B; Wed, 18 Jun 2025 07:31:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 51D356B009C; Wed, 18 Jun 2025 07:31:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40C7E6B009D; Wed, 18 Jun 2025 07:31:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2F13E6B009B for ; Wed, 18 Jun 2025 07:31:05 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id EF673161348 for ; Wed, 18 Jun 2025 11:31:04 +0000 (UTC) X-FDA: 83568304848.09.EAB5EEA Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2049.outbound.protection.outlook.com [40.107.220.49]) by imf23.hostedemail.com (Postfix) with ESMTP id EE50D140011 for ; Wed, 18 Jun 2025 11:31:01 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=i9Rt8TBX; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf23.hostedemail.com: domain of shivankg@amd.com designates 40.107.220.49 as permitted sender) smtp.mailfrom=shivankg@amd.com; dmarc=pass (policy=quarantine) header.from=amd.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1750246262; a=rsa-sha256; cv=pass; b=8AECcGlzXKt1bwH3oGxgcFlXOKmTt+cbQExs2DeF3ztiSihn0IDYlYxzKXqSvPoCeIxaHk 71sYvepTYHW+c6V7lQmnxwViCemrcyZsVrU9ifbnJkBCO3+rCus9xgGGgqqrflG9am2bWi g3GLKlm69HuP9ty5nY8QSSt3Bte9naQ= ARC-Authentication-Results: i=2; imf23.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=i9Rt8TBX; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf23.hostedemail.com: domain of shivankg@amd.com designates 40.107.220.49 as permitted sender) smtp.mailfrom=shivankg@amd.com; dmarc=pass (policy=quarantine) header.from=amd.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750246262; 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=AMYd2Bb5HtIZZ9cwX69+56dJevzV2VycSCr/0q1Kb5E=; b=FqHOG1eRd44gI0rung3QquZAJwQU6JfgclmXlp43Sw91/Cgqifengyx89rJTvHz9zKaxkF J++9AuaDiIRHi2/URCEbzSV9Fpv1UMoiKQoKgWmH8697NCC+M53M7gATqlBk0xPUPP10du hmPjV+rVVhv1IKFGssD1mIVZdU78oEw= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XPcZJkr8j7OZJh95iwQDB4LiWxAEBMV10FFxRR+lmGb6LGDOKiGbrQEtCAqO/mR/oMiRtlNr7gijlX7CUaI/qxfg1MKVtRZNyRZipZxZCPdy0OllxSSlmhSR5r5fB277cKMJ6SN68HvKBowEIvV9OKuk6g31SDMR5OWD3WC702FG9OP7fiq7u149jLPxZsp+BDXqzIQs8b+mWU8p8EoOxaMlOeH3QFBqPI7XHoTPn76JLpvYze7GfrjxLgdGFyCw2+MrUOsfsFfYVKbivJPd+AlyxeYyCh5Se79RCiDWWSg4fGLYNqvjkJ4qe4hDetvaHRMktg9zk/WR70lVyDN/3A== 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=AMYd2Bb5HtIZZ9cwX69+56dJevzV2VycSCr/0q1Kb5E=; b=Q/fe+1vTif5vBlaVrcDZbaX9TJjuPnVgEm1vr7rV99ydIPWNaLdFKQ63w3EBx4QS1EWZRICiPBg3otJmdzl/6CdxwRbbhgok3NZvYkNsEIMwx9+R0gtatAl5rmEdEJrM8h1l8vLeHdfjyRkIyJ3Jcu7Vk4KE+pkOnuCCerET+ekDJbaS66qtwpSKtMMvnWsD6dYeGZYpMsg/7C3R48TkLqCHOACYrUyyTyBDJvRAz+O/BO4I7GfW45ekpXLAsZkJEWl2hGWlU5+K1mU+XlxhfEQDxdvRUUZtOXTP2jdyzCSN5oHORFd+LQbKWiMl2tipqZYLo3PsGEEAT39ALYafdg== 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=AMYd2Bb5HtIZZ9cwX69+56dJevzV2VycSCr/0q1Kb5E=; b=i9Rt8TBXdniE3e6xw2In6g4IRmLcS/FwVAXC2psrfC9/wi+nQhA4KihzyRLCyY9M0cTyeO7kzuX4369bc5XV37Sgf+4c4t0vEf+REYGcXTYBGwu/N7b+sJL4YyNe7OUpvpgcdZFbIke1cqslL2gbMUqoEYqhAwpQrTr0OWHe+Ag= Received: from SN1PR12CA0110.namprd12.prod.outlook.com (2603:10b6:802:21::45) by DM4PR12MB6232.namprd12.prod.outlook.com (2603:10b6:8:a5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.35; Wed, 18 Jun 2025 11:30:58 +0000 Received: from SN1PEPF000397AF.namprd05.prod.outlook.com (2603:10b6:802:21:cafe::2d) by SN1PR12CA0110.outlook.office365.com (2603:10b6:802:21::45) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.33 via Frontend Transport; Wed, 18 Jun 2025 11:30:57 +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 SN1PEPF000397AF.mail.protection.outlook.com (10.167.248.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8857.21 via Frontend Transport; Wed, 18 Jun 2025 11:30:57 +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; Wed, 18 Jun 2025 06:30:39 -0500 From: Shivank Garg To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 3/7] mm/filemap: Add mempolicy support to the filemap layer Date: Wed, 18 Jun 2025 11:29:31 +0000 Message-ID: <20250618112935.7629-4-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112935.7629-1-shivankg@amd.com> References: <20250618112935.7629-1-shivankg@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397AF:EE_|DM4PR12MB6232:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e067d15-8f9f-4c12-a61e-08ddae5b97ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?acoQMXMHGxLdEmekm0WHZ1+pPHd1hKU7bVgiBHKW0nalcTbIl9WwiNMw0E6V?= =?us-ascii?Q?vzFNk/+gMhHX8aoghW2U43zqIjZ4BaX2wFYLgsDNCF8aiRC2TXAYTei8seEL?= =?us-ascii?Q?5pxGhN5T1iNkowGwAxFTNZJg87r759VPkwuoWVXozpvWHXJchKQZbcA4wgWm?= =?us-ascii?Q?VYGyyTaiBXuDVgiQ0ijOTE4cthKHqWuNxIozkuN6DdsshzSmiF3HggDCNR+3?= =?us-ascii?Q?D2y5X0hi38rIq9jraxc1KsJuGFC5IIX6akmEG3B9YUJJqhMWTcePxYCK33UJ?= =?us-ascii?Q?o+Fp5B9xB0eTnE1gAn+IgDQStQcBdLyGCoNx2QNEX6v+N+d3d3tVDepmcx1I?= =?us-ascii?Q?wim8PIA9Fk4YBpoGw7s9c1r5y5GuvnQVCOi+rt63DwO3TQbFirhQ9FlGt6cy?= =?us-ascii?Q?eSQiRTrWCI/CVVpjukNNwH8ioUkOajC1Qks68aO7Ns+1W5SgpqbUjwV31aZo?= =?us-ascii?Q?4LkIdlOYlZ5iTSYQhyD7ur2TQLzuoVZvXUJvrlJKE8Ak+Cxai/xP9LGJmZbk?= =?us-ascii?Q?y6uMdlXq6PiEJ0zp3ieI2AlIm7W8Cnvmfw+opzoJ9opnQwGYsywi/JpB4Syo?= =?us-ascii?Q?1ey7+u6V2l/tlfU4vwCN9igeghNt8zutnWMf8aB7ixnTcE57gorhNxo36ub5?= =?us-ascii?Q?mtypcOM8SMfrLr7DfeQoUPH4Qyc9UO/VagSbtaf/UWQALqz1up10P3A4wTTL?= =?us-ascii?Q?aGAJSZaBAyKfrpCpmGSvaB5Ao6tYQVFRFwzHb/QsiMOOFqp+J++2nTBjMm3/?= =?us-ascii?Q?9V6ElBVw3U9ZFh8QW8w/2rvJkt4Zswgr822i6k5pVWXsnMGe0VcHfP6cJfLF?= =?us-ascii?Q?c98WumxDT6zaBPepZQ7phBF/B50vwGv+IdauK3oC35HQ/WQl/jMefxelW/tp?= =?us-ascii?Q?6uUnP1ZFmoErqgZgAY/v2/KWurpBtrRps5QAbm7Z3FYkRw67su/hU492/y6P?= =?us-ascii?Q?NiPjnclD1eqed1LAufRjQ8E+YAFdpIs4ssPYwpoc5kBeq2v9ZGTjZky4P7e8?= =?us-ascii?Q?XDZ6o1uSwaO4o0YU1dwXukfTsXdc9bbUPhTLHOGSPI2w4Bn58nScs+XiORBs?= =?us-ascii?Q?/+E6wVIYPTHYqsgOzCxMMAP4fDd4FeVZ+MJvsIQLw86yJ5bN+CEo+16cRK+5?= =?us-ascii?Q?3RO6ZPkrWsLyyNt3T9+MIFVJW+49I/xTDoA/mJlGrKV3SGf2uc802IW9/IxO?= =?us-ascii?Q?qVDN+r5meFA/Pj9gNjZOYZGY7hsCJSTzkX9nVglsXIHHR/CF2Een95P0YWXG?= =?us-ascii?Q?uc2wZAPyn065SeyFrLZ5OcygWI7uf6xHE93d9A8VVhTMAKa3NaCRirh5D0QL?= =?us-ascii?Q?KbFZ8OI0BHPlw1lnrp8BKEGvBafggg6NieCTKqhwpFT4osKfH6AYGsZi0Sf2?= =?us-ascii?Q?LdtnFVL6fH3f+CnYM+TcB1gbmesqkrVSMjtq+q4W+/NC7c7ddTPoapJmqvTh?= =?us-ascii?Q?BTZtTP55ZPACabY9ZHkRb/XbHI+2Yj18ENRoLGCh781/FdwT4XXkxLh40FLJ?= =?us-ascii?Q?OlxSBw4GKqEwS6sWyoukplgegUNH9vg6HcYH?= 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)(376014)(7416014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:30:57.0012 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e067d15-8f9f-4c12-a61e-08ddae5b97ed 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: SN1PEPF000397AF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6232 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: EE50D140011 X-Stat-Signature: 8wsng98pd5hbkt573uo6igfornqks9ai X-Rspam-User: X-HE-Tag: 1750246261-242164 X-HE-Meta: U2FsdGVkX1990TKjlpZ8VRgAi9D/IFS238pz3nroI673WbDCYkc+TWfHycW8SvQLb5St+sxPpSP5I+8yybWbN0Hogmfr7KP4UDz/Zfjr2oTmCJg2PtUEPNFpERoFF6ny2H9By4iJj6irzl/HJfwfeM9kId/uwk7PcoiCXc9odsz7189iiw2umGDwtbAEnWNHwNO5w/NH862fE89ogfmIRTQ9dw9ONavz81VCRLqqrmf2fClLgyokx5xlgc4EAtcJEB7DDwmtcyLoZyEfHcoUEtvXYj4Ij49Ba/g4uWnR9c8dYi7fgtHTj+RvPhT55iMcmqHdpN1NBf6qpj6oWJXJCjKo4RF8KYh8zC8Wfwli5npmdOi9SbOp86VrUYKnyIqlCA+FkL0+kkCIQRixsskqSZBOZjOzea5N/Waj7drapXC2IDOo32O935sn3MBr+GHx2yI7nT1KRgzK3PxG0ILEJmvWYLNdIN7p8UwzSKdsRfkRQK+azR6PgIYth9JsF/770k/MNJkkMEbMacH43vuPoSZ4NIyjGQ7PhYQRcwcrPc3ISjeL/vIdMeojYgNRs317he5YO2zQYAGH3HF1VWmENzwVqt/TCwTLhgx5XAPK4KBSoVeCjQRXq6+HVBxfZuUeI/FmeoT4VzrN25JJY3n1v9nFKhhQziuXHDYlYJBFIE9Ec6sZUd7CLYWjla+kp3DuNEHPaFhK1tARqcRd9Aqwry1Ywy7xSFARnT2d5sRvWgU34kr+0GUJuidq6XiD+ql+GtXc9tfXFBtuOpFJ0obUiERTFj6H8yQ/xwdyOP7kh52O4/apr36xLLqmSsSJXZUJbhWZqyNfQmHihFf3JRMawdQfV9pyHd7cPbfuubY6r20GKjosbEMQOXg8ESmpto+e7iDOmCAAwlViZLDc1lEoNk4XSE97X1XX1+3pg/jL+6mDz8gu9u71LxnZcCv0I/AfhOLDTpVgH2GSpGXI/4y tIQ6XqQX oGvIoP+OsyMbF1trX6s774eomw5S+IhWDJLubrt/13U8Ed/7sgnW5TD/mjorkJM+wAG8f2UeZbbZ5IEMgk+6qbABeYBekW4CNZZuwXmsP+rMHlxfCJVbnHG75TUFX/dTGJVfOoI0J1RR4/Rnunp/y6zkJLA2syl5QXZuxZYEEXFhVJ5jrdg4tEYSGX7hgpQQaH+ALL9aQ/D+QfaDsa3LNiRP2vKj1JPSPAw06FgQJEAlVcf5pJDxYpPijpjBX/DK3qbnqzkNqC9CediPFDIkaRPZHKcpFNZ526WQGRDV2YMiUJVCgp1ttaNR0xCYk5xHd2CmJMxStt9/nSOr1HymnW9VPmE33LaZWWV4J0bZ5gqhckmf5Tx9FwYvP7e6Z1qYCZG3XBWlAFrudEBam0pvMX0bN02IWPWNlfTztB6WXc4+lau9Abu7oWNitu30+YV8GW6vLIHa8V3LwRAcFCeUeR4lnG60S4k6kYEAaE+ogw23NONOvvbmBla59JvOCGExBqeVzixon9XIE13TIZ1trD2m5ghF2LZbw/B+UdMIcOZNHMWFkaAVzOTz0qBa6yy8GlbtfoRJbLFhFHvssE0wExO8AfNsO/ywcEec4DRVFuP93gJWTmsBdP7gZhwTeYOFBnjZn 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 Co-developed-by: Shivank Garg 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 e63fbfbd5b0f..6558c672740d 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -647,15 +647,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) { @@ -747,6 +756,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); @@ -805,6 +816,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 bada249b9fb7..c7e913b91636 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 /* @@ -1891,11 +1900,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. * @@ -1906,8 +1918,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; @@ -1977,7 +1989,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; @@ -2024,6 +2036,13 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, folio_clear_dropbehind(folio); return folio; } +EXPORT_SYMBOL_GPL(__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, -- 2.43.0