From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.66]) by mx.groups.io with SMTP id smtpd.web08.882.1631557255055665870 for ; Mon, 13 Sep 2021 11:20:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=b5ZwuGL3; 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.237.66, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B2HoaBl9+uqndZVReBn/BG3Doc+9Dfrrrht4pNVGn18o8216T6tkX5C0GdqxAo8H2D8VGYVCE9YvQtA7qs3sgHWDbkc8dMzCi3Ggfcnkok+1Qkni7Gc+kKdFtOW7TlsWnZ1HaaTffjtnKx2S73wNEcjy5e5XJgj4s0hV1VzF8xeAVSCpN9ItUpRcC8nd28zHssCFXIucYt67WF7xHltaw2QNtMznUb6uZlY2uCFnjr7R70PV9CuBXrwLVOQxnmYbrCT8NF/ojg0HMv4fzNvDkTYRx9SR+w9N9gK91tc3igWN1XI59CElo7QNw+JWiGGyDCDNP0IazSPg2JKnxDCfMg== 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; bh=Cdehb7hXH2moiCfbWYbOZszjbfzlq6BL/XNyAy/BWeM=; b=kWTlPp4GtC+BmmIWs79Q84TMsTOlcGR2teeorYVzI3hOyXOWhX+t0uv49Z+5X1MPH0BF2oPi3Ipm477bv4NMaRGVCYIGwqZBXYUy6xgMDIye0G3+oeDvgI9GjUTXofMvmzdN1riKvgDJegVO9ZN9XzAu2WEsLi8X2dmhZdNuXbIGeP+GuDGE3dxIAFbYZ7olyaFOX3A6yI6XBo2pHF+mlxxpv9ZGL42t6ARLbRfQ3byDaT/2/5YmQdYwZapmbn6gJNztbRkifUZovVZlsOTR5IJtPcwA2iD+0PpvYyVoI7/o2LiG9/wZTWOsWLxxJOEedpmsHoGsyF6VI6UZ6p0mgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; 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=Cdehb7hXH2moiCfbWYbOZszjbfzlq6BL/XNyAy/BWeM=; b=b5ZwuGL3WbBO5fMLSQCGIOi3R4R7xiGSXRL9UxL87odH+QgTi9el7sU+2kQzvZmPL1NVsVIP0WwDV2oubzw1V5AIFKc93sPIDibtApca/hUJBE+kHNZhxWt6JNlg1NyaEGKd0qCAR5C+ZzijbuFaJ7qyX2BIG0nnF3fF8/eZJb4= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SA0PR12MB4575.namprd12.prod.outlook.com (2603:10b6:806:73::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15; Mon, 13 Sep 2021 18:20:53 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3%6]) with mapi id 15.20.4500.019; Mon, 13 Sep 2021 18:20:53 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Erdem Aktas , Michael Roth , Gerd Hoffmann , Brijesh Singh , Michael Roth Subject: [PATCH v7 30/31] OvmfPkg/AmdSev: expose the SNP reserved pages through configuration table Date: Mon, 13 Sep 2021 13:19:40 -0500 Message-ID: <20210913181941.23405-31-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210913181941.23405-1-brijesh.singh@amd.com> References: <20210913181941.23405-1-brijesh.singh@amd.com> X-ClientProxiedBy: SA9P221CA0012.NAMP221.PROD.OUTLOOK.COM (2603:10b6:806:25::17) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) Return-Path: brijesh.singh@amd.com MIME-Version: 1.0 Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SA9P221CA0012.NAMP221.PROD.OUTLOOK.COM (2603:10b6:806:25::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 18:20:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 954245bb-6dda-4ebb-a801-08d976e326bd X-MS-TrafficTypeDiagnostic: SA0PR12MB4575: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1pxilUgDFVor9yn2I8iw1zrSwNwe8XYtuyqWyw/SFc/sCVe9KRs/UNMufJpb/6ZxSAOl0T0LaoltIo8Z3s5Me4+3SzXtlqABndPsCb8IdKbT0nszUQG/QKkXYrkbjXDkaeMtNhJXrYFkkXlFQ1NfqzkqlzuywXt3ylxROgGBxgXPHS/nX/YeMa3tvil+qc2IAkNQBtMRJS0I+gbXI6iITq09000pUqaM9NEGajVizYuyFcDBYLlmqyXNUPX+xargfYeq4FZR3Xg3wKviojSnlF334Cbu1eI7vUaPMXgxMXmA93zHIZGvPz1QBXfMu+lwrBKwdC2IHgACdsiRiU0uQAj35MRI3i1C3TswNxp5qYnQWn2eSzVLBQLt7/DxKd3wIaswf7kBoxx6Hg9+SwT7dpWkX6xzx9S1g/R+fRbpdDU54E7Me/AXh31UtnmEJdGYAUycSE3egHmUkeya7NvU4nXFRYIODdbik73skTOFIj7dvIST6tTfHO6Cg5xBZanNKyxA0FpDUtYhpR22j9VVbZr8SWeqs2zrZBIKHVNki9JRMU1FoDaxumBv4uDC0RR47SuweiTndbK+FrvWOJLHmFgNV+szCzl5ZBLNflTZbOtcgMxinQ6Tx2oEd97XHxAfsxS4QIiffxMM1HGgv8IZjdJwVJlC9m9xFQ4miDQ3d4Xmezm+sHuJIGQ2TsBQ6kg57nsm1LSg8wHVC49WqubPdyRStFkpf9uHoKy+0UhsQfMc5RFWIung52Z8fDYe5teX7YVMu7mOLKchNBemA/Yxjg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2718.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66476007)(38350700002)(38100700002)(186003)(5660300002)(26005)(6486002)(8936002)(52116002)(7696005)(8676002)(66946007)(66556008)(4326008)(6666004)(2906002)(966005)(86362001)(6916009)(54906003)(508600001)(316002)(44832011)(1076003)(956004)(36756003)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lR7rGEFOvNTUI2+FM2R0LsGHrbbgRhLFp0qpokYSR7brXaKZNzLupvjOMCDC?= =?us-ascii?Q?61ndSW9cBTz/XWhRJxmsQvmuzIiXvhJrr8kOqxBUxqkQDn5e+z/Jb8w/kuRg?= =?us-ascii?Q?WMin8A1Gfooh0OhjW7RosouL3Ivh4mTHSAfq5C45RIsIqgfqTeVwnimJPv74?= =?us-ascii?Q?k/QtJtN8f3Dblwa66heyZy8+hj1/tSrLeDjcsii1yiLXjfpc+/VB00T9i+YD?= =?us-ascii?Q?y+bBta95gmqdZLtUhutk7Oa1XM0020rU/NFEQKa1BX1qmbUQpn3ZQGi/RsF3?= =?us-ascii?Q?zCOsEI3HFgxa1vunXjJoFasmpadGMYz/FtKLt0t6eZDKYQzOMtp9xDUJUr+Z?= =?us-ascii?Q?3hh0rBvXYlmjwJjEmazeaZ2RxHhzRPoWgfY7w1z8O5xJYkUWTsr1FVjMuMXD?= =?us-ascii?Q?CmTStNfk6DiTsZhG3HPLkVu9jIwrLiyr1kKMpce5SlVim/x7cmCgsKzJLcSp?= =?us-ascii?Q?TVkt9V7f764L6VUVneFPls3YUdCfYaoGqzVxFwHIrQbGd1n3ZuPqamNWA9wC?= =?us-ascii?Q?9KgQ0pfEF89dZUJQSkR5yHTMwbcY0g3k5aoX6ILTNKv9RinW8Rf2FiDxP1Cn?= =?us-ascii?Q?IH54qJ02pEkFSOhnoby3hS3PDN/nAT3je0Tdq4JnXdFcHKN2/zB9DEHSoB0Y?= =?us-ascii?Q?RoyB3rVBlIEPgdsrhoBZ1UMuaZiYnLxgybIPTIdWY0C40nyeE0lQqphreedk?= =?us-ascii?Q?AIDbs+mawXI3mPYPFXvoKD3+WAvXO8dMbsNdMryd9NVm9//Q210v/IbN8kQG?= =?us-ascii?Q?vdMn6fvPm8WsJ5SiNAh3ieKGA9+fFckTGo4tuNkjIWb2X3hNwKkLRwD0OG5/?= =?us-ascii?Q?5E4cW/VHYRHktu0NrnUwLabwQRwLs97ztLUDYyrAS4Y9bRMTEZktb26otaEE?= =?us-ascii?Q?h+wEKSIVpSOmHYAumgxSutHBRBhzMueuyyoPqthRGmZ0UPA1ylt7fjLNCL8i?= =?us-ascii?Q?iHROf+/WSvuNsThdZwE3huct15sNyYymd4R1g6P6x2TbH8KAhbecff3DfRS4?= =?us-ascii?Q?qNmjwoRVVNwdfFkKxFyATLN+0czJpSSJni+53xSfEuSJ/i0uZf+65obZtokp?= =?us-ascii?Q?nGOnYRO7p7iuDeX5NIkAwm8eoul2do1D1+lzCdj3OCMBAncjcKT9OHwNt2N7?= =?us-ascii?Q?FoV+72vjB2K53pJpGUJeDJLHYMK0yotxN+D9e/lpXg5f9BHCqJvJgGL02v3t?= =?us-ascii?Q?dEZhRlELDZnhHUinionWU0tmuJZWl3I2/ZWyv1wQnSvQM/eLKrUeIa3B4+CA?= =?us-ascii?Q?hj3rIA7iebx7OR82zGKxrSVFNXdGlZE3YMqaCJVd2057lWdo2ETCjhc23vly?= =?us-ascii?Q?hv9ROuPKUGbQim21fZE2cNWL?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 954245bb-6dda-4ebb-a801-08d976e326bd X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 18:20:23.1621 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xx51tduJeDb9p2VV2ePG2uHH8XqHa03P4IYUbQLkftl7LEd+icEgAvl2gRfiwHv++cS9lqRDpFbblFAsOGKauQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4575 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Now that both the secrets and cpuid pages are reserved in the HOB, extract the location details through fixed PCD and make it available to the guest OS through the configuration table. 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 Signed-off-by: Brijesh Singh --- OvmfPkg/OvmfPkg.dec | 1 + OvmfPkg/AmdSevDxe/AmdSevDxe.inf | 7 ++++ .../Guid/ConfidentialComputingSevSnpBlob.h | 33 +++++++++++++++++++ OvmfPkg/AmdSevDxe/AmdSevDxe.c | 23 +++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 OvmfPkg/Include/Guid/ConfidentialComputingSevSnpBlob.h diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index e30cb6eafcb8..c2fbd26ed925 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -124,6 +124,7 @@ [Guids] gQemuKernelLoaderFsMediaGuid =3D {0x1428f772, 0xb64a, 0x441e, {= 0xb8, 0xc3, 0x9e, 0xbd, 0xd7, 0xf8, 0x93, 0xc7}} gGrubFileGuid =3D {0xb5ae312c, 0xbc8a, 0x43b1, {= 0x9c, 0x62, 0xeb, 0xb8, 0x26, 0xdd, 0x5d, 0x07}} gConfidentialComputingSecretGuid =3D {0xadf956ad, 0xe98c, 0x484c, {= 0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}} + gConfidentialComputingSevSnpBlobGuid =3D {0x067b1f5f, 0xcf26, 0x44c5, {= 0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42}} =20 [Ppis] # PPI whose presence in the PPI database signals that the TPM base addre= ss diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf b/OvmfPkg/AmdSevDxe/AmdSevDxe.= inf index 0676fcc5b6a4..9acf860cf25e 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf @@ -42,6 +42,13 @@ [FeaturePcd] =20 [FixedPcd] gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsSize + +[Guids] + gConfidentialComputingSevSnpBlobGuid =20 [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId diff --git a/OvmfPkg/Include/Guid/ConfidentialComputingSevSnpBlob.h b/OvmfP= kg/Include/Guid/ConfidentialComputingSevSnpBlob.h new file mode 100644 index 000000000000..c98e7a1dcccd --- /dev/null +++ b/OvmfPkg/Include/Guid/ConfidentialComputingSevSnpBlob.h @@ -0,0 +1,33 @@ + /** @file + UEFI Configuration Table for exposing the SEV-SNP launch blob. + + Copyright (c) 2021, Advanced Micro Devices Inc. All right reserved. + + SPDX-License-Identifier: BSD-2-Clause-Patent + **/ + +#ifndef CONFIDENTIAL_COMPUTING_SEV_SNP_BLOB_H_ +#define CONFIDENTIAL_COMPUTING_SEV_SNP_BLOB_H_ + +#include + +#define CONFIDENTIAL_COMPUTING_SNP_BLOB_GUID \ + { 0x067b1f5f, \ + 0xcf26, \ + 0x44c5, \ + { 0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42 }, \ + } + +typedef struct { + UINT32 Header; + UINT16 Version; + UINT16 Reserved1; + UINT64 SecretsPhysicalAddress; + UINT32 SecretsSize; + UINT64 CpuidPhysicalAddress; + UINT32 CpuidLSize; +} CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION; + +extern EFI_GUID gConfidentialComputingSevSnpBlobGuid; + +#endif diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index c66c4e9b9272..6e1ba35e02b8 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -17,8 +17,20 @@ #include #include #include +#include +#include #include =20 +STATIC CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION mSnpBootDxeTable =3D { + SIGNATURE_32('A','M','D','E'), + 1, + 0, + (UINT64)(UINTN) FixedPcdGet32 (PcdOvmfSnpSecretsBase), + FixedPcdGet32 (PcdOvmfSnpSecretsSize), + (UINT64)(UINTN) FixedPcdGet32 (PcdOvmfCpuidBase), + FixedPcdGet32 (PcdOvmfCpuidSize), +}; + EFI_STATUS EFIAPI AmdSevDxeEntryPoint ( @@ -130,5 +142,16 @@ AmdSevDxeEntryPoint ( } } =20 + // + // If its SEV-SNP active guest then install the CONFIDENTIAL_COMPUTING_S= EV_SNP_BLOB. + // It contains the location for both the Secrets and CPUID page. + // + if (MemEncryptSevSnpIsEnabled ()) { + return gBS->InstallConfigurationTable ( + &gConfidentialComputingSevSnpBlobGuid, + &mSnpBootDxeTable + ); + } + return EFI_SUCCESS; } --=20 2.17.1