From patchwork Mon Mar 17 05:23:05 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: 14018659 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2085.outbound.protection.outlook.com [40.107.243.85]) (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 45286218AB3 for ; Mon, 17 Mar 2025 05:23:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.85 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189011; cv=fail; b=Ao+4dtiwL9pRFMwGOiKWVQibr+1L0ZrRL2qUjhoO9UVPJcMIH9NGK/x/I0D2YjbosWZewVldd/5Amj70jg2cy/GFXFSQ9iFrrtHgVRSE3DH+HJdn2zEtKwwqlOaF7bsw8tIcNIWHrZQL+So/s3exj/bZv6Vfy9B/P9P/RRoopoc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189011; c=relaxed/simple; bh=RvJeBBEIimdeJW27KD86TenZCjA6GyTtbfVqkGTrp0c=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JCuR8V7HyBJVWIm1TNGYS9Ua73JFypZVdvKR83PulMNgA4C8R4fWL0ecWjRxMyTbvl1eQbpmzHwpamhMzA6ovuoVCh4T0zpxEFQrn7to7QJKVepc8RPbVIQrv/3ZIibPhPizgMXgQWKZxO3OzKK1hYruYmjC35jeTGyetrGXdeI= 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=LHOnWMIJ; arc=fail smtp.client-ip=40.107.243.85 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="LHOnWMIJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VYQeIMEVvAZAPTsCwK5Wdjke5FudfUveZZZFY6mn9BWsXc8FzE5uQgpPf/2a3KZpVFjzByDJWitxCqTs1EoqxKmaMbN/5KqcAAjnOPCsS73ygKSUKbemr5YonIEV1y0KWMR8MaUQtqk42n38wK6L59DzSQHosB/z8GePn+JAfkhMr26Jr3e+faiEET2F+wKckqUHH++QOiHZAhpUyhX9OfgbTN12/X4WZQcdVs5+KeQyzmYstQbCn0X2RLdMk+Lq2bZ9DnKt40VHnpyFImMapDyPBtR4K3WdqiNIaxUpZ1o6POgU+CwihuP46iY1upu/36gPMZAieIeWUwn92/JOjw== 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=9F+ObCITeBxAhkHqiY9udqbTIcQldIiGI3QvnJge+uk=; b=M2zXvX0AOaPNUIxAKn6MpJ1Yp97ESTNoKA32RoCBZWG8Uqineqro8nuEzdBf9FkebXvbk97fjO6WZ5ChHbOF96CfcGHYJLOeHYIVg0W9QR5PRxbB+ei5I4NLHccB8//awmvb6jzZ8h1jVLC7VLighyt4cPbHwWUMNtv5ZPiBXvxt0veumGlVLiAlTssQoIPFKtv+XdNXGUTBLSB9liZRldeeyJ25VwR7mMaLViAzVSYxCXfvYCSZyaycIMK+qkTFzulUC8Ygv+Od7XTxJlK931WDwTbhiF0nUqVJsi/okbcoNA9wVAs4lTyCfjlmqK9dpbV3O0evy7O8f8flEha1zw== 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=9F+ObCITeBxAhkHqiY9udqbTIcQldIiGI3QvnJge+uk=; b=LHOnWMIJ7Mmy+HLMPbMPiKQ6x4BZkB0CfmgW1vVBR9ujvH/ECrRd151GRL9kAKlNOhLgEBHutgG5zvupoBOmJq9XvT4u8LOCY+Pa79aeWlO5zxAh5mWYXiwMLzq+C8KguG9lFXupaN5h58Lv3160Rp3CgayEo2oDNXtxNAxwP1g= Received: from MN2PR16CA0042.namprd16.prod.outlook.com (2603:10b6:208:234::11) by IA0PR12MB8304.namprd12.prod.outlook.com (2603:10b6:208:3dc::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Mon, 17 Mar 2025 05:23:26 +0000 Received: from BN1PEPF00006000.namprd05.prod.outlook.com (2603:10b6:208:234:cafe::95) by MN2PR16CA0042.outlook.office365.com (2603:10b6:208:234::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.31 via Frontend Transport; Mon, 17 Mar 2025 05:23:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006000.mail.protection.outlook.com (10.167.243.232) 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, 17 Mar 2025 05:23:26 +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 Mar 2025 00:23:22 -0500 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v5 1/4] x86/cpufeatures: Add SNP Secure TSC Date: Mon, 17 Mar 2025 10:53:05 +0530 Message-ID: <20250317052308.498244-2-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250317052308.498244-1-nikunj@amd.com> References: <20250317052308.498244-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: BN1PEPF00006000:EE_|IA0PR12MB8304:EE_ X-MS-Office365-Filtering-Correlation-Id: a28f2924-cec8-4c3d-ac7f-08dd6513d83c 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: EkciBR0QazPM2FuXqxBbR5lBs6FLyC/QaUvlueATifZudW82490qyhylpFW6u+cFFfDEkFKp72oMjVoieiRp4j9CAyd+vEh4klR4xZ93EQbRn9sspm+8/ooNR7ujjCh+teSIIxJYqXK/KUGNrrfmXYvXIEmN5p+GG22PZFHcTm1zT4BPgsnTkp+F9tU+o9fh6vMHemf/onA5//wV6Xhw7k2wHgPoXjcaJE5fx7W3iNm1TSKZt8ayvBdzj9OqNtFCQt31P+ND9LUuQkMLNJVq4ZHGv7jpYBdR4ky1q/jc4pFPgU2N398A6dD0aTNDx4eUIBQ3Yh0L2PjEVy3/jA6ww0ueJUtTfFoFO9wHEwut+iK7zFCTVK+E6ToD7d3jnTHN2aKVi1OnT9b0mwCIOF+zEwS6ahbhgrhTKZSrBWX9UuteTwCxe2DLSB+x+5wRVf0PG1Akk2vM3Ya4Zy5LwZFgrgytQv7d/yOFBWENycVkCCWpjDKSKcmD+6ZFW6idN4YUjJ3MBd6h1dUrY0hqeV97jExH5zyo9S19rrV61B08UD1YOA9GaZkbW/VPyZCAjQ3Os66gn8OFGuVfBl4lwsiNfPu9zVaT3VK2zjrT8y+0sFutYzkSR1I+zF3mJ9Jc24AiWDmHU52o9aDEN/3LMxtPwiqp6Njm8oKwv8rFCPxMrQ1qfMiGbprUG8ddzsasdDzgO3qNYxV+XTejFsj8Tmd8PG2QhAhMLEYiJsxuzi+F67sO6sMAOWd8FIt3dOArmNxmIUNsDOiWuVrS2acO4NgtA+CIaVruQ7bls2XbhX5W13UpVhbFu0e8QJDz1UmB/ttvgecdCDAqgCfad1OCE8jUsvTevAl0bfVCT/MhcM+HNUbdwW1G54pYmVPnKB/Ttnr2G6tkPBLQnC4HPBBTHqvRDLUT2kRZr7uCjXKiO0N9SzKkvbvZYdIuQlgxmReQcNaj9o7OkpvqMuL1QrE3cBM7I8fP5ALX/+Wcb0ogFOeUQ81p0aEnQ8txYqxe+NBz2DOpBkNO+Uj4DnjjVSzckx7BWbjAlrOUCjXd0khnvbKFl+dUzKGIfMAOlP23oDIHqWxORtK3ECd/a67zKA5aDyJaGiJ3fjcXp2E5Lz5XhmK7uGQelwveUCAQHiERTA3VTSJ5Nf9XIuUQiX4nskldZAOgpJwf7dzb9pT+Hg8wvslhibGBBy8WukeSYBstOKMELIMUvhQ6fYrDwG4Yn+49Cf4kIuan9A2wiLLOmDnPLE1jglcZbNPRYHaBU25F1x6cKK/7T1p4SvCGwgXfRJtprQ4LvkZgPbMdIMhWF9+1juhVNWprI6JE8K8HQon0lAPN5m6WRoDiSiEHUxkBJHMVbPEHyaJExpzthREl9z+pMMDFcMExjnFmy/J6BV7V6HGDeoWlqNQ/jBCqIQ383ZQDWbQ20CQsbUpAqU/mPlgk/2RqBzENjmmi8u0UH/sFVKBARz2UfMzfNfm+9Diaxtrt2DJI/iCd2tLC4xGHfPfAi5XpPzk= 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 Mar 2025 05:23:26.2648 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a28f2924-cec8-4c3d-ac7f-08dd6513d83c 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: BN1PEPF00006000.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8304 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) Reviewed-by: Tom Lendacky --- 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 Mar 17 05:23:06 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: 14018660 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2067.outbound.protection.outlook.com [40.107.236.67]) (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 40C19218AC4 for ; Mon, 17 Mar 2025 05:23:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189013; cv=fail; b=Z5kOrZayHcs2dN1ce694Snwd1gMJpjp3SQXhLkVYFqG5jxal7E/uUMoXI/MJT8eyn43FMZf7F0WXY+xksXRo248zKM1YyZf5U1w/RjDKNDjYKyUHj0ZlcTgxFfWeznJB4pGKsQsxjDnLHMTms+u2QDjgMwjqFMEQOhFWNKaXN0g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189013; c=relaxed/simple; bh=vvE5gSAnQ5lEWmW82n1vxVhsy9iq3iOzthiRDEpdghY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=R3i8ZMdOwxX8FCno+bJ/VeHCXAOrokZwLkGDv2s/Wh6iiwy8PbSco1OUhzjrRKPul88zLLW3sPu8BhwNz1H5ZMtE4uGofydjO5dRY53guUtJgH9im1j3DsH7vmvq+dwCgiExQQs+XWLNHM/Sqrxbj6ZIWraafGyHiMy4jGODdxc= 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=uYPWfv/h; arc=fail smtp.client-ip=40.107.236.67 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="uYPWfv/h" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WVeMwkglItb7aeq9MN8H4dxf9Qju5/xKeED0EgQev5Jmg34R0KKTl8jPL7CxIWQC5QVygn8OmGS0liboBHdce1ge7FMZJVoBZgvnwXiH2RuZBaE3Rf6g2BhyT1ZQwfSSnHBG2cDq0D2H3939/nJ7O4iunwSrdfw4c2ffsKfqUeV+AhEECC1SOhhwsgZgnIo8N+DGZr4CLSEomGGxGp1j3Wa5FZV+Cz/BIo3jDXuLj8pDnXIbQyqAdcARj+IXdVZrjFPYR6cEr8FVwxKtETiOLeW6rpDBqbaItD1ceNAuPjoUB+gx6Hy/7uISly+A/EtjyGrnnKP4CMSiTl/jkGXiZg== 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=TzqlmzHOnz33sGh5WLkL3T8EPqELR/jgTfNfUDNXzOuO/lk+Zo/I70sSv0oRhT4NhkQblLf3sWztdKR3SIYrjXFUe4YaMNHbq2T2c2nDB67I2BqefahwqVenZqtmh0/wwGgKxNabectP5pRSLGci9I2F2+7xDolDbVgTLRQtGXo+uPX+JtuLMFgRBvn/QafSw+5Kb43KoOkPAAiOPQwH6DY8AL+jlXqg/qaPN6nz/FxrJ3/M9pUGr6VcbrVavPByPWaKy9Qjw2n2MEIeepYeOde9rjU0sbuRjN4i3cfQUFoYZ15EEZD9GTiSL3Z0KtPRSPDhFtpf3yqnA8UU19Xpqg== 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=uYPWfv/hQz5Uht1IS0SPcjGdrDFBNZhJ3+Sp7QpZpslfP4UofNlX/5kKRSopPRf/ahXL0com2sQ05nMd4cX1ymIzOue2FcScJCXDu7GDLgmN5o4E7DN4qntEdQ+CjpJ/p39feyzakE8YGV5GWxLG7cpByhGBlZGStyATqEEzBk0= Received: from BL1PR13CA0196.namprd13.prod.outlook.com (2603:10b6:208:2be::21) by DS0PR12MB9424.namprd12.prod.outlook.com (2603:10b6:8:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Mon, 17 Mar 2025 05:23:28 +0000 Received: from BN1PEPF00005FFD.namprd05.prod.outlook.com (2603:10b6:208:2be:cafe::85) by BL1PR13CA0196.outlook.office365.com (2603:10b6:208:2be::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.33 via Frontend Transport; Mon, 17 Mar 2025 05:23:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFD.mail.protection.outlook.com (10.167.243.229) 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, 17 Mar 2025 05:23:27 +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 Mar 2025 00:23:25 -0500 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v5 2/4] KVM: SVM: Add missing member in SNP_LAUNCH_START command structure Date: Mon, 17 Mar 2025 10:53:06 +0530 Message-ID: <20250317052308.498244-3-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250317052308.498244-1-nikunj@amd.com> References: <20250317052308.498244-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: BN1PEPF00005FFD:EE_|DS0PR12MB9424:EE_ X-MS-Office365-Filtering-Correlation-Id: 67249ad3-ff3c-4c00-f1ba-08dd6513d92d 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: m2OJwyZrjg8suCeU2uZqkRrc9JwTZyAjPJOQvV0yozXp5Ss2WqB663DB2oGohYvfcwjlvVsIbmtnRJTP1VsZqipPpxUYyP36C753D2apMQFQqPL577aJY9gtUMOajHK8PyRiqQQhNley/JgPn7Ryvd/nL6GQyE4nDtwqXiKM+Jj+iOPK7s4OK07X/kUPSyO06KlfWuHrkLc3UTiX6P7V5MSsL/qLt6gB+vvTImQlgaGMPXl5BSpoy0iBJIEkStmDnEBdtR5HPkzO44myxfCSJU+thMWvcF2dRQGmCZXIHI4wygnlCcwndbNdmcS8jTtoN2Eig/fXBvAELGNJlAhxYlz40o9P+Idxd+mOyrU5S4n6HCOSFWk9KxiS1GTecN0efO93aMPE9bxr1S3ux3fi+2H7zXbizvqXlg/vQGDunMowdphUwpyBwR9/EZq+CQxNdGbga5QWDRZMPArleSwR/G/k6+Plqiu8IUgP382JaE+DlRwYrb9pnChDkahmFsj4AKlQnED5DLEIh9nOa/KHjW8//wImyBS3DBN9+C2n9GEYIqKlD47rNbOeELZ7JwmTFd8KhVnjrhYi1FB6j1s+tCqkilnkYjwVkvdCLg7hvEjvJW0H4kM0BIltjELI3Kk/icnHNk64PCObYzOFeYrxQm3N/nuoD0PpE945ERdwIf8HmQ+yC5wtT1CbdQ9jgrfJkfe5NMQemg5NfvorLMmmhPOdFJcasMqPVshlV5E8qB5qMKOFulHpMFxfllb4cz8R4XxKxNDBx2oH/WUZkbnJ8pcKY2bxz0td3apcuGxFgdXv2CNGZsbfBDlKPz0z2qkY89rKzgSC1xuM9i5QFqqc+HCI1dSdS/paPWnnTEqO2rfAzLx0zuAoLeGQSFGtmy5IZBjuCSOHAxR7gvsb+Y4kTFfDwnTukGiUKxqkGpvWZU5AQbYqhwBcvaJ8ApP9oWOSwSuBxmqFsKrCIIrhtWrDO6z7P3DGYfvRgIY+WUL5d6gMiHOvBWCkgJMOi7F2neCR3oc7L9NJEfa7NCjdz0o7DYVncAS+x+VWUMqhlCTXFx/AkpV8xxv23ZXgAA4PZ5feGhH6A9/prE+dzyJQ47haXBASSzecWBYHkWYyphcpoHD9biyisw3z8mcNfRWZqSPtEeYknmD4fNZje/INppl1/ypUYraSjOrhhkUaWSPhGdluQEcjUeC21/77zVw0jztCUmsvTgp+6TwelK3z7v0I8nxUZdet9lIGg9/oyboclUA/PUBs5wJBryZL43AVyNgqh5wcCgNEYhqe8evRC+6llJkxfPo44QMTHAQwnzxSZVtPXg6/9Dp/Vrdkv+IOWsKaISmLBRXUWA0Ik1g9x1obcLBTiY8asdwjfHqNdTG+6wlNQGQSPtmxnQHgT738Fo8dEQ6GXG0FLt8C3aJgVEC81EsixHQXWzolx5ETZ3mvAYGW/0lTaHl7f8AItWStilZR1qOh1OdpbikM2ecysL8CipYCurOp+5HLqiuT/9UTuF8= 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 Mar 2025 05:23:27.8616 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67249ad3-ff3c-4c00-f1ba-08dd6513d92d 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: BN1PEPF00005FFD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9424 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 17 05:23:07 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: 14018662 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2047.outbound.protection.outlook.com [40.107.93.47]) (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 21D39219300 for ; Mon, 17 Mar 2025 05:23:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189017; cv=fail; b=O00ov4CiRw9TG+n1CgdvGYKc/nz6rCSJisgMfC8X8/EjNvkLKri+h7+5hEk4YrEmBANh0lsUthBqxE4apsQPBu8gKbV8t9bIoWNKPlNCJMmtqiRy7Fo9Jve5827oBUmve3UQWRcoupR1yQTlLNcM9hdbZ9hQRFOzRXyrpOgtz+o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189017; c=relaxed/simple; bh=zXutBtyD9KHws3btgvu4qkirKp2/rbfKj1wDaZwZIHI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lNCcXPXJXL+5yPjDPwzpseKiKsioGmT411A9AsYqH5ho5iRUE7cRs+tQJ8vS+b3It6cuE8oMwAViK6Za8RzsAplWvP3KLWyaEJTNvy/6S6N0Xxk2YaqQy5zZq+SlfAucTLdqA6QuyKrIsnTAgmBVn/g35V1v9TEFOYV8gyBU7vk= 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=PgvSFZEM; arc=fail smtp.client-ip=40.107.93.47 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="PgvSFZEM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZG2WOpgC6v4ipFOOu0piC/nsn6C0aymVwrns3yu74zAo0E6NriFgXDZfz2OmxlhZvVd8eSooLvq9w6nXfsOyHE3//dMyZtURbAD/t/KV3wpC0/icuv7ulYClgfzHKFElT1bFkayiX5LneUnqGiD8ay5DQZuCobjt33wJ1q5hIGdHYd/MWzovs+KkcZ00pezL6h8wFKm/z4hzRaZoIj9Kw8KZtPd+9TKWiDKhJlTAAiqcsRGwp36rYSuqCdXaE06iGaANXJTuEUjxwXJIY+g7rqEvnAyEKXzC9ZSAqnrxK/N7+uf5vzpbHP92urJu6lWgbJkJEt3RIYuk5Cq2bjwmIw== 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=Sn86BFV0XW4qVryGzXmhjyRn7AbQUwDZWnSiXBLKbec=; b=u1PSTWPfW+fU8OvXOquriTsXT0hHeA0ATObu6eEBvE6QV3JIrbJGQ+x/WnLAY3UnAISDNnC5KeItmdFG2e8YpUbo+OQd7SGXC+vWCor2CxGIJA18vcc6GHRkj6YuQA6Y+xFFo8iqIbH4NOzIAV66f3603JKNqlfGAyQSgPouZD7pVGOxQYSvcJM9uhEZiuNeYZJCaCuvrc4o8X/XoL6Gw6cwT/1THvbj3moXoBEBp/9xuNOKobHVxXeXxB3LiybHWpFbao7sSv6iThKYqfjGRRljdgDwcu2h5jJuHrAdkI2nUB11I8wO7ieYBDtNfjSzEE5obQMl01OW79wnOoH82w== 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=Sn86BFV0XW4qVryGzXmhjyRn7AbQUwDZWnSiXBLKbec=; b=PgvSFZEMg2sUkXoXfZAV6KFjBUnLVs3Ecj8kBxgNG6He2YQ0UNRRpmsZVgFU32AQJI6b36jRBZ11ZJg3gi86u/U4e95WeH1HX06Ab11Anj9tr5w005qvKGJDTGEiC90JqmRXUlKOaCau1vDtFnBhatst3bv4ZQDr0yWEdZCpxws= Received: from MN0PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:52f::26) by SN7PR12MB8025.namprd12.prod.outlook.com (2603:10b6:806:340::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Mon, 17 Mar 2025 05:23:31 +0000 Received: from BN1PEPF00005FFF.namprd05.prod.outlook.com (2603:10b6:208:52f:cafe::3d) by MN0PR03CA0006.outlook.office365.com (2603:10b6:208:52f::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.32 via Frontend Transport; Mon, 17 Mar 2025 05:23:31 +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 BN1PEPF00005FFF.mail.protection.outlook.com (10.167.243.231) 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, 17 Mar 2025 05:23:31 +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 Mar 2025 00:23:27 -0500 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v5 3/4] KVM: SVM: Add GUEST_TSC_FREQ MSR for Secure TSC enabled guests Date: Mon, 17 Mar 2025 10:53:07 +0530 Message-ID: <20250317052308.498244-4-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250317052308.498244-1-nikunj@amd.com> References: <20250317052308.498244-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: BN1PEPF00005FFF:EE_|SN7PR12MB8025:EE_ X-MS-Office365-Filtering-Correlation-Id: 3984c592-4e50-4293-715b-08dd6513db3b 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: Ttg2DQAzFYte8YIdzpH5nosV9DXwr/RnO+qhWsf11EXKSh66MU5liIuyNg5n0EIHfsUFtBzBmq5JnTsQIAPGey4x185eLa+5HLxsWYPNHWusy+L7GfDiCN7Yg6WN6VARXQK+SdZWMcY735ofhIv0bIFyB7zuNe3qNmWRjfJ1ouO2KqIzzFkgmmFJkJPZBDswdFCYhjzkOkgQYXKweb1NM3dyAmLHC/4B8940ZsAzdpLwmGKk2hUp1UEThlElaPgrNi4154Vzi/ZUhays0ps1pfrIEQ2jyRs3yF++pVH+hIJeBxTNOeD3yVME8UlRmHQPi8W4Vr4dHX1D1IISN9cYJAMCgjSqNNE8LR1R0N4isEr1PsQ02ToYI+PyyO1m5vBfR+GpZqFf8cA2R/3ZH0QT0EYf6s1THH75eHKBsiNCpto+5w3XjOc6OikpCbt4THAAYqvHNI/J2wtvBLlXAPU+6gI9Gqg1n6zOcP89O3H8Jm1heiC9VNCr7nRzP5jTLbjgBgA6w/zpo7dj0RuTfwUsUwr3B/ymjUJA7sdwteZTrDjSl3fFT1Kmo8uZQMC8JxT2cITzf7e0RjjOUrWzAoLTz3tsmfzybcpcq/k5B+dAdK3ma1ySQR6ElvWW4E6XGiV8Wy+2pG/hNME7oPUy5zEeSB2+rMtR3hp1P0a5C5coO6TBYPFWtxg8F/nxOkeMlmnB74EohMJ4gZpWh+rgC5hHon2V50Um2cEEv86bPo99M7ytZPQxOpGL1r+QL7QBYZMKuhfalCpgCLsLLMyGgwjpQ7OJApi30iYRRY+Isy/L/urGngOh1HFCmyrOqOSCFRqjRIl5DNG/2MUuY5X7s91SMEMwWwaQqRwukRPTyIDkNAwliJwEsBSopsKnf51RjkdblwyfdEQrnhQPTbJQGi2/9ZmIxnl7oGzPWsxu7Cn8/WdbUKk18BKRWPZzix/h32OMVu/OcmjCN7Nj2Du4D+IclVNam0LuFO0+IMxqcnL3wfhZFOhQwtTqeAwYb50+smTLTCoRtlK6wNBFB5j/PG3l3C2kB5JH+Prv23qb3acwTiPDU8KnKGSkRyAx88mLibYRdiUxVJW24VpgFOSxBGcMOOwmFZEOHijzttchIqy3IEVCbICz/DyVDohOObviCElnZW7on0JHff1qrD6IygyWizkFResHcthOLKf90+eztepLUcIpggxfs6b2HixDTPzSKx8KqCGA1Wm9BJ3+W20q/kMoqNEmBDGrRzpZh574Nfk+xStqh/DXq2WhblUcFpCINPoItcfHrUKrSIuWf6aumn4QZ2Y+ZGBjXPYGYOyA7g7ZKXP/DoSXMS918i2QHIm0I+MCpXH2cSRGqCamecXBVW0TwXUq1kHLL7EUNLwsLBC9+smiSjl9HBT/YIWrI0Rl72RCVIfaLw8mihF9HO8+gDRuWOBbAk5nHxuBhDujYWJuTBAhQBrbNL8r/BZ7rHx4Iu5/Z3GLx5jc2aoEOZjfzWSGH7uOb+xT0OfOBK5ACaA= 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 Mar 2025 05:23:31.3055 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3984c592-4e50-4293-715b-08dd6513db3b 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: BN1PEPF00005FFF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8025 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 Reviewed-by: Tom Lendacky --- 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 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 661108d65ee7..80a80929e6a3 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -4555,6 +4555,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 e67de787fc71..6e1608f04b85 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 ea44c1da5a7c..513681604268 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; @@ -379,10 +379,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 17 05:23:08 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: 14018661 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2083.outbound.protection.outlook.com [40.107.244.83]) (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 1DA012192FE for ; Mon, 17 Mar 2025 05:23:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189017; cv=fail; b=XrvcFI72+u2al/GsQEid+gcri19GteXRYlpSdYEUJ4frCaiwSix7hxsGHa7RR6frwnpz7kfftNnNa/Q1SO0nY/k4K1Ze5FzCXDpkLpfl0jHky2uyJziWGlYkAl7x/iBfz5hmb1SKOH+Yr55qpS3ujedzD44HPCbSOjNH2HlAS4o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189017; c=relaxed/simple; bh=L+j0mICvho2cH89udWEvNx3OeDCj4z0Iys34gCGJugc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JCNZ+at7Vyxwck20ZX58EIJ/2ATGUiIAb9vrjBru32vFktxeeUkusB4Zo6rFW6+oOv4yz+qbF7vXoBN0VlHj5puzFOgRVzpHAlP2W03ge4BVHdIaKIQqz+ejM6qHhNLR/ZDP+L1cdpac+8BPqInHlujvPNpLFaSu5jjxCuA7B7g= 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=P6pG6ksN; arc=fail smtp.client-ip=40.107.244.83 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="P6pG6ksN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XOOHI53MfMNAzhxplbSmrbCq3cALcowNaQhsZGmtKZWnnGmEa9fn17dIZgowEvTIi8bpbPW0Hf1h4/dkDHDC/Yt1hWThCFWFUtWwuixblX/JARDA0KOJQSsMWUnbn9EV6mevPn9HIqcBrsxffeXh5pOPV4l9DyDq3ytLH8n3YzY2qZZ65xxNUuekYEyfrl7CXtVM3AQ1EgzEa7EItorVOOKHBr3zl3BQkZYMvAM+PLtlaVoA9sg0y5Gd4EEvMu6gvEw7LWl5jlNssXmvJh5PF9peMeQTmIwHaxKNjgcL3KuMza9tsNgVLV3cO1Ady7jQZ7JXGzuwB14O6SyOg6Zhyw== 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=UvN5ncm/qCjwOIIdRNldezf/Pfmlh/JE2XxX5tGiZVI=; b=SGYfd2O2nwrc/EoAm9/OmtVlDdHEY+2UeYtmMXATCTYeAM/urbTI6P0Uwc7N2JYvr6t2g2/xMvHILuAnDHMC3bxgzvYEz+LRRfFcPuSgRDcLNFjvlb31br1lwwH0B3M5JXadUiZgi7Md95wW2gJ2/WDhq6K4Mh7QZ19UoUos2XpQyVUP0Jlipu9pUuVBlXcavjOtTD5a/pmUfLPeAl/+T/yHLwSMIJZz4oSx0Q2RN41mw2AbBe5dI/2V/AeZNGUMemyshNgqYbUYopDyvsvqXcuOp68BU9sETWzYRuyOBoKMMG4PS809JJCHdxsYc1J7FGcz/kXrPUzrQTOQd21JQQ== 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=UvN5ncm/qCjwOIIdRNldezf/Pfmlh/JE2XxX5tGiZVI=; b=P6pG6ksNCoDWv1mJyL+1GoLz60EMvFQwRe7s+k3bmq/EddbiDI05W07H3CCJuMbR6RfD6VVJF59riM0HAzMvZe3iyX3Ef9X2SgZjJkyPMYRRoKZ+rZCFUkznaMbXZ4kN2WM3CNQ+SOxRsyp+1mNaGhGSsezNCsrPNjGelBILebA= Received: from BL1PR13CA0282.namprd13.prod.outlook.com (2603:10b6:208:2bc::17) by CH1PPF0B4A257F6.namprd12.prod.outlook.com (2603:10b6:61f:fc00::605) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Mon, 17 Mar 2025 05:23:33 +0000 Received: from BN1PEPF00006002.namprd05.prod.outlook.com (2603:10b6:208:2bc:cafe::62) by BL1PR13CA0282.outlook.office365.com (2603:10b6:208:2bc::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.30 via Frontend Transport; Mon, 17 Mar 2025 05:23:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006002.mail.protection.outlook.com (10.167.243.234) 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, 17 Mar 2025 05:23:33 +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 Mar 2025 00:23:30 -0500 From: Nikunj A Dadhania To: , , CC: , , , , Subject: [PATCH v5 4/4] KVM: SVM: Enable Secure TSC for SNP guests Date: Mon, 17 Mar 2025 10:53:08 +0530 Message-ID: <20250317052308.498244-5-nikunj@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250317052308.498244-1-nikunj@amd.com> References: <20250317052308.498244-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: BN1PEPF00006002:EE_|CH1PPF0B4A257F6:EE_ X-MS-Office365-Filtering-Correlation-Id: 60249786-cc8f-4cfc-fb73-08dd6513dc7b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: s8G+QPx9bH5bmS07BI2WHrkvZuptnMYKicHzQGg7sKIMfHaGfh5+UZQ56VlbIjAm5Nez3HgLU40B0kL94AXiZ+ehgr70F5aCKZzuvwCOPxQUWusH67blwuMUpFjzmqM5e0q7DDztlikfacmfS6DtLcj8w6RBWw1UaHzFxe7m+O5ygPL/XwcT4vrvPr/4Fs5cKXTCbFCVq8E1BxLxNvZ0T9yNLp2Cnxgw0DHEbPCGZaqATcUYrR0R63imwZnFhH4HBH2ZhGk9qcn8Zv3aMi40MqLNckeBAkZVS0HCUjc1kF4/6utuD4HIQT7TtsxWJDF66sm2RYfsSpFzIm2exDDVxtxAhrgfxhI3oXJtaCcW93gxH1VwcC4VwTFaX+U4TW/Y3HVU+OnoL3uxeUHPfKtPptghu0UMEmaSeCUEJAZRyQv9mvANqdfe+eie+l2mdeuIe/4WNweRC4acIjo6cX+mPVTItIbSoBxygfvA16JFEp0E9WJHk6W++Xhamo7j/FDA/iZR7c/uPEJ0oCByYVCDJH6btmYVkgtALKNiE99HdjKZ8Bt7/rIQGAiPgdSETPIYfKU6b2Rn3ObDrugEInC1xO+TBX41vMzVrkI3Wt3mCRuF1ukxnxtW/bIQ39GE8q77rtxxUMtLBTyvV3bKcGunKAolNfQTQWOIr10IDSK6ZK4CRN3I669byM4Iv8oU2gvYGh0yUFtdfY5Ai7J0OlOOvMXwxfAMOMHyl9Zwl+kmx8z/2+bA1kF6N3bIHFzEHNUr2b8ZabuD0ObX0yEcB6lVllFnpiVJwkYsQjKPRBNsuI7IDYbFfK4aVfcxhi1Ymm+U1qeebH8Pxaz8+hRyNPBNPX/BylYA33EqYmmB3VufgYuRxmh555+fA1sFAfFWnEJYyG0OdIvsEuzIpbKi0cSu0EIZzV10uc2FW8grJC7nMgqTy+auuRTKDZcLwZSqjML1GJwSiwjjM0mQopf8kzCQdytLlvELB6hI0jDNe5ZoyUj45AmeJnwj9ABJ9QH4WK/uS9YH5Punp/re8C2RWk+3tkEA1gaDZBmEv1XvojPaI5zPQsBLX4fWQCeXPgCzHy51ZEjnVpBRhcdtqfebld7mWhU1cUF0sN+1viQ/wYi8AV+DgMrnrS9fT6HzNV7S8+BT0fLG0EKaMFtf2N6AnzXv3ic1FabNdnYobd9pPFBQTxneTNIQsRERtz4ZFbDP9qmVHhsaPYyONGn8Kzjb2j4uvhPBwBLt8ery721YWifwJwy5Hc8z2ampWiOJZYPiTrhzrKUMo/oF8Lai/Otez9p+ptsDZj5pz7IXjQ4pdwQQ/UsGLuS2qxrDvhuTZ3kGOYBQp3RgISz44T1hIFwEz2q78IfN0fOzyw504lsktm0xfEKmbcd+Z9WwkqDPEEyU6mkv/pOf1gTrfHUwM3BYWMR97Wt2beLg2PEsNCsnc+kFCGEClPyWqMVfYwG7UUHfVGi+FCCaHRcKz+cAOb/VgcZLC0C+CQXYSbfprjYEz8PA+m4= 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)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2025 05:23:33.3906 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60249786-cc8f-4cfc-fb73-08dd6513dc7b 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: BN1PEPF00006002.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH1PPF0B4A257F6 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. As the frequency needs to be set in the SNP_LAUNCH_START command, userspace should set the frequency using the KVM_CAP_SET_TSC_KHZ VM ioctl instead of the VCPU ioctl. The desired_tsc_khz defaults to kvm->arch.default_tsc_khz. Signed-off-by: Ketan Chaturvedi Co-developed-by: Nikunj A Dadhania Signed-off-by: Nikunj A Dadhania Reviewed-by: Tom Lendacky --- arch/x86/include/uapi/asm/kvm.h | 3 ++- arch/x86/kvm/svm/sev.c | 14 ++++++++++++++ 2 files changed, 16 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 80a80929e6a3..4ee8d233f61f 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2226,6 +2226,14 @@ 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)) { + if (!kvm->arch.default_tsc_khz) + return -EINVAL; + + start.desired_tsc_khz = kvm->arch.default_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) { @@ -2467,6 +2475,9 @@ static int snp_launch_update_vmsa(struct kvm *kvm, struct kvm_sev_cmd *argp) } svm->vcpu.arch.guest_state_protected = true; + if (snp_secure_tsc_enabled(kvm)) + svm->vcpu.arch.guest_tsc_protected = true; + /* * SEV-ES (and thus SNP) guest mandates LBR Virtualization to * be _always_ ON. Enable it only after setting @@ -3079,6 +3090,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)