From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.65]) by mx.groups.io with SMTP id smtpd.web11.6797.1678917521753894092 for ; Wed, 15 Mar 2023 14:58:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=5OxawhNr; 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.93.65, mailfrom: michael.roth@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eKfd5E7d3Zk32AUbL/8XZxzyqosicohmT8+cXdHJ0MY9BgFPR4LERua0tZ6589pur17aWALDyYoR3BAgm/OXURFPduXLIHx9YkYmbhB6IJ3n4/BdB1fB8dwdsSLoRNv0KEg8zsOeZKp5tAjVYysTGcTGSlKxc5h3JclquaI6P3Vdvb9fjitjf2G/AEgXj4n0hUSWiKy+pYG12+GzD+BSB52u2m14WNxp+uERQPoC3GlPUFLPybj4HYR30XY9liiBj+p8JKQwckzZfSRpZgA6oTmhJgqcp8eFUxN1HqcgLBMgCPqMwZbzZT8w3cUji+X2P02qyxE5O0iK91TQLAk0DA== 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=lXpXRHPP2Vv0U7HTJSDpeJspE9Rt9XcHPqpqyb7aFqE=; b=QEyuJhebOGw5+Lavgp9xA5i3k5rviAOO9ArGz7tM/9Z9UAthW1CB3EVVkVO2svTWktx0tjK0wzzUof9DLwMwnKbnDSrHSdEaTPq+pDDo4engFyvr1cLUYalkfWepu3nbB3XbSwEUiR5eSYYfudrWGWXAIBaXdQldT3uQ2kkrBOIZpPSz6jEoo/0Dr5EyPHVSZK3S+NDlwkJVaLfbnU8//cBQL97bGG18UgthYPvJJrzzGUwvTM358qcfLdwRvUQARYGqwP1cwbDR+DrSKChGUUDPqVtyr0AnJyIv98MqApKeFyVgFnSz9ILqtLzx1vDJoEHQSX6LP2TzAYJSVuMnXw== 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=lXpXRHPP2Vv0U7HTJSDpeJspE9Rt9XcHPqpqyb7aFqE=; b=5OxawhNr+kkchdUbrcSTSDBbjKDc8XXFi5Hik8pJGa1XQJJwalbuREDWBIYC0w+HAIdcjbRFFSv138cDnkmaUTdEP07GC4B69lFr87hKNwhE6apotS9FEhqX+so4pjluFlF1Wh3pPY6AVfN/NwmeB/vdjMGOFRMdOfh1qRV4xNQ= Received: from MW4PR04CA0071.namprd04.prod.outlook.com (2603:10b6:303:6b::16) by DS0PR12MB7678.namprd12.prod.outlook.com (2603:10b6:8:135::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Wed, 15 Mar 2023 21:58:39 +0000 Received: from CO1NAM11FT081.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6b:cafe::53) by MW4PR04CA0071.outlook.office365.com (2603:10b6:303:6b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.29 via Frontend Transport; Wed, 15 Mar 2023 21:58:39 +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 CO1NAM11FT081.mail.protection.outlook.com (10.13.174.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6199.16 via Frontend Transport; Wed, 15 Mar 2023 21:58:39 +0000 Received: from localhost (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.2375.34; Wed, 15 Mar 2023 16:58:38 -0500 From: "Roth, Michael" To: CC: Tom Lendacky , Jiewen Yao , , Gerd Hoffmann , Erdem Aktas , James Bottomley , Min Xu , Dov Murik Subject: [PATCH RESEND 1/4] OvmfPkg/AmdSevDxe: Allocate SEV-SNP CC blob as EfiACPIReclaimMemory Date: Wed, 15 Mar 2023 16:57:44 -0500 Message-ID: <20230315215747.1543837-2-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230315215747.1543837-1-michael.roth@amd.com> References: <20230315215747.1543837-1-michael.roth@amd.com> MIME-Version: 1.0 Return-Path: Michael.Roth@amd.com X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT081:EE_|DS0PR12MB7678:EE_ X-MS-Office365-Filtering-Correlation-Id: 538bccc0-3588-46ec-94ec-08db25a06f4a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NKLoHXe3t4KufgjlASSRTvGAj9IpVBt/KUDPHqAJklsk1Dahn1IsYYxQB+y4/wLkkRwZWW7rBBZvwzdE/EIV41rRA39xlI6DcjxYnlTZJltpMUdD1ioRQ+vmOWoMWSNPlA3qZvPMqJwxmIF9+MDKmG3edhAtypzey4QXto6vWyaOlOsafAmRGbd9wTE8/ayxKSYC8E3FvZgp5+NBiXEQ1lRdd4KhC66t8VYcPMgzq/sJXukZFec1wxCaK1Ec/1hCa25AuLZKknrQX8zj8JK18L4D/4rBC3rdaFz9vwl4GhWuHXBq29BVWSFwcVdfpZAK38/WBqoIRDmnW0Oz9SJ11RgxHD+gv7+R/eFPlpnUWRzuYxwiMgGDAFeilwGLtD4HjCdijmW9FGJL1I0BvbCzPy/qIcjSSyPno31ciZKGxClZ4pO/HYF/qqJeh/ft0EObYcHcWbn5tPyh/3rwRyojlCDIpFq91V8nPGHXoTwsylO342jyfCHiwb0dYLwEbrKIEX5K/2fhwGVPRjMDqSUglo2ViQ7rUY/pqdJ4pfJy63MwnaZUSzMC3luReHNoWdn6iXmBkKj97+wQB4RsOVZ6bB6o0/4L6HJTxYoywV0/ouE5wCLJlpO49we/jNDMy3s7Law65sdb4b81jx/PM6ASKKKLOG3gYi2fOCX9Zm4FTW13sZQM7WE0b9X+w7G9OdPch6SumvAJUxAlMoOl3HtJo0BWKzrYqcTyH9EtcAMv3cJrLJEZOyQQB4e0rN0dQvZ4efzHillPXwXKTlaO1qZ0og== 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:(13230025)(4636009)(136003)(376002)(39860400002)(346002)(396003)(451199018)(40470700004)(46966006)(36840700001)(478600001)(40460700003)(8936002)(54906003)(41300700001)(4326008)(8676002)(70586007)(6916009)(70206006)(82310400005)(356005)(86362001)(36756003)(40480700001)(81166007)(82740400003)(36860700001)(5660300002)(26005)(6666004)(1076003)(186003)(16526019)(2906002)(316002)(44832011)(336012)(2616005)(83380400001)(426003)(47076005)(145603002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2023 21:58:39.2242 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 538bccc0-3588-46ec-94ec-08db25a06f4a 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: CO1NAM11FT081.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7678 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain The SEV-SNP Confidential Computing blob contains metadata that should remain accessible for the life of the guest. Allocate it as EfiACPIReclaimMemory to ensure the memory isn't overwritten by the guest operating system later. Reported-by: Dov Murik Suggested-by: Dov Murik Reviewed-by: Dov Murik Reviewed-by: Tom Lendacky Signed-off-by: Michael Roth --- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 62 +++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index a726498e27..7250cc90e5 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -28,15 +28,36 @@ // Present, initialized, tested bits defined in MdeModulePkg/Core/Dxe/DxeM= ain.h=0D #define EFI_MEMORY_INTERNAL_MASK 0x0700000000000000ULL=0D =0D -STATIC CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION mSnpBootDxeTable =3D {=0D - SIGNATURE_32 ('A', 'M', 'D', 'E'),=0D - 1,=0D - 0,=0D - (UINT64)(UINTN)FixedPcdGet32 (PcdOvmfSnpSecretsBase),=0D - FixedPcdGet32 (PcdOvmfSnpSecretsSize),=0D - (UINT64)(UINTN)FixedPcdGet32 (PcdOvmfCpuidBase),=0D - FixedPcdGet32 (PcdOvmfCpuidSize),=0D -};=0D +STATIC=0D +EFI_STATUS=0D +AllocateConfidentialComputingBlob (=0D + OUT CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION **CcBlobPtr=0D + )=0D +{=0D + EFI_STATUS Status;=0D + CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION *CcBlob;=0D +=0D + Status =3D gBS->AllocatePool (=0D + EfiACPIReclaimMemory,=0D + sizeof (CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION),=0D + (VOID **)&CcBlob=0D + );=0D + if (EFI_ERROR (Status)) {=0D + return Status;=0D + }=0D +=0D + CcBlob->Header =3D SIGNATURE_32 ('A', 'M', 'D', 'E');=0D + CcBlob->Version =3D 1;=0D + CcBlob->Reserved1 =3D 0;=0D + CcBlob->SecretsPhysicalAddress =3D (UINT64)(UINTN)FixedPcdGet32 (PcdOvmf= SnpSecretsBase);=0D + CcBlob->SecretsSize =3D FixedPcdGet32 (PcdOvmfSnpSecretsSize)= ;=0D + CcBlob->CpuidPhysicalAddress =3D (UINT64)(UINTN)FixedPcdGet32 (PcdOvmf= CpuidBase);=0D + CcBlob->CpuidLSize =3D FixedPcdGet32 (PcdOvmfCpuidSize);=0D +=0D + *CcBlobPtr =3D CcBlob;=0D +=0D + return EFI_SUCCESS;=0D +}=0D =0D STATIC EFI_HANDLE mAmdSevDxeHandle =3D NULL;=0D =0D @@ -177,10 +198,11 @@ AmdSevDxeEntryPoint ( IN EFI_SYSTEM_TABLE *SystemTable=0D )=0D {=0D - EFI_STATUS Status;=0D - EFI_GCD_MEMORY_SPACE_DESCRIPTOR *AllDescMap;=0D - UINTN NumEntries;=0D - UINTN Index;=0D + EFI_STATUS Status;=0D + EFI_GCD_MEMORY_SPACE_DESCRIPTOR *AllDescMap;=0D + UINTN NumEntries;=0D + UINTN Index;=0D + CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION *SnpBootDxeTable;=0D =0D //=0D // Do nothing when SEV is not enabled=0D @@ -286,6 +308,18 @@ AmdSevDxeEntryPoint ( }=0D }=0D =0D + Status =3D AllocateConfidentialComputingBlob (&SnpBootDxeTable);=0D + if (EFI_ERROR (Status)) {=0D + DEBUG ((=0D + DEBUG_ERROR,=0D + "%a: AllocateConfidentialComputingBlob(): %r\n",=0D + __FUNCTION__,=0D + Status=0D + ));=0D + ASSERT (FALSE);=0D + CpuDeadLoop ();=0D + }=0D +=0D if (MemEncryptSevSnpIsEnabled ()) {=0D //=0D // Memory acceptance began being required in SEV-SNP, so install the=0D @@ -323,7 +357,7 @@ AmdSevDxeEntryPoint ( //=0D return gBS->InstallConfigurationTable (=0D &gConfidentialComputingSevSnpBlobGuid,=0D - &mSnpBootDxeTable=0D + SnpBootDxeTable=0D );=0D }=0D =0D --=20 2.25.1