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 [40.107.92.47]) by mx.groups.io with SMTP id smtpd.web10.9846.1597325261493431821 for ; Thu, 13 Aug 2020 06:27:41 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=Vpwss1ax; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.92.47, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N6cIGVF/6Zg9THMAuzZ722kIkV3FjFY7SU+egOsatDGw55/rCb98w71jnDf4LXAAmWJk4j4bUTZJvWqMkrai1KS3OK5/qwdttD3AywcuaB1dZtyqFQ0u+e3+IIfPXLjGOvE4lSMwpsNyPXwugZCxvePK58McRru80gnTsZY+1C8gtMkeXYYEsUEak4hFaGICUdLB3VusgA/U7vTMemqIaE7YY+fZypa4aC7WxBJ/Fh5oh77RpMWUZaKe3UQghyEcjOaVktujobofTQ0Qmte0TNv8rtFsttLeVwmmPLNJzcuAmM2laqTg6F1UfGs7pHOHFY/vahBaE97MlOcVJ/umoQ== 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=Dabv+uMPRAjGdUeyPyMYRGrw+/EhZPU6cnGUVXVKkZI=; b=XRskfBnmweibRBnfyDK5745MEKjAhRTdGVyU4EtDhlYpc/e13wEUmpQIS2SXuYcVVzd0XPEmxRRugqulAXnl9W8O6hHhqmG8ENN2l/uQx/jlraJmAe0lH0/xL6HHAclYX0eGxMlcqNJ7bIfJ33e5Q5/71hgVGGx8/TXwoIGSqFgts5qTCXJfRH5iTiIrDpO8TVKDxt13g2EGhcKVwYSvgoJdQmzpB0cA9FA1dzSFhPuKLaqlxKK/3V3c5BcxUEI2SfyffJRei7UOM54SUaWqbDVCMzPPHDwAzE4lp3JbjH3G2z50FD8FbeUnREbh/3UBW8hIMsB+46orbF3/bo3lOQ== 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=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Dabv+uMPRAjGdUeyPyMYRGrw+/EhZPU6cnGUVXVKkZI=; b=Vpwss1axBwMgQXz0hlZwJ3gZ4aT2bqloFW22lOfHTXCPb5ZrPVhcca/x4t0iYrIhzKNE/ri/wB0FwPCI73qr7/vLhTQHcjjRUaOuSsJWrY3HHj07GV+taYMRdVxzjiTnHtsMyxoLbRXlSEt+VIBXj4u+XmxCnkawryhgfQXf6uA= 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 DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB4220.namprd12.prod.outlook.com (2603:10b6:5:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.15; Thu, 13 Aug 2020 13:27:40 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0%8]) with mapi id 15.20.3261.025; Thu, 13 Aug 2020 13:27:40 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Ard Biesheuvel , Eric Dong , Jordan Justen , Laszlo Ersek , Liming Gao , Michael D Kinney , Ray Ni , Anthony Perard , Julien Grall Subject: [PATCH v15 30/46] OvmfPkg/PlatformPei: Reserve GHCB-related areas if S3 is supported Date: Thu, 13 Aug 2020 08:23:17 -0500 Message-ID: <814ff431b40451fbe532fa9763a5ed0829d0f210.1597325013.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR05CA0015.namprd05.prod.outlook.com (2603:10b6:3:d4::25) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by DM5PR05CA0015.namprd05.prod.outlook.com (2603:10b6:3:d4::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.13 via Frontend Transport; Thu, 13 Aug 2020 13:27:38 +0000 X-Mailer: git-send-email 2.28.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d3b54d08-69dd-4e90-6e4a-08d83f8ca687 X-MS-TrafficTypeDiagnostic: DM6PR12MB4220: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7zc+rs3qQsXdsSZxICRSlaAGOwv9Y6jUNcgcyUlbKjKv+KvzelFbmMUrD95NGjF/RVkQNryZN/io0vYzp9DLo0EN5DC+uSt/z2xVkiAR1t0aQPINxNJILiy4YjTITVBPFo5tzQk7bL6D86lDQDcvSgCh5k50OA27g1epc3R0YPqIe+uWCDbrT8y9l32GBlZB4vLk2vbo8SFAfGDAbRBUeD4jlkhTasI5ohSz5afIPWGvPIgJmwbcb3qQ6ZJMJXDPrA3+KFOM51OvztKluRy4BDdlGFO0zxUCcrNcXaXMSgrmW8+o1S33BcBEd/TmBhyWIO6I413/RDuaPEkCc8jTD5jkndtRLQxI/4T2dqLKy5R6XkiIX7o19PhHIKNf4tOHRpuJf3h+Rrky4OCz0b2g/+7Sl9RuwUzEcdnGKGcJSErp2T6Xthr74Ck7KqJgWNPy4G93D2y//+h9SnMy3BKs3g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(136003)(396003)(346002)(39860400002)(376002)(2906002)(956004)(36756003)(66556008)(54906003)(86362001)(966005)(2616005)(7416002)(6666004)(6916009)(478600001)(8676002)(66476007)(316002)(83380400001)(52116002)(6486002)(7696005)(8936002)(66946007)(5660300002)(186003)(4326008)(16526019)(26005)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: MulvDz4VIQJK+9peiPIlGDFoCdHzzGGXEeFWdhtyWKFq4LaBSraa4zOFWZ8KgICd4eBpjBKwn0CVTOU7Ybn9pRDkJJGtLy7ntnjPWhX78C4rlC4cA2mgEXnVUp8+uwEvk+nZnUdlja21esghbS5jwJvQ76X7qImRzTtLQpatIWCaQsCuhtyLtV0qQLDUy8VoZt+yYuZXFzi9NbibjsMweDqMT08JHFs/rtSlZynNely28DAWho7e7Fmq8iLPcCU/QqRyGxjVq7CBUHiTeaWoXXE/ogGgwI434jTlvFl+1utjcWjqslfkgnEd4wjpSDFAkDkFOSmPlNbAnkWTOKYfdBzHV/mkT6eIEG/d+eRV4tX6dS8MCXbNdw9QsP/DUEk1Rlzv5Gxzc65hfT4QKO8GIPYtYmamtjaRAn5z7jgHkuiys2B+40uGQjfYXOFQAa0u9FbU8FOFmFZas2bwxkEUuslwF5WVI6txFpQ2dqV4uZxv2rYlkoif0iWsI5a00E/YB6ZTolXsv1UUsAmODjzxUAbKmdzB9WhWT9ZATEg4qnT65HVrDzAw3LhQbgfIjkqYYLr3cQSRNzMfzRLFQqevgSoRJ43dai6nLhFGeMq58DDFtI2npCdIJXDJU6fObWWIqHD/LNeYAunQD4mic/ogXQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3b54d08-69dd-4e90-6e4a-08d83f8ca687 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2020 13:27:39.9178 (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: 0UQLngCuXtDY93zT7/NpEQuM3bhDyaAwAfyGPE2lTmRH8STUZQC3B6rak50342LMiS/s2PWcLESw+iPuHECr+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4220 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2198 Protect the memory used by an SEV-ES guest when S3 is supported. This includes the page table used to break down the 2MB page that contains the GHCB so that it can be marked un-encrypted, as well as the GHCB area. Regarding the lifecycle of the GHCB-related memory areas: PcdOvmfSecGhcbPageTableBase PcdOvmfSecGhcbBase (a) when and how it is initialized after first boot of the VM If SEV-ES is enabled, the GHCB-related areas are initialized during the SEC phase [OvmfPkg/ResetVector/Ia32/PageTables64.asm]. (b) how it is protected from memory allocations during DXE If S3 and SEV-ES are enabled, then InitializeRamRegions() [OvmfPkg/PlatformPei/MemDetect.c] protects the ranges with an AcpiNVS memory allocation HOB, in PEI. If S3 is disabled, then these ranges are not protected. DXE's own page tables are first built while still in PEI (see HandOffToDxeCore() [MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c]). Those tables are located in permanent PEI memory. After CR3 is switched over to them (which occurs before jumping to the DXE core entry point), we don't have to preserve PcdOvmfSecGhcbPageTableBase. PEI switches to GHCB pages in permanent PEI memory and DXE will use these PEI GHCB pages, so we don't have to preserve PcdOvmfSecGhcbBase. (c) how it is protected from the OS If S3 is enabled, then (b) reserves it from the OS too. If S3 is disabled, then the range needs no protection. (d) how it is accessed on the S3 resume path It is rewritten same as in (a), which is fine because (b) reserved it. (e) how it is accessed on the warm reset path It is rewritten same as in (a). Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/PlatformPei/PlatformPei.inf | 4 ++++ OvmfPkg/PlatformPei/MemDetect.c | 23 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index 00feb96c9308..a54d10ba90d5 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -75,6 +75,10 @@ [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbPageTableBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbPageTableSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbSize gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 3b46ea431ade..6b5fee166b5d 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -27,6 +27,7 @@ Module Name: #include #include #include +#include #include #include #include @@ -866,6 +867,28 @@ InitializeRamRegions ( (UINT64)(UINTN) PcdGet32 (PcdOvmfSecPageTablesSize), EfiACPIMemoryNVS ); + + if (MemEncryptSevEsIsEnabled ()) { + // + // If SEV-ES is enabled, reserve the GHCB-related memory area. This + // includes the extra page table used to break down the 2MB page + // mapping into 4KB page entries where the GHCB resides and the + // GHCB area itself. + // + // Since this memory range will be used by the Reset Vector on S3 + // resume, it must be reserved as ACPI NVS. + // + BuildMemoryAllocationHob ( + (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecGhcbPageTableBas= e), + (UINT64)(UINTN) PcdGet32 (PcdOvmfSecGhcbPageTableSize), + EfiACPIMemoryNVS + ); + BuildMemoryAllocationHob ( + (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecGhcbBase), + (UINT64)(UINTN) PcdGet32 (PcdOvmfSecGhcbSize), + EfiACPIMemoryNVS + ); + } #endif } =20 --=20 2.28.0