From patchwork Fri Feb 21 21:01:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pratik R. Sampat" X-Patchwork-Id: 868260 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2086.outbound.protection.outlook.com [40.107.93.86]) (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 A4EFA24CEEE; Fri, 21 Feb 2025 21:02:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.86 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171765; cv=fail; b=FcXZKE/y0Y9qF1mLRWn6q4taGT/Dv51NH7v/QrxkL5ep+ybWgdrVH4kUws+3LVzTIj+34fwo1Iaf8UiDctfiM2Q2qX/nVj35eMjCypS1E4sC3AkZkOMJBEI4U1fWis32QRu7d1GWATV7Y1+IOfQf66/4Q7DtEoiH3iuRxFlRa80= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171765; c=relaxed/simple; bh=HeobsnJx2ut3bid0GVVsn5d8Rw0pJHYstyYfSln7Xf4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TLpzX6pBbzWlgxQiy9zKBmNDCTOaWABODoM0WyihGH2Fbzn4FCNVvjx+DHXo5wTvvJBmEbsgdHjIY+ypQIzex+pEXSeewUOglQYqpln1pTFC7jPDBH7jNxNg7Ityfw4Da73IQQuqYdUtMmQapqecSFVz89LlCgXinqVKmUX5lw4= 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=XkBS5ity; arc=fail smtp.client-ip=40.107.93.86 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="XkBS5ity" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bMpH840f/nZpx6Nbo716671MD4k9Zmz+OTfRd9NRa6A0gYhXY0Rp0SsdQRulZgcFBSYKyrkyjRb8IIRM8yWhII/WT5q6YwyBJXuGPxRrQBkg0Lg2QFFwC+pRnkM1Jo+Uwn0yNKmgRwnWlqtnwdtN5kHcFy/Kc/KRlJhY0PYeVzjqDeAp453j6CHyBFwqviEgE5hnvJ+X2ke/9+9iWdvPQ5HVDKWf+VlMeXu3EeATlc8AjmNNQzSJbDQU6hK2Y4cugW7lw8Qfks4s1KbCZwaBgEADuATL/yzMBwUUDqs4Cd83jtnpz7VE486lNjGbSkzBmptAvca2VU+W3gXFHDZoTA== 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=JW2KqwJZBVQaX0gnP5NU6UKtopLc4rSHm7f0g0J4fK4=; b=hep4KfY3Ybaw20qfjUjOTTLtU/inSWQpz65PQ7FuKmmU+yF582CKNHH/1lg7Rj38jrYAceV+aMHkSSRI4xQQ6sK7VWJTj/837KxVCbnEZqylrreSwvlRga6ysDde7FinuPUVeZXOFaHECiRfx+O5D+++VpVLUYZIDsMZdmdUE1xPb6VLeokz97feW+oGLfwC0YTMhYq/lEnxFvJsP3nW4RqlKARKrQrZW4upWvhwDwaGTBYFcCnBCuwVXlgvadyf3dmaEH14/RMC6/c/k8OJ6ZoKTqFANNKkteuooMyVEj4eTHFACLiD8o7v4lkGfP1k4+5H5MnU5bre3smEVj64eg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=JW2KqwJZBVQaX0gnP5NU6UKtopLc4rSHm7f0g0J4fK4=; b=XkBS5ityuDdNatqWOGiejbOkurizR8wL5pO+7vROdR2fd7tZSWc8meSCxvk9vTVGubrNLXI/9951a4AQb74t7gfp09AC/GE4lhJgEjNgCAjwWg0ueGShc5u3fj+AUNUSBYSsuChMk00avCMei1vyaQcK8Is5wV/VbuJ1IFQoxX4= Received: from BL6PEPF00016417.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:5) by PH7PR12MB8106.namprd12.prod.outlook.com (2603:10b6:510:2ba::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Fri, 21 Feb 2025 21:02:38 +0000 Received: from BN3PEPF0000B078.namprd04.prod.outlook.com (2a01:111:f403:c803::4) by BL6PEPF00016417.outlook.office365.com (2603:1036:903:4::a) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.20 via Frontend Transport; Fri, 21 Feb 2025 21:02:38 +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 BN3PEPF0000B078.mail.protection.outlook.com (10.167.243.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Fri, 21 Feb 2025 21:02:38 +0000 Received: from sampat-dell.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; Fri, 21 Feb 2025 15:02:36 -0600 From: "Pratik R. Sampat" To: , , , , CC: , , , , , , , , , , , , , , Subject: [PATCH v7 02/10] KVM: selftests: SEV-SNP test for KVM_SEV_INIT2 Date: Fri, 21 Feb 2025 15:01:52 -0600 Message-ID: <20250221210200.244405-3-prsampat@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221210200.244405-1-prsampat@amd.com> References: <20250221210200.244405-1-prsampat@amd.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: BN3PEPF0000B078:EE_|PH7PR12MB8106:EE_ X-MS-Office365-Filtering-Correlation-Id: 415957b1-501f-4346-627d-08dd52bb12e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: bMgCc5UkATdQCokx75C+JFUYjpDB9xeTD7yr0uKZbG2WvoiUEVSjjLoW1J195x2Lz55QhXVOKSiCctd0xuRWmHv+MOv7XKyhs5JdaNYX3xWpkeikEMJvblJFrgCsPAarpXF7J9MrnD3m22tdcyLDIw+oY0/5yFgKoCgBRIHua6opwOcLx4uFE1urN0AU142jSEhOlwqvzQgBuI2XVnerXBL6KQDSZs3qbAQeUM9sKdxCaTZJDb3fKA2N2OQQQXeiq5f43EVOOxJE3eD9ORgYDLGaqpAuftgTDQ4QP3OpoNvqGSQ4F5awyzYafMzS+gBcp205OINzzqqKP/1RxuS8esfOqWW/rgzZCnH76EiwWgmuyfQRYXWwtuGWuJskiFrVeJlrp7wKbA7jac8TCgnX4ls7fXC0CThQ5QfevSASe1hCeD6P29kHPubq/Nfh3caNhy9Z8Qi3FPvSlsgmDvDYS7WOjU9cBGfUD3SZH11oDepueYfRdkhsfZIpRGqOvM0EqmgC5kzjHIalQKJqt4lfXTXiquSktcVjacPdEf8ObuLbzeR3R/LZigMrR/QZpWm1df16aJ4Yb1P/9y9aw9M5/NMnyj88kZqJFgr9Cv5vamxW0iwUamAinVggR6RpM7DYtZRFNUSBekS/92mCgK9sZAZvLAToVPIzwJtkDFHJgTVr0uW0K62orstIGmg7TUd4NAhdARNGD7kr3ismaiW6rH5g8XANzyWE4H4J6k5GW6GBGhZqTKm3fFJAWTRLaC/VeLC9W9Tb8Nac2/kRslEwLRbQXwnFaoo6URAXjU26GbsdmXCRg3heuyOHi6xzXrCKPjTHy5pNujqoIOyjMXuX25WwFH5VAsGOVSm79Ii5NI+cxX+u+xZq12cn1y/u8DgCW4GVc7PepLxh5c00U1SAYTQ4dmYJ8nCOhve1xlHnEJWWsPSt2zME8Vzq7/VUSaWSFS7clJ1U++8RxdraKTDPqldMAaHUmLgqnysTtTZOGuNT0cUkIrPUl1SZ1chIZntn+AqEGgsV3/zLZvz8P9D5lBQq80kcnctGmy6xFK9JbiehqjMbrapod1sgi7CMQDSqG/u1nRFBCrpQcTyYtTpfzyGNneqLMn5ul9BqOG9JwaFrqY5r8pkDsBUgLhRB+q67fom8yH26bFCeIcLevuYQjjyXxvPRGyvEB64bl7hDXoQm2pYIcsRDxOKFjH9cGB82cwsloTqk+2EsHM4pjXaTI7q5oWIrzKdxXVN5lNZmEr7P5Bu5O3AxjIgVXZf9OTm2NvAWTodB16eVSAUY8j1xgtuUnGRhuvkidOegeaMSURp8VIkUW0G79kun5C4Bvd0EDTwamMZZbmej8hB+kMDXu68l2nPQhZN7DhdyXluL0/wc+6AjFZS3S1QbKlekELVsYYpCbfyhjnD/HPkM7yqY5u+ycD5IEpg+hBV5fB6VfZRSha7UqhjTvBSQLcsxV2t1/LQaLxBJpU8L5yJKqnxqbVGs5kS/NVTB2OBAEvuR8xU= 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)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2025 21:02:38.5082 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 415957b1-501f-4346-627d-08dd52bb12e5 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: BN3PEPF0000B078.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8106 Add the X86_FEATURE_SEV_SNP CPU feature to the architectural definition for the SEV-SNP VM type to exercise the KVM_SEV_INIT2 call. Ensure that the SNP test is skipped in scenarios where CPUID supports it but KVM does not, preventing reporting of failure in such cases. Reviewed-by: Nikunj A Dadhania Signed-off-by: Pratik R. Sampat --- v6..v7: * No change --- tools/testing/selftests/kvm/include/x86/processor.h | 1 + tools/testing/selftests/kvm/x86/sev_init2_tests.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/tools/testing/selftests/kvm/include/x86/processor.h b/tools/testing/selftests/kvm/include/x86/processor.h index d60da8966772..6f63fd10bbc6 100644 --- a/tools/testing/selftests/kvm/include/x86/processor.h +++ b/tools/testing/selftests/kvm/include/x86/processor.h @@ -199,6 +199,7 @@ struct kvm_x86_cpu_feature { #define X86_FEATURE_VGIF KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 16) #define X86_FEATURE_SEV KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 1) #define X86_FEATURE_SEV_ES KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 3) +#define X86_FEATURE_SEV_SNP KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 4) /* * KVM defined paravirt features. diff --git a/tools/testing/selftests/kvm/x86/sev_init2_tests.c b/tools/testing/selftests/kvm/x86/sev_init2_tests.c index 3fb967f40c6a..ab3dd11ac163 100644 --- a/tools/testing/selftests/kvm/x86/sev_init2_tests.c +++ b/tools/testing/selftests/kvm/x86/sev_init2_tests.c @@ -28,6 +28,7 @@ int kvm_fd; u64 supported_vmsa_features; bool have_sev_es; +bool have_snp; static int __sev_ioctl(int vm_fd, int cmd_id, void *data) { @@ -83,6 +84,9 @@ void test_vm_types(void) if (have_sev_es) test_init2(KVM_X86_SEV_ES_VM, &(struct kvm_sev_init){}); + if (have_snp) + test_init2(KVM_X86_SNP_VM, &(struct kvm_sev_init){}); + test_init2_invalid(0, &(struct kvm_sev_init){}, "VM type is KVM_X86_DEFAULT_VM"); if (kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(KVM_X86_SW_PROTECTED_VM)) @@ -138,15 +142,24 @@ int main(int argc, char *argv[]) "sev-es: KVM_CAP_VM_TYPES (%x) does not match cpuid (checking %x)", kvm_check_cap(KVM_CAP_VM_TYPES), 1 << KVM_X86_SEV_ES_VM); + have_snp = kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(KVM_X86_SNP_VM); + TEST_ASSERT(!have_snp || kvm_cpu_has(X86_FEATURE_SEV_SNP), + "sev-snp: KVM_CAP_VM_TYPES (%x) indicates SNP support (bit %d), but CPUID does not", + kvm_check_cap(KVM_CAP_VM_TYPES), KVM_X86_SNP_VM); + test_vm_types(); test_flags(KVM_X86_SEV_VM); if (have_sev_es) test_flags(KVM_X86_SEV_ES_VM); + if (have_snp) + test_flags(KVM_X86_SNP_VM); test_features(KVM_X86_SEV_VM, 0); if (have_sev_es) test_features(KVM_X86_SEV_ES_VM, supported_vmsa_features); + if (have_snp) + test_features(KVM_X86_SNP_VM, supported_vmsa_features); return 0; } From patchwork Fri Feb 21 21:01:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pratik R. Sampat" X-Patchwork-Id: 868259 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2077.outbound.protection.outlook.com [40.107.236.77]) (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 D8F4D21E091; Fri, 21 Feb 2025 21:03:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171795; cv=fail; b=oVsBs3OEoBmXQ8EfZ0Y8Y8Xq9TnDDqxOjqFye6WAx49ATWxQkSS+nswMaoZaMhB+wTdaRXgiLhqQTR24tBVU9k8gQzirS+e3o1frDvDbafHRPGgIG319FN24U3BoOfndH5b5n8oKUTRU6WvKucYQZuSXs5Q6sJcJEoXBQEd+Vb4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171795; c=relaxed/simple; bh=kujgCUavp9UJCA59ZfDMqxQKqePH8eRvcxVM+CGNrts=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=vF8KZyZeIEBwP7w7hIA0dUSGH5IoTV1L+gDnzdYnuMdFMjKRpq1gFp9zb4Y8Aw8vXRNYmgxZ+CVUjNi7oviXD59irm1uM8QUM7fecQ7VZqWMvOpPKgBwC8c2Pl72u2hLxiw4DOl2unP4P+6bLlZNPOJFJBEVHOwP+32uvPe0jyM= 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=0DKSc/1t; arc=fail smtp.client-ip=40.107.236.77 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="0DKSc/1t" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r7pilQlK9Tbad8WUE9zn/Heo1N4kDch2GH6k2z526usKoGK7G2vMam2+Od5HFYC0dYlwrFbOgDJdNOz3AbrSaE7gMWVuc+TLgTkY21CteEdwoG1FscZYB6OSc4DJN7cYSPSE7igDf2FlOXQWtOtEzUMEcwff0ldoYuq+0jtXGN3DJXxltRt/H8VISLl7HtHTnaMfJdUJyN4SC2VUaBmMSzMJ2oQlR8rUkzFF07e/cbZLzFcbF2cUGwmJTDvugg0LpJbq4pWL/lhxTaZMqJeoHwsQUo0ver8W851a/xOp5jsjOHxD0szkCGz275dKswxThEfxJ612JDFWAwxchBStzQ== 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=hRrzuhoOyYHYXh6Yhn3ipme9yNxYQMKACZV8513s6To=; b=dBJqfM2erPssvjGzzid/ny0n0fcHMTtyj/mj1qwTIFSxGG8eU8BXUjHmmA56JjN88hwi+h/1eR6Kw7Rt7nox/tEqcRe4d/Of1+S7x/YiIuNfKjGbSdIq/9fxJq8VrkxrhYm++90mzSFrL2KXDRVQ7j7AKe2UcEbnXu/a1eA5QSPmdByoLSdPw0SznzK2q8D1y7Z+9NxSvCWudL589nTJmi8h/EIKiFmT2nKAVsu+VePC+dnZPxw2wcs2pwj4lgIWSmxgHdgE55RjANQnZ21oF7gD/QAIpZZwuFkaSSJ1j8RiKeNWlvb3sV5TkEAU7O12DEyI82GBy+TBj2n5q9NrTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=hRrzuhoOyYHYXh6Yhn3ipme9yNxYQMKACZV8513s6To=; b=0DKSc/1t0Lw5iEOCLt0mTrMVlJgUHE44Qj0TOm0ClxuMwVrWXqG1bTebf+JouAuu0OLu1GMb/SUCVIX2NXdhKnnPZACfZdzpPGalL6If9VCdxQiYAGoVC+lXnDR7bGDKTIRO8U5oO9DAUCCZaJ3Z3WYRxvk4c45UTIOTMy0qaPw= Received: from BN9PR03CA0333.namprd03.prod.outlook.com (2603:10b6:408:f6::8) by SJ0PR12MB7068.namprd12.prod.outlook.com (2603:10b6:a03:4ae::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.17; Fri, 21 Feb 2025 21:03:09 +0000 Received: from BN3PEPF0000B076.namprd04.prod.outlook.com (2603:10b6:408:f6:cafe::ea) by BN9PR03CA0333.outlook.office365.com (2603:10b6:408:f6::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Fri, 21 Feb 2025 21:03:09 +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 BN3PEPF0000B076.mail.protection.outlook.com (10.167.243.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Fri, 21 Feb 2025 21:03:08 +0000 Received: from sampat-dell.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; Fri, 21 Feb 2025 15:03:06 -0600 From: "Pratik R. Sampat" To: , , , , CC: , , , , , , , , , , , , , , Subject: [PATCH v7 04/10] KVM: selftests: Add SMT control state helper Date: Fri, 21 Feb 2025 15:01:54 -0600 Message-ID: <20250221210200.244405-5-prsampat@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221210200.244405-1-prsampat@amd.com> References: <20250221210200.244405-1-prsampat@amd.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: BN3PEPF0000B076:EE_|SJ0PR12MB7068:EE_ X-MS-Office365-Filtering-Correlation-Id: 442460e5-d35d-414a-acab-08dd52bb250c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|7416014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: WxdYCZtJ0TjZ3upt7uoMNmMhduI81ARmtPMq7wRTiLa8An4S43CHZlxChSN5h8ZIlSk3/12I81UOZbf60ZD6wYq8ua9Q6LSWx+zvV6yxvXZvMNBtYsUUhI0lXi2iB+zhorGrgrGXworsxPxIl8IA+KgmoatWyIslyrY6RXFKxWllsD9xwn+cEfyR6mOhSpfV0im6FSdf2aC3aVjJUr5DPC+1Ql8Y4Cjj01mHp7t/pkVncv77gWaA1qjf55sb/4dWSjTg4exl2WDpnkzo7PEg650nkhsHZn28dAvINhKksrizFuN1zBX96wkTEIV+lOrfzm/I0344lSdW9/Sfh0DiGJPsLckCl5enoZxXLiPuLt+JeHfOkYhH9Dhwe5GD+lRn6HUfcKxwYWSLM53cvZIZN9olwQy+RlFW/2m1UIfD/V+j/YNk/V6mURiEc/MFDaMESN+oCiPCwcRksxL4RoJMx8GJQHaa9j3eLgqoQNZ78j9+y88HyWf2cxHRHGEdLY99BOHaEd3/tAvp4Rmz2lqgruanGsAnSUZIQRnYQ4RBXGUsPtSFzk+tcGi1j0jCpaB3euUF09PhDQe1CmocCoZUg8exzCAfMSvNOeWwSIAuQCNOCWp69uxncHT4DAJHvAzIhz9JCuS1iDWX3vDXe4L4G+IllCSNjyHCc80YOHdQctcGqvBSlzQDChHWatTOP9JnRsnP7nfZU3qh0e2Sl9geYuiuo7x3PeA9nam9ggmhlRMLZHqKHc5fW8bRy7BYQR2Nf2ySVzKziMUg9GOWUi9K0brsz404/fx1tRkdxIN1lMsJV/1eVkVW6EZjxC0OLMmuMW4SSx8kzKUwtGdW6+pF0rMonKoDncSPPCCPQxHa4lWp81RT/s3G3pnV9m2KZCU1uIm/8H5nXw5Fay7H/V+01pOhgoYY/xRD+vuD5jyW7EbSoZlZYSQI+xb/1ITjJH3OmlvUvCYNXRVo4wHQ4vnfG2bM5uo4Q96yyRw8MAvdIY6NjtI3vwiOJ/4sD1x++mie0qnmoi4UIoNnzUCSstYDq4dbtELvHwL5fLV6x0B/12/ZQd8xMDpN6jiGa7IBNdX5tXtv1y8mq/dOnBMngTzy6WV3d7Orcz3RECSb6xawjR7JpJlLVGf5lFEi+/d3AIZBKhHilGMqr+56vQ5dWzRfqR9PMfvmFafvtI7FYkXre1Gr4zg//hOcgZtIYkjLlSYNO4OU408I2vkGbvzgNcmh/jqc3hJYQ3IqweRuPcmjij8UHgNtXXsTBPW9LmKvS7e4syJTr6MAiOvp9Ikc4RFX/enIKrXSnp+Fz29KfBA4WIC2K6vUTZaA+MK0dujGcp1YMy/C3StKcERmt52UFKoDv7oLL6dAEcwd7AvovReNG8P27v44UWlUB0OnBlhQL22Y426i1wNrWaydSp42Zy/adkG0zaAgEp5ijar8SMHaKJgKYtXWdgRz7lPAAABjlI2oFYr58LV19A/V3yBjXbFlFmEjOk9O2dSBvqmq4rq1v0g= 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)(376014)(7416014)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2025 21:03:08.9646 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 442460e5-d35d-414a-acab-08dd52bb250c 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: BN3PEPF0000B076.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB7068 Move the SMT control check out of the hyperv_cpuid selftest so that it is generally accessible all selftests. Split the functionality into a helper that populates a buffer with SMT control value which other helpers can use to ascertain if SMT state is available and active. Signed-off-by: Pratik R. Sampat --- v6..v7: * New - Implement SMT control interface within kvm_util so that it is accessible to KVM KSTs and subsequently the SEV library (Sean) --- .../testing/selftests/kvm/include/kvm_util.h | 35 +++++++++++++++++++ .../testing/selftests/kvm/x86/hyperv_cpuid.c | 19 ---------- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 4c4e5a847f67..446f04b2710f 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -542,6 +542,41 @@ static inline uint64_t vm_get_stat(struct kvm_vm *vm, const char *stat_name) return data; } +static inline bool read_smt_control(char *buf, size_t buf_size) +{ + FILE *f = fopen("/sys/devices/system/cpu/smt/control", "r"); + bool ret; + + if (!f) + return false; + + ret = fread(buf, sizeof(*buf), buf_size, f) > 0; + fclose(f); + + return ret; +} + +static inline bool smt_possible(void) +{ + char buf[16]; + + if (read_smt_control(buf, sizeof(buf)) && + (!strncmp(buf, "forceoff", 8) || !strncmp(buf, "notsupported", 12))) + return false; + + return true; +} + +static inline bool smt_on(void) +{ + char buf[16]; + + if (read_smt_control(buf, sizeof(buf)) && !strncmp(buf, "on", 2)) + return true; + + return false; +} + void vm_create_irqchip(struct kvm_vm *vm); static inline int __vm_create_guest_memfd(struct kvm_vm *vm, uint64_t size, diff --git a/tools/testing/selftests/kvm/x86/hyperv_cpuid.c b/tools/testing/selftests/kvm/x86/hyperv_cpuid.c index 4e920705681a..1eb55d0b7297 100644 --- a/tools/testing/selftests/kvm/x86/hyperv_cpuid.c +++ b/tools/testing/selftests/kvm/x86/hyperv_cpuid.c @@ -22,25 +22,6 @@ static void guest_code(void) { } -static bool smt_possible(void) -{ - char buf[16]; - FILE *f; - bool res = true; - - f = fopen("/sys/devices/system/cpu/smt/control", "r"); - if (f) { - if (fread(buf, sizeof(*buf), sizeof(buf), f) > 0) { - if (!strncmp(buf, "forceoff", 8) || - !strncmp(buf, "notsupported", 12)) - res = false; - } - fclose(f); - } - - return res; -} - static void test_hv_cpuid(struct kvm_vcpu *vcpu, bool evmcs_expected) { const bool has_irqchip = !vcpu || vcpu->vm->has_irqchip; From patchwork Fri Feb 21 21:01:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pratik R. Sampat" X-Patchwork-Id: 868258 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2041.outbound.protection.outlook.com [40.107.237.41]) (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 9D957253B64; Fri, 21 Feb 2025 21:03:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171821; cv=fail; b=s4zGV60x6a6bQ9sOnaUgSgKudXcuCFgjPVhgAKFaI7bkeIuKFGKTxK2HcTzK2neKf3yV+q+hjLDXqaktxV7/+ZSkwTU06n+EgeM+GI3+hVvjmMnELvQtmZTq76QjVtwKaazO0nYJfuyQ4UscBOpSBTXdAXs7+BSH8VGQu2jP7B0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171821; c=relaxed/simple; bh=Z/qPvJHY6GtS3NljHu/XjpXo4lVqpdMLSYUiurP2cmU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NNGN+r+KmU7ZXHaICf5++SdOkNgfZJeycIW0Xfv0UNNa9W57a/Zb1tv0c7soXOzYjGGO3oVFYBR3V5pu5jSOTTEhy7rEFAAIhrYc91onGuI71RZ4+WGWt5jeNqV/vDoGczEtDVIuWkV9AJfv8n78IKoVx/suTkEgt2r/2xjqjZ4= 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=4aHySA4i; arc=fail smtp.client-ip=40.107.237.41 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="4aHySA4i" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YwMVH1dOlB+MXl51+aCfDbcqwF9crLVQX+8pkrGQ9X7RSHQ1evBS2Gd8v6uexABLtdRz2OElZrlYuouSukyT80WGG8FadLBUuHDLqiE3V/R3Hp8FdJvehGrjgo0rKHTBjtoEF6EIqO5RawxpRKpLSBEk2npW73pKfsYhgSFxyJOGdatzERV+6UHg61VQlC/K4xTmODsn2q/ZkC1qd8gOueK66QJCpHcRIrcJHv8zLXfyB2QKFb98h46rF0DGTFNxZhEVsMoRKJXGRWb9NwZ03EaAlhr9x58hnJZhS9aWdtYBnGj7PGrZeGtIJFNm+/D5ZrttyHo9mwXDdqL7MN46zg== 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=GEoKaZ/ZkOb1PdTH/119TCEZO7XOkyfqFC1e8eKpKOk=; b=TgxxHkLfKQV8srlDC9nMyw9yktX/WjeD9906RZRi1qUZA/+zujLAZ4KjIUAyBGGrnn2rcATcK17PgNLU38+sX90Q3Sl7hnLm6tfjF7xAOmKthMZ9GsLYgJ4mAoZDp69Z9Uio/z95avxa0HVJIT5PI2vm/K1WztVG0MZNeACAV1d1qGkAEH2sgX3LSUmLX6TpwkjvmS+/tXRzbH34IbSqZ4qGgvNgQy5yCh5NbffyC96d5qqTnXbki3WvXChDH+rOjFFRcsXoDQfd2ygTyQ/KQRhZ8aVEfP4wUj3qZvq7Bhbc+A0vNB9PD76eNEnlphoPBJVRI/QltwU9ryPy049iJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=GEoKaZ/ZkOb1PdTH/119TCEZO7XOkyfqFC1e8eKpKOk=; b=4aHySA4isdfwJ7EC77rAM4pOUJJwgptJCkZV8VWNHFRqfof116/OuTtUMMWo+pfgvtZgiT0GxYsC3m490CARfSp6hx/yjs4zy1sqpRgeNuNEK/rt5BwMiLSQPOHwndOaEwbu9HI7xIVl535sbLYo/6v/rgHJJY+AU2irdLAM2As= Received: from BL6PEPF0001641C.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:11) by CH2PR12MB4231.namprd12.prod.outlook.com (2603:10b6:610:7d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.14; Fri, 21 Feb 2025 21:03:33 +0000 Received: from BN3PEPF0000B078.namprd04.prod.outlook.com (2a01:111:f403:c803::4) by BL6PEPF0001641C.outlook.office365.com (2603:1036:903:4::a) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.16 via Frontend Transport; Fri, 21 Feb 2025 21:03:33 +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 BN3PEPF0000B078.mail.protection.outlook.com (10.167.243.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Fri, 21 Feb 2025 21:03:33 +0000 Received: from sampat-dell.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; Fri, 21 Feb 2025 15:03:31 -0600 From: "Pratik R. Sampat" To: , , , , CC: , , , , , , , , , , , , , , Subject: [PATCH v7 06/10] KVM: selftests: Introduce SEV VM type check Date: Fri, 21 Feb 2025 15:01:56 -0600 Message-ID: <20250221210200.244405-7-prsampat@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221210200.244405-1-prsampat@amd.com> References: <20250221210200.244405-1-prsampat@amd.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: BN3PEPF0000B078:EE_|CH2PR12MB4231:EE_ X-MS-Office365-Filtering-Correlation-Id: b8c45d20-d4ba-438c-4bf7-08dd52bb3379 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026|7416014; X-Microsoft-Antispam-Message-Info: HdIcJqQ4FL7sYMVe6iVvD1sBSLZ+Rn8aJQgQrmr1y8eW3lsCjOM0y4sjrfKe8fCMDCmWBOEf85t5tgIQggIvmF9nT6C6JryqUAfVMK3FUMoxEAwRQKVmOK4JFGuGUIax+n+Uvg8LYUn9u6qL32qE556J3k/lemqFC6MsBFXUcy2A5h7ON0efpXBRMmqH5bcpkm3JkIAE8JIN6Cm7k41gWSa6+jSAUWW3po9uMDP3V+yIsrdDcvRgwixcfzwIWIyCyWbrKf3fqJFZSXPdDI75wrSXCdgJ4HGigH8GJK+6CCEjUS85m4TZtwuV3PJVG9u+zD/tPmx5fj278fooWBiRmgWgzKhfBIqriBTyLocQcA7HuAYi9ieYVIV+5LNth3GGYpSulLIws+lTwlwOdZlzef1NnEbKf32lsD/pbDJImj2Gmg9tdyDHd5Dkengbn29xVXL8Y4R0tIE5P0QgH7K4tB+9BAFAZilpqZQ39K6YjlGrxoBR1fpL/k/x7l3M09jFci6tSnqdlJhFQQrcf1X+TCVcTQuhNFmk9Sa0BAqnSz7GMClMYtg2btt1mrOgxYCeoHVLtqVLjJuueI26eDhHpyttat46o6mJrbYtEaXWNFFKk/lwAxinhafkgVyXm01q3/JQJST4s8bQPRUYQ4mDtrI8ZVozDCpt2TVW/3HkHzM6NG046DpFK0VxZDWmqgTDfzAqzyDtAfObkwK0DeETxdwhnPNWgP5m3SkpAefhOYEhYZFfHDhizHlcPOXj5woYXdzeg11Z0MQFJfGMqk/VsKe7iV579uzBph9gR8iFqhtq+6avFHbsjMTlfgoOJT/8AdwkSqVNcmN9AJCE4oCIvHgfeigfHg2/OgJbZrniqZqSvxXk8jBGF7LoiAjQCypjogXwe/FFmsfQoYqLTZiJCPa44NeB3xRLsIaE965aJ2b/bjenxTuzZfY/AG6x2aEVPCTINx2o7HdHJmot314+y1eHEZoQ9T69XqxIPCaKGboHD56hnS+YEN3NZVcVpWqeCWUnwLVZ00GwPUwwrNuUV/JfP0acxmp6bAgMLMqmpBW7WK52C0sJAja5pHG0K13KMyGAbyZye69xm9kvv+L5awgXLIRZO7pAct2RlG1Yhz0yHZIqokr0kylyQP16g7+N/NWTYCcnwoN4k8vkoAGNJlxCZhZud47dsLJU472AFR9mY4bRG+mp8wF+cz9R+jMMLUrFXSrn2PI2ZhG1wU5hgkCV0a0U2jd4F/+g2NGDE/NzOZ2jhL/qT8A7zgIN3QmWV3xW2H5FUi1IThLqYlrTjHYTftxO6kuDFBgSC5N6kvN3W4DPFvpHsXyZ7K2+z3Y7bS0ZpH4ixv/gsfWfFxezT/b3kwObXCv5Xl4fEgIfw7cLbEXn9je5oyvckjeHRrloGpOaVI0cvjqi+bwC6iUuSQmkd6OabkdJ5/90Lc07b00qKWYGYJaqUkgNWmEX7OhusHi1tVNJ5zjgXdnUH7DmdjRdokauOqymTR08I2Hx1Fk= 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)(376014)(1800799024)(82310400026)(7416014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2025 21:03:33.1646 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b8c45d20-d4ba-438c-4bf7-08dd52bb3379 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: BN3PEPF0000B078.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4231 In preparation for SNP, declutter the vm type check by introducing a SEV-SNP VM type check as well as a transitive set of helper functions. The SNP VM type is the subset of SEV-ES. Similarly, the SEV-ES and SNP types are subset of the SEV VM type check. Signed-off-by: Pratik R. Sampat --- v6..v7: * No change --- tools/testing/selftests/kvm/include/x86/sev.h | 4 ++++ tools/testing/selftests/kvm/lib/x86/processor.c | 4 ++-- tools/testing/selftests/kvm/lib/x86/sev.c | 17 +++++++++++++++++ .../testing/selftests/kvm/x86/sev_smoke_test.c | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86/sev.h b/tools/testing/selftests/kvm/include/x86/sev.h index 3003dc837fb7..b112f7664534 100644 --- a/tools/testing/selftests/kvm/include/x86/sev.h +++ b/tools/testing/selftests/kvm/include/x86/sev.h @@ -27,6 +27,10 @@ enum sev_guest_state { #define GHCB_MSR_TERM_REQ 0x100 +bool is_sev_vm(struct kvm_vm *vm); +bool is_sev_es_vm(struct kvm_vm *vm); +bool is_sev_snp_vm(struct kvm_vm *vm); + void sev_vm_launch(struct kvm_vm *vm, uint32_t policy); void sev_vm_launch_measure(struct kvm_vm *vm, uint8_t *measurement); void sev_vm_launch_finish(struct kvm_vm *vm); diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testing/selftests/kvm/lib/x86/processor.c index bd5a802fa7a5..a92dc1dad085 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -639,7 +639,7 @@ void kvm_arch_vm_post_create(struct kvm_vm *vm) sync_global_to_guest(vm, host_cpu_is_amd); sync_global_to_guest(vm, is_forced_emulation_enabled); - if (vm->type == KVM_X86_SEV_VM || vm->type == KVM_X86_SEV_ES_VM) { + if (is_sev_vm(vm)) { struct kvm_sev_init init = { 0 }; vm_sev_ioctl(vm, KVM_SEV_INIT2, &init); @@ -1156,7 +1156,7 @@ void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits) void kvm_init_vm_address_properties(struct kvm_vm *vm) { - if (vm->type == KVM_X86_SEV_VM || vm->type == KVM_X86_SEV_ES_VM) { + if (is_sev_vm(vm)) { vm->arch.sev_fd = open_sev_dev_path_or_exit(); vm->arch.c_bit = BIT_ULL(this_cpu_property(X86_PROPERTY_SEV_C_BIT)); vm->gpa_tag_mask = vm->arch.c_bit; diff --git a/tools/testing/selftests/kvm/lib/x86/sev.c b/tools/testing/selftests/kvm/lib/x86/sev.c index 60d7a03dc1c2..4587f2b6bc39 100644 --- a/tools/testing/selftests/kvm/lib/x86/sev.c +++ b/tools/testing/selftests/kvm/lib/x86/sev.c @@ -4,6 +4,23 @@ #include "sev.h" +bool is_sev_snp_vm(struct kvm_vm *vm) +{ + return vm->type == KVM_X86_SNP_VM; +} + +/* A SNP VM is also a SEV-ES VM */ +bool is_sev_es_vm(struct kvm_vm *vm) +{ + return is_sev_snp_vm(vm) || vm->type == KVM_X86_SEV_ES_VM; +} + +/* A SEV-ES and SNP VM is also a SEV VM */ +bool is_sev_vm(struct kvm_vm *vm) +{ + return is_sev_es_vm(vm) || vm->type == KVM_X86_SEV_VM; +} + /* * sparsebit_next_clear() can return 0 if [x, 2**64-1] are all set, and the * -1 would then cause an underflow back to 2**64 - 1. This is expected and diff --git a/tools/testing/selftests/kvm/x86/sev_smoke_test.c b/tools/testing/selftests/kvm/x86/sev_smoke_test.c index 6812b94bf5b6..a2de1e63c3cb 100644 --- a/tools/testing/selftests/kvm/x86/sev_smoke_test.c +++ b/tools/testing/selftests/kvm/x86/sev_smoke_test.c @@ -123,7 +123,7 @@ static void test_sev(void *guest_code, uint64_t policy) for (;;) { vcpu_run(vcpu); - if (policy & SEV_POLICY_ES) { + if (is_sev_es_vm(vm)) { TEST_ASSERT(vcpu->run->exit_reason == KVM_EXIT_SYSTEM_EVENT, "Wanted SYSTEM_EVENT, got %s", exit_reason_str(vcpu->run->exit_reason)); From patchwork Fri Feb 21 21:01:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pratik R. Sampat" X-Patchwork-Id: 868257 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2073.outbound.protection.outlook.com [40.107.95.73]) (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 A849D253F2E; Fri, 21 Feb 2025 21:04:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.95.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171848; cv=fail; b=YRwKDgkQTqH24/A9guAoByoUBApdi95IgWI0TJJySut1FCqPb2DdtKDvv48E/mf/7Wbrfa19zNyc/yV5l7EkwO9hE6F0l5rHsJVPYS1xED24x8cU0bFLnS5kXThb30uRgF6v+mfnEwgmL0I4Oc13As5Q8+rqZ6IeuKmGbauBdCM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171848; c=relaxed/simple; bh=Wh1VQunxSshhzHGnqMnZr2cx1/MbSN/znQMG2r1BSzU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kWEAr6kjccuDgoGZ8GnwmhZEOMx/puaVy5FZEPBCgIuQDPKgtQf7pyFvTbb/EXBI9tsRwf9juAWYBPemBTaAyZzf+KaAVqOvpkcHu4avWlE6zYmfra6JoSJLBdRrm5NyL7IKPCVNZHz7FJFSlvwhsRiC5SLtBUlMdF+0fg3yixE= 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=gA59DnBW; arc=fail smtp.client-ip=40.107.95.73 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="gA59DnBW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nbYP6F30Oid0VgtJVlfVc3RMu/E9BBaqI6vJnjFtdaU11HOuxd6eaa8Wrvh7a1XpMr/ddC1OJMfgQoP2uz3tznrsjfXjcbPPMcD/XMX3RhVT4PoMHSZmapwyjHEvuFz22mj2LmFTpENWG/RMAGjn/RGrXyvDSc4IIv97m2yidIvQz5Zi8HQlzLun0M0SOW8lYuDGNyN2XoW80I+bqVEZQbwvGic1lFRL5xoEs0tvbgOwdAlLhVQGQS/pU4iDypOQYbmp14jr8wzCR5ipBUQb/IJeKMNd/PFjuvEBoj2MIEViF+KRYC9QWZHRxRZ1lS7MnKzmV9eUvOIDWNHXeuVwXQ== 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=TPm/75WmSpIvUKzTZ946aEih21z1rjQg7DpJCU55CTY=; b=bkUrtabv17WwJA+FQQFYOyPnW5bDklwpL22yfHAczUv67NPno7IRTbV22+KpbwXlES/r9+/E78J7/P3WeuATfxs8WzoaK+9Kn1bao97m+fD7wGh/8cQ41RBgVGO/d+ftnH5SOo/f894juPY9fO8zDBspyBC8j91XZqGb/XShqe3s1JbJOrCqIHD1T4rZteBmirXPna6MLRrI2qOzXZ2s8yLZBPay2v/IlPB0Cqp+Gm4AmA4bUsmpvDMrxahR0/tITxHBX8iUn/n87r5bPbP4Cev+25GIRO4ryH9HkdK8Pi4hmHF3GI8P6gqM4IJ/fVMrDCLYs9/oW9uD4YIPD9SD6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=TPm/75WmSpIvUKzTZ946aEih21z1rjQg7DpJCU55CTY=; b=gA59DnBWiqLOewB/QTjkkiZDkfNvlCY7ucXKa01K4pq+gqpohqwv9LM6bp7XXrVcutxo3/xE9k7C8DgYnRLW1WcyaNfgOdEEaAR6d4YmcjPfMmi70SjxyoawlUt9r/zGHtWNnD11XLB1o1+a2NY/aRiaRoG58iQ8pycpcPhrjTA= Received: from BN9PR03CA0166.namprd03.prod.outlook.com (2603:10b6:408:f4::21) by DM6PR12MB4169.namprd12.prod.outlook.com (2603:10b6:5:215::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.18; Fri, 21 Feb 2025 21:03:59 +0000 Received: from BL02EPF00021F6E.namprd02.prod.outlook.com (2603:10b6:408:f4:cafe::37) by BN9PR03CA0166.outlook.office365.com (2603:10b6:408:f4::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.16 via Frontend Transport; Fri, 21 Feb 2025 21:03: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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF00021F6E.mail.protection.outlook.com (10.167.249.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Fri, 21 Feb 2025 21:03:58 +0000 Received: from sampat-dell.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; Fri, 21 Feb 2025 15:03:55 -0600 From: "Pratik R. Sampat" To: , , , , CC: , , , , , , , , , , , , , , Subject: [PATCH v7 08/10] KVM: selftests: Force GUEST_MEMFD flag for SNP VM type Date: Fri, 21 Feb 2025 15:01:58 -0600 Message-ID: <20250221210200.244405-9-prsampat@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221210200.244405-1-prsampat@amd.com> References: <20250221210200.244405-1-prsampat@amd.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: BL02EPF00021F6E:EE_|DM6PR12MB4169:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c4ce0fe-6f3b-4c77-30cb-08dd52bb42c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|7416014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: J75oymspuRIi9jd8BSXgke98qvN/pnTB5K+H73bU2hvaUm0xpAkvDGNAG173uNdvxmFM7MR6AGAzcsstIiaD2P0QnQZwUsM41Z3C+fKJsO98HMWXxSES9hNkMNXhl3FXZmgGCNevGh8pJ6cIYaTQpQHVmSxgvbw0CBNa0GL79LiLVGZYvyXI+dywdb+k0NwaBaZrlqzLz79kbTK79eoUfwLHr7MmtMAcbUqxqWRFo/UDE4MgXPH/iWXSO8Ik/MNTXcApFviQixwGQcXHfQwFNyAKmh1OLH+gwOgCHxx8J4jJnWCCw6Nhm54iwKNOtoTG7JCDEQLltBPdtMMxHrlFUNpy6Ct6IrGFMP74ArxF81REu50wZntc969rsxqejWxq34R2wgb151oi7MOcHL+FncKzYMw9sRaGes5ERfRpIPRTzCOqxN5/TPhHt7HOQTfYSnvpuvXC2KcP3ys1M+BOeKHab/uIsYDrzvtF+CwXy1YXGZrc1yiRKEtbZrqldyutUJrzhTexqTOUljuoBrXE7feQzHgZ9G1EGSzlcE7mTBIwuLsTCJKY3gMO3OEsDIaViwhzNnMJlh1HRir8KYuVmk3o1H9zpBDSUoNGQunpyeiIEfF/WvuTZQlj3g4nY2bJ8uYJoPQwBOvqudzQ797op6DpQL6zLk5SIQ1zKqX1oPoZEMZOdLhty1ZbhFjwbQ1YyacrclD5f8XQ9aB8IEZ1+TWwSp7sMrSn5GoylwNDuMRL5vaUm0seMavCpkFL03xsqijl2/BvGG8BWnhdxrwDwSx6fx8dB0r1d18Zk04frSVpNFYcrf2Hk3m03F5k0XN3LDQRAQJmJFRsVZwgXhEl+eP4fSl+5kBbtfO04afXvoqdbjGkXOGhgi4K6KrR9aqTZc0SvQEZY1hjptmuNS2NYeVXNAoZ+wvXimwn3uyWzYVZ9o2y93Z4IZ1G2HZQ2aMEro8hATv8lVG7LxyMBanUSTnBNLdlULE+i6QXuNGnqlszaFQ0ZOApW1DdOy7/Lb7F4C+aqoHpn8kUaqNK5M+bGQ7UhT68pnIif7eDPoc43ADIYFlj6oWmA05358hmt2qgW7Acp+kTvnbNaP94jwPzNA0UC4iZpjAkREF4ZOwiP8B6NApXCJqqvMHCsFL4Wn0FZcYFafoLfI8QBRvqQljm7GdivZfp4sJTT6lblqvkKDXx2p4IyjhqGAxgiosI82g9cYjEVm4cLG6Yoddmw+QSHVSm9yFj3GSj71Zru7IrFEToliJAkDhKyMjYXjH3GZYs5n1JMxDIJ1BdI9gxLQbs10ccH/dbc5EccHSpgsilnDF08LodusYA9F6LclAvHYujsfvhMOAu3HG4Xp3Ourhkye8xmZvQQ25YuogQnwvyTjIwDmf5tbdFntSU5CpN/4WwxLEBEGfybY1WddVRFWc9sBcUhPd+wLvwnmd/gUySgQ4WeMAivbiHOlqjwsPjF4Xdl/DSqJDb6FbalSD5X0WJNO33/WAhUwM5zkmvMTOU+2Q= 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:ErrorRetry; CAT:NONE; SFS:(13230040)(36860700013)(376014)(7416014)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2025 21:03:58.7950 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c4ce0fe-6f3b-4c77-30cb-08dd52bb42c0 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: BL02EPF00021F6E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4169 Force the SEV-SNP VM type to set the KVM_MEM_GUEST_MEMFD flag for the creation of private memslots. Signed-off-by: Pratik R. Sampat --- v6..v7: * No change --- tools/testing/selftests/kvm/lib/kvm_util.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 33fefeb3ca44..089488e2eaf6 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -413,14 +413,17 @@ struct kvm_vm *__vm_create(struct vm_shape shape, uint32_t nr_runnable_vcpus, nr_extra_pages); struct userspace_mem_region *slot0; struct kvm_vm *vm; - int i; + int i, flags = 0; pr_debug("%s: mode='%s' type='%d', pages='%ld'\n", __func__, vm_guest_mode_string(shape.mode), shape.type, nr_pages); vm = ____vm_create(shape); - vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, 0, 0, nr_pages, 0); + if (shape.type == KVM_X86_SNP_VM) + flags |= KVM_MEM_GUEST_MEMFD; + + vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, 0, 0, nr_pages, flags); for (i = 0; i < NR_MEM_REGIONS; i++) vm->memslots[i] = 0; From patchwork Fri Feb 21 21:02:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pratik R. Sampat" X-Patchwork-Id: 868256 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2072.outbound.protection.outlook.com [40.107.93.72]) (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 4B76B253F14; Fri, 21 Feb 2025 21:04:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171871; cv=fail; b=Rc2u+pwuin4EyBvYxVYn1DPR2Hhn9M9k41cjfzz+7/FO8xHZe1gziNap1SHTCnhwmbG/o9IoPtEEbG+M0H0F+YiTbrNK8izLTRQ/3ICtVMKbnqtltmTs6DVJb/LgxhDwjGdaOOWZe50VUwfeu9t+iExe9FtlhCdy/FND1xy90Io= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740171871; c=relaxed/simple; bh=INfJ+NpqjohDYPuUctzRqsQAlgadvTgj3uFqA6uE7vw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RTmet9/VSEif9Zw00JDT+G46hNIqCoYkZfyZNF9iNrDznzErvQxQQ3Pd/EVp3VKCGnvnxqxdgomFk3/zGZiLr5WeUdVHJpkM7XG8+MyYRqu3v7FQrNB/4Jy0WyFTs/9i/N09K6ny+gvjmTQ27FKTHyVWyBnE7OSkJWIOXc0wuMU= 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=1C2guFdL; arc=fail smtp.client-ip=40.107.93.72 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="1C2guFdL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Sb1MMAfdN8bKc91/35sNqCABWHqUEGqJ3Ls/xfH3GMVhek+lFdZWs7Rbkvrl56J4IWlpvQQ18Z/gqet8wIq4PysUgj3ToKc1bM27f5kqgjYgKb5I6jYxE9nnEr5id7e9Su5tCDaGsnkEsCrl+5mzdvvAuIdfHfkNKv+m/JdGJhaNKrLRUXIjtP5uHfE5IZ0aFi8wk8Lj07Ej6Xnebv5+nlp/HUqHN2etm6c9oxy0aJ16TvUiQmL1hazxh9burYyFlny3V6vC/Tc7ljTIaOzArdkfYt9i/M5WXXXrYonvWfUzTlAELNtRcE3+77DxtxtWwTHMZRnDdkH8QirZ3k7y9g== 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=OiO9BGjFVpR0LTrV70ejb3AIlQnTSzdi1RH6Hru1I4Q=; b=X+JVJtPMHMOOQbYU0MaoKZA+KrLSLmI9ykIIyGmqvY9g0NGrm5+ecFH19pyeILwgyufkclFAVJkLkoNU9QsESooEHlcJVPD0U07GBPquCj57SSalzRKye7lpCM4EFSoy70w/0kn1us4/gsjXTX+wW0nQ7pzB8DSpdlqQXV5KatrAj6DLQI896M6PlwSV3/OZzAv2q7vEg9QhL0TBE6MMg4aUlTV59fuv1suuU9bWmkSUEnE9whNWyTGRy+CHWV759erYiPT3sLYcpGTjNx+p7dPzyWRZKMkcsy4VW3ANcUI1t5PlGHwjT5+oT4cT0IXABIhwzbAM5eVaGidtbuf/bg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=OiO9BGjFVpR0LTrV70ejb3AIlQnTSzdi1RH6Hru1I4Q=; b=1C2guFdLMcHOneDBb5HhflI90GFrDSbIr+WmfNWD7uLMh+ySAV/tG96/9p4Pce6cAhdWxmfJuFk+JnzZ6odC4wZ8UTYRnarD6XDyvubHvPMYHH9wIX31UQ1LQ0wFw6pehtiqIc71b9FfNEkwfKaxtwcUU4HEOXm3GA4JqRW2UIs= Received: from BN9PR03CA0179.namprd03.prod.outlook.com (2603:10b6:408:f4::34) by SA3PR12MB9106.namprd12.prod.outlook.com (2603:10b6:806:37e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Fri, 21 Feb 2025 21:04:26 +0000 Received: from BL02EPF00021F6E.namprd02.prod.outlook.com (2603:10b6:408:f4:cafe::5a) by BN9PR03CA0179.outlook.office365.com (2603:10b6:408:f4::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Fri, 21 Feb 2025 21:04:26 +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 BL02EPF00021F6E.mail.protection.outlook.com (10.167.249.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Fri, 21 Feb 2025 21:04:26 +0000 Received: from sampat-dell.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; Fri, 21 Feb 2025 15:04:20 -0600 From: "Pratik R. Sampat" To: , , , , CC: , , , , , , , , , , , , , , Subject: [PATCH v7 10/10] KVM: selftests: Add a basic SEV-SNP smoke test Date: Fri, 21 Feb 2025 15:02:00 -0600 Message-ID: <20250221210200.244405-11-prsampat@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221210200.244405-1-prsampat@amd.com> References: <20250221210200.244405-1-prsampat@amd.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: BL02EPF00021F6E:EE_|SA3PR12MB9106:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e7be86d-2b31-44a9-2917-08dd52bb5329 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|7416014|376014|36860700013; X-Microsoft-Antispam-Message-Info: w6+QIEBXmlwZCkF11mcLPU1/W3KizEITbYlMaYB0wPM99kBsetfbHis3xe843rBgCcXEi8H6KB8LEhdlKdz58EQGe5wPSgqMOmKekH9bQs58KY0dSUCwTYH4w8u3UtN2DElz5nPM+jQAqozJ6H7uegapzMYuh3yXPSiqmRYdXDPDvxyfd315v05ongdfhlZqSzwKZPwBwRTNoP/0J4vom3QCXqYaejkLHioplAGyzqQoePdUE14DCMp9es8vKwGGgxl29FmYFOiUCDmnSKAOWmGGmJBvIQbA4M8tfC4LGdtxt1P7FkwhfpF2EAv9QazdorkxWIG/Y7FwFjzm+4BJeG1e7SDROXDBCOFMRiHfxhmHjWN/MSS9gGAQNhCVsEHvk83qb1kq+2dBVInUiuYECf9M/GhPaaF3FapQF3+Z0kPYGj3nU+9XzfWzd/hSXy3xHbisflNIn4Rx97wyOfZPbk3jLx+KhH54jGBKB19LCtNeJq0YxLMeRpEB5pnW1ezB5oli78CeOh5A47qI7MEGaqkQkq71qDHQaXitkxqvOkdJvTI+4uI/nLie6aras3Sn+uJ4tpIihORFsjEEU0eQY18rxe5p7cOsYlIaQEQBPyGjqORspPwG0bOYI+KqA+BZ6CAs04X2PsEtNu26Jj8s/wdzsLGu+cpFOFU4l6B/Mj67rCwNvQVWS1JHnje+ohTt1AZwVdrnXq6swUpwBuK5fGFuPUBGP/gHA+1Sifm9EKgKg/0zoSJKgBV25iLY2FaYWCNEZaZgmMsLL2gRcRelhT6XNWyMnVexDd7NTrriazJdXs1egAwbkp4buoS7xMwlE55/ReaM9ZfPhf/HjeaCjakujuW/O8YRbYfCCMx2DNBx5UFmmpuiNDG2J+Y1K5GVjiofPsp5Q4h48s63WlrLcH63H1ckaAaaQpX3vPh/Q7KxKOjqgnH2DX7c9pXM84bvlFcY1oog86qRdFfK0uzNKn8wYlJNTPVETMOaFljxVpZpHi9hJOWzJPemhUzV469j/XRpyuc5o5oN/9xHf2q64BY0zAyiF5/cgxgRB5isvT2PXc48kGj3VFeyTsRxTpSLCMu1s4UiZ37OcibV+9OX3iU5K8rlAjoFC0YpFGUkU4SxOvQk9DWE0YOx9aO9rYSJzXPGqtflWsVSwmmOsbY+52E3JohbQ7cuy4W58Y3kipUGmRzWfbUIMCc7PKXjELci6rnWVgz69biod2Q/1LPx1FC87UyUWXXF4oodv1Kot4ziVodJQjeBx6AAlJawG3Psiwn0lFZON7Zf+4D35nX6vXSOtiI7Hb3qFFcq/huolNKK0pc1zNcnAhBMU3HhIiX/d4I97KXY6+v7ufXD0yjHaowOUv3roIVgIFYmX51OP1gwqp8V+pOXoaH8b0Q3bR5NEum7xgd1Qj2l7mbu7FhZ+zVVeau2CYF3/rR2tHQpI0/TCoNjuLX66wkhjQKSAOQ6p1akdbQWTjx1YIJN1/BJ9lp9PjclHmU55eeOrPcnSJE= 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)(7416014)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2025 21:04:26.3265 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e7be86d-2b31-44a9-2917-08dd52bb5329 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: BL02EPF00021F6E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9106 Extend sev_smoke_test to also run a minimal SEV-SNP smoke test that initializes and sets up private memory regions required to run a simple SEV-SNP guest. Similar to its SEV-ES smoke test counterpart, this also does not support GHCB and ucall yet and uses the GHCB MSR protocol to trigger an exit of the type KVM_EXIT_SYSTEM_EVENT. Signed-off-by: Pratik R. Sampat --- v6..v7: * Remove FW version checks for SNP (Sean) * Include testing for policy flag SNP_POLICY_DBG * Rework test in accordance with the last deduplication cleanup of main() --- .../selftests/kvm/x86/sev_smoke_test.c | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/sev_smoke_test.c b/tools/testing/selftests/kvm/x86/sev_smoke_test.c index 620aa7c41f7a..0505cde77358 100644 --- a/tools/testing/selftests/kvm/x86/sev_smoke_test.c +++ b/tools/testing/selftests/kvm/x86/sev_smoke_test.c @@ -16,6 +16,18 @@ #define XFEATURE_MASK_X87_AVX (XFEATURE_MASK_FP | XFEATURE_MASK_SSE | XFEATURE_MASK_YMM) +static void guest_snp_code(void) +{ + uint64_t sev_msr = rdmsr(MSR_AMD64_SEV); + + GUEST_ASSERT(sev_msr & MSR_AMD64_SEV_ENABLED); + GUEST_ASSERT(sev_msr & MSR_AMD64_SEV_ES_ENABLED); + GUEST_ASSERT(sev_msr & MSR_AMD64_SEV_SNP_ENABLED); + + wrmsr(MSR_AMD64_SEV_ES_GHCB, GHCB_MSR_TERM_REQ); + vmgexit(); +} + static void guest_sev_es_code(void) { /* TODO: Check CPUID after GHCB-based hypercall support is added. */ @@ -179,7 +191,10 @@ static void test_sev_smoke(void *guest, uint32_t type, uint64_t policy) { const u64 xf_mask = XFEATURE_MASK_X87_AVX; - test_sev(guest, type, policy | SEV_POLICY_NO_DBG); + if (type == KVM_X86_SNP_VM) + test_sev(guest, type, policy | SNP_POLICY_DBG); + else + test_sev(guest, type, policy | SEV_POLICY_NO_DBG); test_sev(guest, type, policy); if (type == KVM_X86_SEV_VM) @@ -190,7 +205,10 @@ static void test_sev_smoke(void *guest, uint32_t type, uint64_t policy) if (kvm_has_cap(KVM_CAP_XCRS) && (xgetbv(0) & kvm_cpu_supported_xcr0() & xf_mask) == xf_mask) { test_sync_vmsa(type, policy); - test_sync_vmsa(type, policy | SEV_POLICY_NO_DBG); + if (type == KVM_X86_SNP_VM) + test_sync_vmsa(type, policy | SNP_POLICY_DBG); + else + test_sync_vmsa(type, policy | SEV_POLICY_NO_DBG); } } @@ -203,5 +221,8 @@ int main(int argc, char *argv[]) if (kvm_cpu_has(X86_FEATURE_SEV_ES)) test_sev_smoke(guest_sev_es_code, KVM_X86_SEV_ES_VM, SEV_POLICY_ES); + if (kvm_cpu_has(X86_FEATURE_SEV_SNP)) + test_sev_smoke(guest_snp_code, KVM_X86_SNP_VM, snp_default_policy()); + return 0; }