From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (NAM04-BN8-obe.outbound.protection.outlook.com [40.107.100.81]) by mx.groups.io with SMTP id smtpd.web09.1120.1610045429763352142 for ; Thu, 07 Jan 2021 10:50:29 -0800 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=DQcQn3iQ; 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.100.81, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VARTUmwWSU7no65x7QqNwUzHYcSHrM8LCHVU5zRhNfXvXLVyBdI6Qa3mpLQnjrO1M0gk/Qw+3SDKQkju2DnoIxO2lPoYdNvhOs5hFn0yC12CVuto8WpZfnahehCTmwzK3MYzF3zx8YuZtoaLmpzYPvcZOmh98g1c68xxudneEVSt/JO6YuFnenhCbcla6Te6hKwbMd4zOSdluMkq6slppInvMTAN8p21wEY0HyqSM6PDlD+GQ55z+vvLcmwMUVJMhp7kzrnZo3qx1Dm/DEKVM8HOam8l0LY4raHH7lgvBNY33md522GgS3aXfnyl+XHku+oajUL3F0sbznovsiLW+g== 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=xrWe/lVlufpffDCm+3yDZdIMpp8lRR1l0HrvZ/IqIgI=; b=B/ODq7qIi4AU16VcdlmPjgeOWnJbvS2xOgCrhX1gtu7+Uf0RekE3phxuKY+wIUzYnZOteEXrp0DPQ26DEaBj7kBWQzEiHhHe32ThQuY84mG4SHoMkSyqnCAPCQMTOm+LW2buWkW9Ujz5giVfSWEEHJINhtuJu5hoMsH+sYYls1KruC5ZvZuO0AItlY+/Qg5EVp2jNVBEkuojmDrT28+5eDAghIopFKaDIB0CP5JHVWiLbzF3rTvMlxueSTc+ps/r42PvYouW032wGZPELlik74e+2czf8ioUJp132E2vbGr+DzcJxZbHQuQpNueQszull0X+LANVUXm7a63CJImFVQ== 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=xrWe/lVlufpffDCm+3yDZdIMpp8lRR1l0HrvZ/IqIgI=; b=DQcQn3iQI769sBsPHz4sC+D5oluzzk8MJ0qur3iNGu1oYsrO6S/zBO0I3Plfqakqkc7LH7fM09YDBSUs750xg+EdE8j6cTvsGKVuved16/NqRuv8+qZHOFVW7Xn26qhUMLw9EC6MHETTy+/xgY3h2eBfl0UhPHad1STPVZtbMCM= 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 DM5PR1201MB0121.namprd12.prod.outlook.com (2603:10b6:4:56::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.23; Thu, 7 Jan 2021 18:50:26 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3721.024; Thu, 7 Jan 2021 18:50:26 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH v3 08/15] OvmfPkg/AmdSevDxe: Clear encryption bit on PCIe MMCONFIG range Date: Thu, 7 Jan 2021 12:48:18 -0600 Message-ID: <711ae2dcb6cb29e4c60862c18330cff627269b81.1610045305.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR02CA0110.namprd02.prod.outlook.com (2603:10b6:5:1b4::12) 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 DM6PR02CA0110.namprd02.prod.outlook.com (2603:10b6:5:1b4::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6 via Frontend Transport; Thu, 7 Jan 2021 18:50:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 80b53530-94d9-4251-9667-08d8b33d18f6 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0121: 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: JjsQpM8wUO+bfSMRKqm/Bdz0XCJhHn+2bT9BNhkuxnrTkroBWuCnUYVdEJYKZC1IOgk9bIR6+NMrZRZVyZzqZHUOUsLz9Sg1sRgqlFZSi4QxWn9iS1rP5/kzCjQFxEswE3gptUnWNtmp1DHf6/wATQjJxKUDYGJ+qGU1gYrEJTwZVUsrLfFNFj2ym49eEfdFSxZC/ZHV6X7sqx+7Cm+gpfy+8SrSke4JDSQjSuMCczfov3oDV6sd1gmn7tCAr4VMX9lbQZB7FJJpIZrsdODsKxhgy1nFHLNtONfpc2Ab0zUOKgZIiksXRP5UEXLavF6hGdUCLYK8vMlYsU1GD36Nno/tNnUNP37Eau6KMnfuM+MgUiAU3PMsWXst6A9j4zaOxtvjE7bs9+B4oQhDPPTGk89xHli9nvxpcoOPIUQqb/9KLz2Mx6aoQ0ZGEhGt3KYTToy9xq8iZmgxD4ye0+gg4Q== 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)(39860400002)(136003)(366004)(346002)(376002)(396003)(54906003)(36756003)(316002)(52116002)(16526019)(186003)(6666004)(7696005)(4326008)(83380400001)(66556008)(66946007)(6916009)(956004)(2906002)(8936002)(5660300002)(6486002)(66476007)(8676002)(86362001)(478600001)(966005)(2616005)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?EOY7xUD5xCalPisl6KRbkAcbd5v7yCPG/UIErK9208SV3QNxcqyeVsGt9AVG?= =?us-ascii?Q?YYy6teLVOv23MK54GOR39KaFzBuOyqMZcPIZb4GUzD8qGI+x+6YBxXN5Vva4?= =?us-ascii?Q?RB7RVaqOwUsGsIiyLjtuxThp6oXfyHC6GiSaega6B5+beMHLkYYWd3B+zakE?= =?us-ascii?Q?0EFK1pKsQLa7ytFkBrThbdXXkdKsUWegO/YNOQoi1x51sBOEUwqsgxoTvLN+?= =?us-ascii?Q?Hz/KMHA4C7WJFUSSLDqnKj+foukz4Tr6V/SdptoxDDGwKYjUcFLEq8AQqwht?= =?us-ascii?Q?QiyiJwqkpyok7mifwvdcQIUZckvoN9FRpHLgVib4UKuPpQ1L/NutrfUkIwTc?= =?us-ascii?Q?uTEHjm9kR/R1sarmNTKPQmbP6qc+TqzFZC9IDS7i5kWu+QISa/+hBrNDjy0E?= =?us-ascii?Q?w4ll3xD1t2LAZp5PrS9xDyvlfAXzcIGc0plCr+C94ME+QEChSbAsEZyjge8n?= =?us-ascii?Q?+Eg8G0rGVhvjTWRBhu9qUkbMrtORzgHABIhhWs4+Nuq+1HiKyLahRKNDK/+S?= =?us-ascii?Q?aR0r/uQ0SwO/KXALLBIDEvICzUNpw2skVQ8GhBAGwwRB8xTVUBFCPKw7Xu0q?= =?us-ascii?Q?Kj5ho20xiF1XGF/Gv3Zv/6gQIjPoIqZmsGz+x8PT4ioOix0K/H2kzF3kYSC0?= =?us-ascii?Q?lXOqulvTkE6pku/I36TB6MgsQ/vfzBpk21tMuO1vVqjRYgJCec+GVgoGNSva?= =?us-ascii?Q?7TXRg2AoUetEpUrMZDie5SYXBMhQUb+NFfZeQ3MUxHSLHIpPHWL7K7EmAppV?= =?us-ascii?Q?084SdPFP9J4m31uNYDDVmu2gEV+zriGKxQvdHq+462+1BGJxOkpJ54LFL8m+?= =?us-ascii?Q?f6NuJKMy6+H44gC9V8ckhn+gtSjEIDFiTw1aEmBlj+Ibh76T6fihph7hO7qe?= =?us-ascii?Q?jNjX7jWhFLS7UcQ8QA3LZNklycyzMw/H8S9yE+fOoJ/AXQ/badZOPNs+g1Sd?= =?us-ascii?Q?pMzWOtdvOcKAo+SlLMPoH4lLiu/jnxvOaVj9qBJDKcC3UPE58pKwHfmifn+q?= =?us-ascii?Q?XAf0?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2021 18:50:26.5765 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 80b53530-94d9-4251-9667-08d8b33d18f6 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mbU0JeBP6Y3fwl29l+BHIVWltIk6H3Ge8YA6m+Dj1sMNzJxKXgONGZ46u++VLDMGYBLQIgj9GCN7PixzXLB50w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0121 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3108 The PCIe MMCONFIG range should be treated as an MMIO range. However, there is a comment in the code explaining why AddIoMemoryBaseSizeHob() is not called. The AmdSevDxe walks the GCD map looking for MemoryMappedIo or NonExistent type memory and will clear the encryption bit for these ranges. Since the MMCONFIG range does not have one of these types, the encryption bit is not cleared for this range. Add support to detect the presence of the MMCONFIG range and clear the encryption bit. This will be needed for follow-on support that will validate that MMIO is not being performed to an encrypted address range under SEV-ES. Even though the encryption bit was set for this range, this still worked under both SEV and SEV-ES because the address range is marked by the hypervisor as MMIO in the nested page tables: - For SEV, access to this address range triggers a nested page fault (NPF) and the hardware supplies the guest physical address (GPA) in the VMCB's EXITINFO2 field as part of the exit information. However, the encryption bit is not set in the GPA, so the hypervisor can process the request without any issues. - For SEV-ES, access to this address range triggers a #VC. Since OVMF runs identity mapped (VA =3D=3D PA), the virtual address is used to avoid the lookup of the physical address. The virtual address does not have the encryption bit set, so the hypervisor can process the request without any issues. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/AmdSevDxe/AmdSevDxe.inf | 8 +++++++- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf b/OvmfPkg/AmdSevDxe/AmdSevDxe.= inf index dd9ecc789a20..0676fcc5b6a4 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf @@ -2,7 +2,7 @@ # # Driver clears the encryption attribute from MMIO regions when SEV is en= abled # -# Copyright (c) 2017, AMD Inc. All rights reserved.
+# Copyright (c) 2017 - 2020, AMD Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -39,3 +39,9 @@ [Depex] =20 [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire + +[FixedPcd] + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress + +[Pcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index 595586617882..689bfb376d03 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -4,12 +4,13 @@ in APRIORI. It clears C-bit from MMIO and NonExistent Memory space when = SEV is enabled. =20 - Copyright (c) 2017, AMD Inc. All rights reserved.
+ Copyright (c) 2017 - 2020, AMD Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 +#include #include #include #include @@ -65,6 +66,23 @@ AmdSevDxeEntryPoint ( FreePool (AllDescMap); } =20 + // + // If PCI Express is enabled, the MMCONFIG area has been reserved, rathe= r + // than marked as MMIO, and so the C-bit won't be cleared by the above w= alk + // through the GCD map. Check for the MMCONFIG area and clear the C-bit = for + // the range. + // + if (PcdGet16 (PcdOvmfHostBridgePciDevId) =3D=3D INTEL_Q35_MCH_DEVICE_ID)= { + Status =3D MemEncryptSevClearPageEncMask ( + 0, + FixedPcdGet64 (PcdPciExpressBaseAddress), + EFI_SIZE_TO_PAGES (SIZE_256MB), + FALSE + ); + + ASSERT_EFI_ERROR (Status); + } + // // When SMM is enabled, clear the C-bit from SMM Saved State Area // --=20 2.30.0