From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (NAM02-SN1-obe.outbound.protection.outlook.com [40.107.96.83]) by mx.groups.io with SMTP id smtpd.web09.116.1634144286915542979 for ; Wed, 13 Oct 2021 09:58:07 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=O5BPu1rh; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.96.83, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ST34NBeWsho7MLpQX/KK+tVrxduufcPvma2LqfO51cem7fdIS/zVdwGiZvQ1/ajfVCItOcKfg0KtKo5EFEgvfIQWk6vLU2tINKAOoBKfYFeUNxgBkuZz3CYQpDvVYUPBukzJnh5gsOMWCeGLwNd8kPtnGkVv9e5tFVfZnjAEv36EoJ2IsAmq3hvGBCbsoA+0f44DyuQkAFfle6OQvY8IpxmUW/TVq0HuNi61OMm2Ho9jGlUqaV09JHafLjOnaVyZUjJxqLRNRl2SWK3EOsuJgRUCnG57XDgPOPZmWnGcOZIXvpK8CNspR7cSJp6UHo7N1ygBqx088cPB4d7kkONV9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=/hdsez3xb2KZTWgM42sW8N43QppxNiNrNubCQQZPUkY=; b=L6igpHMAcYQjMBJUnUHUeNFoxkYlXFObVg6APWiGE4n/GWpohClqc/L5q6phfp2fm2B2f1yjTD5IMFfSGEmDYLa2UO76qZMwN9CZ1dYNcj8hqM6j3L9mN3+rxIW+0AW8W0MzRML8eKLml/SxmghSnJ0adKkrEd/F2PXsLc94OHrBtHT4lDprb8Lv8ghQ9VeIaK7z/rtcP33fxFkeR7sjEuWPJNZC5K/xtJQjKnG6haYhP5U8VOVyCF8+7RJCU0+VFJAllB1PRQcn3/IsGvzN9XmkiIvsTKdHrxnAYZjl0yJlPUf0rUXcoMTx/O7VzFTAuZD1+FocefQk+CKmHHdxlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io 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 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=/hdsez3xb2KZTWgM42sW8N43QppxNiNrNubCQQZPUkY=; b=O5BPu1rhcv5X/9sXy21bG94AyelU8v7pBzbeBP46Its3yPcfqziv/qCVlUsXWWS4MyWxBdebGZOw9Ub1i9MUwIxv8OXHWwqD3I9h8NZxo+1mHWiSC+84VKICfWbtihuwZXDg+ScoBmuFxOWqEGm1cL/0UaDiwzQbq2Fau6CtVNs= Received: from MWHPR11CA0008.namprd11.prod.outlook.com (2603:10b6:301:1::18) by DM6PR12MB3244.namprd12.prod.outlook.com (2603:10b6:5:18c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Wed, 13 Oct 2021 16:57:58 +0000 Received: from CO1NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:301:1::4) by MWHPR11CA0008.outlook.office365.com (2603:10b6:301:1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Wed, 13 Oct 2021 16:57:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; 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; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT060.mail.protection.outlook.com (10.13.175.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Wed, 13 Oct 2021 16:57:57 +0000 Received: from sbrijesh-desktop.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.2308.8; Wed, 13 Oct 2021 11:57:55 -0500 From: "Brijesh Singh" To: CC: James Bottomley , Min Xu , "Jiewen Yao" , Tom Lendacky , "Jordan Justen" , Ard Biesheuvel , Erdem Aktas , "Michael Roth" , Gerd Hoffmann , Brijesh Singh , Michael Roth , Jiewen Yao Subject: [PATCH v9 24/32] OvmfPkg/PlatformPei: set the Hypervisor Features PCD Date: Wed, 13 Oct 2021 11:57:05 -0500 Message-ID: <20211013165713.727815-25-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211013165713.727815-1-brijesh.singh@amd.com> References: <20211013165713.727815-1-brijesh.singh@amd.com> MIME-Version: 1.0 Return-Path: brijesh.singh@amd.com X-Originating-IP: [10.180.168.240] 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-Office365-Filtering-Correlation-Id: 89c3b21c-4a43-4aeb-6fd4-08d98e6a9b9f X-MS-TrafficTypeDiagnostic: DM6PR12MB3244: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6hnlnJxtak4lmxhTUijLw+0F96G+L3j665Dl3/xEKva4ShswZIyrV2DdMSU+f04dtEypmdUslV1VPCvtFweMGc5K4ZSFwD8LQMk8w8niEzsvQEB5sOKWBxOnESuya6IleXuvm5F99O+z+/5t3p24lgwkqljuy9WXPRtZcLoR89Akmf0jKbugkJaqshjFuwtnxStH30sqajBBGOG+3j/mhBkt2UyB8rWpgbGOlxRg0Jt5QFEfQ2NThFmBLfRrYSNLhoG6txjUxC9U3MyYMI56tlBKPwhRnTd9gRb8hkNyQjh0zwvpyIGGqjQxHwlN9f+eU/dZuajFBcanmGizU6RrwpSHCqQ0PTrB/whJWT7/3UGHpOq00Z81KvywwqCb+aHu8gxOriLxxRqvfK9iB0X/AMxQbBdREpzUk7/pMoA40q0SOoFCAif1LRGDmRctCIrTt3+/J+d63Up5pWue3RgnE2lTpuDso1lq9XvhbLf+n0HQIJF9UotZaSGxSUX2HkA6qPxBNyKCxp3H8FIkVXO/hwd3F/opa6z3t2pdw3hdElK8OMqdvCl/+M7NLbUBO5C7I0xuAMwX+HfeibltNAxn0pvEejGv4+vVBCMmdQOUV7V6CFL+AQZAgknPbc69tYsQQ4edHQzFpMEd/09TPpozVfDj1tBzUwDPRUORh8IWe2BVyBHVYxTDJO0WjV6nD2uYZdJn2drszgq4X5wNQt3JSs6o8++5XH9jzOlkwzm1bY+UhnkfgKOS0gtLadkTBHHumqgA51UtXKIC/Q1BE39qZeQ8nUdc5sDCdW9eEEE9CuUwxRA20SudPmN4TbSci7Iz 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:(4636009)(46966006)(36840700001)(8936002)(1076003)(54906003)(508600001)(186003)(316002)(4326008)(82310400003)(2616005)(36860700001)(26005)(44832011)(36756003)(16526019)(83380400001)(81166007)(336012)(966005)(426003)(5660300002)(8676002)(70206006)(70586007)(2906002)(86362001)(6666004)(47076005)(7696005)(6916009)(356005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2021 16:57:57.6768 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89c3b21c-4a43-4aeb-6fd4-08d98e6a9b9f 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: CO1NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3244 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Version 2 of the GHCB specification added the support to query the hypervisor feature bitmap. The feature bitmap provide information such as whether to use the AP create VmgExit or use the AP jump table approach to create the APs. The MpInitLib will use the PcdGhcbHypervisorFeatures to determine which method to use for creating the AP. Query the hypervisor feature and set the PCD accordingly. Cc: Michael Roth Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Erdem Aktas Cc: Gerd Hoffmann Acked-by: Jiewen Yao Signed-off-by: Brijesh Singh --- OvmfPkg/PlatformPei/PlatformPei.inf | 3 ++ OvmfPkg/PlatformPei/AmdSev.c | 56 +++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index 233b9494f64b..d048b692f155 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -62,6 +62,7 @@ [LibraryClasses] MtrrLib MemEncryptSevLib PcdLib + VmgExitLib =20 [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase @@ -107,6 +108,8 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled gUefiCpuPkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr + gUefiCpuPkgTokenSpaceGuid.PcdGhcbHypervisorFeatures + =20 [FixedPcd] gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index 5e2c891309d4..b71a4a7304f7 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -24,6 +24,12 @@ =20 #include "Platform.h" =20 +STATIC +UINT64 +GetHypervisorFeature ( + VOID + ); + /** Initialize SEV-SNP support if running as an SEV-SNP guest. =20 @@ -36,11 +42,22 @@ AmdSevSnpInitialize ( { EFI_PEI_HOB_POINTERS Hob; EFI_HOB_RESOURCE_DESCRIPTOR *ResourceHob; + UINT64 HvFeatures; + EFI_STATUS PcdStatus; =20 if (!MemEncryptSevSnpIsEnabled ()) { return; } =20 + // + // Query the hypervisor feature using the VmgExit and set the value in t= he + // hypervisor features PCD. + // + HvFeatures =3D GetHypervisorFeature (); + PcdStatus =3D PcdSet64S (PcdGhcbHypervisorFeatures, HvFeatures); + ASSERT_RETURN_ERROR (PcdStatus); + + // // Iterate through the system RAM and validate it. // @@ -91,6 +108,45 @@ SevEsProtocolFailure ( CpuDeadLoop (); } =20 +/** + Get the hypervisor features bitmap + +**/ +STATIC +UINT64 +GetHypervisorFeature ( + VOID + ) +{ + UINT64 Status; + GHCB *Ghcb; + MSR_SEV_ES_GHCB_REGISTER Msr; + BOOLEAN InterruptState; + UINT64 Features; + + Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); + Ghcb =3D Msr.Ghcb; + + // + // Initialize the GHCB + // + VmgInit (Ghcb, &InterruptState); + + // + // Query the Hypervisor Features. + // + Status =3D VmgExit (Ghcb, SVM_EXIT_HYPERVISOR_FEATURES, 0, 0); + if ((Status !=3D 0)) { + SevEsProtocolFailure (GHCB_TERMINATE_GHCB_GENERAL); + } + + Features =3D Ghcb->SaveArea.SwExitInfo2; + + VmgDone (Ghcb, InterruptState); + + return Features; +} + /** =20 This function can be used to register the GHCB GPA. --=20 2.25.1