From nobody Mon Sep 28 10:43:33 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013027.outbound.protection.outlook.com [40.93.201.27]) (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 26C4630ACEE; Sun, 23 Aug 2026 13:36:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.27 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492216; cv=fail; b=Vvkevu8R6z/uGVoIplibXlzkHW+tW7NpmWvmgfj7w3aO5GH54WqNx8oyxfliH9uCVWpwPm01aM19G8ZM8Bb9lQ0u6Z4SobcDkW0LVG/Sdx3anGLpJpVlmYBij2UigRa/XgnavDIt53jn0APw7oq38XEW+yOJNRe1XEx8N1l5jXo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492216; c=relaxed/simple; bh=C/bRSXHWkdib9RhhVNRyaAqGBZbOWSXovudW8KDGKrs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=g0W34u6hdy3viicCyeXq+DxBQLTMyHEneC1M+3rxfrjsblnCA9sjM1r5j3TijCmwJKXiaRkvEdEd0LTO7wwKumwNtsOr3MzKG5uqVIWSJyVX2skXImlTHdhrbE222kHIDVoVw1cjFlYCkff6Ciy0tLKgzyNuSbkH9YBHZK16QS4= 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=5spSQHuT; arc=fail smtp.client-ip=40.93.201.27 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="5spSQHuT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xmbLaU26C9zjEqdcmYShY6GuCsBAEEjTZVw9iSfb0Fimbm9XdBmxQifAuRy4aD+ElGYq8vzyb64UAzNDYzelVunzLlLI+bXDexr7zFgu1wj1G9JKCgOeTPNhOLXBOSk4ZdV9wu5mvXCM/iBD4t79wG7vNz4Oitp2l2jrTdi/gcH43/Lv7j5EzuX7g+vq1Io7FI8uOPJg0eMTVSFPbar+CuosAP9MR/yuhIkHhALHLPlDmZWnq1sKFlDKRMT8zgQeQruds6Eevf/8YvIyNsCN9VArD3IQW9bmt8POoeliU2qeIrKbpyxDxIGDJYOzKk8cUm2K3HtnHbXj0qAhBScqxA== 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=HZGhphsAYQROsl3tcYHexJQpw8g7wXb4S2sUNFniCTM=; b=hqYVZXiG9SUqtLVqKfXu9v9AQDHutt7tx4YTTaSKwU+jbB73XlSaMW35ZJcexNRafK2IJzWyu7ymxkSRtvYVAo2Swwo+rmMV4ibuf/x9fZIPrk/1PLpQgQqJ38SRJNuwrxMnsonU7bLYffKdk0tJsRUEcyQ57liCAYK9Dnr/yHHhtbS/gFyikDtpN+r6j6HiHT2A/TYh/SylXqqdb8Sd7nGAN5mrxY34KYLhxLXdvOnUh9Me4DuwyRcAavGzMYjsnJxWC24k4YL0bzjL7enKvNadKa/d/DYifAXpFVeJFWMdf7LHZSWjRcnr5dQ/oZyK4B8MQDSpndQrVOavOS4Csg== 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=HZGhphsAYQROsl3tcYHexJQpw8g7wXb4S2sUNFniCTM=; b=5spSQHuTHUVpzML2jTIGFmL2af6UkOcIKcotABm+GxDZWvkKFgxDByCM9wL3PF9B1bppilzFdbtZ0u82x3FcHaGizf0lWHaRsSn1trghl8a/zWqn+jVR/+XhmOcZjl6acc7gw11pYlc+Rzl/GsO4Gfk/Z9x28uKKc1ptyJl0NMg= Received: from SJ0PR13CA0190.namprd13.prod.outlook.com (2603:10b6:a03:2c3::15) by DS0PR12MB6535.namprd12.prod.outlook.com (2603:10b6:8:c0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Sun, 23 Aug 2026 13:36:49 +0000 Received: from BY1PEPF000264B2.namprd02.prod.outlook.com (2603:10b6:a03:2c3:cafe::53) by SJ0PR13CA0190.outlook.office365.com (2603:10b6:a03:2c3::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.6 via Frontend Transport; Sun, 23 Aug 2026 13:36:49 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BY1PEPF000264B2.mail.protection.outlook.com (10.167.242.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.3 via Frontend Transport; Sun, 23 Aug 2026 13:36:49 +0000 Received: from [127.0.1.1] (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Sun, 23 Aug 2026 08:36:45 -0500 From: Shivank Garg Date: Sun, 23 Aug 2026 13:36:29 +0000 Subject: [PATCH 1/5] KVM: guest_memfd: take the invalidate lock when unbinding a dying file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260823-shivank-gmem-fix-split-v1-1-512a29fb8e86@amd.com> References: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> In-Reply-To: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> To: Paolo Bonzini , Sean Christopherson , Shuah Khan , Jim Mattson , Peter Shier , Ricardo Koller , David Hildenbrand , Ackerley Tng CC: , , , Shivank Garg , Sashiko X-Mailer: b4 0.15-dev-47d62 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787492201; l=3934; i=shivankg@amd.com; s=20260518; h=from:subject:message-id; bh=C/bRSXHWkdib9RhhVNRyaAqGBZbOWSXovudW8KDGKrs=; b=8+mTiwwSm5HqJ6Q8nOiNnGlMgdTOj+1F4OjgNQcFJit+oNKhbqURdFPqES0aLY+Nxx4Hevk66 wO3DdHsZs/GDmfB+W5sTyC06qWa631Hfm4/+1zDQWyA8CtnLVm9snu1 X-Developer-Key: i=shivankg@amd.com; a=ed25519; pk=2l2QGTeXuGkZTtfmx0nPQU8iFZfjYmX/ymMojitevx4= X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF000264B2:EE_|DS0PR12MB6535:EE_ X-MS-Office365-Filtering-Correlation-Id: d0255fdf-2537-48b5-ad74-08df011b9565 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|23010399003|1800799024|36860700016|376014|7416014|56012099006|10067099003|22082099003|5023799004|11063799006|18002099003|13003099007; X-Microsoft-Antispam-Message-Info: u5AEfElAzOmDMSh0DeQOvjBlS2QH7WjaVoBEOZGH3r722HeM41jDzfhPxZlZEn7MK/XbbdVdYGs6bQUBw47E1U3qQJovtM+3Xn446t9tY9Gwf/62Ur/nbMwOOtFJRVlUSe5It54J1Bzt4vBe4zZ4Hfujh68j15UGJl6l2cNzi9eHH05mombsE9Yv0wvY3iY5KVOpE+WKCx/vOrjZXYxSRhQ+NkMIxEvYbI0jy8fEqECP7ebDDXS7LHESkpTDuivki7JQ+NA1ukh7L4PVN/GL/2JK90rwK5tx0WWlILL5ZeV75Kjrwc92HyRdnIcqAVSrwJ/YtiYYiyZp6rAvEWbLckiR9Vv48snB3zQTuoXmtXdjQWLh0IWfPXFN+pfE/fgJmgKUUoPmmTeSzNUn3J4T/9d/8JO0jAeCoDEH5biXp30tjfStw/yMneT/2HYqoDDdyVQxBg9vNozWSFlbdbmxaxk6+lJLawK6SiXz230JPy++6iY0fzCOItDwVN0abF7aE9/O02LMOknrVYpkN/OVgmP/GSmULtqtx+1zkPonRe1YW7M01ne++n5kcIaIYdMW7KDVL56B20cH6oynK5PjtheSK+X6sxQ5GSnZCAqniWG1bFpSo9eXgKbQ708GXBcHVQ2d9XiVCHMWcg+asj/MzwBq6rJDjkEdzVjy3sOACF4y1nhDtfWcvp9Zej0eYc37rpiQJPso6bMSLyiMLHVgiw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(23010399003)(1800799024)(36860700016)(376014)(7416014)(56012099006)(10067099003)(22082099003)(5023799004)(11063799006)(18002099003)(13003099007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZM+22WflXF/gEEjef9nOw8E8MrDY1cIMxBmKVg1Qq/Lo60bVPc+PYYNeoQKxeln+EzRaHCdkp3D7RN3S/mbtrio1X2wd+A17CHyuCiV9cDxTuWidCX87FIYHEo7jFnUUmD4Lgl2qr9yTnATVMO4HdonZ1KQH7lYdpE8xEDZiSoGJ1/vEJKgBW8wDsM2NdvxvCefnJBxCwXOAx46ncLGeyyZMHC0+11CcnYMRh47jz5LKLYNYrtVKAlaw5FmHyz66FGqs8Apgtdb8FwPo7qFKGYLwh5LVsSZEnMgARKHQWcqkwAE79/LpdHDgXS8vpez73aFEx2yhXbz1kIsitfZ5xeP915wElga7NqOpmnilYmVy3FQ0TLM7ZMdbGHfjpYUH8nHk4Yd/mHbOs4PhQuT5VWW1qcJPpwRGCCGBXwhRqsPtvlJLx1KgGavCv7b6Bv9r X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2026 13:36:49.1469 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d0255fdf-2537-48b5-ad74-08df011b9565 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF000264B2.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6535 kvm_gmem_unbind() skips mapping->invalidate_lock when the guest_memfd file is already dying. All other paths that modify f->bindings hold that lock. kvm_gmem_invalidate_{start,end}() checks f->bindings independently to decide whether to begin or end KVM MMU invalidations. So, the bindings must remain stable between the two calls. If a binding is removed in that window, start increments mmu_invalidate_in_progress but end does not decrement it. Example, unbind race with memory failure: CPU 0: memory failure CPU 1: memslot delete ---------------------------------- --------------------------- (guest_memfd file is dying) kvm_gmem_error_folio() kvm_gmem_invalidate_start() finds binding mmu_invalidate_in_progress++ kvm_gmem_unbind() get_file_active() fails store NULL in bindings kvm_gmem_invalidate_end() no binding found counter stays elevated mmu_invalidate_retry() then returns 1 forever, so guest page faults retry without ever installing a mapping and the guest hangs. Take the invalidate lock in the dying-file path too. This prevents unbind from removing a binding and leaking mmu_invalidate_in_progress. This is safe because any caller that reaches this path holds slots_lock, so kvm_gmem_release() cannot nullify the slot->gmem.file, until kvm_gmem_unbind() finishes. Reported-by: Sashiko Closes: https://lore.kernel.org/all/20260728092027.225CF1F000E9@smtp.kernel= .org Fixes: ae431059e75d ("KVM: guest_memfd: Remove bindings on memslot deletion= when gmem is dying") Signed-off-by: Shivank Garg --- virt/kvm/guest_memfd.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index f0e5da490866..f848120af84b 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -721,6 +721,8 @@ static void __kvm_gmem_unbind(struct kvm_memory_slot *s= lot, struct gmem_file *f) =20 void kvm_gmem_unbind(struct kvm_memory_slot *slot) { + struct file *gmem_file; + /* * Nothing to do if the underlying file was _already_ closed, as * kvm_gmem_release() invalidates and nullifies all bindings. @@ -733,21 +735,24 @@ void kvm_gmem_unbind(struct kvm_memory_slot *slot) /* * However, if the file is _being_ closed, then the bindings need to be * removed as kvm_gmem_release() might not run until after the memslot - * is freed. Note, modifying the bindings is safe even though the file - * is dying as kvm_gmem_release() nullifies slot->gmem.file under + * is freed. Note, dereferencing the dying file is safe as + * kvm_gmem_release() nullifies slot->gmem.file under * slots_lock, and only puts its reference to KVM after destroying all * bindings. I.e. reaching this point means kvm_gmem_release() hasn't * yet destroyed the bindings or freed the gmem_file, and can't do so * until the caller drops slots_lock. */ - if (!file) { - __kvm_gmem_unbind(slot, slot->gmem.file->private_data); - return; - } + gmem_file =3D file ?: slot->gmem.file; =20 - filemap_invalidate_lock(file->f_mapping); - __kvm_gmem_unbind(slot, file->private_data); - filemap_invalidate_unlock(file->f_mapping); + /* + * Take the invalidate lock even for a dying file. Otherwise, + * kvm_gmem_invalidate_start() can find the binding and increment + * mmu_invalidate_in_progress while kvm_gmem_invalidate_end() misses + * the removed binding and skips decrement. + */ + filemap_invalidate_lock(gmem_file->f_mapping); + __kvm_gmem_unbind(slot, gmem_file->private_data); + filemap_invalidate_unlock(gmem_file->f_mapping); } =20 /* Returns a locked folio on success. */ --=20 2.43.0 From nobody Mon Sep 28 10:43:33 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010017.outbound.protection.outlook.com [52.101.46.17]) (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 6F8F22C15A9; Sun, 23 Aug 2026 13:36:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492218; cv=fail; b=F/jAqtO9El3tjpe60RSRPkkjav9xSrLB+3GaUa87ZyhHf+XARdHXoC+Pcj6EqvpwrlzqrFa3wnsQtoWLJ/sRd7Yxoyi9Vh3CRZuZuDUXWCXAV3SKaYAInTdzuA3Y/pc+pl1itL0/aeF8qls7CBw3hXmicdScaxVKfqgw42fqWBM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492218; c=relaxed/simple; bh=xGRMZIhvtPEKnVuNDdGvO3JI0/kk7eDcykQCBsL0+q0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=WeIAkwI5QK1gBbfxb42A986DC55QFWsW410me/1ZKz4lxoZSbUH2SIm/P+vXvDuWHGna4NQxIbxtwLYH7Q3BZI49UzL3Wt9FmONX4Uw2C+cK1GzQdHqDe1Ia4onHLQnE6rDhx+ysbrRDyEoEfcc/x0HjVlh2kN3AfFGx+VlGG7I= 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=RaGXURhF; arc=fail smtp.client-ip=52.101.46.17 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="RaGXURhF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LSk3e7Y+vvj1a3ADH7o9I3XbiKg5Ppq2OJdqqssjnwIQbQu65iRYP3LKNeMV7ftbUgEvz1ptfKGuZds1v2XXVafV7m92tQZTz0ues2uMrA8nfNM4Bx0A+h1sS2kSpYhDLEvw+oI8ttkw/C41XRl7ByJPsKP/wvpAqj1ALSOIeKcEW1YlZDZl17g5ebRDmz88+QjoA2YmtT0nEONOh0hpz4LZkFPhx0RQm7xJpH6nFYYXucL583rapEY4Vrnir0dAmmRiJRGQxz5yzHBie40pjj9wyyS9/Zmb/2tmqk/zgugCNajeKFrR1gXtMkFp9eEOzHXZHmP2QrhTMcXLS/+48Q== 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=tUJpy5866Qg3JiRjZNIXIy3xtqBtLkeoIzlrzNHrdQE=; b=GMhFbplyghO2y32gXszgD9082Npc/rSNYvO0pMUerSO4YnxqzuMHnhyXj+u6ySppHKcNPEZsgCQ682Olf6GpXqI/FwmN0VO5SMLdJWb1F2KxEXDfCCvole9Jveeq7ngp7bL83w2q3X7TlAAdz+Dnr/cDoo6zQPCAMLMeTxBgFBsz8+WmlWQHpLsynBP3PzCyXgHyeBdYk5SXXi2oHAraTQch0UEZd0C2830eUPw+J4h/kkSkAFu6Ic+zir1XD5knmyEayACRgB1NKA2v1JgCmQTdsZvV+gJYa3jJu2K91BUL89BVFeHLer+BRK6EXXhlsHwn7vL429ne6B+ki/JgXQ== 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=tUJpy5866Qg3JiRjZNIXIy3xtqBtLkeoIzlrzNHrdQE=; b=RaGXURhFL1xxyqBtr6GBVXuuGNu8YBaEGgLKBvFx/KVi9ZcQHehtKCTYWO83CFOq56jZ2ZOdYi+ZGpwvWQPU1PCBDCRmk1sW9fUjaTTG7sSv2WtMvnKbVmKG4IlDJ7Dq6j99pvlnzlO/0qL6GKANMQllEdCWsE+4wKTHyvGZjzk= Received: from SJ0PR05CA0015.namprd05.prod.outlook.com (2603:10b6:a03:33b::20) by CH3PR12MB8993.namprd12.prod.outlook.com (2603:10b6:610:17b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Sun, 23 Aug 2026 13:36:52 +0000 Received: from BY1PEPF000264B6.namprd02.prod.outlook.com (2603:10b6:a03:33b:cafe::35) by SJ0PR05CA0015.outlook.office365.com (2603:10b6:a03:33b::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.5 via Frontend Transport; Sun, 23 Aug 2026 13:36:52 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BY1PEPF000264B6.mail.protection.outlook.com (10.167.242.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.3 via Frontend Transport; Sun, 23 Aug 2026 13:36:52 +0000 Received: from [127.0.1.1] (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Sun, 23 Aug 2026 08:36:49 -0500 From: Shivank Garg Date: Sun, 23 Aug 2026 13:36:30 +0000 Subject: [PATCH 2/5] KVM: selftests: fix maxnode arguments in xapic_ipi_test Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260823-shivank-gmem-fix-split-v1-2-512a29fb8e86@amd.com> References: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> In-Reply-To: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> To: Paolo Bonzini , Sean Christopherson , Shuah Khan , Jim Mattson , Peter Shier , Ricardo Koller , David Hildenbrand , Ackerley Tng CC: , , , Shivank Garg X-Mailer: b4 0.15-dev-47d62 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787492201; l=1369; i=shivankg@amd.com; s=20260518; h=from:subject:message-id; bh=xGRMZIhvtPEKnVuNDdGvO3JI0/kk7eDcykQCBsL0+q0=; b=7YB62OiIBMdBB5Di+lb+BBbJLPN/xk3JV8TqhTWDD54rom+ZWRNnGn0o4txXubdS2ZDJN42Ax CcZq+OfSFCCCgW2tfxGFhhvCrdTiQfckJkcx1P3qc6fV2ZnG96b8FrY X-Developer-Key: i=shivankg@amd.com; a=ed25519; pk=2l2QGTeXuGkZTtfmx0nPQU8iFZfjYmX/ymMojitevx4= X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF000264B6:EE_|CH3PR12MB8993:EE_ X-MS-Office365-Filtering-Correlation-Id: 63cff135-6fe6-4d0f-3a1c-08df011b9766 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|1800799024|82310400026|7416014|376014|23010399003|18002099003|22082099003|11063799006|56012099006|6133799003|10067099003; X-Microsoft-Antispam-Message-Info: HRLPgJP2a6Jz7Co5OaaqdLOAp/ANX3km6PVLcaJaNPRpVfkclQz/Jq6i1pzLSL8JwVehknmKICxVlAv8cccclyT10nyaMLBZ2qsjMHu7l8g7A/rmK8EiV70G1VoebFZ5RfDt+IoqErqLk5LHkkwDo22HK5CIUHmobyWbk37wo45QIbk7PnF+tRPSL5eFRsWawfVNuhhSe6jIqT+cUbwqozxLvpJGxa2325lcqrhDZYBioU2EhYtOwT16Bn9s6ii+q29qsXZQr6Rn7064juFu/cWlFJjAf2W1XiyXwrS0dRZyqEVXtifG3vGTDihyomt5C4k/7sO+dj4vYUouVnwVWsWb+52fNIshOcgYnIdybuwLJsF/0w2FaAzOpBiI9Up3T6B4H9LaOhbLx+HHc07ETWnZyipw7lahrFDGR1lFhTuT8IMttgvAoiGJT/HQfD1ytRTsZVHlSnVkx7sUtifpZkUYDLcg0aYuFqN6vMODlbcVJ/+9Ac/yqfW1+MpJIsSbxljqAutHYzl7zau7LiHjZY4ecxeFJQfU3Z6xpNhi/L79e2BJmj6A4A9LSnnL6NH4fdmi4EIsDLLtCq+OpYihu4yfmS/KmVr5TWatYdD5ilL1peJddEJnUtV5qBh9RyfjUT6M4tTpSJFQnbiWYQSqJeWz4MFxafzMvo4QNEqtERK9ljxuWBxz3sqDItRJ8ra0erE9sYWJwmNL/6qMinRRIQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700016)(1800799024)(82310400026)(7416014)(376014)(23010399003)(18002099003)(22082099003)(11063799006)(56012099006)(6133799003)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: U6EPNehHptRU9kCSYw5l1ridkAWCyDuBd0vnmekGnD+UIv5nJAFTiJJRfRJEBcJR39oVBL3WXDz150iT1amAG9QtfNHHcwbyLg7Zso0kl/7aodJ/KUhKWxHcDgUAcUyadVdFmaZedVi1MOtcfF8hxnHkfbYn7G2GHiMO3LKYzlRRppPSe5aKtg1IctEhdlbYm4wMcl5qJJs2zjb7IEAIqxJll6lBX6QDAGlVIK9DFfmgCmjQi5YP6My0nVdAFEoslyWSQH5jMtvD77PAFzwa+Qij9Gc25K8f0rzuJIt8HFZkUfTmse/ZScn5TzxgfOsiG1vz2L+9jMIPp04dn7qdVGV46Mo3PIiInu6X0+n1/Khvia0fzmCp2WDiVIKGojAsb4VS1uxhI9e2idMu83UmmlDNoVJWzVmMKrmd0uUBLCz36qlZLlFgXx/AkjSand3P X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2026 13:36:52.5004 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 63cff135-6fe6-4d0f-3a1c-08df011b9766 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF000264B6.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8993 migrate_pages() syscall expect maxnode to be one greater than the number of bits in the nodemask. do_migrations() passes the size of nodemask in bytes to migrate_pages(). This sets the maxnode to 8, so kernel only checks node IDs 0-6 even though the nodemask covers node IDs 0-63. Pass the nodemask size in bits plus one because get_nodes() in mempolicy does --maxnode. Fixes: 678e90a349a4 ("KVM: selftests: Test IPI to halted vCPU in xAPIC whil= e backing page moves") Signed-off-by: Shivank Garg --- tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c b/tools/testi= ng/selftests/kvm/x86/xapic_ipi_test.c index 39ce9a9369f5..761e47e4cae2 100644 --- a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c +++ b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c @@ -310,7 +310,7 @@ void do_migrations(struct test_data_page *data, int run= _secs, int delay_usecs, * KVM_CREATE_VCPU ioctl. If that assumption ever changes this * test may break or give a false positive signal. */ - pages_not_moved =3D migrate_pages(0, sizeof(nodemasks[from]), + pages_not_moved =3D migrate_pages(0, sizeof(nodemasks[from]) * 8 + 1, &nodemasks[from], &nodemasks[to]); if (pages_not_moved < 0) --=20 2.43.0 From nobody Mon Sep 28 10:43:33 2026 Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11010043.outbound.protection.outlook.com [52.101.201.43]) (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 9F1CC30D411; Sun, 23 Aug 2026 13:37:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.201.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492226; cv=fail; b=nOz3/Lg3ldyyDYmb0m/2xxP0mNekDYdWBJZygSfgLVLpfB0ZmX0NqtJ+UZCeXQMQTYJz2EalF9gT9KJd7i96Um2YQjt1FRN7eQCT9Dt4eVpqyIQP2JujfkR4GfSHGlqPjAxP1hUH/Yi7VQ1C/LbXwGUOP8NJSdRgKI6blKG5yGM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492226; c=relaxed/simple; bh=QoGpca2K2qIzQz9CVG+OIW++7fyOjuSFlIken4lrZuw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=UjB+LCzTDLJgFdpRCcMUvqCpu5aK4RF/awnBEgYurd10596rNEZnOKmvce8nyNuBRQY2t8LWZhpdI0qPDU7epjai8KO78GJwOyu4zIXCV3miC+oty/YbrNU73eTa5+Vo55wKCbli+DlsvZKVQ3wdiQv3i+esAhuNvEmEMajkRPE= 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=2dEGCNFc; arc=fail smtp.client-ip=52.101.201.43 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="2dEGCNFc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JB2XYYBAWxVaPPYS0Nh5ZUe+5OGEqzwJFPGt/8euSB0tR6eBjxYtCeQHVPQZPwi5GgL/hxGx1tX2kx4Y+zjSQZApXJG+tr6l4HPtYPEwCmtFlltSbOhEK/Pjlh/BZGBPraRVnGQ3oP59LeeEiNl7kCOGj46hAlGS/D0DrSKyQQQ4jaelBySr/tGJw90onvrPYplCD7rpeFWj3gfMxAkVjFUwUmImdSNeSI8sCIutw+d5g+ktO3wf0Tdr1nehjjYfb4YKs+MbnRfzEFRSzYK4ydcheW7/GTG+/9Iuvvv8bzRq3Tznq0tPsxqnZMcqDAVDTl4byzsZR5J4e/DpKHRhTw== 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=EnhcPNIeFNxUodYSdgpowZtRY8vOzvsSY6XGiEauKxY=; b=XBWx1hsdoxAmK0k3vp71+r0/zgbY18LzMkNVd2B8ZAdzl4ACnNmQh2Ph6UHrqh1XVxXit6PKwKMRoPZOgKtfLtP5oJ8IOYCWqYF4FnMr31i1KmIAeitppp6IbBNBuprABnyVPxptvyxjz3GT1OfZ3BoF3dRUYgmFsc+v0GxvhtWrkEY8jN0Wi03l/kQrs4CKhrDbpz0QzoUCYuaDBHIFUkeGhLMAP+7IggOa3Kkbn9Oiz4EvbxXAhx0gIbKPMCrMf52zceJpOeMeaneTiryPSUchxBCojZEM1snNXh9qByGB/jxo5i7xptdJAa/jB27RXkehP+4vWNlpkev3HiWqvQ== 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=EnhcPNIeFNxUodYSdgpowZtRY8vOzvsSY6XGiEauKxY=; b=2dEGCNFctqk+fgDyN/uRWLmc3smAiw8eTng7tuZrnBryve+t50RGxChdogVoJFIWkWFwLoJ63gk6RwDx3tQZfYTIpQeKPCoeUvPDDfuKrZF7MEzasM21v7TBLAh42DPrJdYUTg3LtQUBGX+bZ/F+ELH9/C9vkniXG95OOqlfEhw= Received: from MW4PR03CA0341.namprd03.prod.outlook.com (2603:10b6:303:dc::16) by IA0PR12MB7652.namprd12.prod.outlook.com (2603:10b6:208:434::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Sun, 23 Aug 2026 13:36:56 +0000 Received: from BY1PEPF000264AF.namprd02.prod.outlook.com (2603:10b6:303:dc:cafe::4a) by MW4PR03CA0341.outlook.office365.com (2603:10b6:303:dc::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.339.12 via Frontend Transport; Sun, 23 Aug 2026 13:36:56 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BY1PEPF000264AF.mail.protection.outlook.com (10.167.242.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.3 via Frontend Transport; Sun, 23 Aug 2026 13:36:56 +0000 Received: from [127.0.1.1] (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Sun, 23 Aug 2026 08:36:52 -0500 From: Shivank Garg Date: Sun, 23 Aug 2026 13:36:31 +0000 Subject: [PATCH 3/5] KVM: selftests: use BITS_PER_TYPE() for NUMA masks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260823-shivank-gmem-fix-split-v1-3-512a29fb8e86@amd.com> References: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> In-Reply-To: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> To: Paolo Bonzini , Sean Christopherson , Shuah Khan , Jim Mattson , Peter Shier , Ricardo Koller , David Hildenbrand , Ackerley Tng CC: , , , Shivank Garg X-Mailer: b4 0.15-dev-47d62 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787492201; l=2319; i=shivankg@amd.com; s=20260518; h=from:subject:message-id; bh=QoGpca2K2qIzQz9CVG+OIW++7fyOjuSFlIken4lrZuw=; b=iq3kYO+rx7uWI8FZ5I7427kdCW9mkwFGeBqap3iH6kZfWo9S1QVgAgyAxEHKFwo65Oj7nxQBm Yv38zy1gH1ODYnpY1XcgzUvPkuO1iBZhX9waVB4NAe4fRUd4omFeauZ X-Developer-Key: i=shivankg@amd.com; a=ed25519; pk=2l2QGTeXuGkZTtfmx0nPQU8iFZfjYmX/ymMojitevx4= X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF000264AF:EE_|IA0PR12MB7652:EE_ X-MS-Office365-Filtering-Correlation-Id: aec02686-81e4-472e-1623-08df011b99b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|23010399003|36860700016|82310400026|1800799024|6133799003|10067099003|11063799006|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: ztbcJ5mI+EAHEdSgC9zfZcAhn1TQevHhjZ1oQdkLTq0jBnzu2M5rTuxNhzQ5/CAC3uNm1J4N5PItCGosT/VbF5ykMREunmvX/YCwHLkvHR2565G/ysf9PuN8+a++MTmFfKhaaLBoClbU1y75Yj+6NdkGrfwuJ+STp2WpkRvxouLPum4Bha+tHDfNjij+6JYf8olOhHGLMSxz4WO6eiT1DOkF6fRJ5a3A9aNdAY09OHV0QNfc9LyRpgfxR56YYTP/XAg37HKl/U7/KabEzzaRo+LUxlGi8SkTO/Zjf2nf/Om4nzWptyoN/D4pp0Jb4psUBayiXRB1C5m/MFuDob9kLleBD8PhI5D27+t/NmDyI1oDN79YoSDIxgLb8v1aEAxvLQ7scHkJWcaFf2NS/kGb+ZT05WX/eRY2+1bowCPyYdR8KlbY/8tp2Y6fJFcnesurfqzuadh3rMDNJYOtZey9zzPi0fQ1RedMbJS723R0h3BLfWrc3ZWVvJwtNsbdlLh6s1BTF52/466cSDb3jN1W+ZgOgfMih9Gaz+i0+S9Dj82H3lb23Ss83o2UY/HLZutFRLMdlrs3GZ9GhOOncgegk4tEBQVktRj5+FUVoRYTg1f3ROsDR/nYrSGm0cPFhouY3l8TjhoHAQXZ6mVS4yLGHUmLErqgP/p6oknf7UZ4CJpCapjpGmJSVVoikX4wQRZJjxBV0E2Ak6+P8fw+A9H1Xg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(376014)(23010399003)(36860700016)(82310400026)(1800799024)(6133799003)(10067099003)(11063799006)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zwrqS6eN6W/Q0Y0QKQ4mxR6Nu03Xo+Ug4u0h3QswKidyepZ5QzhN7WoBsNus3RFRAR5sXSfSt8MkctSMC/zvhCiRa4G9V/sL2oIn/3A/x3yXQDqgfZBl6x1wBd/vRhgU9KSsYZjkU4JMZhNavr3ocBgE0E4EdfkiEMw1lN/4knht97tsYS1E094QCrMlgpbypJJdJ6IOsdamD5cm/Obf9v2t3BE7UviBJQMCut4RdgQ4QlEy7YiBoAPJ1U/1Adw1NQiNaWMcSRzC9JDjo28LJ9+IkvOTa0TFzedOK/KbpYEfmrH/ETNz1i+IDQdJBDoZGcsB+8kHheXS71mb3/hbaPK2vK4N+J0ibMR22WYYd/9qyPXOMSeLD3R9eq5W3MpV/PSvecFgJjkwHG5WjdRWOOHFab+EZkDihXbs4o/qvchGQyDA3aVQfDmdwT7Zc6xg X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2026 13:36:56.3162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aec02686-81e4-472e-1623-08df011b99b5 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF000264AF.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7652 Replace the open-coded sizeof() * 8 calculations in do_migrations() with BITS_PER_TYPE(). No functional change intended. Signed-off-by: Shivank Garg --- tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c b/tools/testi= ng/selftests/kvm/x86/xapic_ipi_test.c index 761e47e4cae2..769d8d95ab2c 100644 --- a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c +++ b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c @@ -252,7 +252,7 @@ void do_migrations(struct test_data_page *data, int run= _secs, int delay_usecs, { long pages_not_moved; unsigned long nodemask =3D 0; - unsigned long nodemasks[sizeof(nodemask) * 8]; + unsigned long nodemasks[BITS_PER_TYPE(nodemask)]; int nodes =3D 0; time_t start_time, last_update, now; time_t interval_secs =3D 1; @@ -267,18 +267,18 @@ void do_migrations(struct test_data_page *data, int r= un_secs, int delay_usecs, delay_usecs); =20 /* Get set of first 64 numa nodes available */ - kvm_get_mempolicy(NULL, &nodemask, sizeof(nodemask) * 8, + kvm_get_mempolicy(NULL, &nodemask, BITS_PER_TYPE(nodemask), 0, MPOL_F_MEMS_ALLOWED); =20 fprintf(stderr, "Numa nodes found amongst first %lu possible nodes " "(each 1-bit indicates node is present): %#lx\n", - sizeof(nodemask) * 8, nodemask); + BITS_PER_TYPE(nodemask), nodemask); =20 /* Init array of masks containing a single-bit in each, one for each * available node. migrate_pages called below requires specifying nodes * as bit masks. */ - for (i =3D 0, bit =3D 1; i < sizeof(nodemask) * 8; i++, bit <<=3D 1) { + for (i =3D 0, bit =3D 1; i < BITS_PER_TYPE(nodemask); i++, bit <<=3D 1) { if (nodemask & bit) { nodemasks[nodes] =3D nodemask & bit; nodes++; @@ -310,7 +310,7 @@ void do_migrations(struct test_data_page *data, int run= _secs, int delay_usecs, * KVM_CREATE_VCPU ioctl. If that assumption ever changes this * test may break or give a false positive signal. */ - pages_not_moved =3D migrate_pages(0, sizeof(nodemasks[from]) * 8 + 1, + pages_not_moved =3D migrate_pages(0, BITS_PER_TYPE(nodemasks[from]) + 1, &nodemasks[from], &nodemasks[to]); if (pages_not_moved < 0) --=20 2.43.0 From nobody Mon Sep 28 10:43:33 2026 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013056.outbound.protection.outlook.com [40.107.201.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 670E72F7F0F; Sun, 23 Aug 2026 13:37:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492225; cv=fail; b=taZkdbHGM6jGf3Qzki8BqGRSDhjL1iKy+tXDIPmcPp7Lpn8c+fxNe4/XCwLjaC2CA6dzkblh41oMV6PWXr64CT4Bq6QWK+ET/53VcCA/SqMYpAutxc/qx79JFOBV6L27q1IGlP8ryVmEyfGgdRVkc4kGRHJa6VbIEBEM2cnZItg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492225; c=relaxed/simple; bh=4zperuRefGS9/dWP8CCI2r4B3olGwgompH/Zj9KXkuM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=s1SeXTXfOkPmhJvwEyttp8QNgzCiU6C+68awCorflYH+ZkfCMeR8RLS9lTVTtCVWvlXMfFdolaiUn/aWkpVorIgReherdqFa82tzCLb/ZJ+7V8X36u/WYgD6gYEiM0HZjbm6bjNp/tK/S1R0b469oguK3dLkCM6lJMzLTPdN4xU= 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=sYlDddWL; arc=fail smtp.client-ip=40.107.201.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="sYlDddWL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bGi38Ne5cGeU4R3xhe02iKvvLHvXjJYoiS9MAEmUvNhuxtPq7UHc0IvQVkXym6oB4NPczMpVSRjEgQCq4bLfyG2FQ0EwFLyuF5w8/+scbR7D0LmnQ7SmBZ8Qx8anxeMOfi+rXOHV/jRI+MR6f7LgxDAoeOJdZHMoFQX7DsPoPQRmcqQI68gtH0YQduqbw5L9PCs7e8LymrEdW1DKTu++tAxv1BqoWEJnIIvAeig8pzfxyaWRYf3U0ae8WQeOJ7NFwVhJ9wA7fQRxyu0nl2smNNxpNOl0CPZ5wOGFlp2/WhF2SIJR6jRTTUoYGGWIO+y6FWjq9qo8bBBwJnJ8F5PVAQ== 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=cAOKOFsD0mkH/dUzG78vyaDwu0cWpfSC6Roky+0Uwv0=; b=BiEyVnrv7/Yk2kp62mu6H+8ct/pe3M9LRpTXsIgNFkxC1if2bVUM/zNsQ0OCzXWef+9BYFjRjY6qF/aTvB3Qvk14fBc0ySTNle76yuJIzEnzlemLVzeBiGN2t2ix69ugBPNkH9awX/pDf1Ul9G9VZovFpJ2Fr0V6jlnlPV1d2p1lj4SLWaNFcdNp/mQZcN61DvosukQdoJUtMvDvjTcoReUdjrihIVlFFbDbxpJNnTXX7RKTuZjfsRI0rSxokydAY8EyL5r6ieco8ScFAP0nSfKyES/DisUcj+ityQRlaoIclcmpXzCweoH3gb7DeeAaa3ifNQgFD3mM+QiuI77Pnw== 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=cAOKOFsD0mkH/dUzG78vyaDwu0cWpfSC6Roky+0Uwv0=; b=sYlDddWLjktvRPg4GR7kX7U+myRrdXDMELCz8mWZbF/GdPU/08qPCnC73b29zZBnyV5blnAjKpNEPnj1yB7zR4WxMWe/ROSJea+pxAsJ7b0uNbBNXl3q4ijA18m4BiC883VGTLst9irgRKn/mOtyEfHQ8XDAta3IR3czPzqq5fw= Received: from SJ0PR13CA0131.namprd13.prod.outlook.com (2603:10b6:a03:2c6::16) by LV3PR12MB9411.namprd12.prod.outlook.com (2603:10b6:408:215::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Sun, 23 Aug 2026 13:37:00 +0000 Received: from BY1PEPF000264B5.namprd02.prod.outlook.com (2603:10b6:a03:2c6:cafe::82) by SJ0PR13CA0131.outlook.office365.com (2603:10b6:a03:2c6::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.5 via Frontend Transport; Sun, 23 Aug 2026 13:36:59 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BY1PEPF000264B5.mail.protection.outlook.com (10.167.242.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.3 via Frontend Transport; Sun, 23 Aug 2026 13:36:59 +0000 Received: from [127.0.1.1] (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Sun, 23 Aug 2026 08:36:56 -0500 From: Shivank Garg Date: Sun, 23 Aug 2026 13:36:32 +0000 Subject: [PATCH 4/5] KVM: selftests: add get_numa_mem_nodes() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260823-shivank-gmem-fix-split-v1-4-512a29fb8e86@amd.com> References: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> In-Reply-To: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> To: Paolo Bonzini , Sean Christopherson , Shuah Khan , Jim Mattson , Peter Shier , Ricardo Koller , David Hildenbrand , Ackerley Tng CC: , , , Shivank Garg X-Mailer: b4 0.15-dev-47d62 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787492201; l=2451; i=shivankg@amd.com; s=20260518; h=from:subject:message-id; bh=4zperuRefGS9/dWP8CCI2r4B3olGwgompH/Zj9KXkuM=; b=yFiJ09FRSfNoA7zmGdRTNSNuTbJvaYTKKq1Xp0ZNv+cVNEdY0J1D0PmW4e0dfuh90vtRYTvhn hN0YevfMkb4DphGvlUZZRsVTwPCmJ4HV0TgwkAIV3+bIyjOjtG3hxAL X-Developer-Key: i=shivankg@amd.com; a=ed25519; pk=2l2QGTeXuGkZTtfmx0nPQU8iFZfjYmX/ymMojitevx4= X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF000264B5:EE_|LV3PR12MB9411:EE_ X-MS-Office365-Filtering-Correlation-Id: 33e5bca0-9a8d-493a-a0b0-08df011b9b92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|23010399003|7416014|376014|36860700016|6133799003|10067099003|56012099006|11063799006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: xsCW/kK0Tibt7IkzL9T+6sq1qEFjIVyvuRG6hD19V9QAN/5aLEaMza6Km8nrdRhDUnsQbt4Blc2LaNNcwb3pBG5dJ/BrXdbWYh7wUzuDotdLHjWTY3Jk4y/U5gzsZaA2fw9RKI/4kOrQ9awnIQzT3OekdTQZtsPam5upXZ8humPpZwTX/7/4QckELTTN0BsMtaYEwUZpk8ogY4iUrMz8wlmun1ulCEq4OMHA+u571Cdm27Oc8TkeDg5djcsK/pCdUknyO+XQ/iWQaPqMK7cykCbUiFNKlxSoF7Cvm9jG4va48YfpsGWclsGFXPyX7nFyrzzsdQ07YjrY01FaWenIgvVFTnZsQ7a+aGoubbhCaZ0UtoSRMmEiayjaEHgifN+6DfjS8mXl1dwK8AAvZf2UaeB0VoJKPZCrd8enA+6fio+PxGkkUH3C6GTHoju8Aq0cuP2X5kXejwztc+Mc0UpFAf/FVqZEICjUiNyKCpxK309vHNqmUYnxyUBe1nB3tvf0EOXryVzxgSNwcyI+HYOiqyM5KKH1K2x/HgtR6zFT6KWyDF0vriuhnHvOO81Wrx6Pm+su/LvTRRZ+PIgMYofBVFO4ZQnVvFUm8bTGkIYYLUcgaCarxU0gUzQnT2haQic1yMPjZ91DQKdCWvt7U1puqeJu85JrCp+ILpCPwEM1G+o1AeBauZXHkQRdGTNueIPXt3+Ln6/KrHJ/SwMRUNz19Q== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(23010399003)(7416014)(376014)(36860700016)(6133799003)(10067099003)(56012099006)(11063799006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9jr+pqGrZCL6QxAkOWKPfYRoHHqNYMJF7nIUEnCGvDZT+hpQAiDgGwgs6IA96edL5Z3KShYqB8HGeeP+PB0Kw4UZsGZZedIUCIbA+bbr3ZOYNTkNs9+U33CUOsdhfOvI/oGip8IrvXB6TL7r0lS5LzuWTCRvNbk4TdbfyDFBePmyAB+80o1NJukyD+n0Q+4sPNCyRL375VUWu82n/2FHwIhz7D1lyTvx8CFWP4/LZoC3OSydqVghBt7bxJCjqsjr1wj12DQDd4VkQrpS6Qr44xrUm8WjPQt2NzQoSIGU6A3zvXbRCe+Mwy4+fgOcxnQIq3oFij9TyOEym0GSHd2GFEAQzsLhW2FU6Z0UBlofe1Wejj7/Yv1KYKrJNP35V0ZtQy7XjVguVQ/WLESJAII6iWX2KroPwb7susVDSmwFR/TIte9z69mwra3wJ/7Tu6qo X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2026 13:36:59.4722 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33e5bca0-9a8d-493a-a0b0-08df011b9b92 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF000264B5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9411 The xAPIC IPI test uses MPOL_F_MEMS_ALLOWED to get the memory nodes available to the current process. Move the query to numaif.h as get_numa_mem_nodes() so other KVM selftests can use it. Call get_mempolicy() directly instead of using the assert-on-failure kvm_get_mempolicy() wrapper. The xAPIC test already asserts its two node requirement. Signed-off-by: Shivank Garg --- tools/testing/selftests/kvm/include/numaif.h | 12 ++++++++++++ tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 6 ++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/kvm/include/numaif.h b/tools/testing/s= elftests/kvm/include/numaif.h index 29572a6d789c..55124e2330ab 100644 --- a/tools/testing/selftests/kvm/include/numaif.h +++ b/tools/testing/selftests/kvm/include/numaif.h @@ -75,6 +75,18 @@ static bool is_numa_available(void) (errno !=3D ENOSYS && errno !=3D EPERM); } =20 +static inline unsigned long get_numa_mem_nodes(void) +{ + unsigned long nodemask =3D 0; + + /* Get set of first 64 numa nodes available */ + if (get_mempolicy(NULL, &nodemask, BITS_PER_TYPE(nodemask), NULL, + MPOL_F_MEMS_ALLOWED)) + return 0; + + return nodemask; +} + static inline bool is_multi_numa_node_system(void) { return is_numa_available() && get_max_numa_node() >=3D 1; diff --git a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c b/tools/testi= ng/selftests/kvm/x86/xapic_ipi_test.c index 769d8d95ab2c..66dcf36398aa 100644 --- a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c +++ b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c @@ -251,7 +251,7 @@ void do_migrations(struct test_data_page *data, int run= _secs, int delay_usecs, u64 *pipis_rcvd) { long pages_not_moved; - unsigned long nodemask =3D 0; + unsigned long nodemask; unsigned long nodemasks[BITS_PER_TYPE(nodemask)]; int nodes =3D 0; time_t start_time, last_update, now; @@ -266,9 +266,7 @@ void do_migrations(struct test_data_page *data, int run= _secs, int delay_usecs, fprintf(stderr, "Calling migrate_pages every %d microseconds\n", delay_usecs); =20 - /* Get set of first 64 numa nodes available */ - kvm_get_mempolicy(NULL, &nodemask, BITS_PER_TYPE(nodemask), - 0, MPOL_F_MEMS_ALLOWED); + nodemask =3D get_numa_mem_nodes(); =20 fprintf(stderr, "Numa nodes found amongst first %lu possible nodes " "(each 1-bit indicates node is present): %#lx\n", --=20 2.43.0 From nobody Mon Sep 28 10:43:33 2026 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010022.outbound.protection.outlook.com [52.101.85.22]) (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 22A28308F3B; Sun, 23 Aug 2026 13:37:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.22 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492229; cv=fail; b=q3eolibYr0NrJz/Y0ngLVZQ2/gkhL0IwhVXd9ex3auW0Hvznln4RwrrvJGq3qhNo5oRGpIJva1IjNc333Ce0oYbWrDU+jGvVe2u+SaZZHTQ4SOEL8qikswjLDRcamMRYtmBRlZ1Srn7HEVGhUJP6H94cnN8wvJ7uMXIQeG1iQts= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787492229; c=relaxed/simple; bh=dXBKg5fXAKj1J06FIg2E6wP+hH1T9We3hGHWo+1DfNo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=J/l3xceXz98VygmSW3uSqbJxLs4ujZAOyjZrxlO0x0AzLKmS/kbej+oTAPLp1K/FzxGxd/W67W5bJENYkVH3zytoSuC2PDeppHuPHOc4LdrbkTPkJZGZIaMLN1MOgrTt5FgIecMoak5uR3DFCV+EalOUhrUEZuXMv0x5BErVBKM= 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=F96IVbui; arc=fail smtp.client-ip=52.101.85.22 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="F96IVbui" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qJ8I/GzUwgRnrt9Yn24+NKb5svknXwqI2BhwCxj9ywDf2UnyxQeZ2UZnxpTpqaYD/kTxylL5tg3YrJgkeq0/4QSuoo5uh7NrMa7H8V7hlCzJHutT1RpO5g5hcgeLo7Fb3jS3wyQ+mlSwy37qofKq/RSD8ygehfmVS/CTnPXpjx7FFecS5prW3U9v7Qth8fEkHiHSwbSO2xBDgBtqtBK3ES2IS+1rtWTUtobmXhQuXmO11Qtf2KPimgmCG72u8WjkRSezauFN/eiyeiu48vBgz8ay/6iEURlvflZXBhqoSE1Dhb4UryMTdRzBpSMFlVGQ7BFylbjqzmnCRyfRDtOndA== 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=KklIybxAVesquBLCUQC12uQsLRjArXF17xfa2W0HOEM=; b=BpgoonOcBVZeZCLpxzfYw1AwAU9HGRBQyCn7faRAUy5JWUEVc/ovpTnRlmx/APSeEA5juTC2uTSURw1ADEn9N3091f8lTjPJ8o0enNeyXyKxUK/K1x/tr9eeLBxjIjkX7w7jrSrP5f3xisO56+BpUbaYWeuMllhQ/F6uPMgPP5wWsSwfJ9YaaMmTZv+3P68UwxOhL2EELwCgngdPY3D9Twf+529QLt1Eb3oZ9DH6mG1OKmEyrEXospvK+91WFa2ak8n5ZzNLj1kBmhvbl6M6zUoDKC1n84CvwcxLK3IxmyD4/B5ycS9+gDg1//azLruJRoA8jJP+GE7d+lA0vwH3Pg== 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=KklIybxAVesquBLCUQC12uQsLRjArXF17xfa2W0HOEM=; b=F96IVbuiH3Odq142Mh35WnV94GkQmrpyktcUUaw9YOlI93fPVe01190Qga4g39R5tWZx0LH8O1/dPKnaL9SUGXZv7KKCamrN0GCa6bvrU2+WmiUt7wAMvyUQGCsOldcbwoJ2E7tgti007T70uIaFgy7zRcvqkwd363bz1JcXHjw= Received: from BYAPR21CA0002.namprd21.prod.outlook.com (2603:10b6:a03:114::12) by IA4PR12MB9787.namprd12.prod.outlook.com (2603:10b6:208:54d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.11; Sun, 23 Aug 2026 13:37:03 +0000 Received: from BY1PEPF000264B1.namprd02.prod.outlook.com (2603:10b6:a03:114:cafe::4c) by BYAPR21CA0002.outlook.office365.com (2603:10b6:a03:114::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.4 via Frontend Transport; Sun, 23 Aug 2026 13:37:03 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BY1PEPF000264B1.mail.protection.outlook.com (10.167.242.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.3 via Frontend Transport; Sun, 23 Aug 2026 13:37:03 +0000 Received: from [127.0.1.1] (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Sun, 23 Aug 2026 08:36:59 -0500 From: Shivank Garg Date: Sun, 23 Aug 2026 13:36:33 +0000 Subject: [PATCH 5/5] KVM: selftests: use allowed NUMA nodes in guest_memfd_test Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260823-shivank-gmem-fix-split-v1-5-512a29fb8e86@amd.com> References: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> In-Reply-To: <20260823-shivank-gmem-fix-split-v1-0-512a29fb8e86@amd.com> To: Paolo Bonzini , Sean Christopherson , Shuah Khan , Jim Mattson , Peter Shier , Ricardo Koller , David Hildenbrand , Ackerley Tng CC: , , , Shivank Garg X-Mailer: b4 0.15-dev-47d62 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787492201; l=9670; i=shivankg@amd.com; s=20260518; h=from:subject:message-id; bh=dXBKg5fXAKj1J06FIg2E6wP+hH1T9We3hGHWo+1DfNo=; b=QfEynsOzsFQsZQeWLNzdEeowxRDIfc8a88pRRvsRtU7zHn2gf7i+P2LK5TGpYQa+xw7dygxn5 eUF/t1W3IgXDAK7gZ06EN+58TZTjbqnC0fQx30lnFVrhNVgGyct9OjE X-Developer-Key: i=shivankg@amd.com; a=ed25519; pk=2l2QGTeXuGkZTtfmx0nPQU8iFZfjYmX/ymMojitevx4= X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF000264B1:EE_|IA4PR12MB9787:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a7903fc-3392-4166-96c8-08df011b9db2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|36860700016|1800799024|376014|82310400026|23010399003|11063799006|56012099006|10067099003|6133799003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: CxW7Un8mM+6NzJzG5gsLCtaXLFucB0mSQZJRZOxkkEYHt7ELgpea2sxd5tXxBco4E/jP1zTekyzqbWaNEafgiybZwDWn5dRpivYKIQZ0fxbQpW1MdhVUlz5+cqOLTe4DoVkLW7TlrMkN6pyK61fuHE6t2iCX5FFPx5QgO28yY/yZd8GHbao79SLDMUMja0hLKzHEPYHZHNuPkfq9Q2eIQ7+p0FxvNUh6t+cO8uzgQcmV8668HfFE0bwdHJ46fjzOfahFMaWof6UCwZkiAqn/oDYmtIfFPqUHTk8Jtw8PD7UzpiNpP9dlsPXYJarcgsicP4Riumccd9Dfd+0vhKPHjpsO9YLCtYRkAZ6DcUalUTUzgIdCQQ68rkqzEoQ+7v9RyQ1DmrR1GeUZJvmfmDqZTHoTqeGasOd2+RubOPqVoIy4lPiDsgBJ8YMHnp4Sdbm1cUZuFa6d9uJWoCJEYTrrCDD5HaaYPQbP71G1eeBSnYGDjya+ypOVgllchOKCBMuLZKeELVZL0NPA0d+k/gcOYWYeSkKenjFn8JxWYgf++0yn7t5VBARdYk1QQptVZOjWSBv9JMbxseYkBPVBcrIeefhJrmK+6SUgFlDLR8dB+lIIITmQt7oZqrfcT0n7n/VAMR5WclEI83iIeqjH6DoZpf9Hk6ZZihuqAoPah6SAGJtNO5ouq43B8Oge8PIcxF5l X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(36860700016)(1800799024)(376014)(82310400026)(23010399003)(11063799006)(56012099006)(10067099003)(6133799003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5PO6mL25gVNFNdANWDYpxZKgP4SIl6Hgk1og++T00iEvGZbaTE6Z/tPr1jSyxW3WMh3g6pJ+YyiEU7SmVosW5xiNITtNOJIiW931kn67qQZcwz9cAnqF53tU+d4RF89iCWB9pi/7+Sr27dOaL6BIP/IuqP5Esc45nrz9eBESd9iV8OaqiZhgNhxlvn7bHp4KQWv7KadL5tkUlFEQsuqZLcMMjzO/sye9aGsnvgrp+YvQEr936bOI8i3ZmrVWyS17rLZIUM0RVTZ3dF6+RD6gbm6Dll2LaqImNd6UqhcQPtqR5fYKcAtEjJZRtpL7aEp30gtL7dNnl9com2QNRHqroPeDLoz1LHcufHeV1twyETVtKYTW/H8SjwPymOIHy6fXTqNuLaCenpES8Z0TA25J6sY70PT+GO+eDRZW+NkqK7pNOwo8xJoyX3fp2TrfgVHN X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2026 13:37:03.0347 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a7903fc-3392-4166-96c8-08df011b9db2 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF000264B1.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA4PR12MB9787 guest_memfd_test assumes that nodes 0 and 1 exist and have memory. is_multi_numa_node_system() only checks that the maximum node ID is nonzero, which is not enough for sparse or memoryless nodes. Select the required nodes from MPOL_F_MEMS_ALLOWED instead. Use the full nodemask width plus one to mbind(), and let test_mbind() run when only one memory node is available. The sysfs helpers for finding maxnode are no longer needed. Signed-off-by: Shivank Garg --- tools/testing/selftests/kvm/guest_memfd_test.c | 86 +++++++++++++++++-----= ---- tools/testing/selftests/kvm/include/numaif.h | 52 ---------------- 2 files changed, 58 insertions(+), 80 deletions(-) diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing= /selftests/kvm/guest_memfd_test.c index 2233d871a38f..aee80dda6229 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -76,33 +76,53 @@ static void test_mmap_supported(int fd, size_t total_si= ze) kvm_munmap(mem, total_size); } =20 +/* + * Fill @nids with the first @nr_nids nodes in the allowed mask. + * Return false if the mask contains fewer than @nr_nids nodes. + */ +static bool get_numa_node_ids(int *nids, int nr_nids) +{ + unsigned long nodemask =3D get_numa_mem_nodes(); + unsigned long nid; + int nr_found =3D 0; + + for_each_set_bit(nid, &nodemask, BITS_PER_TYPE(nodemask)) { + nids[nr_found++] =3D nid; + if (nr_found =3D=3D nr_nids) + return true; + } + + return false; +} + static void test_mbind(int fd, size_t total_size) { - const unsigned long nodemask_0 =3D 1; /* nid: 0 */ - unsigned long nodemask =3D 0; - unsigned long maxnode =3D BITS_PER_TYPE(nodemask); + unsigned long nodemask, bind_nodemask; + unsigned long maxnode =3D BITS_PER_TYPE(nodemask) + 1; int policy; char *mem; + int nid; int ret; =20 - if (!is_multi_numa_node_system()) + if (!get_numa_node_ids(&nid, 1)) return; =20 + bind_nodemask =3D 1UL << nid; mem =3D kvm_mmap(total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd); =20 /* Test MPOL_INTERLEAVE policy */ - kvm_mbind(mem, page_size * 2, MPOL_INTERLEAVE, &nodemask_0, maxnode, 0); + kvm_mbind(mem, page_size * 2, MPOL_INTERLEAVE, &bind_nodemask, maxnode, 0= ); kvm_get_mempolicy(&policy, &nodemask, maxnode, mem, MPOL_F_ADDR); - TEST_ASSERT(policy =3D=3D MPOL_INTERLEAVE && nodemask =3D=3D nodemask_0, + TEST_ASSERT(policy =3D=3D MPOL_INTERLEAVE && nodemask =3D=3D bind_nodemas= k, "Wanted MPOL_INTERLEAVE (%u) and nodemask 0x%lx, got %u and 0x%lx", - MPOL_INTERLEAVE, nodemask_0, policy, nodemask); + MPOL_INTERLEAVE, bind_nodemask, policy, nodemask); =20 /* Test basic MPOL_BIND policy */ - kvm_mbind(mem + page_size * 2, page_size * 2, MPOL_BIND, &nodemask_0, max= node, 0); + kvm_mbind(mem + page_size * 2, page_size * 2, MPOL_BIND, &bind_nodemask, = maxnode, 0); kvm_get_mempolicy(&policy, &nodemask, maxnode, mem + page_size * 2, MPOL_= F_ADDR); - TEST_ASSERT(policy =3D=3D MPOL_BIND && nodemask =3D=3D nodemask_0, + TEST_ASSERT(policy =3D=3D MPOL_BIND && nodemask =3D=3D bind_nodemask, "Wanted MPOL_BIND (%u) and nodemask 0x%lx, got %u and 0x%lx", - MPOL_BIND, nodemask_0, policy, nodemask); + MPOL_BIND, bind_nodemask, policy, nodemask); =20 /* Test MPOL_DEFAULT policy */ kvm_mbind(mem, total_size, MPOL_DEFAULT, NULL, 0, 0); @@ -112,7 +132,7 @@ static void test_mbind(int fd, size_t total_size) MPOL_DEFAULT, policy, nodemask); =20 /* Test with invalid policy */ - ret =3D mbind(mem, page_size, 999, &nodemask_0, maxnode, 0); + ret =3D mbind(mem, page_size, 999, &bind_nodemask, maxnode, 0); TEST_ASSERT(ret =3D=3D -1 && errno =3D=3D EINVAL, "mbind with invalid policy should fail with EINVAL"); =20 @@ -121,17 +141,19 @@ static void test_mbind(int fd, size_t total_size) =20 static void test_numa_allocation(int fd, size_t total_size) { - unsigned long node0_mask =3D 1; /* Node 0 */ - unsigned long node1_mask =3D 2; /* Node 1 */ - unsigned long maxnode =3D 8; + unsigned long bind_nodemasks[2]; + unsigned long maxnode =3D BITS_PER_TYPE(bind_nodemasks[0]) + 1; void *pages[4]; + int nids[2]; int status[4]; char *mem; int i; =20 - if (!is_multi_numa_node_system()) + if (!get_numa_node_ids(nids, ARRAY_SIZE(nids))) return; =20 + bind_nodemasks[0] =3D 1UL << nids[0]; + bind_nodemasks[1] =3D 1UL << nids[1]; mem =3D kvm_mmap(total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd); =20 for (i =3D 0; i < 4; i++) @@ -139,34 +161,42 @@ static void test_numa_allocation(int fd, size_t total= _size) =20 /* Set NUMA policy after allocation */ memset(mem, 0xaa, page_size); - kvm_mbind(pages[0], page_size, MPOL_BIND, &node0_mask, maxnode, 0); + kvm_mbind(pages[0], page_size, MPOL_BIND, &bind_nodemasks[0], maxnode, 0); kvm_fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, page_siz= e); =20 /* Set NUMA policy before allocation */ - kvm_mbind(pages[0], page_size * 2, MPOL_BIND, &node1_mask, maxnode, 0); - kvm_mbind(pages[2], page_size * 2, MPOL_BIND, &node0_mask, maxnode, 0); + kvm_mbind(pages[0], page_size * 2, MPOL_BIND, &bind_nodemasks[1], maxnode= , 0); + kvm_mbind(pages[2], page_size * 2, MPOL_BIND, &bind_nodemasks[0], maxnode= , 0); memset(mem, 0xaa, total_size); =20 /* Validate if pages are allocated on specified NUMA nodes */ kvm_move_pages(0, 4, pages, NULL, status, 0); - TEST_ASSERT(status[0] =3D=3D 1, "Expected page 0 on node 1, got it on nod= e %d", status[0]); - TEST_ASSERT(status[1] =3D=3D 1, "Expected page 1 on node 1, got it on nod= e %d", status[1]); - TEST_ASSERT(status[2] =3D=3D 0, "Expected page 2 on node 0, got it on nod= e %d", status[2]); - TEST_ASSERT(status[3] =3D=3D 0, "Expected page 3 on node 0, got it on nod= e %d", status[3]); + TEST_ASSERT(status[0] =3D=3D nids[1], + "Expected page 0 on node %d, got it on node %d", nids[1], status[0]); + TEST_ASSERT(status[1] =3D=3D nids[1], + "Expected page 1 on node %d, got it on node %d", nids[1], status[1]); + TEST_ASSERT(status[2] =3D=3D nids[0], + "Expected page 2 on node %d, got it on node %d", nids[0], status[2]); + TEST_ASSERT(status[3] =3D=3D nids[0], + "Expected page 3 on node %d, got it on node %d", nids[0], status[3]); =20 /* Punch hole for all pages */ kvm_fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, total_si= ze); =20 /* Change NUMA policy nodes and reallocate */ - kvm_mbind(pages[0], page_size * 2, MPOL_BIND, &node0_mask, maxnode, 0); - kvm_mbind(pages[2], page_size * 2, MPOL_BIND, &node1_mask, maxnode, 0); + kvm_mbind(pages[0], page_size * 2, MPOL_BIND, &bind_nodemasks[0], maxnode= , 0); + kvm_mbind(pages[2], page_size * 2, MPOL_BIND, &bind_nodemasks[1], maxnode= , 0); memset(mem, 0xaa, total_size); =20 kvm_move_pages(0, 4, pages, NULL, status, 0); - TEST_ASSERT(status[0] =3D=3D 0, "Expected page 0 on node 0, got it on nod= e %d", status[0]); - TEST_ASSERT(status[1] =3D=3D 0, "Expected page 1 on node 0, got it on nod= e %d", status[1]); - TEST_ASSERT(status[2] =3D=3D 1, "Expected page 2 on node 1, got it on nod= e %d", status[2]); - TEST_ASSERT(status[3] =3D=3D 1, "Expected page 3 on node 1, got it on nod= e %d", status[3]); + TEST_ASSERT(status[0] =3D=3D nids[0], + "Expected page 0 on node %d, got it on node %d", nids[0], status[0]); + TEST_ASSERT(status[1] =3D=3D nids[0], + "Expected page 1 on node %d, got it on node %d", nids[0], status[1]); + TEST_ASSERT(status[2] =3D=3D nids[1], + "Expected page 2 on node %d, got it on node %d", nids[1], status[2]); + TEST_ASSERT(status[3] =3D=3D nids[1], + "Expected page 3 on node %d, got it on node %d", nids[1], status[3]); =20 kvm_munmap(mem, total_size); } diff --git a/tools/testing/selftests/kvm/include/numaif.h b/tools/testing/s= elftests/kvm/include/numaif.h index 55124e2330ab..4bbbf314e9d7 100644 --- a/tools/testing/selftests/kvm/include/numaif.h +++ b/tools/testing/selftests/kvm/include/numaif.h @@ -4,8 +4,6 @@ #ifndef SELFTEST_KVM_NUMAIF_H #define SELFTEST_KVM_NUMAIF_H =20 -#include - #include =20 #include "kvm_syscalls.h" @@ -30,51 +28,6 @@ KVM_SYSCALL_DEFINE(mbind, 6, void *, addr, unsigned long= , size, int, mode, const unsigned long *, nodemask, unsigned long, maxnode, unsigned int, flags); =20 -static inline int get_max_numa_node(void) -{ - struct dirent *de; - int max_node =3D 0; - DIR *d; - - /* - * Assume there's a single node if the kernel doesn't support NUMA, - * or if no nodes are found. - */ - d =3D opendir("/sys/devices/system/node"); - if (!d) - return 0; - - while ((de =3D readdir(d)) !=3D NULL) { - int node_id; - char *endptr; - - if (strncmp(de->d_name, "node", 4) !=3D 0) - continue; - - node_id =3D strtol(de->d_name + 4, &endptr, 10); - if (*endptr !=3D '\0') - continue; - - if (node_id > max_node) - max_node =3D node_id; - } - closedir(d); - - return max_node; -} - -static bool is_numa_available(void) -{ - /* - * Probe for NUMA by doing a dummy get_mempolicy(). If the syscall - * fails with ENOSYS, then the kernel was built without NUMA support. - * if the syscall fails with EPERM, then the process/user lacks the - * necessary capabilities (CAP_SYS_NICE). - */ - return !get_mempolicy(NULL, NULL, 0, NULL, 0) || - (errno !=3D ENOSYS && errno !=3D EPERM); -} - static inline unsigned long get_numa_mem_nodes(void) { unsigned long nodemask =3D 0; @@ -87,9 +40,4 @@ static inline unsigned long get_numa_mem_nodes(void) return nodemask; } =20 -static inline bool is_multi_numa_node_system(void) -{ - return is_numa_available() && get_max_numa_node() >=3D 1; -} - #endif /* SELFTEST_KVM_NUMAIF_H */ --=20 2.43.0