From patchwork Mon Feb 17 10:22:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj A Dadhania X-Patchwork-Id: 13977507 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2043.outbound.protection.outlook.com [40.107.237.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 2800119E7FA for ; Mon, 17 Feb 2025 10:23:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787783; cv=fail; b=r3edpAHJAerDq7qPlDEy7yxBb2PA/aMCiXKOl4mAGvJ1oqJYyYRME00fTlsUMt7cIdbTFxxdV0fuCPigOyvLVdHMRuWEmsvYqlBM37obZH7dNqngUxOB/K4NnXrXEwN/39OevPjrL0SiBfkwzcXZbNK/XcvOVz+oJSvGhDbQvMU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787783; c=relaxed/simple; bh=j2qjQb3iQXJX6W5prS/VKCV3GbtwzCOKSOTega3zcJY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qTZNiq8T+YD+QgRgi46ZoRl2HSJ0JZsVFWkxLOjoDgCBdjiaw7yrvgFQW1HNDZTjom3hwSUQ7LZSBRj0Xm6i7faRitLw9jaR2A8AIRPrw6e/g5xDLXUZwfPqGRiMGdc5GLcgkKQSB7YkZg0JNmpAIr7HxUzIV0ErqxOMxlqU7mM= 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=uGsK4AY3; arc=fail smtp.client-ip=40.107.237.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="uGsK4AY3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f0zrJNTnXfKoIDKngqCJqLl+ngJKVlJkacWujHpiEcOOfCJuwAR+yxGsuqEDUWuJA/hdSnI6p/aTEb9AfwPHtDs/vB5VuIlHMassOq4gDrGPepY8dJi5l/aKVYZzXLZ6wvd4Ra39yxN6fYod4u2VHD26tx+lowRSZUF7n9IwlMbE4itVTtciOalCTRW0+2HAVWcUrrgMkhE7uAVopQzlOPFsyXT2XaMRYDfrfAFMuFdCDxXZHXwZxLvkbD0BAnDNATbqGIR+yR8dIH0Pji5w/gMvHaCbuFjdTONvwpiMzWBvaHzAYRxtUeHE0geIcWDMG4F9GVdTxuEhTUXWn2IBDQ== 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=vd5GErn9lxl10TuPur7D/9TVtBaeaqHRdXKWkxYHm1A=; b=XVtEL0KbN3Hbk5sCsBUDxTbXUsdZsVn4UnshTBq7f5UtGQIJindSFSceFFdsVZBrJfxzh6xidhHov1W5gtFNPJqi93LDUk+quo2P8NGAN8pxAfGyJHX9uF1Yh00UJMUdtWQ/UwvPeu1384xUmvErDceqd7cEpBRuy3r1dOW1/9SEWAVAScnUhgWQnvfYfRzgO/ZqgRfyvxp7XLd4B+OZxamJ+v4V+pHA7LGCN4Am/9lA7z6JqnAbgxMOFNh8QtmfIzUQWmi0Q8uXIRshpXob7JFSmoFziX2mO9PXevvBrTPjfb2NCFj/gZtF7+lqf5ADZ3rHtBL46wb+LAOnJIdZSg== 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=vd5GErn9lxl10TuPur7D/9TVtBaeaqHRdXKWkxYHm1A=; b=uGsK4AY3nO+yLqhmkSNwICNUYshSP95jGptWA9C+skxw6WzW4YpMDIEqr3Eb4VCENIWWXC4RCAFBNb1hclAKniKG203RN/8OOMQK8SwyShxW+y0JIzXcX7jcy/Fr/Ud69Hu5cmhjFaKQBp3tEw3TSv8IfpqKgrIzoGr9iBtxuhM= Received: from DM6PR08CA0002.namprd08.prod.outlook.com (2603:10b6:5:80::15) by DS0PR12MB9324.namprd12.prod.outlook.com (2603:10b6:8:1b6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Mon, 17 Feb 2025 10:22:57 +0000 Received: from DS3PEPF000099E1.namprd04.prod.outlook.com (2603:10b6:5:80:cafe::83) by DM6PR08CA0002.outlook.office365.com (2603:10b6:5:80::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Mon, 17 Feb 2025 10:22:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099E1.mail.protection.outlook.com (10.167.17.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Mon, 17 Feb 2025 10:22:57 +0000 Received: from gomati.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; Mon, 17 Feb 2025 04:22:54 -0600 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v3 1/5] x86/cpufeatures: Add SNP Secure TSC Date: Mon, 17 Feb 2025 15:52:33 +0530 Message-ID: <20250217102237.16434-2-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217102237.16434-1-nikunj@amd.com> References: <20250217102237.16434-1-nikunj@amd.com> Precedence: bulk X-Mailing-List: kvm@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: DS3PEPF000099E1:EE_|DS0PR12MB9324:EE_ X-MS-Office365-Filtering-Correlation-Id: c67bb982-5ce4-4b9f-c41e-08dd4f3d0c4a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: t/i4j7YQ4CLze21iBBjjNGPYjjClnY0HjMEaSAoEvo/pMtvhIwchkIG6ZDeaYOFsLgrwTnsLeC052D837DRjHmUWNSiy7VcPtzn+OJzYkyeUYmrgrUUQde4D23n2QlNUSa+kPbhhpVoRsxRPk2YL7eISapJzRLzhhl2//4FlH72dFBOJsfn8cG8MxiG4GVdWvd20LBdD/n/O8Do1LDfNnENWu0tgrpsAZpqK/6U8ab7/vBKRebeCBTotRQh2Ug8E6DgSP9A1llvK3XDQdcaX03udmx+lbOVsvv3ORKl6HXM8LjGfoj8CQYMZtnWJ1BZY/9qnp2kD5jHybE2NQdGIcwn8PpoLl1bdD+2KXkrwP345Rsl9GdgQ2a4xTO6cwdpgzAim3gB2i2xoeSXCbHOdpShC/URp89hlBv3v0zcJXzOY3T9OXOtZLIXtpUy7f/6cNA/E53g5OFFBTc0LR4Mk1INuo38zwq0s+mvE2bKKaXzR7HC7hBVsxRTG5u159C04EuHF/33hl9bF6apbchBZzL6OeCzSLSw6F6eDe0Qqd+xP0oL2iBAa+B6IiRw/6SzVITuKhPHPW5TvH+waeuyj6QVbviEwTrIsLkMnRz8i1DGdILMOp8aEIX3bIU2o707/EZvvzPCzSu33Mjhtd7gTJRTjGoBeq1mjAvJAXcwz2RJWtTCxZWdImz191ZLl6CCCqxveabYioYk61IaMPmJ3x8n/YbdmymNcj7MDVHc/o2Vhnlsd/dFahZIUMxLNRLSnb1fxI2zl0iVqmbo3FEs0jLNBiyDB5F8H/qwUnECKEBRo36flEBCoV/L110bRRsun2+wyPwEQJu4dnDDXc8QYc6DJQRBZQjR2wZAONFuGSY8+LCra1yXhHJuKfm5gNAWGZ2VvFRteXfJ4S5bx37gImgAZbMmASUyQKnBF/zVt3Y2ifLeF/NNKxYnBCAKSzEcSAQtNGwsbZwqQACBKIeZDxYppccKko+2LTK2+lLtBCK+/KAaptYSQyCLkWHzrvkNjqVlHUqpdFt85godcwVa0I13gjsSCp1rQG1GNG8ZHCqC7MnOpV/vNEYA3yPyEulOz23s0oe2701lyA2X9CxyZL5HiVFnbZzrC+b0330du+VDfuV7GQG34wlnJfloEA1frrk02mSHcLIIL5gr3KH/Dnoohx9EYamHR9+Dwp3fsaX+zPClLzPRmRrDz+kHJw3VbG9tlk9yIiwui0LTF8W9oNJp9DO6sJzaJbX2jVfkFjd0ctyA+VUYPadtfNZ4fQCkaMcfUWt7GZGaOGuxCr7BPXY1+YArkGYUtOhFTiY/2mGbYRliuPJZE1wpWYxJ0sfFlR/5H1wkJKLrFYi1fesoKfSOem9kP4psb/e4LcC9hkeepoXfkg5BDY/rMyuNtrEPcsRhypXaD1p5BSGYspHZWTthLh5vFJAjwEDMtjKFJYGSLohUbAe6I3K90K/2y1K6xvDVlGPSoiBuBSlmVivfdMJlxzzQDvvX/4rRBLk7Rt28= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 10:22:57.3210 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c67bb982-5ce4-4b9f-c41e-08dd4f3d0c4a 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: DS3PEPF000099E1.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9324 The Secure TSC feature for SEV-SNP allows guests to securely use the RDTSC and RDTSCP instructions, ensuring that the parameters used cannot be altered by the hypervisor once the guest is launched. For more details, refer to the AMD64 APM Vol 2, Section "Secure TSC". Signed-off-by: Nikunj A Dadhania Acked-by: Borislav Petkov (AMD) --- arch/x86/include/asm/cpufeatures.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 508c0dad116b..921ed26b0be7 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -448,6 +448,7 @@ #define X86_FEATURE_VM_PAGE_FLUSH (19*32+ 2) /* VM Page Flush MSR is supported */ #define X86_FEATURE_SEV_ES (19*32+ 3) /* "sev_es" Secure Encrypted Virtualization - Encrypted State */ #define X86_FEATURE_SEV_SNP (19*32+ 4) /* "sev_snp" Secure Encrypted Virtualization - Secure Nested Paging */ +#define X86_FEATURE_SNP_SECURE_TSC (19*32+ 8) /* SEV-SNP Secure TSC */ #define X86_FEATURE_V_TSC_AUX (19*32+ 9) /* Virtual TSC_AUX */ #define X86_FEATURE_SME_COHERENT (19*32+10) /* hardware-enforced cache coherency */ #define X86_FEATURE_DEBUG_SWAP (19*32+14) /* "debug_swap" SEV-ES full debug state swap support */ From patchwork Mon Feb 17 10:22:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj A Dadhania X-Patchwork-Id: 13977508 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 6F2C1215F5F for ; Mon, 17 Feb 2025 10:23:03 +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=1739787785; cv=fail; b=AZ/gw9Gi0F90k6BW6zvCibWMPOuyeOUmC/h1h2hPkaI4I8ul+qzhnh+g8IeF9jY4K+pp5F8zBFH2vCMqdRh8nbO6JXalSP4/th+uZPraj4/dJiyZ0BkDRKr3OUAD5wrlTAt5fB+9MjSuXLQDQi+SsSPOCr1fu8nWCf+X6GcKDvg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787785; c=relaxed/simple; bh=DXMpB79KV+RwNWujnZrVtlq7nnzFnhjzW/hcu3zrnCA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gsYoIpO51x/7ZzNHqcnVFKrWhmicgG99sSR6w0QEXrwn2ndrU18J3nsaY1vQQe40NPPemPYIjihp0iOPWH3Nv5StkugmjUoKPAMmAb75W7umsytKcpNme2povnVytfFThjC4kNTqqQdnyozZJLelkdrjGCvm/vmT5iEcb9TFG8I= 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=fZh4Yfts; 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="fZh4Yfts" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=t5tZ48apspC4vuC0H6uJxV4R93ved56WQ8MKFBqM4StRP3cYmEpU3kXsV0Mk0UlAvAyNJsuItWDEdH1PK/34ZJllDRBlitZRAwmbUN8vf0914SZipE2o4HcblvV6LxBSUkBbFAuqoGhgiqwzjwGo1n+EDmdzAQfgORzZrajFLb8Okl5pkOGICEGXJhukaluLbDPCmDYI0rgQ2p0xZhaYFvd2bSCR8tuinfekUsF810boltoivr2VehdbcZvWZpvm4achNXl6bh5QQo8sFkdhBX64m/evxvrjrPVwtdKbETXnOnFTglzogma9D7lM1dRZiKhzvmFuGxf1t+mD1IVydw== 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=rIMmr3nVkv50kO6hjTFUD/Bn0YoKd4MTJMhFroyuuHA=; b=LNZCruj5ctRp5sitX6JQVBocHAHrfhoLR9HzV4TrdAz2rhlT/PRTfQ7fAY+WYCQJINlIeVjkAJcGWHiQl88MPEuW6Cvm9fJFKOXJcttmRalrFtJlqnnUKKB3pH3EZcflw4zGP7UrYtNzDdaLCIUq1rLZXNWM+5hhBlWvKmbKOG8tNtyCBiEXMjXxpucO1WV7BgAxQh0UO09fzjLqqQdPvaIyGwY0XlfWrAs835JCQkEDHrwq+4KwllYAt4KgiMbThyXu/PgVM2JmbNqKvX4C4v+GwZgPc6aT6YIo91Zn3R39L3KB7btvuYPB4Ngut38h0HMEz5xrcZz0m7QWGk1YUA== 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=rIMmr3nVkv50kO6hjTFUD/Bn0YoKd4MTJMhFroyuuHA=; b=fZh4Yftsxm8S4DC3Z0j1rz/C16gjfbe2iCqud5JuVmLeWHOr0ygL+gycqfkIggROPeOktO3FQ749zeymRvF0jiOQqoY1ahH3Raxy2M4dhfyDPOlsxcyOb54ipQjR5JULopSRqG8VHZ3BNYPP7GAyScHRPC3nUOSsjzdU3GPNh+k= Received: from DM6PR06CA0074.namprd06.prod.outlook.com (2603:10b6:5:336::7) by PH7PR12MB7305.namprd12.prod.outlook.com (2603:10b6:510:209::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.16; Mon, 17 Feb 2025 10:23:00 +0000 Received: from DS3PEPF000099DC.namprd04.prod.outlook.com (2603:10b6:5:336:cafe::e9) by DM6PR06CA0074.outlook.office365.com (2603:10b6:5:336::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.16 via Frontend Transport; Mon, 17 Feb 2025 10:23:00 +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 DS3PEPF000099DC.mail.protection.outlook.com (10.167.17.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Mon, 17 Feb 2025 10:23:00 +0000 Received: from gomati.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; Mon, 17 Feb 2025 04:22:56 -0600 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v3 2/5] crypto: ccp: Add missing member in SNP_LAUNCH_START command structure Date: Mon, 17 Feb 2025 15:52:34 +0530 Message-ID: <20250217102237.16434-3-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217102237.16434-1-nikunj@amd.com> References: <20250217102237.16434-1-nikunj@amd.com> Precedence: bulk X-Mailing-List: kvm@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: DS3PEPF000099DC:EE_|PH7PR12MB7305:EE_ X-MS-Office365-Filtering-Correlation-Id: e217fc7a-6fdc-4c24-6b3a-08dd4f3d0e11 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: +e+JDFdWi+STkQK9YRoFWjuQfJ29FUeeXKJQt7JHDitrcsTT1ulENop2i584FQ2bKshX3qoJ/Yl+kCmJr2ca1Hkz7WYSQKIwqjHMqjrrOj8odGU7liwF9mDqjuEJN4Rre0nMmx7XpMRecMuJO6LYGwcgGMR0Lt4olHLsRY8ZiGNLI9o+G0FPfMbt8eGsjdsNUbAEP+vxZ/7DWVdRgh27PDrpNmhXR0EWhfKn6+GKmczd9EvuVaGldgD6kp1l5+bnNMvgaYOgNi8NzpJh2h458YvJzQryO6vHxZZurd8aQNkeyg7Oa6K5bN1Q1LfyfzrHmRrLK+NVxUL3UViDDx612HwnyiirRvGltzY2L7LhyTst62wJ1pVETYsU45eUxgO+qgXbNLmqrLNvQC4mt1sPll3FBpwSf6OZaw/lgBM6YiJRQXajl0s0DIcvwZBWGyINclxZCZky6xCuIww33FVsoAs+5NfIFhctWmREveDMjuQtAnMdu8B1q/j/eN79Y7Em5Aex5pAYqKfnLIdG6Q15HjcMoUN+NdeWIY/KEWfO9L8eZBbsHh6/dtMUq7QaqIn+0XcbAGtsS4+DkLD9IGNNkeDBE9LrgTMLeo19rEbD7TiCQwQGQYfsdBq8nwUdW6pHjyad8PH9hzngzKBVvbaYXUwqQUT+/lMq4nM49tvwxmBDBZrZZv1ut8uXKwvGNPctp4ZfoBHLkhQaXVrTqim85W5CHQCuvynd0aMz0Sas5dOEmcrv8KKeGZjmIx8WFgSQdHGWxII6JLhFBq82dkCjSfIM1jQbk1OYWr6oas4WQFfzN9wD/hGaepO6DvCmqzJvKccJquEt8Lb+ozGYfawYtKafPubxeuPCEK4qTGIExbCfQGzn9zWXues5p2fFK4h/renO4L0uLxWh7k/PhY4SmdWSez/0WBl6pMEiIMU08x4jb0BpzgXPYdqLF0+rkGdT5QOjBg8ydUtiWhCRPh5//nRPne27e159mvBC1Aqa64wQHBYHRHgXzyd7V+MGn9zqEc6b32NU46CcO6N3wtYREVYG+RAEfHQPMBdguggd0f5RqlLzKQWo5gr4vELQZzEm7Y5fsq1ofAkH+/hI34immqjj43FxWJMja0bFXNA5OJ1PUmQ5zR172bKD6rNF9dys/3zQjLOCVDsffQNjAwcVwacTNXeySrHLWlvH6JU+RuRBJ8PL5OomVpGvNkW+jZrXzgcEm75ljXCThzMn03sxWJRkF1u7F5GDtn4EQZNKqt1331/r0CQoLC334fMZokXI+vd8rGHk7hHXh2j1lLXVf7z5V19LRYauRNAfD+qOn0I6NNykK2L6wbHhMBkbd9Ht4rLlrYS1TKQZUQfLZtWbtXW79N4rV382/BGTfAzcE3XEA7/m5QQZYFvRJKCmEOA3bREy+6aX2xSWfZJUbeNyDHrXNlGBDyR/4k6cTaijuS+UfpgKVNK4qq3eTXKMLQjQvE5XqTmLd9kZ2wwkDc4bpZdZeGuRcaUVC0iDFwGb8vk= 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)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 10:23:00.3006 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e217fc7a-6fdc-4c24-6b3a-08dd4f3d0e11 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: DS3PEPF000099DC.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7305 The sev_data_snp_launch_start structure should include a 4-byte desired_tsc_khz field before the gosvw field, which was missed in the initial implementation. As a result, the structure is 4 bytes shorter than expected by the firmware, causing the gosvw field to start 4 bytes early. Fix this by adding the missing 4-byte member for the desired TSC frequency. Fixes: 3a45dc2b419e ("crypto: ccp: Define the SEV-SNP commands") Cc: stable@vger.kernel.org Suggested-by: Tom Lendacky Signed-off-by: Nikunj A Dadhania Reviewed-by: Tom Lendacky --- include/linux/psp-sev.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index f3cad182d4ef..1f3620aaa4e7 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -594,6 +594,7 @@ struct sev_data_snp_addr { * @imi_en: launch flow is launching an IMI (Incoming Migration Image) for the * purpose of guest-assisted migration. * @rsvd: reserved + * @desired_tsc_khz: hypervisor desired mean TSC freq in kHz of the guest * @gosvw: guest OS-visible workarounds, as defined by hypervisor */ struct sev_data_snp_launch_start { @@ -603,6 +604,7 @@ struct sev_data_snp_launch_start { u32 ma_en:1; /* In */ u32 imi_en:1; /* In */ u32 rsvd:30; + u32 desired_tsc_khz; /* In */ u8 gosvw[16]; /* In */ } __packed; From patchwork Mon Feb 17 10:22:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj A Dadhania X-Patchwork-Id: 13977509 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2076.outbound.protection.outlook.com [40.107.237.76]) (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 7973D215F5F for ; Mon, 17 Feb 2025 10:23:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.76 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787789; cv=fail; b=u8QMfK4Nm3YnwdcBdAioHzwjqtIu37KFqkGT1Vz6yyiYh8CFG+yHqYIfQci+emU0EKZW467p7T311d5H8x19hoYuaA2WRxa04VoXnc4amQqF7t4Tt9l/2Vg/prhRHC8CNhMgpdgaADM39Yz9Ib/o8zK3KgdNWzKEIR2jO/2ijXY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787789; c=relaxed/simple; bh=MsccPwj+LqbrdmxYSUg0DzFJimy48ppHFBXW48hPHyc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qurVdC7cpbmzEVfepRjZKHHgbl9xWTLMDafmv2I1ltETHFI74S8TBz4eqTCM9xG9EC4MJ7vj1IlgbPiNLKJPaam8ybpIq0MPGkKV+zOflWythjTaAXoGpF5a5WnTsmsRtjgQua4xYK/gXDlzJhSbmT//iJAKvFSHisglopxqcdE= 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=0dToy0Ly; arc=fail smtp.client-ip=40.107.237.76 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="0dToy0Ly" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KkqMGBqf1WduX0N7E0w/nqGBOAYuU2brgRoz6eMLz43qyXl+wjORThvXaXfe8mmtTB2XRAB8Myxpq6Za5c88u55La4wbv3zWzUs59Uv1MluiUE7NhXhASq0DMgMzE0u1GpbSUmDs8Edep6nY+dAJK0GA7g8U7g3fPXGteJYVQzPz2ycPJd1HrqwXuubELX1uBzCR/FKMyFvdXRi52BCIxbnAgkK86Vn35Up5LhpJGXMMTBuym61FLH21tHZYteD0bio/JW92aDVl5rAAi7G2iVOJge3M6fI9roCbO8wLso1Y2QfrbFF2JQqh1UK8FmgYCHe84Xd2pG6VPkitb3hleg== 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=pU0OcvzR/Q86MgudJIiZUYS4RrHR3symfIAo+HDbWX0=; b=H5mXNTTl9Qh1Tqgpw4V5TE1jER8qAbfrDmDpkn3LX0wdMH8Gksy4E5oozzkiUna6DhWMmY8wDV/GMpHyB8lb2WrDiLGX9WO3Pyt9WTucOMkVhfZ0mqnHIUDLYFDeJDbg+klSIQlv8pLQL4HJ2LsricwxVfyxlu1iJQ55PiK5dB7fd31VApkXEoUziMvzZ2CyhpdsGrPgmyXSFAo/gvkLMxEaOzDaA+ZCb3Gpdi9B+vui4mwb74UxdTGHssJJ6AAGZTxBZU2aTBBH0btq17Hi/OkFErGaDzkvlpvPtl2nvXksG3QLzQvQPf3hlCK4ljJwouYNm6jxD4WcvE1NiiQE4g== 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=pU0OcvzR/Q86MgudJIiZUYS4RrHR3symfIAo+HDbWX0=; b=0dToy0Lybg9XMVMW2rPlV39/oZfJkdS94ctS09tNUp90dAcfFeoQYxILUKqmvZuB2UrYQSBBtp9b4RJupX1BUl1+QUj/bJ+1oisylPm8VerqqL6mv3L0w45jR43Wy3A9qxU6/f9w0CQiGGi65gqquRPwP8lHqi0OXt37DrXd0vM= Received: from DM6PR10CA0026.namprd10.prod.outlook.com (2603:10b6:5:60::39) by DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 10:23:03 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:5:60:cafe::58) by DM6PR10CA0026.outlook.office365.com (2603:10b6:5:60::39) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Mon, 17 Feb 2025 10:23: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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Mon, 17 Feb 2025 10:23:03 +0000 Received: from gomati.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; Mon, 17 Feb 2025 04:23:00 -0600 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v3 3/5] KVM: SVM: Add GUEST_TSC_FREQ MSR for Secure TSC enabled guests Date: Mon, 17 Feb 2025 15:52:35 +0530 Message-ID: <20250217102237.16434-4-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217102237.16434-1-nikunj@amd.com> References: <20250217102237.16434-1-nikunj@amd.com> Precedence: bulk X-Mailing-List: kvm@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: DS3PEPF000099E2:EE_|DS0PR12MB7726:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ab31a34-bbc7-4da4-d452-08dd4f3d0fdd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: GeTpM/0GVi6CtzP8batCopRlv5LXKjc5vYR7SZaSPQI1OdDeH1b/G50+S/1Aup6ShxQTAFkT+192MOLniMiFgTTqFlBQzPqfNnC/UByNlsdmCMAxIiRYu1Kv4y+ij/sAPZOGEr7JrDP+TtaWB4P6DdmkYJt5bWV5WeYjTswemJiDkLUM3vxlaimEWnAMgwj6nmevoQN22lXPN8+VBWQbdy4FpWw8mBcT38jezLMxHMVIATdEjrO2dYq2x9+MicKtwul/eCRxF69bbq1l0TuQZyyeZLB7zYg6aiBoDCxpeiDIIXeTLnJBoHTRkoT4mJHIbVC7t5SAJyVEDwy4JboTm1hKlTGX/LIsh/GaJCYP1FOWySM7Hc0Eh9gGRH4wZfZ2x2njs81sXswu4YFGu/A8vtwx7h/2rDLIQ0R39zuvbQD0QOBEnPJA+aJeXL4u6bh41nuwLWPSSYF3przWarb9NYJhgHE1H24DbekSU09w6LFcDT4npUu3EKmHlCqO3i+KnlCrFy0m81YOIGWDBQaULzMjaWrh/jb8CVi5XK1haJ3pOWqyGMxTGD12TIWqpsBiRQbTu77gjzGL6dQnpzQIMM0ePrACVawwyQRjyTGxZDPqpBlBzCPJRfkiZFVOz4QK8p1n5BXFrNieGbkzqP87T/pk7eTYz+QXTmmY6NqFDQ6UINh0S3HGOskZw+a0At+2QxyLhpvmcEJWuzkXKjax1CTvXLq8wvjLv0nkV4OpeIo/9VR+c4BH3gyRfRC991Xyn1w3rGcLH12KsV7xfTbx5j3jwa1V73xm2GDZ/A67LZhqfPaf3o3FYhinHDcvw6JybEAUcfSsLA2ipcI8BOEU2KmHXOjlJa2Pxb1ipQczsJqJB3zgnMZJTiCPpaRrxsTD3BehOCFaFxI6iAsr2VEF+HnmqCT6yeOH0fFltq7CM2fy71edSBUb4WYziQnI6rY0hC19SAv2ZvsqYiCp416tPslbPNi/j+obPHOXiJQFf9EuBOaecxn7BheFrwa28NmwII4QcufRh8Dy/4VarHYV3yC85LiOHuY0KK2tn2O91vD02/216jw2YSwpJQjjUHbmfUvZLPuYm5dxGwt6ryOjcBMN/qehBp2o/5eukO+VuNCRS+mNOo3f/L9E6YPDWB8eUrP/GSx4o7iIKLWlTtVzSDK9mqDflVXEG4oaDJGGIhVFT59WbhOvssnFdgSvg00LY01Ba74eFrY2Af3GlXY4R763b4ZhsDnpEOSH6wiNQEzHzmkT0TBgQLpR+n2pc32PJpbTcogk5XWvIKISdxnWMsyMiCWfxWkZkizjrS24m52IqJMwQ/fJ+VCYwbXwhLZfEXGaDqRR5rR/c6kXdDZjEHQAQ2Nj+Xkgt1R3umggRTuILokknElE9x0R6ukj4kPoAmJOKdliMz1PcSB/0/yhvxlq6xV+fpFBwVoTj98vk/am3zkPsaNq0DLxHW7wgRpuLWFXAScWXO01KHYPT5Gjz47YL3b24cyrTRjJWKKsbFM= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 10:23:03.3336 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ab31a34-bbc7-4da4-d452-08dd4f3d0fdd 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: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7726 Introduce the read-only MSR GUEST_TSC_FREQ (0xc0010134) that returns guest's effective frequency in MHZ when Secure TSC is enabled for SNP guests. Disable interception of this MSR when Secure TSC is enabled. Note that GUEST_TSC_FREQ MSR is accessible only to the guest and not from the hypervisor context. Signed-off-by: Nikunj A Dadhania --- arch/x86/include/asm/svm.h | 1 + arch/x86/kvm/svm/sev.c | 2 ++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 11 ++++++++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index e2fac21471f5..a04346068c60 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -289,6 +289,7 @@ static_assert((X2AVIC_MAX_PHYSICAL_ID & AVIC_PHYSICAL_MAX_INDEX_MASK) == X2AVIC_ #define SVM_SEV_FEAT_RESTRICTED_INJECTION BIT(3) #define SVM_SEV_FEAT_ALTERNATE_INJECTION BIT(4) #define SVM_SEV_FEAT_DEBUG_SWAP BIT(5) +#define SVM_SEV_FEAT_SECURE_TSC BIT(9) #define SVM_SEV_FEAT_INT_INJ_MODES \ (SVM_SEV_FEAT_RESTRICTED_INJECTION | \ diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 74525651770a..7875bb14a2b1 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -843,6 +843,8 @@ static int sev_es_sync_vmsa(struct vcpu_svm *svm) save->dr6 = svm->vcpu.arch.dr6; save->sev_features = sev->vmsa_features; + if (snp_secure_tsc_enabled(vcpu->kvm)) + set_msr_interception(&svm->vcpu, svm->msrpm, MSR_AMD64_GUEST_TSC_FREQ, 1, 1); /* * Skip FPU and AVX setup with KVM_SEV_ES_INIT to avoid diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index b8aa0f36850f..93cf508f983c 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -143,6 +143,7 @@ static const struct svm_direct_access_msrs { { .index = X2APIC_MSR(APIC_TMICT), .always = false }, { .index = X2APIC_MSR(APIC_TMCCT), .always = false }, { .index = X2APIC_MSR(APIC_TDCR), .always = false }, + { .index = MSR_AMD64_GUEST_TSC_FREQ, .always = false }, { .index = MSR_INVALID, .always = false }, }; diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 5b159f017055..7335af2ab1df 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -44,7 +44,7 @@ static inline struct page *__sme_pa_to_page(unsigned long pa) #define IOPM_SIZE PAGE_SIZE * 3 #define MSRPM_SIZE PAGE_SIZE * 2 -#define MAX_DIRECT_ACCESS_MSRS 48 +#define MAX_DIRECT_ACCESS_MSRS 49 #define MSRPM_OFFSETS 32 extern u32 msrpm_offsets[MSRPM_OFFSETS] __read_mostly; extern bool npt_enabled; @@ -377,10 +377,19 @@ static __always_inline bool sev_snp_guest(struct kvm *kvm) return (sev->vmsa_features & SVM_SEV_FEAT_SNP_ACTIVE) && !WARN_ON_ONCE(!sev_es_guest(kvm)); } + +static inline bool snp_secure_tsc_enabled(struct kvm *kvm) +{ + struct kvm_sev_info *sev = to_kvm_sev_info(kvm); + + return (sev->vmsa_features & SVM_SEV_FEAT_SECURE_TSC) && + !WARN_ON_ONCE(!sev_snp_guest(kvm)); +} #else #define sev_guest(kvm) false #define sev_es_guest(kvm) false #define sev_snp_guest(kvm) false +#define snp_secure_tsc_enabled(kvm) false #endif static inline bool ghcb_gpa_is_registered(struct vcpu_svm *svm, u64 val) From patchwork Mon Feb 17 10:22:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj A Dadhania X-Patchwork-Id: 13977510 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2043.outbound.protection.outlook.com [40.107.236.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 A79FB213224 for ; Mon, 17 Feb 2025 10:23:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787793; cv=fail; b=MPpyjW1QFE0FxqcanCNoeGmoyhwK+XJuDAwaUf/YoIlRbJCUmJdFQpgmAgPLQUSJTRXc0XIcUtGHkG2uRDnYuQxUqsSTG3UJtJ6izHGSh9iCGiofFAXa1g49nElcKiG+xK6v/7k755nw7HVNfMFdEj1KhvP7jeqZBLgMSlLpZRs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787793; c=relaxed/simple; bh=uDbx5XzUWyHj4AaucnZQxPsJw5BFbWLyAOkje9nYnbw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mdrFjayEbU8jXRTggIhuwX3OqmBF0/zGNacbhSzlZdzWFHhyWCzgjZpKhNEva0xJxncQx9xajMkV1ndD9FdWjr5WGgEaZZVBe3vjlvWHscAhvPVq8T5SIM2uD9ZDJaZvKY2vizcumQW+qYrv2Rxw2S9JC8yEwbHCApHVO+NYxtE= 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=DZRPaElm; arc=fail smtp.client-ip=40.107.236.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="DZRPaElm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R0o3lMWNrYmPlNQlU7hCyz0hO4whdFXm1gfIKBp4rHIyP8q6pJCg1vJWyqIdic+O2gefv4UM6nsUV71C9QhZSox587g6fd+06lcN0bp9X8A8bhHbmT8jRPal9fcum7eZgxmUW0Sid3MxL7u7awqv/kCK2ZBJPU+/LYCQpZv/FpMhkd7SrpENbt9nbJtEOjXZO3pXTu6M4z4senLlfXvA/5ouMbTT+aPgXVtvhjApkL6JYIkkVCCtVdtv4Mo3MhZTaHGRLbzKwVYtHVNMfatS5oe003aoAbRm8P/LeDdBbtzJAieSI/B47T4Vg8yZqdyEm9INQUByS1Hrht1zvYbPWw== 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=/v+cTVTV9dehohiPGCxufORnYwzwF5WQo5ZtzGPuA7s=; b=JzWvCwAbM/gVjrvf+bsPfpPk7qju8b/sfIHU3oq9xTs9UwGl7/DuTZ476gSwDqgYkPNMZ8JX2B7Jly235ZApwG9JXy7j72CRHItIZ0gAsMjeCkCHB77kNFJMskNfGvAnknyk7m2MbOTGBwd6OIzMWK5USqDHIgCL2MnSYCZTwDQgYtEV3Kt7tJlzER8WH61oxLG5gwxO64qQOegs/kPKhht37u14P8zqFp0K8Wxnu6VE2oPMXTH6EJOUzKa94TJ92QFyY5JSEgl9GVxjIuM+04HlOtzShnRPVD7klwkWOsazBOkK+zjzZzGxW20G83JxtyTMM+d+bn6s/mO6Z+dTKA== 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=/v+cTVTV9dehohiPGCxufORnYwzwF5WQo5ZtzGPuA7s=; b=DZRPaElmMce9xUSMW4BognlPkIWSzVp1TwuaWkWeHP4APt0vz1ePjd8wUkIMAB7qJl6Hqt7hNM7d5pO5Ew6YaJ6YLixu9wtCGtkiwjhbharcwIDt3LwKaBRssY4+EsXDlOo8wxvVn9sUoagExXti9E02LZM2hKdT+VIuG/Yt5Ws= Received: from DS7P220CA0019.NAMP220.PROD.OUTLOOK.COM (2603:10b6:8:223::14) by CH2PR12MB4232.namprd12.prod.outlook.com (2603:10b6:610:a4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 10:23:06 +0000 Received: from DS3PEPF000099E0.namprd04.prod.outlook.com (2603:10b6:8:223:cafe::5) by DS7P220CA0019.outlook.office365.com (2603:10b6:8:223::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Mon, 17 Feb 2025 10:23:06 +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 DS3PEPF000099E0.mail.protection.outlook.com (10.167.17.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Mon, 17 Feb 2025 10:23:06 +0000 Received: from gomati.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; Mon, 17 Feb 2025 04:23:02 -0600 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v3 4/5] KVM: SVM: Prevent writes to TSC MSR when Secure TSC is enabled Date: Mon, 17 Feb 2025 15:52:36 +0530 Message-ID: <20250217102237.16434-5-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217102237.16434-1-nikunj@amd.com> References: <20250217102237.16434-1-nikunj@amd.com> Precedence: bulk X-Mailing-List: kvm@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: DS3PEPF000099E0:EE_|CH2PR12MB4232:EE_ X-MS-Office365-Filtering-Correlation-Id: 9150d299-82aa-4c5c-bd07-08dd4f3d11a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: z/CdTxaQW6EF0aTAE3SacNWFXC4oUszw60pclwbD/r1xOmjSHX0+alVYgM3SIw01ZjaTX+8S+q3nVb2QZBqPSZFhU89ISPU8f20tmrM3+kXWXnXreQDEo/mRTLAsXszMYX8OE4cPgUWpf2DmdHqgVo2IY8lB7LJwsQ3f/yC3cOw55y7pXraFRKh1HPjC4X8zqTuAjZNiHmg9j0FNN4vNg3E+mfxSWnP6WplWDZ+6ukBM6FuD0Sl7+TtEP4F0xPHRD2jFbS6UkPsXpueLbc0fd6EsAh+3610dBu7VkMw0dd6JUTSagq89ePOSYmg8WRLpcgBSyMo/OE8REldjoe5DKaW7+5o+2sWDxZTeODkey57eUIuPb0m01lkQZKTd6gfXC00HJKJ5jS4Bl6lWeaCYL3knzVtIY2chGPLQUs7TX+V5uEc3m/gFdByIpjFbROoUaWjcHomdSrmL2lGtJ+/5RBhirVkShgirJK7Qx2MX4RN4yyyiuMeCM/KYSvU8H5SCuQK/CxmvW/MrWGKzqubg+/3JIcWMb3gRw9AsGTJJm4daUJsjYn/3f95IbB0gcvfgJOSEeBC/ajvn6Rdxv53Gtdi4MewYvfvObr9VMlLslLMmFRx/+OX6jqgk+0yvU330m9azCrWboYm7FFoxWE8dLMa0o4XFVfNnvuomPWBmCnsHITl/lXPCwTERryxwr8v4bnilKaJZIkDCesuZdNRKfVBVCPVXJN1FhAjQD/7yvgGkfZyQQJuXlA1haD9UhocVR0ZLwCMAZjMq0EFrV7EfW94PBZ/13RTgJ5d6CP2E/d4G4jjg4IaGKtjcHZWASvryLG8RuNYyCszt7hmM5AI/5emSSBzuCrhrfFRqjsFf3whe0U6eBYszCYhUV+KpwzSLxMvlZrsMOyW7JQ3A2se7LpgLaRWv6iNsfDt85/sP6p8bwLpZZawdU/UknygsjkLFhcSntl6U/YKIhIKkUryilU5fvIqGnnShjGZUVyfgPfVXK2uPqM2vu6l+LAS3QGLMTMbTl/CK1vFXiK0R0BWWxutfHHspXuTZYR+1i78SNIUEkgNIREFlgK7kj8kSVy2fBr/Ezw7gXp22JmUwfSU83EmaEiti42DIRAiast3DhbWArXOsI8tpi2wdhYDv56IdL7kCNujgteIYtcwnxeKvk+elswLWFAZfQwYsaK93OyzWTdyMLcvGauIvrCPf/QvEqcF41FiDUTRsAHfEp8aMdwy/1M1oZk6jnM4J9HIpR0fBLCQ8o7XwCdkF+kmv5r9FzIHON4dPjqPJ9FU8ZYEkuq1gFwoKRVO0rsvdXVdeJeILVTAJIxrw7yrGCFf83ABlPSh0ZyOUNKTUu+6cCVXil13N44SkfERrSrSLz4OPQcbFnJAssyRdCJJF/vgQNYgnhC0iER/QvKhWpPM2j+iyTFlfHGrB/NE8FV7jJT194QmMDtjLXkypmxSfULK4L7x/GT+GXvje/IPwRGIN3SHtDcnCNzJ4SNfTZOoGPMUblnQ= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 10:23:06.3255 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9150d299-82aa-4c5c-bd07-08dd4f3d11a8 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: DS3PEPF000099E0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4232 Disallow writes to MSR_IA32_TSC for Secure TSC enabled SNP guests. Even if KVM attempts to emulate such writes, TSC calculation will ignore the TSC_SCALE and TSC_OFFSET present in the VMCB. Instead, it will use GUEST_TSC_SCALE and GUEST_TSC_OFFSET stored in the VMSA. Additionally, incorporate a check for protected guest state to allow the VMM to initialize the TSC MSR. Signed-off-by: Nikunj A Dadhania --- arch/x86/kvm/svm/svm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 93cf508f983c..7463466f5126 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3161,6 +3161,20 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) svm->tsc_aux = data; break; + case MSR_IA32_TSC: + /* + * If Secure TSC is enabled, do not emulate TSC write as TSC calculation + * ignores the TSC_OFFSET and TSC_SCALE control fields, record the error + * and return a #GP. Allow the TSC to be initialized until the guest state + * is protected to prevent unexpected VMM errors. + */ + if (vcpu->arch.guest_state_protected && snp_secure_tsc_enabled(vcpu->kvm)) { + vcpu_unimpl(vcpu, "unimplemented IA32_TSC for secure tsc\n"); + return 1; + } + + ret = kvm_set_msr_common(vcpu, msr); + break; case MSR_IA32_DEBUGCTLMSR: if (!lbrv) { kvm_pr_unimpl_wrmsr(vcpu, ecx, data); From patchwork Mon Feb 17 10:22:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj A Dadhania X-Patchwork-Id: 13977511 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2086.outbound.protection.outlook.com [40.107.237.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 D01C4216613 for ; Mon, 17 Feb 2025 10:23:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.86 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787795; cv=fail; b=CyMgxtxmOpgHr+ut8U19p0SlyVso8JdFzadpguUb32Wqjs/LznrtwF59VCY+8GQWJfTmYyurPF9fthLeCUSPRjsFcJg3tid7qNwQI2wzLIbjtnCCBfjB+5dDGe7lZnX6ka16yDkYJ2srduophREiDQvcoYff7Y6skiPhddhwU/g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787795; c=relaxed/simple; bh=QG5zevDIhwe4+0Id/B3NSRHaTwQAqL2R9qfa4MDxlGg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hTA6Kbw8uLH1oHabD4qI4YfqwFdYwloUz7bs79YszQxd33g4wtFB4DXH2FV5EkPybehUr8EX3upjA/xZZx1OMREZj09R1OaFO0/V9iDfy5XtWey3LLw8wfzPsAg1ZsJyATEPNHpVq2RSFrruAFUa67c/+w/MV1eSNhkP24FPj90= 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=a2yegLcv; arc=fail smtp.client-ip=40.107.237.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="a2yegLcv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=F8fiMueK3c9NQ5lwqigR/MZ4ywYprttVYkqm2hWPvpPAyUXISsw85U3RREyVvqfrEfPaCdle7YRwCT7VgojJprvi05KhdurQzIhTOYTGuOKUukphy7hIqTJRNL8DharbgNsn4nCkMch0ZgG76waqoyTK6ermJEC+44BeLz1vDJRVKv92Tuvq4yW7H4A5fS6/1KsnEbSvtjlWLOzQXefK/qo9fat4FQU2z+GKpfxH6dDCFCYLqYiHXiVSA9Ia6Zq2Vl9QlL79qk7Fjl66xu1smSY84weM1fTa8JNcGiWTRNaCpbgG8zSbnQoYZZJ4OJ6YX95mOjFEHFPmJU+6u1sS9g== 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=oEO1mg1bJN2w/hQQzqBbQjERuWM8ythJbGKngoG25QE=; b=rpFWkdDfVQ5Mk0LQ2ql9RuD37UGsgulGCGLr5MtUCKtVCH9gYcAqgW/XL4zPtVzF/x93OewK7W0lOCv0XxZq9Ogn8gyaRpGcZvTk132i32wINyHoX2gY3w9OVnsiAnWU5XOBHXkwztxqmrmDjc2QrUsvCiqycf41p1w18fDGQ9zgGWqjso9iBdVo8cNcNXoway0hCE82LXrO0WBYNInwtB5TebMW7qlQz35qsbDpC0Zz0h/rgkOugMO02g8jqblotcRg9FLXXPgZtgA1FEvkaJiRZo9jxygRRUsUoGhm59wSJc0tVr4Di1PB7kzNWVd1WHW1BnDZW6YwoVa6HC+ncw== 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=oEO1mg1bJN2w/hQQzqBbQjERuWM8ythJbGKngoG25QE=; b=a2yegLcvetkIhSBdRuMFAW5Gr9P8g1F4d19EauOlVrU4ON3gczMZS6pEx28i4Y5mfSZHXxM4b4bGmMsk570uuvya5OqgcNZixn1AsB779RXRnZcQOdhXBoNixlykfwmSydYAFSZIWu2rHbeMa8AP2er4QWm4H0D9wzCV/zds4fw= Received: from DM6PR02CA0058.namprd02.prod.outlook.com (2603:10b6:5:177::35) by CY8PR12MB8314.namprd12.prod.outlook.com (2603:10b6:930:7b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Mon, 17 Feb 2025 10:23:09 +0000 Received: from DS3PEPF000099DE.namprd04.prod.outlook.com (2603:10b6:5:177:cafe::27) by DM6PR02CA0058.outlook.office365.com (2603:10b6:5:177::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Mon, 17 Feb 2025 10:23: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 DS3PEPF000099DE.mail.protection.outlook.com (10.167.17.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8466.11 via Frontend Transport; Mon, 17 Feb 2025 10:23:09 +0000 Received: from gomati.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; Mon, 17 Feb 2025 04:23:05 -0600 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v3 5/5] KVM: SVM: Enable Secure TSC for SNP guests Date: Mon, 17 Feb 2025 15:52:37 +0530 Message-ID: <20250217102237.16434-6-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217102237.16434-1-nikunj@amd.com> References: <20250217102237.16434-1-nikunj@amd.com> Precedence: bulk X-Mailing-List: kvm@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: DS3PEPF000099DE:EE_|CY8PR12MB8314:EE_ X-MS-Office365-Filtering-Correlation-Id: 8637a658-79f9-41c3-86fe-08dd4f3d136a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: Y/mBzlZXpbuY/dZiKCMgB3o0YTtst+PzXRksGM7JusICKxgyqGFKuHtl1spg7skx66hfXqEznKFpAkYSBST5IY9PKT46mOlKxJCJGm3jlX/xuDyXrOYFaGrpD1OoSJZ6V/+2oWDfLGtJ9159OzGdVSP9DNmt/zGGe+Iu7v5mLRJxU1WJJpIvVxGo7pifjd2ymNSyg722U2J4eP6nd+oelBfoQutbwhlkH9RpACDxnISpQX6FWt4IwVrphdJAeA9uBdqduvIC0t0vUFIgwTxVJWeIj1PYd357rFhDLopeCN8n0yLnmpe05yR7mqNNUbHY3L9M7Ho6bvO9v5NqJlHuPnAdVdRv+sutH5tbZUluYsLvcDE53NAM7vLus4D7oK1c0AdgkV9PXbXcq+qYlGFQjcNumlq+8Ej9snUYbxkTKSA49aXp5suxUBf+CcpVVys13U/RM86YregqoCsU6xYk+fmG6tiqZmeRFCrqEYLyPiO8mCqyx1j8W+JxiolH2Lgs/tl+x28DLamf9SSJkXV/Ff9WRaqNxWEWG7ZixDekphPMZCZyzDvqk9q3uEp4ohJ/xCqPej1z6uMDeZ2bhlxspyBhFCs9KjipsjJGJun7v7UoW5oV7CN/RpWIkGVRrnosbfgcsXp4N+y8lidNUIsSc6PLz7r6E3nu3/Yi5bAVq47VH+sxHyd4duhaCl4zguJdog3BQzv7j4emL+SZ9QnBppngaunbYt2TUKsaWdsDjbFZ0zQthCdZYFw1ICbAKqb/97uyDim5QEJDHarDXDwPrbtT/ULbs0cQdQe0ra43v3tmLll0adlM0btiu3mnxdIa04BpIhlClgWb8INymE+FX3O1F/NPqNFq/R6tU9L0yRpIkzGy8ujmvLsjFO5W3PwPmGPscUYS0dcx3b8L9h5rwM6nJMCMHu+KTKjACeo2m980T0up+vBKr7+gc/013MRurJHbYgyZ3eZWhQ4qUBW8t2vcb4f+viz9ZTzFnfIheTBupAmgmrPhfdA/XqxZFWPf/Efeg90YLxz2gTBFvtMbvXODfK7dCIlPi0v0An2vh+cK+41iN2ImxArAaqw+7tLTLMPAE+JFiq3/7AYZGFXLCd0+ZK+FY25B8CnWtQ8Xiah14Iv1YZj5aXfAG/NAerQ676OmXarFbU1CxaY/FzUuooB+/RkN2yISWPBPBayprI4ykT2ELMuWJDt3cKqrIS/eHZrJ8fdFMJFqkRUsdztip0XhoHMi+8LD56t0SDbZ7MDSj6vWsHOBQJaUFuUpecHDuwQqM92WYU9ZqkeQB2858K1wVHqnaszUfXU5FHuol1b5OgMKWik99j7PgPXsMnygB672UWOPgrmTnTIxdjc3I4cM98AQnK3XL68Jkg/OLg9kwto0aVvYhCHNniLHY3dBy96Z+akbKrTjOefMbyygu9hkNWzvLs6wWlncoULcH9B+/Dkpbh3ZpoHyYTqUfGQhiPD46QNS0UHgDXQKj8yI+8Qo/D1whD82QAuNKjadWR4= 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)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 10:23:09.2732 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8637a658-79f9-41c3-86fe-08dd4f3d136a 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: DS3PEPF000099DE.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8314 From: Ketan Chaturvedi Add support for Secure TSC, allowing userspace to configure the Secure TSC feature for SNP guests. Use the SNP specification's desired TSC frequency parameter during the SNP_LAUNCH_START command to set the mean TSC frequency in KHz for Secure TSC enabled guests. If the frequency is not specified by the VMM, default to tsc_khz. Signed-off-by: Ketan Chaturvedi Co-developed-by: Nikunj A Dadhania Signed-off-by: Nikunj A Dadhania --- arch/x86/include/uapi/asm/kvm.h | 3 ++- arch/x86/kvm/svm/sev.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h index 9e75da97bce0..87ed9f77314d 100644 --- a/arch/x86/include/uapi/asm/kvm.h +++ b/arch/x86/include/uapi/asm/kvm.h @@ -836,7 +836,8 @@ struct kvm_sev_snp_launch_start { __u64 policy; __u8 gosvw[16]; __u16 flags; - __u8 pad0[6]; + __u8 pad0[2]; + __u32 desired_tsc_khz; __u64 pad1[4]; }; diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 7875bb14a2b1..0b2112360844 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2207,6 +2207,20 @@ static int snp_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp) start.gctx_paddr = __psp_pa(sev->snp_context); start.policy = params.policy; + + if (snp_secure_tsc_enabled(kvm)) { + u32 user_tsc_khz = params.desired_tsc_khz; + + /* Use tsc_khz if the VMM has not provided the TSC frequency */ + if (!user_tsc_khz) + user_tsc_khz = tsc_khz; + + start.desired_tsc_khz = user_tsc_khz; + + /* Set the arch default TSC for the VM*/ + kvm->arch.default_tsc_khz = user_tsc_khz; + } + memcpy(start.gosvw, params.gosvw, sizeof(params.gosvw)); rc = __sev_issue_cmd(argp->sev_fd, SEV_CMD_SNP_LAUNCH_START, &start, &argp->error); if (rc) { @@ -2929,6 +2943,9 @@ void __init sev_set_cpu_caps(void) if (sev_snp_enabled) { kvm_cpu_cap_set(X86_FEATURE_SEV_SNP); kvm_caps.supported_vm_types |= BIT(KVM_X86_SNP_VM); + + if (cpu_feature_enabled(X86_FEATURE_SNP_SECURE_TSC)) + kvm_cpu_cap_set(X86_FEATURE_SNP_SECURE_TSC); } } @@ -3061,6 +3078,9 @@ void __init sev_hardware_setup(void) sev_supported_vmsa_features = 0; if (sev_es_debug_swap_enabled) sev_supported_vmsa_features |= SVM_SEV_FEAT_DEBUG_SWAP; + + if (sev_snp_enabled && cpu_feature_enabled(X86_FEATURE_SNP_SECURE_TSC)) + sev_supported_vmsa_features |= SVM_SEV_FEAT_SECURE_TSC; } void sev_hardware_unsetup(void)