From nobody Thu Oct 9 08:47:44 2025 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2048.outbound.protection.outlook.com [40.107.95.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45B0E2853F3; Wed, 18 Jun 2025 11:30:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.95.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246229; cv=fail; b=FV1p44ktI1apQ5xjvwvB0E7qyFZ4yHD34bRekBfsOrqpIx993YtjKMIrSRENbfb+69mJYm0iWCW3fXSYEtNF1RT9Tdp7vhdFXWN0mcqAk5PxDoEEBdwnUDmtJO10jowFcWmTaLC4WHX+v5plWyCnxNDR0qn6aqS3smz3E5Gr3rs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246229; c=relaxed/simple; bh=8c/UtJr/3Cg8TRzWzkSIuEChLE3Zp/thakGso0tnfFY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JgZuvFSQkQTP4+WXoNYwO8cwOvbtSFRP9cBPTYQJ6MlKKmUW67I7RGBhnbwhniWC139JOGSgn/FXuEJrfXOLaQpqUQ7noZ07+oYlzyTAN2KWAKNPnSWhoT/bi4TNlRJP127sba24Ik4cs3yHqAgT33HayY0aTSsXHSRoiHDZCjI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=LFPNz7G/; arc=fail smtp.client-ip=40.107.95.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="LFPNz7G/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=slEiPHKwp0p6eeJAbM5J5ENdqqv4yZYup9Da5RF14KN2syMl3qXXF5iEN4D72c0/LuAcQMMV60izdOHZ5P9VBEp01Zc6YtvXQo4BUEbCMrpv31ImNpCY0hkNdYt7xVW+FedGYPBcJIpgmoQIlmtwggJbj7e6k5XoTA1bfkxg9o8BjEVP709t2SbrIYe4z2gnKOxDGLcDCJpp1YJSdpTyslqlle2FcYeKT/28rJruBwOOcF1nXZ2Qxn13PfsuaKBvUEm/qsvXnDyrwZeBqi+1EYBhglu/fQupx5Xc/+Mec3S1hp5gN2jX8u9Q1yvEcMGU2OVnztr4BfNpmi7bZ0U0vQ== 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=bVvjv1zEScwp44LjQhxl0FatJUjtklmF4PWpFgttafA=; b=jLN0IKxuPJnSmJye8h1AkVyw+TV0QtEotZhJbyUolY2Cc82hdy8yGrx02eTLmPTWcXlk8pW4RMdaLxdvklZD7k/AkExbiWqQsPGvsqN0vehSmGxuAzo7ccjN0RHQI85iLHG3d2hjJGlASSxEfp4BAp2br1Pbj055alKGEE3jFoajOQam2ZxU4pRCXkHo+zj8t6bzVYA2q8F2B8LueLStJSyqKB+trzUOTZF55HYsIYwjjoKjDmLpqih5KRiUQsVZh2FvrZuwjdWN/sQuuozwGwC+f9KlunbgI0cl76lbtS7PSBQs01s+ZquOV0A5oE3uc3o02d+Iy2ZR4rsqC+YG9A== 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=bVvjv1zEScwp44LjQhxl0FatJUjtklmF4PWpFgttafA=; b=LFPNz7G/TrKsHB8J/tFdfFSP3egRspIJOEweFKFrbRoR4m+3s2hXeIU5/k8dZxO/Bsq8e+rvJATp/7FJL6IB/8qqTuSGj2Kq2v31epjoLBNehLCgvBgpOg97V3LymMSNe6FDzkR38ug7j5YsBq6c5tLy6FPxnD7VUalGoGwSAlA= Received: from DS0PR17CA0001.namprd17.prod.outlook.com (2603:10b6:8:191::19) by CH3PR12MB7763.namprd12.prod.outlook.com (2603:10b6:610:145::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.21; Wed, 18 Jun 2025 11:30:24 +0000 Received: from DS1PEPF00017099.namprd05.prod.outlook.com (2603:10b6:8:191:cafe::e2) by DS0PR17CA0001.outlook.office365.com (2603:10b6:8:191::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.34 via Frontend Transport; Wed, 18 Jun 2025 11:30:24 +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 DS1PEPF00017099.mail.protection.outlook.com (10.167.18.103) 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:24 +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:08 -0500 From: Shivank Garg To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 1/7] security: Export anon_inode_make_secure_inode for KVM guest_memfd Date: Wed, 18 Jun 2025 11:29:29 +0000 Message-ID: <20250618112935.7629-2-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: DS1PEPF00017099:EE_|CH3PR12MB7763:EE_ X-MS-Office365-Filtering-Correlation-Id: 0185bf54-fcc2-416e-9e68-08ddae5b8466 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IUM7mMnULIb5vPRADkjUuwY2j75YxtM62YQgtmW/Db9h56bkOxR0gRGesKBM?= =?us-ascii?Q?KYiCES0H5rwAwy+TYsl6beQTRIbgW7426dk6ntTRv3fxKE//SHAPMPRrcJs7?= =?us-ascii?Q?sRzd6JGlANXidIW+z96Npzvass7RG7WOfSyrT7gU3aU/n8KFqtVXImBCBV4m?= =?us-ascii?Q?nnX5wmbVu+Knac+KE63/d1tJazx2cpCzsxHvTCOjssnBIUMWFS1snjVm6ONN?= =?us-ascii?Q?T4whIu8IMwfVS5nWUumcUV4kULUZjNQrYSvTrvyMnClTXMOEZQirYgZaYAfE?= =?us-ascii?Q?eO60NnnkINmUNzGjUfPd6m7yE/2UaxeqPKVpGvWj/25CXlvkoO4c2IJxpcO/?= =?us-ascii?Q?nyT4PKPDoPcIl0LZj26xUF/XruF8JV1uzJMbPbDPw8rmS9lErIgcM9HrtNbd?= =?us-ascii?Q?eJ7qOUYePyA39vHX2cQ+dYG9rbp8h01T7bVG33YmwRXHW53hxz7lmrQG+MX/?= =?us-ascii?Q?5Gt47WDL/kcsxiiuofoI7nJ3iH3w0gMFQMtmu0bO//4XvdCH+5tFb2sLZAEC?= =?us-ascii?Q?uHMgtB7DidhKC117oE0ciGslfOIUo7qQhQYzAJmjjh3cQt7EM9m91W6QvECS?= =?us-ascii?Q?8R72wV8dIqegJ0SyqSSVAZm4yRHqNlpJ5ZYIqjztjO7fDJj/bj61EkdDnnCr?= =?us-ascii?Q?ZPgSpIyJVAD6z3gUYE3oc27F+889Cuq4T4UIBA9hitY6HvVmYLAnpp2aZL8j?= =?us-ascii?Q?igC9Q8x4OXexgMemc5Bg5b2mnFHf/xF7zPTCBJKRKqckAkrIkgrpmwaQx++T?= =?us-ascii?Q?fQW+QfGzS3Ia3ZJ/8BUr6xL+E/pEWzvaohbOT42TobcDrCohesOxLDcAe0oT?= =?us-ascii?Q?YhpVwb4a0xSiXqj3OgbyoEbpLhwdiOlBRbyA/IjG7GNCIWSetmRt2diVEC5V?= =?us-ascii?Q?0hUHLLJzrChvrQ6MhFlw74ioSaSlFKTLhu85eMwjlRQq1GzTWqyA8J978PN3?= =?us-ascii?Q?7ViG5M5fnYWwFI+CxTklqXFcICKs7KhQsvoA7u3gcv7Zd/FgFt0SUOUdte37?= =?us-ascii?Q?vtDbMWUZeD3QJQjsBZacfEyS0caCw8t0VIU0Q6WuIQiAg9CPEtRCmJZYgcwZ?= =?us-ascii?Q?rhpzAZoMVJ+IqjOyAo35GVjrpFpMYE+8WD9+VpbwzZw7RpRzKEIAUJ5PQdhr?= =?us-ascii?Q?fZvFdPGB/ggVg1fNSak4vJLVGJgzVf+NN/56S4FPlXcAekp5QSE6n8T7Ukr1?= =?us-ascii?Q?iaaNg13hBlEysUBy4dK23oGJCE+PXvN5jP49p4oZgA93dDWzd27PgJMxd1gH?= =?us-ascii?Q?lDABw1MmrGt6qHDTI+Bc3ZAt+0FixQLG77aa70CTZR4PdOgnKWeR3H/6fntd?= =?us-ascii?Q?QZb7SgborgXWWehmkabRPORATqdK6Q1/HXFkXO3OyWeOJ5J4zBh8CLOYmi8D?= =?us-ascii?Q?PQVzy2W+l2ZpdpR4uP5i6AIojlttb6LgTbGKEFqLTJGtDAQBuWp7Jzv2kiCg?= =?us-ascii?Q?ky6stn1uHrNjeNbL2Tp8y6ve753+OLMI8d1sTOJ5D+NHca5obmnhhZDFMEmW?= =?us-ascii?Q?sJo/arT2rsMdrNtSh2QmNTs4FnxLGqpw0uV/6vFqMYE1IYBuuO6RVgfv3A?= =?us-ascii?Q?=3D=3D?= 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)(7416014)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:30:24.2223 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0185bf54-fcc2-416e-9e68-08ddae5b8466 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: DS1PEPF00017099.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7763 Content-Type: text/plain; charset="utf-8" KVM guest_memfd is implementing its own inodes to store metadata for backing memory using a custom filesystem. This requires the ability to allocate an anonymous inode with security context using anon_inode_make_secure_inode(). As guest_memfd currently resides in the KVM module, we need to export this symbol for use outside the core kernel. In the future, guest_memfd might be moved to core-mm, at which point the symbols no longer would have to be exported. When/if that happens is still unclear. Signed-off-by: Shivank Garg --- The handling of the S_PRIVATE flag for these inodes was discussed extensively ([1], [2]) My understanding [3], is that because KVM guest_memfd and secretmem results in user-visible file descriptors, its inodes should not bypass LSM security checks. Therefore, anon_inode_make_secure_inode() (as implemented in this patch) correctly clears the S_PRIVATE flag set by alloc_anon_inode() to ensure proper security policy enforcement. [1] https://lore.kernel.org/all/b9e5fa41-62fd-4b3d-bb2d-24ae9d3c33da@redhat= .com [2] https://lore.kernel.org/all/cover.1748890962.git.ackerleytng@google.com [3] https://lore.kernel.org/all/647ab7a4-790f-4858-acf2-0f6bae5b7f99@amd.com fs/anon_inodes.c | 20 +++++++++++++++++--- include/linux/fs.h | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c index e51e7d88980a..441fff40b55a 100644 --- a/fs/anon_inodes.c +++ b/fs/anon_inodes.c @@ -98,14 +98,26 @@ static struct file_system_type anon_inode_fs_type =3D { .kill_sb =3D kill_anon_super, }; =20 -static struct inode *anon_inode_make_secure_inode( +/** + * anon_inode_make_secure_inode - allocate an anonymous inode with securit= y context + * @sb: [in] Superblock to allocate from + * @name: [in] Name of the class of the newfile (e.g., "secretmem") + * @context_inode: + * [in] Optional parent inode for security inheritance + * + * The function ensures proper security initialization through the LSM hook + * security_inode_init_security_anon(). + * + * Return: Pointer to new inode on success, ERR_PTR on failure. + */ +struct inode *anon_inode_make_secure_inode(struct super_block *sb, const char *name, const struct inode *context_inode) { struct inode *inode; int error; =20 - inode =3D alloc_anon_inode(anon_inode_mnt->mnt_sb); + inode =3D alloc_anon_inode(sb); if (IS_ERR(inode)) return inode; inode->i_flags &=3D ~S_PRIVATE; @@ -118,6 +130,7 @@ static struct inode *anon_inode_make_secure_inode( } return inode; } +EXPORT_SYMBOL_GPL(anon_inode_make_secure_inode); =20 static struct file *__anon_inode_getfile(const char *name, const struct file_operations *fops, @@ -132,7 +145,8 @@ static struct file *__anon_inode_getfile(const char *na= me, return ERR_PTR(-ENOENT); =20 if (make_inode) { - inode =3D anon_inode_make_secure_inode(name, context_inode); + inode =3D anon_inode_make_secure_inode(anon_inode_mnt->mnt_sb, + name, context_inode); if (IS_ERR(inode)) { file =3D ERR_CAST(inode); goto err; diff --git a/include/linux/fs.h b/include/linux/fs.h index 96c7925a6551..7ba45be0d7a0 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3604,6 +3604,8 @@ extern int simple_write_begin(struct file *file, stru= ct address_space *mapping, extern const struct address_space_operations ram_aops; extern int always_delete_dentry(const struct dentry *); extern struct inode *alloc_anon_inode(struct super_block *); +extern struct inode *anon_inode_make_secure_inode(struct super_block *sb, + const char *name, const struct inode *context_inode); extern int simple_nosetlease(struct file *, int, struct file_lease **, voi= d **); extern const struct dentry_operations simple_dentry_operations; =20 --=20 2.43.0 From nobody Thu Oct 9 08:47:44 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2063.outbound.protection.outlook.com [40.107.243.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BEEBE2853F3; Wed, 18 Jun 2025 11:30:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246244; cv=fail; b=kVgWcInS9+ORqmTEeIpyo2yMe4jiPxCsda2QTI8gx+pB7b69qdOeMD337WBKcFJRATwv3vMCYkC6sOL/UGdw81aaY6q2ZmLDLOC/fiysgJWLaPj4NnfkDTD1SWZk6jwq7EGlArY8ObnB3G/LG0NoOTGViCxBiQnpA1Z3LQP6B8M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246244; c=relaxed/simple; bh=RTX69MxLrzMRl3tGjhigtmM11snxLJPwr8CuoMpLMSA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UEtSBecJocJwHLoQkHzStxaiHVZIlVcQGUzoLb6c1suk4JzOd4Rqcs6DdRYaF70viI4KFnguikXRhUXhJxrxX6M/V36TyP7/SmLb0fs/dIxPaMLU6+ch1Dfd6MSOz8sqqbCoQikoPxQJ5QFlERlm7z8GIfYRm9aSV+knLWckaLA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=PAW/7C+c; arc=fail smtp.client-ip=40.107.243.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="PAW/7C+c" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=g11h/KtSGyyqfby2Qee8jn8eYCytMLicMzwyv+HfGRHf3aU7sjehD7lQKHug1TjUA9SAOZ+QLGGfuzqE+UVg1jX+E+Q7TlK0sBArl5x97D6/jo24C0y6MmHXFjrtpJkzLVXS3KcBE6ZEiZV3N8CZ1XHtygdkgOSUe/cKQF2IowiMrvOJEv37JEEbvyXDCVYSqPQIP8uh0WEkZgGFVhuMH9AMe7O0WwkczmFK3GphLWi4raPQd5ji6vqITyyMRS7ViAou9Jpbri58i3p55b0BuHkfKFGRSCqVIqKw+p3M6jIwQkvzgDIKzInjQC7Kqic2tBX7VmLIlSkIxpjc1e9nqQ== 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=S//fZd9LYLxSjIwb1vhn1CUPtCMBp4NUQzl4E+yMDGM=; b=TK7faNaVajBv/BC+Voigq9ZPnpaxe4GYG4qBDk7j4If4fo6/gqxqng6mVrSpaPIW+CJh6l+z9Cd0dTMriwOtk8qLNQo2hqEBSMYUKB1BDk7pRrtlD+gEFzAUjukjXSqSxe6jXOoij20Q4BwgLxeonnjlRBJXytKp8k8Ulo/TOokSZb0vt5YmimoJ5NVDOtg4nZZtXSdnDPhd/ubL08fHJyqnlAkqOcIVIP7qxPHZNJ1EevfoLtofuHJWnDOdVlc0vhDEwtELD/h4n+Zq7b15p+W+y1D63rZBCYAe1FuYQfF2cWGfDTf5u5nxFG3iMvxz5SX9mfLAbfIGmNsa80In+w== 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=S//fZd9LYLxSjIwb1vhn1CUPtCMBp4NUQzl4E+yMDGM=; b=PAW/7C+cVrinw4YIKc/ELG/1HzU/qabNvxcUXO7AqkFoHwL1uBxLPs+z9d3C5uyo5NXmbqUtzinMwW3hPo9snKNubETvoCIfRDMmi0dLIZ3OJZbNovjA0AYO70ol68eoEtIM/dTbiweSnY+IUdoYRygV3lSasPocLkot78Cn/kw= Received: from DM6PR11CA0018.namprd11.prod.outlook.com (2603:10b6:5:190::31) by PH0PR12MB7469.namprd12.prod.outlook.com (2603:10b6:510:1e9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.29; Wed, 18 Jun 2025 11:30:39 +0000 Received: from DS1PEPF0001709B.namprd05.prod.outlook.com (2603:10b6:5:190:cafe::91) by DM6PR11CA0018.outlook.office365.com (2603:10b6:5:190::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.32 via Frontend Transport; Wed, 18 Jun 2025 11:30:39 +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 DS1PEPF0001709B.mail.protection.outlook.com (10.167.18.105) 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:39 +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:23 -0500 From: Shivank Garg To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 2/7] KVM: guest_memfd: Use guest mem inodes instead of anonymous inodes Date: Wed, 18 Jun 2025 11:29:30 +0000 Message-ID: <20250618112935.7629-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: DS1PEPF0001709B:EE_|PH0PR12MB7469:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c98e7ac-5418-4be3-809e-08ddae5b8d75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|82310400026|1800799024|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?OzF305btAQRJkTrGh10jCpNq8cLc+VbgYGUJ/oOOlAANTyatVuo118SP/QCo?= =?us-ascii?Q?0Ox3OVMM3Phf7Br8mxDwQkn0Mb+aFdJyNqhcTzppFMSjdbwMCkiuHdB0PPvL?= =?us-ascii?Q?Gpg39ZA+oTJQThokNrMKuTzj3XOBDoXQ9ZdUXbQGs08fy0ONxPNHaw8T4K9G?= =?us-ascii?Q?E0lkm87SdrIN4rgG0ZDK1QZkmC5WFGjW8oza557GFUDFwDCKpJtvamc3ltmu?= =?us-ascii?Q?z5SLQJ5jlNDKFMghjpDf6l35TDAZ+PEuG74ekDdiEjyU4kQEVB2LvOgoEeQa?= =?us-ascii?Q?jrXJfGRc9Qx1Tks++wr5xBiihju8VV6T/4ND9hJQCYTRD8ouv994Q+S3my9p?= =?us-ascii?Q?79sjDh9B9iK1NUwy2rDVJT9xTIrvFtWUw7q1D3R32oJGyakz0Mrk4Jlg9lEW?= =?us-ascii?Q?6hlg84BxWo1lrSLb4a5tlMY8c2JEslczd2Sal0sFlqhvOgdAIACrcRNL2Iq/?= =?us-ascii?Q?EmDe+lagC7mnXTrFuXkQUc8JDZ11nU4ftcf/O9yzHQ/z5u+Gj0I/ucJmmcwo?= =?us-ascii?Q?NJ1h+AKJjALy7A3PUGezI1bwbatscWSA45ORLHKlKFKD7iVBdP+dvAj8hrF9?= =?us-ascii?Q?If/ObXAd/2+vwrVtyBrOPp2Ig+6pWyzqTp2qDf7hWHMSrT9L8mX8nCuJKLFj?= =?us-ascii?Q?EPSsz2v5xx+jujyABJxwsJLFp4CPwc1Olp0d1xfL2cCKOqnRsJcMejuJEU9b?= =?us-ascii?Q?2lFH+yaM4nUutRSHSihy1u6H+W+lZEm9WhlpBvGzXfTXuhxDrk5FCFbNDHJo?= =?us-ascii?Q?JAs8OkF5TA2pOZ2wlhHEGIbxPCLYV1EvkJRj4/DaPDUs8dGVrl/wW8gb8SeM?= =?us-ascii?Q?tqvvJDvQt0bHHV/W5fZGr21WvAmkRBsL6u6r2BLtdNZLOvRpaREUvQ0eFrhl?= =?us-ascii?Q?zy/ytLH1TRQXT2JitksOUkSvIL0SKhHQ+D+aIn/35JbGFdIjiJSvdZWn8Fkb?= =?us-ascii?Q?rq3TMsvwpN+kTZfQIMhLpBVmMZTB3djpf9gCOWCT6UJFseK0pnVB2U01EAZQ?= =?us-ascii?Q?GGbSeXdXm3J16z2f68YlOpL7ktc32eaYCKkoL3B9oCU2czKoS1oXO2xAdQOb?= =?us-ascii?Q?1QHDJ5e0anPdpGZrirembpIpOoIsfhjRIMg9QShj00KUciQQlcahkRLYv99a?= =?us-ascii?Q?7RM4KUN57vM8Bm2JXj/+fzBRoyAXfuqXXTXKyV5FZdR84gc0afjVqTHP5lrN?= =?us-ascii?Q?A0Y8mMsJtCdzS9hIGx5EZBCNU/OZjgDZ+9snTi1BILcf5w+JcQazBstwrBeS?= =?us-ascii?Q?bNEglBB+kFy8iBZ+mphTPGx8jdZI45GBaCJi2CtgM9LcXgGj0Y0w9tb8JDd8?= =?us-ascii?Q?VuWYIKRKu4qOhzY/abPthTruMBiCJmSqUPVrv+75uWOp9o4o9Oopp6/VFpiJ?= =?us-ascii?Q?YOodXZynK1ElRRvYugMm/iReloWmbE4iON5M9K1PCVtLWjJBoqNmUVhTngid?= =?us-ascii?Q?/smo8yYGeXfcPEaLaSoOU6FCPN+s93ED2lEqyJL8b5NAJ4+oVBS/tH6a4dOr?= =?us-ascii?Q?2wpnjlZMqExXc132tto8xxmJoQTut4KrUEQ6?= 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)(36860700013)(82310400026)(1800799024)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:30:39.4238 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c98e7ac-5418-4be3-809e-08ddae5b8d75 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: DS1PEPF0001709B.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7469 Content-Type: text/plain; charset="utf-8" From: Ackerley Tng guest_memfd's inode represents memory the guest_memfd is providing. guest_memfd's file represents a struct kvm's view of that memory. Using a custom inode allows customization of the inode teardown process via callbacks. For example, ->evict_inode() allows customization of the truncation process on file close, and ->destroy_inode() and ->free_inode() allow customization of the inode freeing process. Customizing the truncation process allows flexibility in management of guest_memfd memory and customization of the inode freeing process allows proper cleanup of memory metadata stored on the inode. Memory metadata is more appropriately stored on the inode (as opposed to the file), since the metadata is for the memory and is not unique to a specific binding and struct kvm. Signed-off-by: Ackerley Tng Co-developed-by: Fuad Tabba Signed-off-by: Fuad Tabba Signed-off-by: Shivank Garg --- include/uapi/linux/magic.h | 1 + virt/kvm/guest_memfd.c | 134 +++++++++++++++++++++++++++++++------ virt/kvm/kvm_main.c | 7 +- virt/kvm/kvm_mm.h | 10 ++- 4 files changed, 127 insertions(+), 25 deletions(-) diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index bb575f3ab45e..638ca21b7a90 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -103,5 +103,6 @@ #define DEVMEM_MAGIC 0x454d444d /* "DMEM" */ #define SECRETMEM_MAGIC 0x5345434d /* "SECM" */ #define PID_FS_MAGIC 0x50494446 /* "PIDF" */ +#define GUEST_MEMFD_MAGIC 0x474d454d /* "GMEM" */ =20 #endif /* __LINUX_MAGIC_H__ */ diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index ebdb2d8bf57a..159df462d193 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -1,12 +1,16 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include #include +#include #include +#include #include -#include =20 #include "kvm_mm.h" =20 +static struct vfsmount *kvm_gmem_mnt; + struct kvm_gmem { struct kvm *kvm; struct xarray bindings; @@ -388,9 +392,51 @@ static struct file_operations kvm_gmem_fops =3D { .fallocate =3D kvm_gmem_fallocate, }; =20 -void kvm_gmem_init(struct module *module) +static const struct super_operations kvm_gmem_super_operations =3D { + .statfs =3D simple_statfs, +}; + +static int kvm_gmem_init_fs_context(struct fs_context *fc) +{ + struct pseudo_fs_context *ctx; + + if (!init_pseudo(fc, GUEST_MEMFD_MAGIC)) + return -ENOMEM; + + ctx =3D fc->fs_private; + ctx->ops =3D &kvm_gmem_super_operations; + + return 0; +} + +static struct file_system_type kvm_gmem_fs =3D { + .name =3D "kvm_guest_memory", + .init_fs_context =3D kvm_gmem_init_fs_context, + .kill_sb =3D kill_anon_super, +}; + +static int kvm_gmem_init_mount(void) +{ + kvm_gmem_mnt =3D kern_mount(&kvm_gmem_fs); + + if (WARN_ON_ONCE(IS_ERR(kvm_gmem_mnt))) + return PTR_ERR(kvm_gmem_mnt); + + kvm_gmem_mnt->mnt_flags |=3D MNT_NOEXEC; + return 0; +} + +int kvm_gmem_init(struct module *module) { kvm_gmem_fops.owner =3D module; + + return kvm_gmem_init_mount(); +} + +void kvm_gmem_exit(void) +{ + kern_unmount(kvm_gmem_mnt); + kvm_gmem_mnt =3D NULL; } =20 static int kvm_gmem_migrate_folio(struct address_space *mapping, @@ -472,11 +518,71 @@ static const struct inode_operations kvm_gmem_iops = =3D { .setattr =3D kvm_gmem_setattr, }; =20 +static struct inode *kvm_gmem_inode_make_secure_inode(const char *name, + loff_t size, u64 flags) +{ + struct inode *inode; + + inode =3D anon_inode_make_secure_inode(kvm_gmem_mnt->mnt_sb, name, NULL); + if (IS_ERR(inode)) + return inode; + + inode->i_private =3D (void *)(unsigned long)flags; + inode->i_op =3D &kvm_gmem_iops; + inode->i_mapping->a_ops =3D &kvm_gmem_aops; + inode->i_mode |=3D S_IFREG; + inode->i_size =3D size; + mapping_set_gfp_mask(inode->i_mapping, GFP_HIGHUSER); + mapping_set_inaccessible(inode->i_mapping); + /* Unmovable mappings are supposed to be marked unevictable as well. */ + WARN_ON_ONCE(!mapping_unevictable(inode->i_mapping)); + + return inode; +} + +static struct file *kvm_gmem_inode_create_getfile(void *priv, loff_t size, + u64 flags) +{ + static const char *name =3D "[kvm-gmem]"; + struct inode *inode; + struct file *file; + int err; + + err =3D -ENOENT; + if (!try_module_get(kvm_gmem_fops.owner)) + goto err; + + inode =3D kvm_gmem_inode_make_secure_inode(name, size, flags); + if (IS_ERR(inode)) { + err =3D PTR_ERR(inode); + goto err_put_module; + } + + file =3D alloc_file_pseudo(inode, kvm_gmem_mnt, name, O_RDWR, + &kvm_gmem_fops); + if (IS_ERR(file)) { + err =3D PTR_ERR(file); + goto err_put_inode; + } + + file->f_flags |=3D O_LARGEFILE; + file->private_data =3D priv; + +out: + return file; + +err_put_inode: + iput(inode); +err_put_module: + module_put(kvm_gmem_fops.owner); +err: + file =3D ERR_PTR(err); + goto out; +} + static int __kvm_gmem_create(struct kvm *kvm, loff_t size, u64 flags) { - const char *anon_name =3D "[kvm-gmem]"; struct kvm_gmem *gmem; - struct inode *inode; struct file *file; int fd, err; =20 @@ -490,32 +596,16 @@ static int __kvm_gmem_create(struct kvm *kvm, loff_t = size, u64 flags) goto err_fd; } =20 - file =3D anon_inode_create_getfile(anon_name, &kvm_gmem_fops, gmem, - O_RDWR, NULL); + file =3D kvm_gmem_inode_create_getfile(gmem, size, flags); if (IS_ERR(file)) { err =3D PTR_ERR(file); goto err_gmem; } =20 - file->f_flags |=3D O_LARGEFILE; - - inode =3D file->f_inode; - WARN_ON(file->f_mapping !=3D inode->i_mapping); - - inode->i_private =3D (void *)(unsigned long)flags; - inode->i_op =3D &kvm_gmem_iops; - inode->i_mapping->a_ops =3D &kvm_gmem_aops; - inode->i_mode |=3D S_IFREG; - inode->i_size =3D size; - mapping_set_gfp_mask(inode->i_mapping, GFP_HIGHUSER); - mapping_set_inaccessible(inode->i_mapping); - /* Unmovable mappings are supposed to be marked unevictable as well. */ - WARN_ON_ONCE(!mapping_unevictable(inode->i_mapping)); - kvm_get_kvm(kvm); gmem->kvm =3D kvm; xa_init(&gmem->bindings); - list_add(&gmem->entry, &inode->i_mapping->i_private_list); + list_add(&gmem->entry, &file_inode(file)->i_mapping->i_private_list); =20 fd_install(fd, file); return fd; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index e2f6344256ce..88c7dd6770da 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -6482,7 +6482,9 @@ int kvm_init(unsigned vcpu_size, unsigned vcpu_align,= struct module *module) if (WARN_ON_ONCE(r)) goto err_vfio; =20 - kvm_gmem_init(module); + r =3D kvm_gmem_init(module); + if (r) + goto err_gmem; =20 r =3D kvm_init_virtualization(); if (r) @@ -6503,6 +6505,8 @@ int kvm_init(unsigned vcpu_size, unsigned vcpu_align,= struct module *module) err_register: kvm_uninit_virtualization(); err_virt: + kvm_gmem_exit(); +err_gmem: kvm_vfio_ops_exit(); err_vfio: kvm_async_pf_deinit(); @@ -6534,6 +6538,7 @@ void kvm_exit(void) for_each_possible_cpu(cpu) free_cpumask_var(per_cpu(cpu_kick_mask, cpu)); kmem_cache_destroy(kvm_vcpu_cache); + kvm_gmem_exit(); kvm_vfio_ops_exit(); kvm_async_pf_deinit(); kvm_irqfd_exit(); diff --git a/virt/kvm/kvm_mm.h b/virt/kvm/kvm_mm.h index ec311c0d6718..4b825a7f114a 100644 --- a/virt/kvm/kvm_mm.h +++ b/virt/kvm/kvm_mm.h @@ -68,16 +68,22 @@ static inline void gfn_to_pfn_cache_invalidate_start(st= ruct kvm *kvm, #endif /* HAVE_KVM_PFNCACHE */ =20 #ifdef CONFIG_KVM_GMEM -void kvm_gmem_init(struct module *module); +int kvm_gmem_init(struct module *module); +void kvm_gmem_exit(void); int kvm_gmem_create(struct kvm *kvm, struct kvm_create_guest_memfd *args); int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, unsigned int fd, loff_t offset); void kvm_gmem_unbind(struct kvm_memory_slot *slot); #else -static inline void kvm_gmem_init(struct module *module) +static inline int kvm_gmem_init(struct module *module) { =20 + return 0; } + +static inline void kvm_gmem_exit(void) {}; + +static inline void kvm_gmem_init(struct module *module) =20 static inline int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, --=20 2.43.0 From nobody Thu Oct 9 08:47:44 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2056.outbound.protection.outlook.com [40.107.223.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 642E028FFE5; Wed, 18 Jun 2025 11:31:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246263; cv=fail; b=a8y0z/awBNmSohOeLC/Vvbrcb1RcO1QsUEY9mh/OwdWh/97mm94+++dAoy/E3kEl40Io2KM1fIrAddFbaisZFilfclSq9FslViX8yKGlZvf1zffNms+eBVNPmfzaTxIGrelnqwtUcWfGUmLslUVGqMoASQE0LP8Helmi+w7ACKM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246263; c=relaxed/simple; bh=kgPTlE3nhh9ATtzXkSJ0F0w17EvjJIbiQ5bfpixyxV0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=I+HHkWUogkREmZSyZkA39PiHb4tdz8czulVhjGsGrjNpMqwO7/V0fJGbSu/xGULI7r89ELIydQ5SMuIHoRdlhNnP7zlF4b0nsVL5r/PnvVA8by2i5mpu+D3cyXwPkr/r7/JUxnV2TmfGO7i1kDiVxuZpZ/UjGIhGJnOAv+SgEhI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=i9Rt8TBX; arc=fail smtp.client-ip=40.107.223.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="i9Rt8TBX" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 Content-Type: text/plain; charset="utf-8" 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 Acked-by: Vlastimil Babka --- 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) =20 #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 orde= r, + 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 =20 #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__)) =20 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 i= ndex, 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 ind= ex, fgf_t fgp_flags, gfp_t gfp); =20 @@ -805,6 +816,36 @@ static inline struct folio *filemap_grab_folio(struct = address_space *mapping, mapping_gfp_mask(mapping)); } =20 +/** + * 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 orde= r, + 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 =20 /* @@ -1891,11 +1900,14 @@ void *filemap_get_entry(struct address_space *mappi= ng, pgoff_t index) } =20 /** - * __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 i= ndex, - fgf_t fgp_flags, gfp_t gfp) +struct folio *__filemap_get_folio_mpol(struct address_space *mapping, pgof= f_t index, + fgf_t fgp_flags, gfp_t gfp, struct mempolicy *mpol, pgoff_t ilx) { struct folio *folio; =20 @@ -1977,7 +1989,7 @@ struct folio *__filemap_get_folio(struct address_spac= e *mapping, pgoff_t index, err =3D -ENOMEM; if (order > min_order) alloc_gfp |=3D __GFP_NORETRY | __GFP_NOWARN; - folio =3D filemap_alloc_folio(alloc_gfp, order); + folio =3D filemap_alloc_folio_mpol(alloc_gfp, order, mpol, ilx); if (!folio) continue; =20 @@ -2024,6 +2036,13 @@ struct folio *__filemap_get_folio(struct address_spa= ce *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 i= ndex, + fgf_t fgp_flags, gfp_t gfp) +{ + return __filemap_get_folio_mpol(mapping, index, fgp_flags, gfp, NULL, 0); +} EXPORT_SYMBOL(__filemap_get_folio); =20 static inline struct folio *find_get_entry(struct xa_state *xas, pgoff_t m= ax, --=20 2.43.0 From nobody Thu Oct 9 08:47:44 2025 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2074.outbound.protection.outlook.com [40.107.95.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04F772DBF53; Wed, 18 Jun 2025 11:31:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.95.74 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246293; cv=fail; b=MXP8NaboEwFwiE7JQ+Duny6NPWMR55aP41OZVbsgLjEEnvlL+dZY9K8tEYQaLk7sYXtxNUv79k+ZYIKmYz3bEHtpIM9v4CASH5y0u9x5c0ul1eWXZrt+i5PhU2gxDudcgROUtlK9E/VphvltWkPqawNMsvMdCWllsRr+MQTE8i0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246293; c=relaxed/simple; bh=lfXGXm+Ek8zzvw23WEeag0FZAgtggJFpXyPM86bM/Jo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=c/fa1DCvxymymL+oXaoTSn+QmJOUEK90mx34l78JdeYoonfCzdSsC0CVCS7HpQZ8aOSmHe6WbZKotZWOAeXmemLmKUtK0ofibAohCPz7RZiLfBsp1U/GygCAWd+6B3v8DK1ASH0mslMz00wtfDIwj/X4jyCZmTAdhNTWPricD9M= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=wZiZwcA1; arc=fail smtp.client-ip=40.107.95.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="wZiZwcA1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GI9kOcogCbYhnmm4aaI58otgolz3Wi+LeqfEhPgHT2zc6eR8SU6hRmpEzTt1XbJyKygVHLxf+/iJ3NlztQX4Hg8QoDgIhgUhOhgZ5mZgzpk6EX9D5E1pA5A+bjE3A0gofILQkIp4Zp92mSpnZ9abN7mejfpL7fSLX8O9duAAsECUTruaAZtEccQFaLVxR6h1S5Q1FHY0C+YFDDmjYQUKz5Nta/fEOCs8uoCmUQXUW7rzxFlQ53NS58jYeu0DTdDF75qbx5V5ytCWO6Okx04RQCKOz7Ju7cNYTxet60/+qdCYnmuxEdOWwLrB4ZTPGn9FLGNUSRpnApjssoId8QVV7A== 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=cAmX9iRNDTZi0f1Ik14X6Rpj4CEBbwYZWKOSW4ycUR0=; b=UtgELZJli/Dh9Z9PrQKA3sRvA8KRGy4vzUeIaoYFSAgDzqx9I8sNuXzPGnmj+AyIRUqTXkytotOJYiiMRGoavDBJE7gAjo+cRANN+62byWUOpOl3p517r0/+OeQ+stHNDfYene4Xei86gXMD9gDZ+zJo9gA3OLwuIy25xlCBSlW7NlOJXw71uql8VfSemYJ++EqGo7Q5TyN3a/t0N4WKvlRyFlWiZWbBFiIRnfJI9YKU+zFPHCCQX65zE0Idiq1A2KX28tnfCLVukAOmyGwuB8wsP4NIg8aRzscPtR/OhR9gGqn2RdWVDTa/OS+0Tciss0ibULuY65JagD1ztXe4DA== 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=cAmX9iRNDTZi0f1Ik14X6Rpj4CEBbwYZWKOSW4ycUR0=; b=wZiZwcA1sVxO4zgBXE2zQbQeNJDMwJKXA3SXAVKYUt55MmErL7YApdjTYH13gsQ1ZVbiHU73Sb5pstcJO+kUWO8LM/36o2Qe7yFLcL49h4A00jOErcpubZEyBf0EeNlC9Pu5jzgfu2Ih02ccHC/lp66CuRP3NEq8UWMXL6n17AQ= Received: from SN1PR12CA0099.namprd12.prod.outlook.com (2603:10b6:802:21::34) by PH0PR12MB7958.namprd12.prod.outlook.com (2603:10b6:510:285::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.28; Wed, 18 Jun 2025 11:31:27 +0000 Received: from SN1PEPF000397AF.namprd05.prod.outlook.com (2603:10b6:802:21:cafe::d1) by SN1PR12CA0099.outlook.office365.com (2603:10b6:802:21::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.30 via Frontend Transport; Wed, 18 Jun 2025 11:31:27 +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:31:27 +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:54 -0500 From: Shivank Garg To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 4/7] mm/mempolicy: Export memory policy symbols Date: Wed, 18 Jun 2025 11:29:32 +0000 Message-ID: <20250618112935.7629-5-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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_|PH0PR12MB7958:EE_ X-MS-Office365-Filtering-Correlation-Id: da92630e-11b1-4f74-87ec-08ddae5ba9f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?m3sTfJJsWNzmXpowWpoY5VKjJLqa0ITKwKDQw/0Pv0WpUN5+aFBreKrXeWt5?= =?us-ascii?Q?z0YvARaZVke0KfkVKW9iORR0diMrAkXu/clx8ru87vINMKy4CqL1WV1mV/61?= =?us-ascii?Q?qQ+TqcU+iw1VVVVeslEydf7TmpGDd22tzDbQKd7wGCH8rMckwMERXSSxI144?= =?us-ascii?Q?V5ND/C9oE6XBpKXwch8mcdyOAj1CUvwfyG0dP0gYdQqfTpnzt6Wcj0P4H0uh?= =?us-ascii?Q?Z+BcWIuUEWK4hKjYzpzQTDnCqcdVFoXQX256hBbfY+e9W3ilV454Rs0dHPw4?= =?us-ascii?Q?9gRsMSgjRdY6ON8C5hBD+1EIucKqUVjfHHNlXO0XCiiMPwWv7bgjyGwjhJz7?= =?us-ascii?Q?InouU4+hDNLLXQxHYP6j/wfvUVm4Un8L0DNMwFvHtEw9tl6rNmej2eWnOyVB?= =?us-ascii?Q?pIYMN/LXL5lKW3qJreXOi5jczadLwipNaNP60hryK8FwPtOnx6I2+JS4+z8D?= =?us-ascii?Q?4N0cL6wp90RlkNlPFjZJxGCmCIdMC3bdbQvgUW5+QKc/uVQrABL0HPpnrC27?= =?us-ascii?Q?FEfRCjLzIMot3GxX7fMZT5Zvv+U/gVomXmzvG4eVH83LCmKIG/IgT0x+jxf2?= =?us-ascii?Q?TstFci1Mg8TEqZvrOjcONesCEyX7IahX6k/TZJu/MTg7w8dQ7DEutLdbJDyP?= =?us-ascii?Q?mEEhJvd3aIT14GfVpddretneBdlaTeDeZFAT2KpQpdS5x7XoL0tsRRMEcYhY?= =?us-ascii?Q?2tEJwuUF9Olg5xwBKHCB54PEOIx3EoVwdZ+tsgbY12wAc/aVcw4U8idHBscP?= =?us-ascii?Q?AuOff2sW37BYCJRBNhAUD1fxT6HQ9s70blILLmeST5r2z+fLuXAXxK5l+cvY?= =?us-ascii?Q?F2KakRwIuZ6scEKaVlzzzeMh9qDxH50FlytoKbM37JiFcud+1gCgWqCJpjyN?= =?us-ascii?Q?a/J5MiZI3CVbhJ+CKECCbLqZOOlthHG7FP4+gNoOJFnVLqQlAgw3+ntKimcE?= =?us-ascii?Q?qV4EF5rfxXG+t4V1+MSerkEAIQ37sX06cT+iEKzwqNuODrHZAF/lQGHm3cCp?= =?us-ascii?Q?gwtMaTKRZLaa1FAIRXl7RyDRnIqRd15NePI+HacdXuGx5IpEHAAn2ap6D5sd?= =?us-ascii?Q?67wfJ4MiGwVytvJh9yU2qPGBVZLN71t2naMH8U0CagTN/MHP+v5SRTLhqOaA?= =?us-ascii?Q?5V5Dr0WSny9/G75eMMkjGMUX4k6+SmH4G+ot6ADsub+6SRDJM5dSPwOQMYT3?= =?us-ascii?Q?IecN4wfSxHf3E5V0QkretxE+pyKb7AzN1Vmjbjva0kCRTtmX4nGyJxzTel82?= =?us-ascii?Q?LBf0Tk8SYAXMXYu12HGifvGt6fp60jIeTFj/4YkZ0Wm38E2Ax+TR4O7YkCrj?= =?us-ascii?Q?P2WcHbz0biodqWnDIv+YJ2PjJ/Dnsz4pgGRj2bo3KEnlvqXj0P3YcDqmy0sF?= =?us-ascii?Q?AtZ+IiXiVECM4Hmtjh6KGHEPRcDZTMnS+F8GJLBKFdnt8bMYXgf1YMXceLwQ?= =?us-ascii?Q?tfP1xrS68Kq0h26G+RxRD7lmYXoJklbjvPJoeTpT6lEHzglnFgYrhFAXUrKM?= =?us-ascii?Q?C4Vzb4znO3JJcuYNlOE8O1vXadAtsCI3POfp?= 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)(82310400026)(1800799024)(36860700013)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:31:27.2711 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da92630e-11b1-4f74-87ec-08ddae5ba9f9 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: PH0PR12MB7958 Content-Type: text/plain; charset="utf-8" KVM guest_memfd wants to implement support for NUMA policies just like shmem already does using the shared policy infrastructure. As guest_memfd currently resides in KVM module code, we have to export the relevant symbols. In the future, guest_memfd might be moved to core-mm, at which point the symbols no longer would have to be exported. When/if that happens is still unclear. Acked-by: David Hildenbrand Acked-by: Vlastimil Babka Signed-off-by: Shivank Garg --- mm/mempolicy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 3b1dfd08338b..d98243cdf090 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -354,6 +354,7 @@ struct mempolicy *get_task_policy(struct task_struct *p) =20 return &default_policy; } +EXPORT_SYMBOL_GPL(get_task_policy); =20 static const struct mempolicy_operations { int (*create)(struct mempolicy *pol, const nodemask_t *nodes); @@ -487,6 +488,7 @@ void __mpol_put(struct mempolicy *pol) return; kmem_cache_free(policy_cache, pol); } +EXPORT_SYMBOL_GPL(__mpol_put); =20 static void mpol_rebind_default(struct mempolicy *pol, const nodemask_t *n= odes) { @@ -2888,6 +2890,7 @@ struct mempolicy *mpol_shared_policy_lookup(struct sh= ared_policy *sp, read_unlock(&sp->lock); return pol; } +EXPORT_SYMBOL_GPL(mpol_shared_policy_lookup); =20 static void sp_free(struct sp_node *n) { @@ -3173,6 +3176,7 @@ void mpol_shared_policy_init(struct shared_policy *sp= , struct mempolicy *mpol) mpol_put(mpol); /* drop our incoming ref on sb mpol */ } } +EXPORT_SYMBOL_GPL(mpol_shared_policy_init); =20 int mpol_set_shared_policy(struct shared_policy *sp, struct vm_area_struct *vma, struct mempolicy *pol) @@ -3191,6 +3195,7 @@ int mpol_set_shared_policy(struct shared_policy *sp, sp_free(new); return err; } +EXPORT_SYMBOL_GPL(mpol_set_shared_policy); =20 /* Free a backing policy store on inode delete. */ void mpol_free_shared_policy(struct shared_policy *sp) @@ -3209,6 +3214,7 @@ void mpol_free_shared_policy(struct shared_policy *sp) } write_unlock(&sp->lock); } +EXPORT_SYMBOL_GPL(mpol_free_shared_policy); =20 #ifdef CONFIG_NUMA_BALANCING static int __initdata numabalancing_override; --=20 2.43.0 From nobody Thu Oct 9 08:47:44 2025 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2049.outbound.protection.outlook.com [40.107.96.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3BCB32DBF62; Wed, 18 Jun 2025 11:31:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246294; cv=fail; b=JO/bIDSJ/jgg0fxUAnypZUBPn9v6pjpRbU73Hzj7Ucag19Cp6lXXQCBCnm5oShW00kC1VIjaC4mOJrBquNLcMwQg6VOZuYSB9E42Z5xEEe2Mo0VAKpF1tzwLlTOQUjnwiLBm0Y2M3rp+RQxd/hfDUrdvpLSlhe1zrtmiLBNTsyM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246294; c=relaxed/simple; bh=JJtqDa3VWFeXLPo5CDLTbWFpXl4VC/64GAjP58654u0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oSjCyFB0PbT/yoYleULTPQ+c2HjlYhsdbIH4cEL2PzjXe/UZ1MSwgy9Jv+fPrOjNiOiwTEqPDNRL7dKr9WSCHSOTIoCDjay5xr8zGngQFTK+tAfDxvon1zuRI/c1dOlSBta+qg+UyDVIyszpsSpO0czlL3jSDAThzbKYGuI0KEk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=3NgkmsV6; arc=fail smtp.client-ip=40.107.96.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="3NgkmsV6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uLyhpHMkErdw1UuOP5w/2ngIcY5WgG5Tc9zpyuZtTAhW7WTmgZOIvWdjpc4dMKHDxwy+4EBtwER3LDba41mEA5ZAmWETwCYEslFX3mmlZ+3s+WT44cW+DyGmyStnDNiu/vYvO8/EmZcbHCA3AON4LPdkUesNWL6ExfBwaUL+SKWSHA83leWyIJyHwH6/PtLTP3rb4kWPgextOL8AB/J6e6j2zn1Vm74FqrT9/7R7CIwdbLpL4cJuN8mdie+l+4AwjlnNcw46HMHfN2pBYR/3+V1r5RouCoAuzyEN1f+iKmyMQ6d2EVYnFyHi9d7ygLjKodEKfv1MVjLjSe2OIGEcgw== 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=sfQXSb5tak1K9mOX6+8D2lKXxaLY4oi2TQeAVwUQv7A=; b=ZtEWTW/mw/evO+wExrMYhtFCdLWhRb6kvoffkc1D0JjakMXAVdF5PJFtYt3cNb4Az5fteyazN9HBOShf0C8xmQi2u+SjXgoEHHfLwG8oaniP2fcQkPh8mgc6fTCy5JtbwsprLxZQ07HxInasyhBudqrNxDeTFCh/Y52sln8v/hw/rddNAr6zT8m5e8m+pAp6qSkJC3FqOSsZusNygzaKEWTKNDV+PS4v5rmDXQH7plC31Oe1uUdR38p/unzk3t06J5Bs6KqXtHH8hQiNmrM1uj6jp4h/DFZYGNq44bYYMO2NznU+Xuqma7+FmGjO0RQws+NMQJhxgu8+VrB2m6Sopg== 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=sfQXSb5tak1K9mOX6+8D2lKXxaLY4oi2TQeAVwUQv7A=; b=3NgkmsV6Pe3WAIb7XCvjNUfoXF4okcDOaxervL4URWkm8glMAv5RSvnzL3IzP8W7VAqhjnTFu58v7czyjZsQU8LGVDB34Lq2IJXEIJt+8CeyfjWD50FXRtoBVcOBl0d1y0TOpehZO048S7b+UAFQqrkcPuUhK+Dm1gL+yLropGY= Received: from SA1P222CA0047.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2d0::20) by IA0PPF6E99B1BC1.namprd12.prod.outlook.com (2603:10b6:20f:fc04::bd1) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.25; Wed, 18 Jun 2025 11:31:30 +0000 Received: from SN1PEPF000397B2.namprd05.prod.outlook.com (2603:10b6:806:2d0:cafe::ee) by SA1P222CA0047.outlook.office365.com (2603:10b6:806:2d0::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.34 via Frontend Transport; Wed, 18 Jun 2025 11:31:29 +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.8857.21 via Frontend Transport; Wed, 18 Jun 2025 11:31:29 +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:31:09 -0500 From: Shivank Garg To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 5/7] KVM: guest_memfd: Add slab-allocated inode cache Date: Wed, 18 Jun 2025 11:29:33 +0000 Message-ID: <20250618112935.7629-6-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SN1PEPF000397B2:EE_|IA0PPF6E99B1BC1:EE_ X-MS-Office365-Filtering-Correlation-Id: aa7a7ebc-a1f7-4b44-f2a7-08ddae5bab38 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?M5E7EEkIVQklvmBdhpm4P94mI093+WVTp/FCk/tVr6LsZS7TlRwAr7tnK6Bt?= =?us-ascii?Q?VwxQkZsR2O10GDvUgrVHN27ToMmz5RCtcNx1zW08qUvTZrEaAjxeQiLGzh5f?= =?us-ascii?Q?xmXkEqI4yf/kXLUhRAhGoZmXAYwmbkRH7/FQceveUjSHNbneAvYLojXOo67U?= =?us-ascii?Q?0wAc9K7qfKMetxUzQXG15MCTRytaK+NnRCUIM/mwrCNT2f6UTh2Q5FSLu/Ho?= =?us-ascii?Q?NFAKfB9nlVbGs5jiC2eaH8WpwpqJvCxyxkEGUzzrm31s5ZryWh2AIfWjwD9n?= =?us-ascii?Q?xIwSE4ueWJiUCCJ8jGowfI8ojzP4l8nbYQSqHhD8NttIivymmuhLIcRtlVBg?= =?us-ascii?Q?80s7gr5Xe+uwMYf1x2CYzEzFNuafqT7S+pGoRcby0itsRkvadeNZFc8spXO2?= =?us-ascii?Q?/lcqyBJFFqknq084qQibJ5gC9cimfBwzkeXOGoRtrUWE9K5IbijSCr9tnIO8?= =?us-ascii?Q?biUxkD6vamHcvbxKuKfLyxqwN+uNYYYXSLtxYRQ+e/O/cL1hxQvlS73mKUja?= =?us-ascii?Q?uo/JJxSt0nSjUJ6ovpVIBKVgw2g62ekBvMnon/OaelyIFVo44Xfct8RqLrzV?= =?us-ascii?Q?C0lUx8QhW2cQF8P7JZ8oGohgSv4wdhg8By0UDIgNWuHAWaKgJH3D1wd81BEb?= =?us-ascii?Q?s1w4t0DNLhC3/Qw/kci9Kru6esrmyN+bMvrpj8UKGsth4QyqlvyYYc8UlkDK?= =?us-ascii?Q?1Pukmdyxp+n0ZuAER7p1kWdtmmFve6E4XMDZXL+lxtf37OhVjwN8ypTUKV4S?= =?us-ascii?Q?AkBWYn6PowmyTCvfSK5N3iI3yCSHxqlmuMH3Iz0EMv2KILUwBB93906zRyq+?= =?us-ascii?Q?GkEw46gkom7PMhubP4sJkYRsJllYMqlPjzx1j8/xakklM0T7SLB5oEyhAXC+?= =?us-ascii?Q?rekv7ltmgBBGH21uT/LJ6aPosSnPQCUEeUGW00/E+2r/GnR8Rxu71+1ppwYV?= =?us-ascii?Q?sFGGtZw3PODg4dWLVyhhwQRXbaKPZt/zobvL8tkEqW7c/eF8C9F7X4s5WTpk?= =?us-ascii?Q?6hVsOk+5U09ejUGPN4L1YmgMEhq3phL5SjkDqfwezoCb5/XmM7jbM05kQe4I?= =?us-ascii?Q?ieCqMa1qI6xXHe843/an5TYOb9SNxdhSwMTHyZtvJP8KIGZZZny/56Qk7ZuW?= =?us-ascii?Q?HO36YNtvfMmszDE/VMmgV2LkIJTF3bW6mLi7Mif4s3jiaIrJqUZjVj9y977t?= =?us-ascii?Q?1mcecoEdVmETn91CG3++dBeYnpznSDhAs8D/cBNd1ZGiGF8BoxQIsxGr0E4a?= =?us-ascii?Q?ggjmD1jjPG1lrCHTyvyjGea+oIloNOIqbx8IDMacJ9XuxdwTQg1QEt/Jfiw8?= =?us-ascii?Q?yYo5LDW1fKQHTtSEiNHfmf58mwNQ2fgnJ4MMAso9xvCIyvsCM9YQkz2fyNh1?= =?us-ascii?Q?tZlwzVQTSqYGQbOZRq+AwlESQHIgu5HokPSw5HyZXxfHrAR32BcrIAGyKGm7?= =?us-ascii?Q?Qusnskx09k0xd86O3Ck9gpdrW2f9EBlXCHGKRPRDFv9ZfvMH6bFb3NRgWH/7?= =?us-ascii?Q?lZDkUzELHFeTjL6nVcGQc/EutaoOK60G3UFN?= 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)(36860700013)(82310400026)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:31:29.3719 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa7a7ebc-a1f7-4b44-f2a7-08ddae5bab38 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: IA0PPF6E99B1BC1 Content-Type: text/plain; charset="utf-8" Add dedicated inode structure (kvm_gmem_inode_info) and slab-allocated inode cache for guest memory backing, similar to how shmem handles inodes. This adds the necessary allocation/destruction functions and prepares for upcoming guest_memfd NUMA policy support changes. Signed-off-by: Shivank Garg --- virt/kvm/guest_memfd.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 159df462d193..5a1ce6f5e287 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -17,6 +17,15 @@ struct kvm_gmem { struct list_head entry; }; =20 +struct kvm_gmem_inode_info { + struct inode vfs_inode; +}; + +static inline struct kvm_gmem_inode_info *KVM_GMEM_I(struct inode *inode) +{ + return container_of(inode, struct kvm_gmem_inode_info, vfs_inode); +} + /** * folio_file_pfn - like folio_file_page, but return a pfn. * @folio: The folio which contains this index. @@ -392,8 +401,33 @@ static struct file_operations kvm_gmem_fops =3D { .fallocate =3D kvm_gmem_fallocate, }; =20 +static struct kmem_cache *kvm_gmem_inode_cachep; + +static struct inode *kvm_gmem_alloc_inode(struct super_block *sb) +{ + struct kvm_gmem_inode_info *info; + + info =3D alloc_inode_sb(sb, kvm_gmem_inode_cachep, GFP_KERNEL); + if (!info) + return NULL; + + return &info->vfs_inode; +} + +static void kvm_gmem_destroy_inode(struct inode *inode) +{ +} + +static void kvm_gmem_free_inode(struct inode *inode) +{ + kmem_cache_free(kvm_gmem_inode_cachep, KVM_GMEM_I(inode)); +} + static const struct super_operations kvm_gmem_super_operations =3D { .statfs =3D simple_statfs, + .alloc_inode =3D kvm_gmem_alloc_inode, + .destroy_inode =3D kvm_gmem_destroy_inode, + .free_inode =3D kvm_gmem_free_inode, }; =20 static int kvm_gmem_init_fs_context(struct fs_context *fc) @@ -426,10 +460,26 @@ static int kvm_gmem_init_mount(void) return 0; } =20 +static void kvm_gmem_init_inode(void *foo) +{ + struct kvm_gmem_inode_info *info =3D foo; + + inode_init_once(&info->vfs_inode); +} + +static void kvm_gmem_init_inodecache(void) +{ + kvm_gmem_inode_cachep =3D kmem_cache_create("kvm_gmem_inode_cache", + sizeof(struct kvm_gmem_inode_info), + 0, SLAB_ACCOUNT, + kvm_gmem_init_inode); +} + int kvm_gmem_init(struct module *module) { kvm_gmem_fops.owner =3D module; =20 + kvm_gmem_init_inodecache(); return kvm_gmem_init_mount(); } =20 @@ -437,6 +487,7 @@ void kvm_gmem_exit(void) { kern_unmount(kvm_gmem_mnt); kvm_gmem_mnt =3D NULL; + kmem_cache_destroy(kvm_gmem_inode_cachep); } =20 static int kvm_gmem_migrate_folio(struct address_space *mapping, --=20 2.43.0 From nobody Thu Oct 9 08:47:44 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2088.outbound.protection.outlook.com [40.107.92.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 442882DFF17; Wed, 18 Jun 2025 11:31:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.88 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246307; cv=fail; b=g8dzL1wDdSHLAw/p1B10AJ1Qx5HlzWDWfCYTwDcMXRXxIcJORDjL7lBVzkTq6Wt/p5A/dGlcd1cNuSuhm/sIgePrlGtBP/04dQy8Ec2uKyxFOMBEEGGsnbFvOnsT3PZWpdTzqrtUF1bc9cWMSM0U8d0kdlo0X2//K721DpzknYY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246307; c=relaxed/simple; bh=NhuU8ppHG2STCJcBdjxhd78hD8i5jObNdOKIlpbKBDo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DbKxYfMYvx4tc92HscqpPiAv5LR4NfblDwTnqVQYf0wEtFmz4kCOu1KDtm/cvbkgx8/URv1ifNvLhyLrMGA04Jo6PNyAsAag1vrewgfTWS5CWIAES0Br6b6tAtme1Pg+IjyqO/J+gagAclBUcik4rT5Xz97hXPlyPK73B0D7bt4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=fM8VtP/0; arc=fail smtp.client-ip=40.107.92.88 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="fM8VtP/0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b0EEAkLUcV1J0lhA0r/52NgO7vpW7jdWD5qpWyfWWJBlQmxU5F8ablvY0yThM6gwQhdnxY/TpMC7mKrlr+saAqZidRVyVzYa4mho34xuO4MbBKyGZkmAvUf3J1saCqHFmr0FWYOPZ3Gn8ILZhbNZzjZLrtlyCRTwuDn1RWdTlmjdVEwitv6UGO5xXUmPEWhLCoEZXcFwpe1niMnYXtsBxqYRvQDCH1jEDp6mgMm5+3de3/zsI4IJqPwnTjsamRnI4M6q4CRbPBslWJKysrcyoZUec3rBu291u1Atu0xiW5mc1l5ZzG9wzF9Qc3ommd4uCY9X+zJStr+TRunQDS2KcA== 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=C/udd3S7OSs9ba5kuMi2wHriDONJNB4tzfZ126Bnl04=; b=GDambBnexJZOGtxRungd5MR1DH4PZ7idbB+hslQ6/ugkUKH3v1j4cUASUUi/HGbRRGhorPQp9L+BbpUdT5ZiOfNQsk3vx0N103tFdCWwiDQb3XmToFJr04zo11Y/49xpvRI4PbREyNU8HgQG4dGs0K08I2Scr4oWrU1Cig62vvlF3MVEOYGakhxPD7BWUHcJKXga5lEQDNp/LEHMgia3G1TAXfljCIDC4OMSmdIJKX8Ew7zV49LXSkmMQl9DZFPafQfrAJL5ISYF4cCS/QbrOGcB9AJK/8+cttgBi6zN1xsMKcLVDP6Sxu9rAi+Ga6TsxWiXYuW93JjPM7UEFnRtFA== 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=C/udd3S7OSs9ba5kuMi2wHriDONJNB4tzfZ126Bnl04=; b=fM8VtP/0/v+ckL9EK1Ldi5pZ98Vi5RCmiWF5tPaRk0RVa0TBsUAOvFtkzuFXZbYfwAe0dWQ/dOWvLKM01f6ew/SFr9LHJ+fzz657i7g9qCC+h0Qe63N7BA39HAMdhDAglqMkxzoq1zyFxTXCX0up2GnsKVLjaYjRg2HxVWyJ6tg= Received: from SN6PR2101CA0027.namprd21.prod.outlook.com (2603:10b6:805:106::37) by IA0PR12MB7579.namprd12.prod.outlook.com (2603:10b6:208:43c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.29; Wed, 18 Jun 2025 11:31:41 +0000 Received: from SN1PEPF000397B4.namprd05.prod.outlook.com (2603:10b6:805:106:cafe::1e) by SN6PR2101CA0027.outlook.office365.com (2603:10b6:805:106::37) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.7 via Frontend Transport; Wed, 18 Jun 2025 11:31:41 +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 SN1PEPF000397B4.mail.protection.outlook.com (10.167.248.58) 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:31:41 +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:31:25 -0500 From: Shivank Garg To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 6/7] KVM: guest_memfd: Enforce NUMA mempolicy using shared policy Date: Wed, 18 Jun 2025 11:29:34 +0000 Message-ID: <20250618112935.7629-7-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SN1PEPF000397B4:EE_|IA0PR12MB7579:EE_ X-MS-Office365-Filtering-Correlation-Id: bbd81e82-2871-4cc4-0d81-08ddae5bb246 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?lQUO9xLoZiW1LxMDt6SC0Pu4tB0MqtcQFQ1f6tbCni2e0QWkJgg4cGoH9SvX?= =?us-ascii?Q?dWZoHUKK95w0KQSqB2qM9OnjSh264fy0cUHSrlD66Td+QmzHz3bSc8HcvTq4?= =?us-ascii?Q?nTg63bKVy3/dRbEFL9kOJWTWU/WiJ+uP40zVAsv839uMAqR1TRHimssz7pGu?= =?us-ascii?Q?xzOYYxOCdTYVloOE4HeZyBdlsyGKWSR0L5lEpBg7zFPTJccgRUhrehPL/PgV?= =?us-ascii?Q?+0xw2cH25NAGfQtm8ENpx2V/pmtj3xzBjgnQJ49UAcXntxYxryFSnpeGzj2k?= =?us-ascii?Q?iuEJRgcmSihI9VYVVtzXN33uyZa+B02H1Yi4rew69G7wPXk067iGp9bPbtbE?= =?us-ascii?Q?RCWTjblnIpL26sCqBwYvDEAccQlO+wBJYCGke1L8eu85YxbboZO8RBKrExYT?= =?us-ascii?Q?MT6SllNVIG+F0zstl8+dCw/EK28UXQ7v6Y+11iiPCAhv93LRmFWI1sm3KwtV?= =?us-ascii?Q?y9ehlLfsYT8larhHBmE2aIy1K4QO3FuqGsdnWdij3OeEwhnwsUkWJAzZbLeU?= =?us-ascii?Q?/5HC/1XnYUQy89L3ypki4G5mmbyg7sgmD7U0r5bD0yGhYyDX0wF8Q1+DC1YI?= =?us-ascii?Q?55OuD5rHsLGajmBiu2R23YlKu12T7AB/lgukq+Y9KHD9nuiKpB4RjLUU1Kn1?= =?us-ascii?Q?QseS5xwz5rLfQtSn1btB85sO6JS+SsaRdBFV5kd4ffbWZxXSFWARK8l9X2eB?= =?us-ascii?Q?bJQfUvzl7xYAn39RnQbtudvAXhoFP3T4karoi/iqaCo3WbDMcHnRKRcQL0kA?= =?us-ascii?Q?JeQPnm/Bbrrw44Fqm06nSeTzpoq0WBejDBIU9lWYkKwhvJU9oAof5PvN/vCk?= =?us-ascii?Q?roco/BMchG9e1MCwaNFtFlxatcD/azwpwOCv6uwc7oYHTh8QdTd1sejCPQC0?= =?us-ascii?Q?kPledpOCemUeGL5d45tynMFUtYyUqNGtSMfMHrleUrBA6WqhRduWdbqauGkB?= =?us-ascii?Q?judxOlZypmZpXCDKSTNc5h93B6Fwn88XhVjVftxAftRBMm5bb+Xc4jKmHn+r?= =?us-ascii?Q?tpk8BfEKJK8Ps3ShwDMonnuFF4k/gaLqqolb1/icG8BjQqMk7KL3R4cIrN+q?= =?us-ascii?Q?IV/pet7J3ValEVne9xIA5yhmWsr/+j9q/xlZj7ukBuqDUAF0x0M56pvJI8aA?= =?us-ascii?Q?sOJnIUfRbR4UcPSE5ciw/dzspK5adwsUx0BBbtQiwqhhXvKF9QVbZUGl6Q6C?= =?us-ascii?Q?rJgF/RUUKiD7Og25QeO4oCato2cehz/7HMWSwp3lC6p5qUd5/uFb4ovKBMtM?= =?us-ascii?Q?6iq9nx+9MnfCKIZOl63B3L3T/oHPPmW/nO+VfWHDm3KR7I1g144xgPqdTiuF?= =?us-ascii?Q?KEI0moK2pLYS2s3Wk8ZWjeHQ0zolOJ/3LHs38B9ngudWn+cqFSmj5DX0RzLP?= =?us-ascii?Q?25aVXipCdvZWM7IM0TnCgqbM/5j3WVobbjPvjuST2slE8EgAR4HAxPgs/W25?= =?us-ascii?Q?gu3mz2mKW+Uhv8ifRZ39V8s46drhSfs3cbndzrgpXcu9kooNXyUqxolWsLX9?= =?us-ascii?Q?j58IilTTAXAgchE77Lxr4FoFNjQI72ZeCPNp?= 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)(82310400026)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:31:41.2027 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bbd81e82-2871-4cc4-0d81-08ddae5bb246 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: SN1PEPF000397B4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7579 Content-Type: text/plain; charset="utf-8" Previously, guest-memfd allocations followed local NUMA node id in absence of process mempolicy, resulting in arbitrary memory allocation. Moreover, mbind() couldn't be used by the VMM as guest memory wasn't mapped into userspace when allocation occurred. Enable NUMA policy support by implementing vm_ops for guest-memfd mmap operation. This allows the VMM to map the memory and use mbind() to set the desired NUMA policy. The policy is stored in the inode structure via kvm_gmem_inode_info, as memory policy is a property of the memory (struct inode) itself. The policy is then retrieved via mpol_shared_policy_lookup() and passed to filemap_grab_folio_mpol() to ensure that allocations follow the specified memory policy. This enables the VMM to control guest memory NUMA placement by calling mbind() on the mapped memory regions, providing fine-grained control over guest memory allocation across NUMA nodes. The policy change only affect future allocations and does not migrate existing memory. This matches mbind(2)'s default behavior which affects only new allocations unless overridden with MPOL_MF_MOVE/MPOL_MF_MOVE_ALL flags, which are not supported for guest_memfd as it is unmovable. Suggested-by: David Hildenbrand Signed-off-by: Shivank Garg --- virt/kvm/guest_memfd.c | 69 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 5a1ce6f5e287..2bd5ff3abd87 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include =20 @@ -18,6 +19,7 @@ struct kvm_gmem { }; =20 struct kvm_gmem_inode_info { + struct shared_policy policy; struct inode vfs_inode; }; =20 @@ -26,6 +28,9 @@ static inline struct kvm_gmem_inode_info *KVM_GMEM_I(stru= ct inode *inode) return container_of(inode, struct kvm_gmem_inode_info, vfs_inode); } =20 +static struct mempolicy *kvm_gmem_get_pgoff_policy(struct kvm_gmem_inode_i= nfo *info, + pgoff_t index); + /** * folio_file_pfn - like folio_file_page, but return a pfn. * @folio: The folio which contains this index. @@ -112,7 +117,24 @@ static int kvm_gmem_prepare_folio(struct kvm *kvm, str= uct kvm_memory_slot *slot, static struct folio *kvm_gmem_get_folio(struct inode *inode, pgoff_t index) { /* TODO: Support huge pages. */ - return filemap_grab_folio(inode->i_mapping, index); + struct mempolicy *policy; + struct folio *folio; + + /* + * Fast-path: See if folio is already present in mapping to avoid + * policy_lookup. + */ + folio =3D __filemap_get_folio(inode->i_mapping, index, + FGP_LOCK | FGP_ACCESSED, 0); + if (!IS_ERR(folio)) + return folio; + + policy =3D kvm_gmem_get_pgoff_policy(KVM_GMEM_I(inode), index); + folio =3D filemap_grab_folio_mpol(inode->i_mapping, index, policy, + NO_INTERLEAVE_INDEX); + mpol_cond_put(policy); + + return folio; } =20 static void kvm_gmem_invalidate_begin(struct kvm_gmem *gmem, pgoff_t start, @@ -375,12 +397,52 @@ static vm_fault_t kvm_gmem_fault_shared(struct vm_fau= lt *vmf) return ret; } =20 +#ifdef CONFIG_NUMA +static int kvm_gmem_set_policy(struct vm_area_struct *vma, struct mempolic= y *mpol) +{ + struct inode *inode =3D file_inode(vma->vm_file); + + return mpol_set_shared_policy(&KVM_GMEM_I(inode)->policy, vma, mpol); +} + +static struct mempolicy *kvm_gmem_get_policy(struct vm_area_struct *vma, + unsigned long addr, pgoff_t *pgoff) +{ + struct inode *inode =3D file_inode(vma->vm_file); + + *pgoff =3D vma->vm_pgoff + ((addr - vma->vm_start) >> PAGE_SHIFT); + return mpol_shared_policy_lookup(&KVM_GMEM_I(inode)->policy, *pgoff); +} + +static struct mempolicy *kvm_gmem_get_pgoff_policy(struct kvm_gmem_inode_i= nfo *info, + pgoff_t index) +{ + struct mempolicy *mpol; + + mpol =3D mpol_shared_policy_lookup(&info->policy, index); + return mpol ? mpol : get_task_policy(current); +} +#else +static struct mempolicy *kvm_gmem_get_pgoff_policy(struct kvm_gmem_inode_i= nfo *info, + pgoff_t index) +{ + return NULL; +} +#endif /* CONFIG_NUMA */ + static const struct vm_operations_struct kvm_gmem_vm_ops =3D { - .fault =3D kvm_gmem_fault_shared, + .fault =3D kvm_gmem_fault_shared, +#ifdef CONFIG_NUMA + .get_policy =3D kvm_gmem_get_policy, + .set_policy =3D kvm_gmem_set_policy, +#endif }; =20 static int kvm_gmem_mmap(struct file *file, struct vm_area_struct *vma) { + struct kvm_gmem *gmem =3D file->private_data; + struct kvm *kvm =3D gmem->kvm; + if (!kvm_gmem_supports_shared(file_inode(file))) return -ENODEV; =20 @@ -411,11 +473,14 @@ static struct inode *kvm_gmem_alloc_inode(struct supe= r_block *sb) if (!info) return NULL; =20 + mpol_shared_policy_init(&info->policy, NULL); + return &info->vfs_inode; } =20 static void kvm_gmem_destroy_inode(struct inode *inode) { + mpol_free_shared_policy(&KVM_GMEM_I(inode)->policy); } =20 static void kvm_gmem_free_inode(struct inode *inode) --=20 2.43.0 From nobody Thu Oct 9 08:47:44 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2040.outbound.protection.outlook.com [40.107.220.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8F9829DB7E; Wed, 18 Jun 2025 11:32:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246326; cv=fail; b=ggokvOVychTgmH1hLnQ7v4hkSLoOY1Wv2VnusuDr3NssKSnhLGaUyGLn96JGDKoKoV+gIO75vZkBHog4UtrVp2pvcWX4W/F12JOUS50PM8DlTJcEiA3Fs6uus35U1rMIq8yb8jFZyyJlgerok9PpXhvXml/G0w6aaUFzv3fI/ps= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750246326; c=relaxed/simple; bh=rGKaxhopsjzg5whXYJ5oOo5z8yaqW79j4exy6KFRsqE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UzIHrT7qIopam3z6nxY/5ciOu8qR8CAZKVDcfcVgfVUktc2hks5bIKaOzmlUwIBrFuBb+pzc2XSNuG7Cl6gejb98yCq2LuaZBkjeYxqkS20h1/c0tMY4N+Pmt4GgP3hmJjyMv7G+DiRpkq6GJPV3BvZsG4HFJRQ/PSaV66lApkc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=s9zHZS3E; arc=fail smtp.client-ip=40.107.220.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="s9zHZS3E" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rhTqyd6O6mVVdrpQDx7BCnOHGgRc5iAuwBTgh8Ow/UxldOwbKnWxXUYGcDbTa7rxM9DWd09WND7ZFNYmykJxCzHgwvRlJoM9Rvrt0P6QWYCxVDAKOE5Wcc+ziilbwGaR4NZg46uMrgbfBmaHNyaXpoaPFm70ayfKUvztVYZlJoydp/U15LhiDHQok0UHwnuYgYUqQmGHSyfuduqyAAbo01AbILM+YO0uwZpFZE3bvwxPIup6Rz8/LaYBfkW4y8EAbnKnp+x27x6B4kQM+9av/XfrqW3uRXO5eBqFVG87QixvE0t2olVPWp8i3NM04sjeFNjPjUS7x56JaNr9bpFhQg== 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=aFphcHKUBvSNXcUaDA1E9dP98Pnht5uF+GigLhSttx4=; b=K92VyFzpfbi1Uf8zvZyVLqKyQZ+GrL8lmbf1H3nrgYjNR16a9cp48Dmu/UFvGQ69gMv9RIw+3LARgHqq0nMrsc1w5YVyNmzatK6kGqATxvqavJOg+QpPhmst3NmUwlzM8wQNlEn6WvsecDPbz94SKpPxSXnK/A3U5OEnveeDObTM+rocgxlHQRyrNj47y1nIXonK1DhzqlQFRH0u3JTATOgdUA1F9hF5NuuHAmOnJXB2Bt5gWCTjU65hmhsKeQJ3kC3SxJuvRyl8eqZUXw8A/NtnYqk7FmfBTNJqRNLGHjzkypdCovbYW1g4TgZUEwKmNDyBEcKqS+nbBShtKikF0g== 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=aFphcHKUBvSNXcUaDA1E9dP98Pnht5uF+GigLhSttx4=; b=s9zHZS3EdmLSeXHmJa/OzgL4XCgs+PEcjwJp0qrejImlLgjB88iqNtbzGH/VC4YN/oqVcEAweseKLbUETV8SVsjthJB96x60ZO/qSkUWX3h7QBcNKXFEs8ht1rnrTa4MvpUiaIIsBMvFb43zCVlyC3sYy/taxYq+r/Gnq63YRKc= Received: from SA0PR11CA0210.namprd11.prod.outlook.com (2603:10b6:806:1bc::35) by MN0PR12MB5930.namprd12.prod.outlook.com (2603:10b6:208:37d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.29; Wed, 18 Jun 2025 11:31:57 +0000 Received: from SN1PEPF000397AE.namprd05.prod.outlook.com (2603:10b6:806:1bc:cafe::4b) by SA0PR11CA0210.outlook.office365.com (2603:10b6:806:1bc::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.35 via Frontend Transport; Wed, 18 Jun 2025 11:31: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 SN1PEPF000397AE.mail.protection.outlook.com (10.167.248.52) 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:31:56 +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:31:41 -0500 From: Shivank Garg To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 7/7] KVM: guest_memfd: selftests: Add tests for mmap and NUMA policy support Date: Wed, 18 Jun 2025 11:29:35 +0000 Message-ID: <20250618112935.7629-8-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SN1PEPF000397AE:EE_|MN0PR12MB5930:EE_ X-MS-Office365-Filtering-Correlation-Id: a16d9d3e-3295-40bd-d31f-08ddae5bbb78 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zb7WaMFy/okY21uLXk+a/PSRd5y7EzGj9x2GFNGa/q9nLiz8tu4RE/PPI/A4?= =?us-ascii?Q?gcoth7mWMeIQgf9cfRkckkDH+XGUSTD04YPKtN602oO234NSF5xnsZfzKemU?= =?us-ascii?Q?gSklGKhaFTtnZxRh9WWHdVnAO794MDU3SiDLbc9HEQywhLmq3kbAKpmBReyK?= =?us-ascii?Q?xtbtgXSOvGSu7CTou4fFSWi3YsG7OKiIDIbw7MuyUTWP/z8AQqjY93TJG+z3?= =?us-ascii?Q?nuoZ2kG6JJmH1ewkGUhjVf+6yX1YfzfW/djS23MkADZqyvDb7LHdNQlnCjMv?= =?us-ascii?Q?ivL5Z9eYeWkzQO+CX9Bxa/WEQ2LSeNgQTHVdMAjhjR+zew9bbY/2cd5+VfYx?= =?us-ascii?Q?yUopCD69Ml3n8ZyDO7J1UwnKkrNVyweQYQVRd+rVOzJGJv+NBFjAyGAc0Brw?= =?us-ascii?Q?qSWzODwZZaplgKMi3KBNn9qWhX0/Tw62JzpZjr2L+bwN1u3pHseh3AUg4bRF?= =?us-ascii?Q?48jZ6kpJBwCDzNWO3Y+JFGDE3zCQJp5J4p11A4Mt50+F85MGC1xq03Sezvol?= =?us-ascii?Q?RXfzYNBR53eA3ZzZTmcE7FUyAV3RyAHwnr/EswJEzYSP8V5n7oX30PvWnYkZ?= =?us-ascii?Q?Ws2f4WZioBF6J5hykf9L+HwkDnKI0QmJGMCZYNBjnb8ih4k3SPy4V/8Vg15I?= =?us-ascii?Q?WM4JwwclrAZbfFl4xBUODGe75+hmhfKJqK+FBOqv6su9kYHYT3rvk0CsfCKC?= =?us-ascii?Q?QCO1NYH0mhUsRIO9qK9UCVGgJFtqoIYwPKpPwBu2ghi4+7PzeNpszjUyIZKL?= =?us-ascii?Q?nyXDCEW3bM3HPnPXKUlS3pwm9CU1IfqhMYNvNJgt3rfmtdaMdYaXQ1CoJr9Z?= =?us-ascii?Q?tzyXX7HNI/t6yIHKzR3RtMTMwoMQLA8zRRGrR6wm2lTX8BlX5Sblc4VGiUtL?= =?us-ascii?Q?EC06U7R2YJfOij4LWBKEpmfZaN6WZKjcOY9Ac/dFHACNEplhC/5BtWk3lUpp?= =?us-ascii?Q?H+mp6IUcREgbKtXW/pi2ZxSwi3ilkgvY5cOKHePaGfA52GjVS8LXtgqSb+N4?= =?us-ascii?Q?nVHlIVs0lFH6OXy3aqh4QQu7QogZmLWZ8arcXzqw5sN7wceiELp6B5z01b5O?= =?us-ascii?Q?EiPiX7hCzlR3MzWoxSWA0PZzihcue+TojqWxSv/P3UV9cvxhYewRRsye3rJ/?= =?us-ascii?Q?DprtwyDh6pV9DWoVUUkDWL19eOdCX9az2xj3WgxOI7OBMmnB7YxjJMLrNIHB?= =?us-ascii?Q?vE5uwsUDO60hJyUjdadNkuwLQQG7tbI1E+CqjWE6WeHO6xb/w6XFEhGFhEhS?= =?us-ascii?Q?ZK7UUmjpqAg2V6DX68/HqsRvlx5NJO3nvSNrPA8w1G73rxraYqAtNyebjLeD?= =?us-ascii?Q?W3cT7eycv3hAk3N/njT8h+l8PgvcfAooNKLHKPNaRIDkdmYOfY13F34fr4Zn?= =?us-ascii?Q?HQ2ZnOs1qz8gbQ14GMQrewVO5iMQupAUXY8if9uPAdIFf+wP4wyepa7WS6fM?= =?us-ascii?Q?rtet+Alfo+How90oITUm2RLyN0mCRsCab0C5g3lFZLATB0F3x68IOuxoc3YK?= =?us-ascii?Q?s9WRYLP3V/EbHWxhq7L95E82Nj933NzB7sOA?= 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)(36860700013)(1800799024)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:31:56.6268 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a16d9d3e-3295-40bd-d31f-08ddae5bbb78 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: SN1PEPF000397AE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5930 Content-Type: text/plain; charset="utf-8" Add tests for NUMA memory policy binding and NUMA aware allocation in guest_memfd. This extends the existing selftests by adding proper validation for: - KVM GMEM set_policy and get_policy() vm_ops functionality using mbind() and get_mempolicy() - NUMA policy application before and after memory allocation These tests help ensure NUMA support for guest_memfd works correctly. Signed-off-by: Shivank Garg --- tools/testing/selftests/kvm/Makefile.kvm | 1 + .../testing/selftests/kvm/guest_memfd_test.c | 123 +++++++++++++++++- 2 files changed, 122 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/Makefile.kvm b/tools/testing/selft= ests/kvm/Makefile.kvm index e11ed9e59ab5..f4bb02231d6a 100644 --- a/tools/testing/selftests/kvm/Makefile.kvm +++ b/tools/testing/selftests/kvm/Makefile.kvm @@ -273,6 +273,7 @@ pgste-option =3D $(call try-run, echo 'int main(void) {= return 0; }' | \ $(CC) -Werror -Wl$(comma)--s390-pgste -x c - -o "$$TMP",-Wl$(comma)--s390= -pgste) =20 LDLIBS +=3D -ldl +LDLIBS +=3D -lnuma LDFLAGS +=3D -pthread $(no-pie-option) $(pgste-option) =20 LIBKVM_C :=3D $(filter %.c,$(LIBKVM)) diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing= /selftests/kvm/guest_memfd_test.c index 5da2ed6277ac..a5d261dcfdf5 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include #include #include @@ -18,6 +20,7 @@ #include #include #include +#include =20 #include "kvm_util.h" #include "test_util.h" @@ -115,6 +118,122 @@ static void test_mmap_not_supported(int fd, size_t pa= ge_size, size_t total_size) TEST_ASSERT_EQ(mem, MAP_FAILED); } =20 +#define TEST_REQUIRE_NUMA_MULTIPLE_NODES() \ + TEST_REQUIRE(numa_available() !=3D -1 && numa_max_node() >=3D 1) + +static void test_mbind(int fd, size_t page_size, size_t total_size) +{ + unsigned long nodemask =3D 1; /* nid: 0 */ + unsigned long maxnode =3D 8; + unsigned long get_nodemask; + int get_policy; + char *mem; + int ret; + + TEST_REQUIRE_NUMA_MULTIPLE_NODES(); + + mem =3D mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + TEST_ASSERT(mem !=3D MAP_FAILED, "mmap for mbind test should succeed"); + + /* Test MPOL_INTERLEAVE policy */ + ret =3D syscall(__NR_mbind, mem, page_size * 2, MPOL_INTERLEAVE, + &nodemask, maxnode, 0); + TEST_ASSERT(!ret, "mbind with INTERLEAVE to node 0 should succeed"); + ret =3D syscall(__NR_get_mempolicy, &get_policy, &get_nodemask, + maxnode, mem, MPOL_F_ADDR); + TEST_ASSERT(!ret && get_policy =3D=3D MPOL_INTERLEAVE && get_nodemask =3D= =3D nodemask, + "Policy should be MPOL_INTERLEAVE and nodes match"); + + /* Test basic MPOL_BIND policy */ + ret =3D syscall(__NR_mbind, mem + page_size * 2, page_size * 2, MPOL_BIND, + &nodemask, maxnode, 0); + TEST_ASSERT(!ret, "mbind with MPOL_BIND to node 0 should succeed"); + ret =3D syscall(__NR_get_mempolicy, &get_policy, &get_nodemask, + maxnode, mem + page_size * 2, MPOL_F_ADDR); + TEST_ASSERT(!ret && get_policy =3D=3D MPOL_BIND && get_nodemask =3D=3D no= demask, + "Policy should be MPOL_BIND and nodes match"); + + /* Test MPOL_DEFAULT policy */ + ret =3D syscall(__NR_mbind, mem, total_size, MPOL_DEFAULT, NULL, 0, 0); + TEST_ASSERT(!ret, "mbind with MPOL_DEFAULT should succeed"); + ret =3D syscall(__NR_get_mempolicy, &get_policy, &get_nodemask, + maxnode, mem, MPOL_F_ADDR); + TEST_ASSERT(!ret && get_policy =3D=3D MPOL_DEFAULT && get_nodemask =3D=3D= 0, + "Policy should be MPOL_DEFAULT and nodes zero"); + + /* Test with invalid policy */ + ret =3D syscall(__NR_mbind, mem, page_size, 999, &nodemask, maxnode, 0); + TEST_ASSERT(ret =3D=3D -1 && errno =3D=3D EINVAL, + "mbind with invalid policy should fail with EINVAL"); + + TEST_ASSERT(munmap(mem, total_size) =3D=3D 0, "munmap should succeed"); +} + +static void test_numa_allocation(int fd, size_t page_size, size_t total_si= ze) +{ + unsigned long node0_mask =3D 1; /* Node 0 */ + unsigned long node1_mask =3D 2; /* Node 1 */ + unsigned long maxnode =3D 8; + void *pages[4]; + int status[4]; + char *mem; + int ret, i; + + TEST_REQUIRE_NUMA_MULTIPLE_NODES(); + + /* Clean slate: deallocate all file space, if any */ + ret =3D fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, tota= l_size); + TEST_ASSERT(!ret, "fallocate(PUNCH_HOLE) should succeed"); + + mem =3D mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + TEST_ASSERT(mem !=3D MAP_FAILED, "mmap should succeed"); + + for (i =3D 0; i < 4; i++) + pages[i] =3D (char *)mem + page_size * i; + + /* Set NUMA policy after allocation */ + memset(mem, 0xaa, page_size); + ret =3D syscall(__NR_mbind, pages[0], page_size, MPOL_BIND, &node0_mask, = maxnode, 0); + TEST_ASSERT(!ret, "mbind after allocation page 0 to node 0 should succeed= "); + ret =3D fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, page= _size); + TEST_ASSERT(!ret, "fallocate(PUNCH_HOLE) should succeed"); + + /* Set NUMA policy before allocation */ + ret =3D syscall(__NR_mbind, pages[0], page_size * 2, MPOL_BIND, &node1_ma= sk, maxnode, 0); + TEST_ASSERT(!ret, "mbind page 0, 1 to node 1 should succeed"); + ret =3D syscall(__NR_mbind, pages[2], page_size * 2, MPOL_BIND, &node0_ma= sk, maxnode, 0); + TEST_ASSERT(!ret, "mbind page 2, 3 to node 0 should succeed"); + memset(mem, 0xaa, total_size); + + /* Validate if pages are allocated on specified NUMA nodes */ + ret =3D syscall(__NR_move_pages, 0, 4, pages, NULL, status, 0); + TEST_ASSERT(ret >=3D 0, "move_pages should succeed for status check"); + TEST_ASSERT(status[0] =3D=3D 1, "Page 0 should be allocated on node 1"); + TEST_ASSERT(status[1] =3D=3D 1, "Page 1 should be allocated on node 1"); + TEST_ASSERT(status[2] =3D=3D 0, "Page 2 should be allocated on node 0"); + TEST_ASSERT(status[3] =3D=3D 0, "Page 3 should be allocated on node 0"); + + /* Punch hole for all pages */ + ret =3D fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, tota= l_size); + TEST_ASSERT(!ret, "fallocate(PUNCH_HOLE) should succeed"); + + /* Change NUMA policy nodes and reallocate */ + ret =3D syscall(__NR_mbind, pages[0], page_size * 2, MPOL_BIND, &node0_ma= sk, maxnode, 0); + TEST_ASSERT(!ret, "mbind page 0, 1 to node 0 should succeed"); + ret =3D syscall(__NR_mbind, pages[2], page_size * 2, MPOL_BIND, &node1_ma= sk, maxnode, 0); + TEST_ASSERT(!ret, "mbind page 2, 3 to node 1 should succeed"); + memset(mem, 0xaa, total_size); + + ret =3D syscall(__NR_move_pages, 0, 4, pages, NULL, status, 0); + TEST_ASSERT(ret >=3D 0, "move_pages should succeed after reallocation"); + TEST_ASSERT(status[0] =3D=3D 0, "Page 0 should be allocated on node 0"); + TEST_ASSERT(status[1] =3D=3D 0, "Page 1 should be allocated on node 0"); + TEST_ASSERT(status[2] =3D=3D 1, "Page 2 should be allocated on node 1"); + TEST_ASSERT(status[3] =3D=3D 1, "Page 3 should be allocated on node 1"); + + TEST_ASSERT(munmap(mem, total_size) =3D=3D 0, "munmap should succeed"); +} + static void test_file_size(int fd, size_t page_size, size_t total_size) { struct stat sb; @@ -275,7 +394,8 @@ static void test_with_type(unsigned long vm_type, uint6= 4_t guest_memfd_flags, if (expect_mmap_allowed) { test_mmap_supported(fd, page_size, total_size); test_fault_overflow(fd, page_size, total_size); - + test_mbind(fd, page_size, total_size); + test_numa_allocation(fd, page_size, total_size); } else { test_mmap_not_supported(fd, page_size, total_size); } --=20 2.43.0