From patchwork Mon Mar 10 06:43:47 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: 14009299 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2081.outbound.protection.outlook.com [40.107.94.81]) (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 012FE13A3ED for ; Mon, 10 Mar 2025 06:44:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589053; cv=fail; b=CrSd5sA0ppdOthdWjAPuumlQYyJHm+UGQz8K0Pg0O5t+jysQoOtpZpL2rPBcwQZY1KzccraSBauDy6qxyhDaElI/7tE1WZxw5m35wIT8ar1pw7BkTncgS1SjQ+ATsQPUTVMgbXzKbACCgWry2aLL/S5/sG7PxuSeOSXzGP+o+I0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589053; c=relaxed/simple; bh=FxucCd6D/D/SrCVdpmvabJ2BYuE9w9loDgYd5jM+D88=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OmcTQfvODpvQ8LxwLMiNvD4ax8jiDHTp606bF79myy7mLbHxz/2BG3n4hFHdPVHj/AVhK/MpVZskfYX8qKhgAbqfyLoPQI0IZgBzzGOG1Hp+yrYBVT2pLttBRhOB78xK/G1YpOT1aurpc8cYU+NnxTuKfbGhbym2sVAhR3RIArM= 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=fT/BzMMR; arc=fail smtp.client-ip=40.107.94.81 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="fT/BzMMR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JFU1RN9EKU3nS+H0kIb4mFHD8NhHQwjG/onwX8tvvS9e1qMJzwbVpUsm+6iabGPiE8VKEOySvEuJx7F8eZlUUsOgKAH7R2ljWIwf11/V5tPlPg9wP9eJWdfG3++0++2LEib2dGHNp6GJ0Z/kKJ5QTAbCJMVg+M/ekNYDzlER6mFNWuoBnpXTbHlNY1zO3Ldf/XQTpTlF+u4b1XgWs9Ltb2iF8ZKHjVcErLAOfSkCyUBVFz8r16rb77r9cuWnfzaMQPE7qxkmZzM9I6MYsCOCzLfDANkK9jCay91ugGTtNYMRJH5Vd0Cddc7kYed3n3g5w6cYne7iDh/iMU+tvWBoMQ== 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=rI4speJcl2fP4AKM3hJBsQsZcZxC4vb+Ho0l2dvzN2Y=; b=dFjQ1ilhDs8q1H0ZpqjPEO2+zZNrmqUAmXE3lo2RgA0J1RMyQPOCJYVuvlH1smb706xsSta0frWO6RWIyRZ2xAFFZ5s4dZ28bfqZGNmZLoUlPQ54arXPlgH16MGKGFsGEcsQ3AmKKRxZTWViNwuELUSfFewm2G1hNwzWGFPq3n8P74Bks+s407Qy2H5ICjErBhNFd4JwSaS7e6tKjsLAAaJxg8iNan3UBZo9Ne8BTdGk8nKEYbo2TLOyeZtwGb/J6Tv0lbr64NnrP9Dmm+Wf6Bq8zOr8o2UbNtiwNJMNuiVFF3uCqk4zMcBW7xCprBgwBgvjYtVDk147DI+/RHxbUA== 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=rI4speJcl2fP4AKM3hJBsQsZcZxC4vb+Ho0l2dvzN2Y=; b=fT/BzMMRNTO6lzRORraHeGzcDcIrZlj3RF7YfccD+tbIMtq+doSJhyzWElTSfLStgKJxU7avjI29drOk5YrJvHwSe8xpGHpwaa7x49Du9pgDmQ9IKmssspLhVTpst6iIR/d5ENTaFiDA9pZEL0mGcOfSGbuuVcn/kP4NmdhwQX0= Received: from BL6PEPF00013E08.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1001:0:5) by CH3PR12MB9196.namprd12.prod.outlook.com (2603:10b6:610:197::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.26; Mon, 10 Mar 2025 06:44:07 +0000 Received: from BN2PEPF00004FBE.namprd04.prod.outlook.com (2a01:111:f403:f909::) by BL6PEPF00013E08.outlook.office365.com (2603:1036:903:4::4) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Mon, 10 Mar 2025 06:44: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 BN2PEPF00004FBE.mail.protection.outlook.com (10.167.243.184) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Mon, 10 Mar 2025 06:44: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, 10 Mar 2025 01:44:00 -0500 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v4 1/5] x86/cpufeatures: Add SNP Secure TSC Date: Mon, 10 Mar 2025 12:13:47 +0530 Message-ID: <20250310064347.13986-1-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250310063938.13790-1-nikunj@amd.com> References: <20250310063938.13790-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: BN2PEPF00004FBE:EE_|CH3PR12MB9196:EE_ X-MS-Office365-Filtering-Correlation-Id: 735c46d9-31a0-4b90-cce0-08dd5f9ef488 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: LG+8mLYZLZfYjji9NE0VaIXvVq0eVDudqzyj669xzxsT9pMqtsPOfgc2Uqi0WtPUYcFRrKgIANCQVIcC2juUxVwZYWw4udDB7oWHGJqyLmhheB9xMOQnUp2QCedtewSSHA09Nz+CYiBpfn+c1SmxC0tBxRffB5aET0kpaJchfms5J11TJlh0r3x1STDux+F5dDv9XJ/b9QQVGIoHHJGlmkxQTILpZtU7yYOvAXgXSbLXZlXj0Ja/sbdBsRV+9QxuiC3u3LHXkEqHyd9RAxdRGqL48RKRH5Ak+YHEVSJCajKUJ8V5u0qvSk3emy7MhUkZ2L4Hdu5c/VrruEelU2jr3PqAK0b8lD+xmVhUjWlAiuoL4GO3lDl3ebdvma52Y6koUaV+83u20UKsaSytnJjhdvIvCXIFqNNZ4yK2fmzMgNtfUDCa4nNTuP2cIRAOR3zMSrDDDQpqGwq4n5Nb7LjtrCVtK3qpIfWlDudy993SlbALiTXsN5ViXYKj/3+rBCNIesBJEW3gMzsPedl40RMzHpTUWy7NcZgjDyvSw05iWkfd/bNtwBCOtItL+SC7hUwEeDXS//4OoD/5Rgl40KfkBZvA1VhtSP5gbd7VlERmwOeRdeFolJ0Q/GmpsSUL980ycx7BazQWtKiT3aGLXAkGFGto/LxbQHx3ArMAV0rJcQKYU5fzwkbyXfWgxzYxF0uOF1xbkRqMCtkwnicie5qbtZrZ01E2nBn3r0BluTmnXf+bnSFbUZxxrCZRAx9ALNznoTda6QlNtLppUIJsAbk8pVXk57RSef5QTKEvHaYvS9ZWrgNdX/KNTvrl01y9Vyitaiabyo3sd95J1z4W1TDoil4qC3b28aTAnGJUb8VoV7d8xhkOCBBMwmgwg0MyIsraZLIppfonJyeYuGDDmj1GXqxgnLW6NSA7Yg4BcZ55gP9uC5v91xthf8ml3keu8Xj++sp5T4z9B4HYwsoiBiXc+Xr4hc4lZb9aTRzCxq2JNOFuSnOKcoK5FmV0RQ8hH8uuGG/NGwaXeZsi0aFcx+kEGMNB9vQOw4OzFA7MlYF8pPa0Q3JBe/urXkdrJOtzXl1pyyfvY3GVPoBDfrQi0OrGc6fwMYkr8O1NjAspfWOgcGmHiPFmr2H65DCEZEk91FqKUmgAwzma0bmKGUspXalM87fNfyzFEi/BI8/bDbovnovvbpJ3p1x1M2ESAVlSCdSuHRXCInhnBRXv+3T98rqLB7sFP2DvKnbUGARV5Assys8DpBEf03Ih0VYUWGONzzqC7KNMCDcXyGF9RHHUMkc9h21o6UL8c89c5UdXPAysUuzxckDV0WXKuufxzfvRN6IcAIpDZCbRpAQQnzdnHpOdtGPaXAHqvDILI0NAc4qMLyD8MZL8+40alyutcyWPhUshpZVyUwSPVE8k/Qmvdyiuiy6uTrkXNV+JBgsE122RRfMWWzKvsaepPRclCc1ZxHACxItSrfnodtSJVSsd1r+ZSZwB686coZE+i/dBppe9Dd4= 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)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 06:44:06.8087 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 735c46d9-31a0-4b90-cce0-08dd5f9ef488 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: BN2PEPF00004FBE.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9196 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 8f8aaf94dc00..68a4d6b4cc11 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -449,6 +449,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 Mar 10 06:45:19 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: 14009300 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2049.outbound.protection.outlook.com [40.107.236.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6EE8D29D0B for ; Mon, 10 Mar 2025 06:45:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589147; cv=fail; b=WMuxBkkKipexsItfWn6LGgMx+EvCe8DiMP8zXEXKI7/pXrheQMG1xAJ9y8SqTvPxwcj7kHhKAhUjrMviiLoXuMHpsuCN6/KYKc30lBxjhleXIGxR3lhuBkgPqyRwHxGPTxPEPrj8my+Ka6GjPi8g80Ktwe7jOD6sGxNoHUq5kd8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589147; c=relaxed/simple; bh=vvE5gSAnQ5lEWmW82n1vxVhsy9iq3iOzthiRDEpdghY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WU4iTsi91J+vMSJoLyCnLIGoZ1gX5bEdHenupuTsnLxjVjJ/AFJecNljpGUQ58WpEYLQIy65CmrnXzXRiI128Y5Nh4kDx3gD6IScA0nig7Qoxnp/QFhP2md8eUDVXie9Tmuxc9RsVmYBk1eCbjXmqtTHjqPlbn5lUSPhMaU0tFU= 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=go2Z0L/M; arc=fail smtp.client-ip=40.107.236.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="go2Z0L/M" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YP6sD0MCLU70AF0KgySIO0r3gvWaBy0Zm/jHKeDY+rfWhND9qJeAvG8J5bnKQdLouqVbffM8gZjFRcTIKqhNpJYU6PCI0/iX+3LyAYZkgnZR+9g1bMjPrTaWcCTa0AOmJ/4/s6WassulA7eFkhn8dAk7Xm2sSis6kRc8Br9eDQn70jEL/9cQ2TMcclKv50I0iY2PDqZLQ19s1jMesbaLtmDyq4M88EN7nuI/X+LC2AnGqd8MZiNbL8Y382bhkWeeajOgOZWo6mHyr7uLwjaj3igfef8tsmY/S4ncLNruPemuI1WHsRO+HU277XreVXX515cEBAqw5yhF3X3cDad5eA== 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=p8dzdjTcME5sIpYgG3KHz5BrENh5we87r775lbOIz6Y=; b=E/01ih4KAcH8bn5fImgt8VlVHGTRoat5hWgeLSCgbFIo3PcRX2S+V31NUXOpTGE7Mz43Kqbjq4HExBosOjYk8q3gUkV00JkeUgi6TxzHlAP+caB8MLoEkb9zlAtycE+wt4kWJbBYLXv7+2R/dREfXBxs0usH9OMONhev7QgFHQu0Vru/G5ocw1P7cCUiW74dh6MEzE/dS4AQ89zAjDO18dEnNxb+bfcCcM8SO0r9NhLtAtc/yd0XBN58+nJAr5O7eBVo+noOFuCgsaTnqKimICQqThHeVp9T5lI0M6yQ2lR99nhw/yd2haLNWp3z5NSA+xqYvx2iS+I743WLvTmppw== 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=p8dzdjTcME5sIpYgG3KHz5BrENh5we87r775lbOIz6Y=; b=go2Z0L/Mcj23PSAa/vN0gWYqvKYJg6bFSDwlZ1m/Wd08iy2hJMrenBFm+Vs6HjBPnWCSoZXitU7xmtnEEbrgjGajXpUn2BkzYcmBICfurnIlJ1YfKrsfB3e00U0Mr7BkYLCEG0yTgMTpOWqb6Q8z63dFSSkPgnzPPAwu3/Lxrkw= Received: from BN1PR10CA0020.namprd10.prod.outlook.com (2603:10b6:408:e0::25) by DS0PR12MB7558.namprd12.prod.outlook.com (2603:10b6:8:133::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.26; Mon, 10 Mar 2025 06:45:42 +0000 Received: from BN2PEPF00004FBC.namprd04.prod.outlook.com (2603:10b6:408:e0::4) by BN1PR10CA0020.outlook.office365.com (2603:10b6:408:e0::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Mon, 10 Mar 2025 06:45:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN2PEPF00004FBC.mail.protection.outlook.com (10.167.243.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Mon, 10 Mar 2025 06:45:41 +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, 10 Mar 2025 01:45:38 -0500 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v4 2/5] KVM: SVM: Add missing member in SNP_LAUNCH_START command structure Date: Mon, 10 Mar 2025 12:15:19 +0530 Message-ID: <20250310064522.14100-1-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250310063938.13790-1-nikunj@amd.com> References: <20250310063938.13790-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: BN2PEPF00004FBC:EE_|DS0PR12MB7558:EE_ X-MS-Office365-Filtering-Correlation-Id: d6d54084-25a0-45b9-a336-08dd5f9f2d1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: LTfsVNlnpe7tSYHCKFkLpO11r0hKUe/sUEtjcUKPVQE+Or0Zs9xQmgiBEdldxfIpZwm6im8YNCZE3l8UW2v47UXTDi2CrnEBHBY3Y/jz3g9z1SjbvCEozUNxKAoyAQ2KBs3ueB2mz8XvKeuWg5v4a+MAgS2h0R1vD8VXEtX9+dUCM2GWBUmmLuC0l3C4+1LAPs+6Tl7xj+ee7XPhihGgPO9vDmMDajagkgznMGLUW56/nQ2x+6A0X5pU95/UgFSK7CIxW3DWL33bZUfQaUKpitoCz4zgC6PqnAN8oSh9N2a5wrekOr3i9+Zs2xQEBS7FtO6crdAt37TsyBT04T3LQMGZBVdaWaWcVhd/9HiNU7D1re761bdNGOa7Yc70+7vdgyD3h6fWbJ2hj66X9QrG7IMYnDWlbZWM1ZZw4uepVtaBRlYf3dyY5xT27yO2bdEQHT8CIdjcPnl+3XuWkz0k09+veshXL8CdD1oEvMP9GzyG/ZXYd3+G4T49qJ+YvQ0MNdgjH6EFiVZfIYYS75wQaA1NFdab1kayfO+w6OehRMCSzeW6OD8VstYiSmc63e8wDljnHnKsorZeA/lhrLKRyssqZ01EOgMferqHq/CYHAShl00l66HWm5PqYpiwMWDZqmQ5iChuPkzRGIRokh8aAdQfWcyfFEyTd+6R5r6lPug3HvuZXp/+X7l7gprm8ccWXc5d1p+b0AWAGnwcLSIvaHOQYBIymGuccyt+YFMw1K9dInUI0pXNYw/fWm71zVM7jPrSfeKNIKGrbvy/fP4hN6V8nGVgKpmghj4bjebnYLTGI+Ii4i4NQfzOZAtMyNs1zxAYy3F/KrJBI12O+zpi3aG/6/16bAilfnLQFwRFY9eWhfpkUB6DcOCPIPZ6C3RJxi3LGCOT91P/QKWro8gC2FLHq3W12S4z7EusQ2Ooj9kbMeVfFqMkJknVSOqWcJhFyHojXbDileViSQFg7NHeWm9FXc7H5r5BfJPw7oxFoh1zhnth7DiBG9Hlodlmnwb216azx+k8A2FWJ9KVuie21zKBIOpmTCu11z+XtnwBqPd2j86HRII/ioAOxsDnOSbEIBIbxyEXIimoT/NVv1m5svWWw+T0bgQtV/Q/+GLm5cg/wqnBBG718fE/3LEDvaPhDa0wnnIGRbvZCZb7A0U4BzRzDKHeGEIGh9MBbgVsWu0LIcP6zOsEeunayyYGXAUNWyuLKnftwQ7r8NPMXTqYOVwwSUTmEVTIEEI6Nfvga9TJtlh/BbhNgkn69TktpJx4RfHtNgoxTSIhPWD1yyBsK6yhgZnBppoVPNTCY9eYc7uwwa1kOl6oykuZMZksajzJQpzGM1rFB4De8bCeHZJ1NMIbWJLC141y8nEYby7hvFSQF+/AsfhypUWTSb1GE5wjBqRVuTF2j0NbGlE8ObF/2/MsYaAXS/IT5jxclrDGTJRhSqjzHNvov81Csy1hj1rOQOm3yrt5CXSdgqGAhNjfCJDQGUSnzgXy9+xYfGDa/PU= 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)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 06:45:41.7234 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6d54084-25a0-45b9-a336-08dd5f9f2d1b 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: BN2PEPF00004FBC.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7558 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 Mar 10 06:45:20 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: 14009301 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2071.outbound.protection.outlook.com [40.107.220.71]) (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 DFB5A29D0B for ; Mon, 10 Mar 2025 06:45:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589150; cv=fail; b=QeAXzpTMHp8gIV2Q/cYDGvMKOg9CRpSNODCdSSx3TESSSJ93auChIpmsaHBIybrQll4UkYzl2ycXhX+IVLJXWmBV5O4m7MZWFcxex7iPchCzhzkIks99UFEeNnHCmJ9iWHJHph/As6vVGeBFHkwPC5fbqOgUbZzJ2b3mnKyeSXc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589150; c=relaxed/simple; bh=hxmTJ/e0sDCF9tLDqRpBD34u4urE7AXNJlfPxVTN1rk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AopEm0/XRcAIgBm5aPQc9urg+xgLMe9Ocxgwb2cNUV5Ltw57rs28a/uTPXSYi15P/N68crgeb1j1NjhMNgiPpPLUyax7r0lfQ+uhpGL5RUps6yR3ZDBYouDpnujduXEbLrjpmXKDSMM/eQ4/t4TNMQyhF4SlLNZHwasi1Wh8WFE= 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=vUv5vujx; arc=fail smtp.client-ip=40.107.220.71 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="vUv5vujx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QyvKJ1+ORWYpKrBwP72mDEcyJwU1+N1pVTu3m1KuwIa1KSohKxO46pjFj2IS1oPmCY4SG6H910Lsz+lNq6MrSe6tilijr3+jFJvnznerMXpa8mbwKBGT1KCNtLXVskdic8DuZ5v0dLkifmHblXZTHOWFr4VmbwgA4queOhdNvdCZYNfRT6qSqQ0CXBCC93sTCdMyrb7wmB0BTSKd5Fwjcdzmfq4j9z2m0qJ0/qR10Jb8R+BSd8GarDDaprmJxHubJbraF4KQna2yrTYTBR6bN1KOP1T7PCh7aE/eE3BGXPlEDfU8emyiDSREh8zV/5AYiT1hg016oi43iUNZgrfx+Q== 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=6eW2G8YIGdAMGsSMQhDYxsWTz/7JZ+/Ln7NTmwJKUO4=; b=YKe3ntHudiV/s8ULRTIXsgsN1BKSHe/stfcSYrN6EPxzwhGTweqghXuTyLAXWJZJ0ZtguVWIF6/47d2BwOAK4StOukUHHnME7c3o0WYJFccgseoaQGv+Fw9ogFmULwhro2sS0nDerym1lOgA/PC5PDhwpRkJtNVpW1+WIDxdjiJMInHN1AygCkb2llbSRFr+5h1I/VIsQrzBYQzv4DSxNBIq6F3nurEcmHZEeW7ik5a/hAUKF0GwUMIkBdP8ahq60IAtvHwF4BJtgt6CNB++gVybG7/XHetr3sP5iwNQWaoKkR/xjI5xPx0Qz+rxpXuJaudef9scG/2sV1Fgcwm1rg== 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=6eW2G8YIGdAMGsSMQhDYxsWTz/7JZ+/Ln7NTmwJKUO4=; b=vUv5vujxeUigVFu2WvavH2+vxeAtOy41Piugm73isAs3tHkeClCznKUr5L7UU/RUUB4fpP8Z8T+WHRfR2CvJCGH/zn3I2FM5A20x94AzY34hjnpmp4NvK4LZiCMDw12OEFN3n76PYeba5RAOWyOVYg+zF6+LbZl0+QHRLjmsPq4= Received: from BN0PR08CA0010.namprd08.prod.outlook.com (2603:10b6:408:142::11) by BN7PPF915F74166.namprd12.prod.outlook.com (2603:10b6:40f:fc02::6d9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.26; Mon, 10 Mar 2025 06:45:44 +0000 Received: from BN2PEPF00004FC0.namprd04.prod.outlook.com (2603:10b6:408:142:cafe::db) by BN0PR08CA0010.outlook.office365.com (2603:10b6:408:142::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Mon, 10 Mar 2025 06:45:44 +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 BN2PEPF00004FC0.mail.protection.outlook.com (10.167.243.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Mon, 10 Mar 2025 06:45:44 +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, 10 Mar 2025 01:45:41 -0500 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v4 3/5] KVM: SVM: Add GUEST_TSC_FREQ MSR for Secure TSC enabled guests Date: Mon, 10 Mar 2025 12:15:20 +0530 Message-ID: <20250310064522.14100-2-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250310064522.14100-1-nikunj@amd.com> References: <20250310063938.13790-1-nikunj@amd.com> <20250310064522.14100-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: BN2PEPF00004FC0:EE_|BN7PPF915F74166:EE_ X-MS-Office365-Filtering-Correlation-Id: cd0e9ca9-1848-4c23-2311-08dd5f9f2ed8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: xW3rp1x6Pg/UpFitdom7w7h353omRW6DnuzjSRHXWQrock91wC7KmaWb9DGEVCchsBvZQXQU9vrrbb9/Ig/hZQv85ci3ax3caEWeb7Io0mWneE56RU9YrQO3M70uWdYCfa/R9305pSglBDMoVlRFpyHtR0RqSqfRktYLUvkhB2GybSBlYrIbmnUrFD5Fw6a/gy7sw+snL671jPwjQm9DQc5UEoVptHqpwNTZEw9oyQcZDzM3vBTaLeS+xPFur1Wp21mm0JV3vpPkAOTN5YJmMfkmBEvtG5QTc1EQGEZeI1m/oPxDiWePlCh8+HhhKuhT+DI+UocvTGMcQE7GRU27hVc9wt32T/mfwS2c3LYjGxDzNHdrARoIMlELmJpykN6nPGblBs+peETDbhgU5E39yx/bLmlemZyQ19c9iZqwyqw4z+o8XrTw4WtqsKUn0zGEquveDfjWxZNDmmA7K9bk9hf7LUq1pqfL6oJ0YMuONT9pb+vsddZ73xNoEaokfgge1LI+upPgfSfs3ejqfp7jIUw/AlOdmGREKLBp7YFyaxb9/NMOP7HOMxoQX/79/LLFNKGXco1tdh2vndGHwMq+rKOdipSJNdY8WiN6m3oxs9wacyT5sbsJOyEflwfDSThtw47fiwp9TJmL98YVcHFQVyjn8HFdBpJEoTeSOjYWZ2TMVCEtmkCwp+M+hR36nwyNcFrwltNUSdVw1l9xXtJ1KBGzFJXbshgusl4t3FEnnygG8oykPnwfcWHev8/JmEP0JoKhe7tVirLc20GvVHQiYLGRFwYwaiu0O0PvLMWysyxlRBwbgvNVPuv7jQJTT9ibolgl4EVYNpfYxxcX9Fb2ukzrLdQNGpDgC4WuWDBT+5poX6bIwkqbW4//Lb35G/FxMK7vUQJA6Z878vKNGqGsRGoF7Nh/66V4eeINPzolznbz/QEVNvKh5Kh12tQllizHoU6QVDPjPG76phpN/wAxrR9lq+tfovJWmhES/W3G6TVt+0VpfIo388IO4eP4ar23lo01saz+t958q3D3iKcoqYkWeWqZ1v69c9HOfSjkI8LqboLlxVYBGHUiHmjLz3vVtvPAUSemW8A/y0CtPbtXBXaX9+isCVHCeHkUEfzMXHBKI2GyS2IGBgG1xT45LaPcxYZWQ9ZGUATgp65VkYD8dLUSCiXgNo4hePm2N2f+8Im7VcveYEKfnEGbbWpepn/KJDzW1hVeDrAaFiFVdNnBkMB+7T23aoh1S7ms6ToDT0vPhTacAw7NptOFDOzhOR2Xs3jH8Nd5VsJUibmUQbtFOFTCwo7ipB7avH1xoZYZZOcm9n2viv3qS+mSJwbFVnX3RjoZxkF3f8MhtTe5ZJFOgzqwcXr8pPsmaDPWS/8BnUeBTWhYDSIISdtvPfYZSOQpQukv6j7lLXv1BSDith9lzIQD5SGFsXXC3uUV+3Pzye6fR/wv1HFo+kDzBoOR2OkJFdvhiusEDUpXTsplRJyUChja1kTMDNotzt6soUbRQwE= 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)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 06:45:44.6208 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd0e9ca9-1848-4c23-2311-08dd5f9f2ed8 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: BN2PEPF00004FC0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PPF915F74166 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 | 3 +++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 11 ++++++++++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 9b7fa99ae951..6ab66b80e751 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -290,6 +290,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) struct vmcb_seg { u16 selector; diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 0bc708ee2788..50263b473f95 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -4504,6 +4504,9 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm) /* Clear intercepts on selected MSRs */ set_msr_interception(vcpu, svm->msrpm, MSR_EFER, 1, 1); set_msr_interception(vcpu, svm->msrpm, MSR_IA32_CR_PAT, 1, 1); + + if (snp_secure_tsc_enabled(vcpu->kvm)) + set_msr_interception(vcpu, svm->msrpm, MSR_AMD64_GUEST_TSC_FREQ, 1, 1); } void sev_init_vmcb(struct vcpu_svm *svm) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 8abeab91d329..e65721db1f81 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 d4490eaed55d..711e21b7a3d0 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 Mar 10 06:45:21 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: 14009302 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2068.outbound.protection.outlook.com [40.107.94.68]) (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 EAC671C726D for ; Mon, 10 Mar 2025 06:45:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589155; cv=fail; b=N7vZhh+WYQf0zy3x6O33J1VJv+uXgkalw9C+CUSqBfQmCSCM+C7bXiwTjrxcqoMT+V6jbv7e1XX4RZJtSKKIhub9dnCb+JjBGlyt+PPXWsw5ZEGx8q6rqxMbd2CsFPNf+8XD2LNYIoDOtdjezw9JAUdBHF9R/xg3bGZcMCT+EYM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589155; c=relaxed/simple; bh=J5+R8ODDGBaUlMdGfjy0iUs3DzKrLs/BuhUtNP4k/iQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VB+xb3W5+A8DkFg9q3FbbRjGt7Ed4kQnGoHqpbhXl80v2G/G9fBdcHH6WOboAdCELLynqEC5WkpR3h7Hlj5b2zY7TapS6xZfnmSUpHYgyWHq6Ne7D4R7aijjXa/cMUUCsCHU6ezZCwLa4/GVdsk6M49A/G2uxhtbGhu2UK0vXl4= 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=T5s7I6j2; arc=fail smtp.client-ip=40.107.94.68 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="T5s7I6j2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FSKCMdBbROL6on6XWSDbP7NmonV3H4vTsqz14+BZr/sbTprCCfAJ06bB4TeTMG7S3PCUzOG7dN0ynNf02XnvdmbrXLMaK11Pa+S6I3JLaq3dRnMYU7SRA7OtTpexC/v3Fx2/CKfHN56L/v00sz0Tc0Aa73bpjlY2KNInM4IeLpfnF8UFbKpIAg2HB8xtiBnPkHMJs9Fefs3e4RjrKwynM6u+l89pcUdI9tUmtDfgg19J9koq10BNoBx7zjxs2oY18lXL4LE7tQtI4RfC05kFkFT3Kj/8JmOT+SgfXPZ18oWA5f4CT556Y9U2UPVmShXbxElrtbsNDuYO+UsuTo4pyQ== 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=NpTYS3MgzJOWKAvRKZHWNRO//ALZuYi9TSwTXg8BVgw=; b=hwCOY7OsY7ATV/u5i+nKKU8CltUi7YF29QPDL/apTgeM8lMVgoyk0NuwwIK930y1WRjiS5XD2hrBSFd8N1bZIMxMPWGCPeJzcF0mwVswAKcbEpl1gH+/1NupIAo+uSSn6NPBvFYX6vLLSoUzstcl0Xg39B+oZ+cAKTQgXgrOhITS7CwGWZMwKTnQA3O5pvOJaoIjFghyGTccorNck7oZSrNWAm0tEqZHeTU0LlESXJroS8FXXeIqVbX2tZeNC5dwzw1VieIfPud6uzHrowWfHYudfDcj6IWpRG607C3slqP7qF4qUQKAvbdVxRTvk17DsU376MNYkHJJmS95mlOdkA== 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=NpTYS3MgzJOWKAvRKZHWNRO//ALZuYi9TSwTXg8BVgw=; b=T5s7I6j2SMl8GmK2FxnD/fp60oLZVIV0r/EZLEicwMX83PUy0Jt7F3VWKP73HbSFB2b/7CnggJA6bdQOfNL2MyVxon/30TXR6wbiS0NobnrMmTuVgue+nAsEwZxwJlLMV/gSoP3/OVOaqwHYY5OE8AUFvcYTNKe/7fiYy4EWg1g= Received: from BN0PR08CA0006.namprd08.prod.outlook.com (2603:10b6:408:142::26) by CH2PR12MB9541.namprd12.prod.outlook.com (2603:10b6:610:27e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.26; Mon, 10 Mar 2025 06:45:47 +0000 Received: from BN2PEPF00004FC0.namprd04.prod.outlook.com (2603:10b6:408:142:cafe::7f) by BN0PR08CA0006.outlook.office365.com (2603:10b6:408:142::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Mon, 10 Mar 2025 06:45:47 +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 BN2PEPF00004FC0.mail.protection.outlook.com (10.167.243.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Mon, 10 Mar 2025 06:45:47 +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, 10 Mar 2025 01:45:44 -0500 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v4 4/5] KVM: SVM: Prevent writes to TSC MSR when Secure TSC is enabled Date: Mon, 10 Mar 2025 12:15:21 +0530 Message-ID: <20250310064522.14100-3-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250310064522.14100-1-nikunj@amd.com> References: <20250310063938.13790-1-nikunj@amd.com> <20250310064522.14100-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: BN2PEPF00004FC0:EE_|CH2PR12MB9541:EE_ X-MS-Office365-Filtering-Correlation-Id: 34968d86-b217-40cf-71d6-08dd5f9f308c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: wG7lM4XkAyBJu7G6bMVRrNGTcuPmZLQ8N31kVT0bAoQKEZVtSM3qunXCRvzP9X1HVJu/LwQJ19e50H6kvm3y72xI//Unv18PrULI0grdr7f+KJzrheFGRCML+Hsvfe5+9WIBZkf18FZ83Gl/97qZx/vOCV2SP6ZbVz3BlGO7pY7WaqnroKmkHkq2bVO7onUfI3QRueg8EbzF7jGnf43iztmkp5LblAP9a9TjEOxDBFwsBMoTG6Ewll7I3PgphMFCc6RlMe/yN1DM0VLAreFrFd8KelQ1hmAzGTBVEvdNnL8qDLkQfYPfci/cNR247qVoDxjon1RYyX7T5Xy2rGYMhuyKugdLATALBtiK9WctEZRtsb7YnPx8+6Df6UhEn9U0wVw3b3H7IrzT+ieVuZBVKLZ3JpFdUBTuiVZP4XcjMZwm8/WCLTWu8lZombzNrQyML/Op9yi/VbifwPU437S6J8oFe8DVWh26rX5xNpmPyamCgpMay/66BP/MQv1HuHLBhE5zt47PN1hN0fnnqURYrhL2I5jbieE0zeT+94l9jqNECknoyYSjMF1VYVr4ok5jN8R/Zu7QmYBFAUeOs31jzrqHoao2Xw1UU0QNCTUR/KnDwvauWpIhZFDBHpdNSOa6NpJqPnFmgUJeJSqlK5I+lnK96wKUmY0j6Q1J3pQZi1ItgN6hmY9fp4AJuX0NReLwfHyhMm/y/IBtTbC4C6wG49tfHWzCa5QwutRXrj5djdhqcpRcU369nxD1Ani6LWVJRNvAbQr7brKY3Pyks3/FZVQbMNIOAFoFzMScbVOd4gZ6vzgXRXfbv28a9NyDtLsf7CXd24WhVwQUFAm8fM/BNXUwrUjGnM9HF2gQG9HMPAIihKQssNc/2XVviGVWy9V9V4DctFMEWCObcI/MaxhwPeIZktYTqGwertv+AK/dY3UAkA5YSnv4RSDszhjpR9SfHPLqw3DgzeVBLIGuf4doqSQtlzyqmjV4bIxQoOZypeaskh5tC4QgIYhafF/+hnUaif6IRhLgldktg9tR2H8UmdlDWWjnTRBJdXZ2p/PQ79mEpbuq1OBWNIfYi4z/SqeFZRy9VnGDCpfKlC5NKUqCnUDM0qF1Ih21LS4MG0ouRo9cJCC/vdaNbAAGl8aW9Yp4CmzxiMETyibvT+3YO5indaT7xPxj9kVmUQkzDtFx2r9LY/TJ8RjA7rZEXdtUBkXCL9np1rkRNG/Btfu7zWHDgxKHCYCCYD7wpfaeYDV5bhqMoOHQp90pY1LrGK0wEqudHoHk0Q+xsfgJSqwK0gYkLdZpsQIxBmP1kZWYScvL23zyyJC5qCYP370VjesYqxOYUviePN6yjaWcjk1J7Pho4T2HV5YQatw27A1aeCxVJyKX8I2aPsk633ulr51iN8t8sX7W88xVhvn1vkrqeQlwRopP7TtJhhmiRyLbSa0v85AXGGTt4aEyaQRG84NiR+mAcK12oePG04g7Wct5zrNPL5gDJX9W3HhdM+sKX3lTgKs= 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)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 06:45:47.4959 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 34968d86-b217-40cf-71d6-08dd5f9f308c 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: BN2PEPF00004FC0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB9541 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 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index e65721db1f81..1652848b0240 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3161,6 +3161,25 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) svm->tsc_aux = data; break; + case MSR_IA32_TSC: + /* + * For Secure TSC enabled VM, do not emulate TSC write as the + * TSC calculation ignores the TSC_OFFSET and TSC_SCALE control + * fields. + * + * Guest writes: Record the error and return a #GP. + * Host writes are ignored. + */ + if (snp_secure_tsc_enabled(vcpu->kvm)) { + if (!msr->host_initiated) { + vcpu_unimpl(vcpu, "unimplemented IA32_TSC for Secure TSC\n"); + return 1; + } else + return 0; + } + + ret = kvm_set_msr_common(vcpu, msr); + break; case MSR_IA32_DEBUGCTLMSR: if (!lbrv) { kvm_pr_unimpl_wrmsr(vcpu, ecx, data); From patchwork Mon Mar 10 06:45:22 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: 14009303 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2044.outbound.protection.outlook.com [40.107.223.44]) (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 91BCF29D0B for ; Mon, 10 Mar 2025 06:45:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589157; cv=fail; b=dECZkc3CRHZyl0Hr+Su/lHFEIPaau8/jFUF5iEHLkBPdXdKn29DfIIEKzr7lq36oFLiacBFViHN1ku+0BmmKHHOeVpy5pCgsKGVCoYfTC35QyQYtRsjd07S10+luRB/373eBx4SB/jhA3uz46ApKIAZxBJgeTbShRwnEatCa3Bk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741589157; c=relaxed/simple; bh=dBnzNm0E+Ky1N4x/CrZnEsHBIwXk50GIdUybsv3i6Go=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MIn+0NbBTGF+8rQjLvbaI2Ok8aLKEwwi3VCAMLBVAPSS/bXWtuoB7yAaM7tv/eY38xXTVojKkvopXZ5lmBs1MClTJLjqWClkXMtL4CWl9yfGcBYbRIKFybYiMbWKKpoMHDXq2mcJQfHfOvm3L+HXySaxdEesWbNH6XpZoXIZAo8= 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=ti3OiUmv; arc=fail smtp.client-ip=40.107.223.44 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="ti3OiUmv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Hltp0FF57YdF2gdS46khNfl2BYdsDC1TU8do61b3k7HUj4eVlMIqIq/rpIazxSXXcjTjPQPso6rtdbR6OnuGx4R+EWrsouRwgU8toKhs4bgFRnSOX6zhulCaPp4gwgYqV480yFoKY+Lk3j57O6BUUIQqyznsUq6sdYuYnt/y0D0zSQMkgZdX07Ozz/uEk7ITkfzOAFaAUa3BbOXqj4sQ5upEdHqASOtRxW7gH2jsfh1mqg4aAziJ6rBJhGm0ldtbEZi29H0zg4DZkixJuiaHq7wsQT82OTJYZ16j4WzKtb07aYzdLsxlwKpr2jGasrbr65j+kve4ro1LScuaqEgrOw== 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=O56VsIY3dGKUiMb3gK0GbY1E0ibSEWcjpDJQE/4A40c=; b=zQ4Wtrwc4b9Ur2wt5eLsXCr3lKgfsRy3lqI0rfYd1sVCbGZ7oKac4K3VjUw1KfsWCA4B8n3kJA70oHIjOEa3oX0Ykc33YR3r9a44EP8TAhAw/cxlDKdjaAFMGugsoJ953uPv5W8QPfRPAcudCbAfSNZBUj3bNQSffHOqWLXmSA2se2JRKKBGr/XCvoVCNqAMGRuxHWHdtWyRzuokqvs8iCKL6r+ONcb/EUtBt7XoA6/WMuBIDBZs5j8qm1ArjTMsIQMn4fjqUpXPViw+lCdIrcFWIPPtTQRateRdBkIw6dyBTclwem8IGSrY1fdwM6C7AOecXTknrZd2ytauDnpv/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=google.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O56VsIY3dGKUiMb3gK0GbY1E0ibSEWcjpDJQE/4A40c=; b=ti3OiUmvBH+zIbaazsompihFlzJG/h+Axtc3bEVP3fOpyuxqPY7nCl9dFVvM7GxSqRSa+XxCJmBPjKEELebmCwUWn9WPcImVyYoq4D3Z/UMYdWwTa1h12KxWlJ8JzDmWeTeLv8SzvKKLEyN8HybOuVgXkTpzY1oRpuFbY5U8dpY= Received: from BN0PR08CA0008.namprd08.prod.outlook.com (2603:10b6:408:142::30) by LV8PR12MB9641.namprd12.prod.outlook.com (2603:10b6:408:295::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.26; Mon, 10 Mar 2025 06:45:50 +0000 Received: from BN2PEPF00004FC0.namprd04.prod.outlook.com (2603:10b6:408:142:cafe::14) by BN0PR08CA0008.outlook.office365.com (2603:10b6:408:142::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Mon, 10 Mar 2025 06:45:50 +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 BN2PEPF00004FC0.mail.protection.outlook.com (10.167.243.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Mon, 10 Mar 2025 06:45:50 +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, 10 Mar 2025 01:45:47 -0500 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v4 5/5] KVM: SVM: Enable Secure TSC for SNP guests Date: Mon, 10 Mar 2025 12:15:22 +0530 Message-ID: <20250310064522.14100-4-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250310064522.14100-1-nikunj@amd.com> References: <20250310063938.13790-1-nikunj@amd.com> <20250310064522.14100-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: BN2PEPF00004FC0:EE_|LV8PR12MB9641:EE_ X-MS-Office365-Filtering-Correlation-Id: 3cbb487a-89ee-453b-5e87-08dd5f9f323e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: NxqYS+Ii8OCvLqZn0cd+okRKvUtMF5YokgTPDT1gWyOleT3flhTsME9XCDtnzHHyH/LqbTMFh75V3FwflubUXO3GNFoDsuz44e4ohGtlO265eZBHBC+QIFAEYGkjzf/ITjsGpVM0JFK7SFm6NYAb9SQE31QmW7iea7v142H8YjXWmyWyck3cVHUL/HU14/AOBKviLwc5Z7Do8AXC1EB45LWKbFJhYJlJ9aqnSfhq3yQpXl8+/BIjzZLJ8h8be/fBHZ+PCD/+s8TXwL30I8brHbcy48Lm9T6MkUoUrXfENorfTJStRzwhynaZysJ6cNV90chnpd04l+/ZCIIFiDuljVe6voMW+nYx1Hbe1oTYDBX/MhPKLVgrugGSMMfLZOfTtX17wCMqfNcvmdcKQ1RJAi8YaUO2tBdXhQ8WX/CC+o0yb0zgk7XDqxzfAahA0HNsBYIKeEkfl8GzZ3wRhMCF7wqsh3kbRY4cBh5sz2qGGFJ6P4+jzpUW0fe8evkYdffHVxf689zXYVWaF7xOxFmMsHcPhKW7h1Gu6VY5+o6GwnhSteFMGLwv1rm6NnVSyj7CTU0GZfmUjrYBsktXLmGI2C8VP5W1s5nSWBStEgR9YRUKWxWTDmIKI3hkcmNwDbgTjFCi2bY+bVyuH8ZORovgbGS3COMaisi91RDqFehIMxHTBPdIYwnBBRTnboaaEBr+waLjDSfcspqgwMP2miZMVUzqPtzpfmKic8fJU0vAlbA+qgL7dMYTXZcAFGEI1PoqI3B135XxUfayFovRGcWGHmz2E0HB3NRNx7ux2Llh81sb7n9oLuhWQcmNOzpDeAZYLcnI/Em21aGmfvaA38dl09pQyqtfGldJa7/lQjhro/999otQhypPu5gnKl3HrZlufR1ia9h6pn2VySditqJj294mupqURrw+m2ojALxQAXXxlXp3AAuhtqd8Bfdg1s+LdkbvXfU35qCuoC8S9r69AIkv4rZLS/8n7glYnXrnFL7oBAarrzy7dZFVdrLAMp1xztz2G/nj8lMO1+gSwq9jkLXsdlLt+Zz0uW784B+WNm5bmNT4U+7bCoJFmgMlBQEpLjHgk4eOFrew/FySBkbCSu4GOhtpn2DDeYA/arqlzPPwCsjTXs3l5gLOOsaHu1gtGSsdewPUvmXHj89znIdtVKTvbC8kaGwuwWffWYSuWKF78IY5l02LOPuHn/r4IUexGQNcdm/XiiLjviyPqyZVSTMli0/tDyJ2m2vPa6nxMHES2fiG6skZZu+NXdspW0m/jNCDDQfgKDR7AeH8JQPdd1+nGAL5yWyJZKW/1tfJRLj2ea7MK47DKP7HaIlFwYeQUxGHSdrGfnN61WUNOwik0Uabkn9SAHn9iY8hcl6pNWJFR3iYf2X10mzioqv76PNIEeWD/0Z4pLUgf/Wrp1VCZ3+6b6auJ/fO64HJhbU2tlD1wGsRvv59ZUz5Il4JFkIfbjKEFuXbgyh6y9P4eFxkxlKPbB5yCNIdgvsVK44t9B0= 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)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 06:45:50.3396 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3cbb487a-89ee-453b-5e87-08dd5f9f323e 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: BN2PEPF00004FC0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9641 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 | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h index 460306b35a4b..075af0dcee25 100644 --- a/arch/x86/include/uapi/asm/kvm.h +++ b/arch/x86/include/uapi/asm/kvm.h @@ -839,7 +839,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 50263b473f95..b61d6bd75b37 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2205,6 +2205,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) { @@ -2927,6 +2941,8 @@ 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); + + kvm_cpu_cap_check_and_set(X86_FEATURE_SNP_SECURE_TSC); } } @@ -3059,6 +3075,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)