From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web12.10214.1619783548337545009 for ; Fri, 30 Apr 2021 04:52:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=EgPt0QIY; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: , mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LDUrOUWUxOltgvBCz+2/7GBUHM6N4MLodnBXUIlyu2t4T7wILgLGUiF6r7DAWp4uKmG3NrOKM2xTtZSeY+Lwaym++BU2oOlYtvrSyibVua61T1vmUwJypVxcdBzti7NG+W3s6dablgfbWdWf8L6zXbz3E8XphASLTRJ1zjB+SGmozBpbv/MywTNzxRhEa75xyucpU8Bs7PR5VjjotdZWl3Ozs7UBY8yJWeBPbIzXziiIoIMovb8Hu0CEFVEL1DEbSJwnsbbLT6bVGqyi7+cClAKHVfsabp/dkwaaC4kPk2ssj+ZWA14/jYRT+ZeD6EmaeSPZaCfb2mvZ8Xd55fKy5w== 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-SenderADCheck; bh=jFT2ripJ3fyRhcnCiCYO+pQdh3CcqMz2boo7IkvUxrw=; b=FkVAIAqJMSAVJPVhInHzQk39vrkTXHNyOCtE9gndr9xpVj9xHQy2eMk/3OTfpPd8LHMJvhY1odmtTmGIIVoqXaypLzSekuJvl7LmIV56msjjOcKdzzSvgdIq16k3h5VAURM4K+xwOvrrikimdPpzC8VT0XlOqo/0PlI2YHRpUvADqYJY5V3TU+qTLyzrZ9zyM7q0GIn6EpxjaQBZRAyuCM39FhcwJYynU4nGjyU7sIMgFjb8LXBCmTjVlluH9D6O96AoNe+M5D69WeoifB1smw/Wg64xxfGHHg7Ds7BH7w+f3yGqGizTD8ESpKJC+n3Be7pC38ExHqb4s+3liRVQHw== 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=jFT2ripJ3fyRhcnCiCYO+pQdh3CcqMz2boo7IkvUxrw=; b=EgPt0QIY3qh9C20Ta0DdxtRKEpmkAwrfECUMyDV4HmMEv6IyfgT/u65UyLQOyxInKkTJoslBcxygP0kGuQYTjELS5iXK/lCs7dkrm0yAA+ZP53gWd0IH3b9tmjBRK73k8XmEQv9uTEcu4xW+t5QlZZz72TS5XA5bW+JEbHRED7Q= 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 SN6PR12MB2783.namprd12.prod.outlook.com (2603:10b6:805:78::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.25; Fri, 30 Apr 2021 11:52:34 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4065.027; Fri, 30 Apr 2021 11:52:34 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io Cc: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas Subject: [PATCH RFC v2 27/28] OvmfPkg/AmdSev: Expose the SNP reserved pages through configuration table Date: Fri, 30 Apr 2021 06:51:47 -0500 Message-Id: <20210430115148.22267-28-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210430115148.22267-1-brijesh.singh@amd.com> References: <20210430115148.22267-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR12CA0006.namprd12.prod.outlook.com (2603:10b6:806:6f::11) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) Return-Path: brijesh.singh@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SA0PR12CA0006.namprd12.prod.outlook.com (2603:10b6:806:6f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Fri, 30 Apr 2021 11:52:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54ef6a66-b115-42ad-ef34-08d90bce704f X-MS-TrafficTypeDiagnostic: SN6PR12MB2783: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1H5ZcUdB9clW+BG2MW2Gxawrl+31AsMaGHBL2w5axKwEVOFcy3l7AgFQpURKeJGjogmUFYSEErNfKtScIUir7BCDryawUqgyhrMU0TfVKNekZkgooj/eFO0hJBilrVyaTSe0fR82k9lOzUipdDufQbpfImA97iCF/e3kAbhWDJb9UwP8F2wYSpSB7fUNEKH+zCIXOT5DnNHiQIKbIMDgoInlzM25IX8vS6lTMbwINsRK/Efko4DfZwOkrcbA/u724sWSpXwbe7pqd5NDd07KHL9tI8+FepMDquWdi5NVUzo7FG6ohwKrC07NGZ2xxiPZm/UKF5LGcCEq5m7FqsKOWJRxoEykSV5lobnUbnx1cQ6OaF7ZffoEWZSnW0qHiW8GgbLnDUHY+vnsu/qWZXTZOdEezWviSWjE3UrJhj35R7TLBOBrL5nWCumB5F7CVaLTosVc7nId/L4uxm3o737hsdarfZuXSYi062Xj+VboSU4L5sort4XnJSz+R9PgYDJViDJfghCOzcrkB0hamAxc3JyE5OlJrX8J4HcvclmW+RqczEkRScWZ9gewwgpKOEvx49S/CpODPKG4MhzU79pu2oFuU9trt/HLYrAKidqgsSls0ju9DNp4U1bawTZ4ENRc7trdJFP8SGufQNMrWTnBb1TZkH+aMqXGWcfz+0Nye30XVW192edUMaH10EHvYX3JmDBLHwqRXslpfcWNLxq27+gzyW1Zx23W5TFsC+4vo6o= 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)(39860400002)(396003)(136003)(366004)(376002)(346002)(36756003)(44832011)(16526019)(52116002)(2616005)(956004)(66556008)(26005)(38100700002)(54906003)(966005)(1076003)(66476007)(186003)(7696005)(66946007)(5660300002)(6486002)(38350700002)(6916009)(86362001)(316002)(2906002)(6666004)(8936002)(478600001)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?c3lXqIUZIhrNjCBA6vELTD3feUwyYyUPdoqNiE0axRKeQGcrX/yxyOtQ6BVx?= =?us-ascii?Q?FdI7WfAsBaQRFmLS4uxG/V94TSzwFMftlT+zaRGjeBG/cI9XD3ZHTL7BiOM6?= =?us-ascii?Q?brsO6RoOHVzil+pWznIM3E30FijPUiU+MC1St4PyofqQcU/LJo0mg2RqbFyM?= =?us-ascii?Q?qA7QVtc3ORYNC9QPcv+E617Y0UWW3PMnPo/IlZwqbaYn0vIubTZZAiOwc86J?= =?us-ascii?Q?zfMI2Bh4S9TufDb3IYZkdLCKnVoY5nXZJ9jPLLwhVLsadSXCj57xzxzUDknS?= =?us-ascii?Q?mdNeAD9ythnLD2FRWetbP974H+O1CeBqihnDHYVKiyI8xqQb/aCAD9oFQGQD?= =?us-ascii?Q?1p12qYyxzwaFNpgnf2oMN/+GxjO80GhZ0Zq1pmbU1pwe6XInnDZ89/vMH6OV?= =?us-ascii?Q?Hmcn1fPS5JjnipAxqbPv/KuHrAib96DXr7l2s48N0DO5VQN+vZv12wZdzRan?= =?us-ascii?Q?onhuhgQzql86q/XTgg8QTvj37mhHTmcaAnOSep30Na7jULm3CTDFwFn456qf?= =?us-ascii?Q?HZtHhBU68PwzT/XVWEu1nb5D/S5DYKHpUGv1GZWWR4D8BhSm5GuO0HqIpiMI?= =?us-ascii?Q?XPW14YF5WtDVGkVT5IXwRwrnmCKYyCOblrt1L5t82sdvO2CarxDAOpZCUkUw?= =?us-ascii?Q?mTD//ZYvXb6RVn0NheB2+cEWHkehhPGMPFi1Lotx8D5b3yQ3Yj9G2szvrwp1?= =?us-ascii?Q?ur9vwzbJLl6adYGvwgu8h1E4/8QClxqUcdcRTRloGkWe9ibfhxM3j+3KMU/L?= =?us-ascii?Q?yVtPdvHqg8dbP+xx3qupxYUhk3XGMKFyyErpGgYXCw0+QNK8eW+BMcseuqhr?= =?us-ascii?Q?wQWJudZXCU5GIYNx2nDWiAcaY3WG03D4oXmJiWlnpJFivU3xIOkbB9lK05m7?= =?us-ascii?Q?e0zSUAAwbtPYsFaigqL62JdoEybSmrABLWAtsyad32t6EzdDFo62tEqsJLzO?= =?us-ascii?Q?3R8tDKfZpeKF6tksfNSgwudvKUfkiFKwC9pnMGAsW8ASnvIHV8ITypE53jnx?= =?us-ascii?Q?RYyR8fwzwyWgdSfv+SJiSm7ljjUY7BASIvAXwEQ6sue81/5k1D5NLKBlKq3P?= =?us-ascii?Q?YoUO3mifgWjp6gtfeY6HuV4Gta1YC8O3Av6wG8SKv0Nc4bKRbSWZ+ktr60ne?= =?us-ascii?Q?x8Eq0QdCzE5RJ3clzuCfs/LsYRJ/PbGASxZdcyVAytpHqpcTwWsPfkYbGioz?= =?us-ascii?Q?/MD9TZo4FMpTijnc9A47yW0PS8jAZXp15L7crOy4JF4EX683twTti6S+qMQO?= =?us-ascii?Q?di57sBD43mrydpfG1e+pSSjP2FNHB8WjWuK33osyPcuxyoGFm03CqDUdGckc?= =?us-ascii?Q?IQrnoeKS1NE+pgduRDtYLCnT?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54ef6a66-b115-42ad-ef34-08d90bce704f X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2021 11:52:32.6820 (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: a5AGB72wK3Ey2dk0VglM8Xn05zP7Xnut2yMKBMBDp4rhw0m8HE03hFB9WtC2YKfDuPAvuBxevpQY69H2wonqPQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2783 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3275 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: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Signed-off-by: Brijesh Singh --- OvmfPkg/AmdSev/SecretDxe/SecretDxe.c | 21 ++++++++++++++++++++ OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf | 4 ++++ OvmfPkg/Include/Guid/ConfidentialComputingSecret.h | 17 ++++++++++++++++ OvmfPkg/OvmfPkg.dec | 1 + 4 files changed, 43 insertions(+) diff --git a/OvmfPkg/AmdSev/SecretDxe/SecretDxe.c b/OvmfPkg/AmdSev/SecretDxe/SecretDxe.c index 308022b5b2..08b6d9bddf 100644 --- a/OvmfPkg/AmdSev/SecretDxe/SecretDxe.c +++ b/OvmfPkg/AmdSev/SecretDxe/SecretDxe.c @@ -6,6 +6,7 @@ **/ #include #include +#include #include STATIC CONFIDENTIAL_COMPUTING_SECRET_LOCATION mSecretDxeTable = { @@ -13,6 +14,15 @@ STATIC CONFIDENTIAL_COMPUTING_SECRET_LOCATION mSecretDxeTable = { FixedPcdGet32 (PcdSevLaunchSecretSize), }; +STATIC CONFIDENTIAL_COMPUTING_BLOB_LOCATION mSnpBootDxeTable = { + 0x414d4445, // AMDE + 1, + (UINT64)(UINTN) FixedPcdGet32 (PcdSevLaunchSecretBase), + FixedPcdGet32 (PcdSevLaunchSecretSize), + (UINT64)(UINTN) FixedPcdGet32 (PcdOvmfSnpCpuidBase), + FixedPcdGet32 (PcdOvmfSnpCpuidSize), +}; + EFI_STATUS EFIAPI InitializeSecretDxe( @@ -20,6 +30,17 @@ InitializeSecretDxe( IN EFI_SYSTEM_TABLE *SystemTable ) { + // + // If its SEV-SNP active guest then install the CONFIDENTIAL_COMPUTING_BLOB. + // It contains the location for both the Secrets and CPUID page. + // + if (MemEncryptSevSnpIsEnabled ()) { + return gBS->InstallConfigurationTable ( + &gConfidentialComputingBlobGuid, + &mSnpBootDxeTable + ); + } + return gBS->InstallConfigurationTable ( &gConfidentialComputingSecretGuid, &mSecretDxeTable diff --git a/OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf b/OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf index 40bda7ff84..d15194b368 100644 --- a/OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf +++ b/OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf @@ -23,13 +23,17 @@ MdePkg/MdePkg.dec [LibraryClasses] + MemEncryptSevLib UefiBootServicesTableLib UefiDriverEntryPoint [Guids] gConfidentialComputingSecretGuid + gConfidentialComputingBlobGuid [FixedPcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpCpuidBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpCpuidSize gUefiOvmfPkgTokenSpaceGuid.PcdSevLaunchSecretBase gUefiOvmfPkgTokenSpaceGuid.PcdSevLaunchSecretSize diff --git a/OvmfPkg/Include/Guid/ConfidentialComputingSecret.h b/OvmfPkg/Include/Guid/ConfidentialComputingSecret.h index 7026fc5b08..0d7f1b8818 100644 --- a/OvmfPkg/Include/Guid/ConfidentialComputingSecret.h +++ b/OvmfPkg/Include/Guid/ConfidentialComputingSecret.h @@ -18,11 +18,28 @@ { 0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47 }, \ } +#define CONFIDENTIAL_COMPUTING_BLOB_GUID \ + { 0x067b1f5f, \ + 0xcf26, \ + 0x44c5, \ + { 0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42 }, \ + } + typedef struct { UINT64 Base; UINT64 Size; } CONFIDENTIAL_COMPUTING_SECRET_LOCATION; +typedef struct { + UINT32 Header; + UINT16 Version; + UINT64 SecretsPhysicalAddress; + UINT32 SecretsSize; + UINT64 CpuidPhysicalAddress; + UINT32 CpuidLSize; +} CONFIDENTIAL_COMPUTING_BLOB_LOCATION; + extern EFI_GUID gConfidentialComputingSecretGuid; +extern EFI_GUID gConfidentialComputingBlobGuid; #endif // SEV_LAUNCH_SECRET_H_ diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index d1bfe49731..f38c5e476a 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -126,6 +126,7 @@ gQemuKernelLoaderFsMediaGuid = {0x1428f772, 0xb64a, 0x441e, {0xb8, 0xc3, 0x9e, 0xbd, 0xd7, 0xf8, 0x93, 0xc7}} gGrubFileGuid = {0xb5ae312c, 0xbc8a, 0x43b1, {0x9c, 0x62, 0xeb, 0xb8, 0x26, 0xdd, 0x5d, 0x07}} gConfidentialComputingSecretGuid = {0xadf956ad, 0xe98c, 0x484c, {0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}} + gConfidentialComputingBlobGuid = {0x067b1f5f, 0xcf26, 0x44c5, {0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42}} [Ppis] # PPI whose presence in the PPI database signals that the TPM base address -- 2.17.1