From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.70]) by mx.groups.io with SMTP id smtpd.web10.14863.1624902217988413196 for ; Mon, 28 Jun 2021 10:43:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=CZerwtLv; 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.220.70, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hjoOksjAAAYjZ3/Hgq+T4phVktI8bi5dydA37ovLbyn1j1jJvD5LxiOmmlB8KIE/g+pdozlX1qDTav+zk74zzO44IM3xxf2SBwEOwHztZsA9B4mx0LD5z8xOY031gDEqDWkG/X0DcTnXQI5d17+cxyTuuGA46/mtgq0y+cwQw8OxXMlqkZVUlLv860a0G4w99pmaFGYzYgZLfRgEN7JJ1yyCp2RM3C/3frrmB6OsPbyV1nxEmNB0m1jDlPl/E+EZKmuvQPx7xhugF+5XMPis5XgkCgJAIkYUP00hh6vlBncuWvh+3fsCxM6qYjRTdcXqAN6UR7fPYl6bpmWYFGtD/w== 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=oi68z2wD8/2V4B85XwZKA2/OtChrfx6Q/wv17/CWhio=; b=SwHeSAo4zf93THROCzACW0IfVZbTnyy4SZWSpj62lqXmr+Awhapk1361BgNIjKH7dNw6lYtezDnMMwgX/lleThXYX40ZUAgm/6rMmtRrU/wTUmISfAFBFzAhU7MEEnaEcF9/AQsuz1hPMwQeNoeS1/GEfgwYJ87s73zOEOA3udVBFjm9cvrdjVr7zF/fQKp2QViyfzUA9bsneRwe8n2IK5GXgvW1IKPV/5QWR6eTYXgtwp/20uLxLJm4/vKRjObpRoBq7V09DT0AS1JnNBlKHoFVT55sVRZeNDp5+iTxxOhfe28Z06Md5zwkxpFulGUmEMIL0tJG+QbSb9j1jscl+A== 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=oi68z2wD8/2V4B85XwZKA2/OtChrfx6Q/wv17/CWhio=; b=CZerwtLv3Kabqo4LeB43ifyWH3S5CBJPInfnshB5iuI0gPiFsxdKd8mvPTnw+r9XYcAnOtYoOlHNumbAy9ceyOCep+nogOBSRJTP3rByn3gAAX+zoCmJ0ut8DYKCTBrIcd+9ghau0XR2EzlZBrx8Ts5tT0uBiG44jkr+S76/2d8= 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 DM6PR12MB2714.namprd12.prod.outlook.com (2603:10b6:5:42::18) by DM6PR12MB4172.namprd12.prod.outlook.com (2603:10b6:5:212::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19; Mon, 28 Jun 2021 17:43:36 +0000 Received: from DM6PR12MB2714.namprd12.prod.outlook.com ([fe80::7df8:b0cd:fe1b:ae7b]) by DM6PR12MB2714.namprd12.prod.outlook.com ([fe80::7df8:b0cd:fe1b:ae7b%5]) with mapi id 15.20.4264.026; Mon, 28 Jun 2021 17:43:36 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Eric Dong , Ray Ni , Rahul Kumar , Michael D Kinney , Liming Gao , Zhiguang Liu , Michael Roth , Brijesh Singh Subject: [RFC PATCH v4 13/27] OvmfPkg/AmdSevDxe: do not use extended PCI config space Date: Mon, 28 Jun 2021 12:42:09 -0500 Message-ID: <20210628174223.1302-14-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210628174223.1302-1-brijesh.singh@amd.com> References: <20210628174223.1302-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0601CA0020.namprd06.prod.outlook.com (2603:10b6:803:2f::30) To DM6PR12MB2714.namprd12.prod.outlook.com (2603:10b6:5:42::18) 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 SN4PR0601CA0020.namprd06.prod.outlook.com (2603:10b6:803:2f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19 via Frontend Transport; Mon, 28 Jun 2021 17:43:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0f09426-3b9f-4348-240b-08d93a5c41aa X-MS-TrafficTypeDiagnostic: DM6PR12MB4172: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:773; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6D/mFUW/6eclQf0wy8s9gdUEXo8KSV/8LyG4H/vyL6XnC58/rsRrpckEJg2v0o73liplCNtzE3kgdN+Mp/waPmhYMVmM9sy6JdAJZoztc+GaOLMSTXwng4lzvFVOuHhvoFrtimi2XHf5obSoxqkENAAdk3o7hXPctEJwZr3bpb8hn4aNtKZYWeA1LTmacNBVqK+iWNReDYw4nwbr1cXrvKytXX8V8gjDkg1qrBUW0Wo9NI6gEde5gyjGlaJZBjrhQzjK1lbt8HZYQ/Oty1FVlfnoT+BMRvPJfc8dLyujzV5l7/MwzHPiShTsGLqReg1gLB0MbYJ4oRIPYxbGtajS9A4MNSOEDB19+x73lbEKOF+88MJV0P4JVVmWqi5Zqriq+BU16bZ+TQ/lj3wYSEjgwd8qLcDHshheP9s3dQdbwrLzGCY2htQZAClv+slO9p5lLX/SuXAzcsBmpB36uQm/n252g/TEGYA6JcRgqWd5190WpFLuf6POiqwuPLGaveS88r2u8gVvdO2L0sT0wTtvfzTDtVcSvuawqkLJZcOBJDDVHCyP0K1hjljqoMBCRGpUr6TBVz4MAA3VDd0Ji33FN05j6Qzxf8exTUKFZuGErdl9VczX+zCZ3lUx31tNXC1MXgR13IFJUia6jg+JFGhQVKPM1/R3sl2jWDsNFL80yvVjDja7WEUuga20hW0iJOkNy6h9pe+GuEsiSi315TfEOF2Yst4vXHZ+DZERL3Rzm6OsosdU1SJB7sWYpCp3f4AIlrAtIOsKULPcKSvjMKQmy9pigIyUEtMUTBY2N1pUe55zreuYdpsGgNqV1sVpmQiH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB2714.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(136003)(376002)(346002)(39860400002)(396003)(19627235002)(8676002)(66476007)(66556008)(66946007)(966005)(5660300002)(1076003)(6666004)(8936002)(38350700002)(38100700002)(4326008)(478600001)(52116002)(2616005)(316002)(956004)(6916009)(7416002)(86362001)(54906003)(2906002)(7696005)(83380400001)(16526019)(36756003)(186003)(26005)(6486002)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kZmzt2jKI74rfWtqpy1kystGxgiorScrxGiQz4H7xip7QGOubGThv3Znvp2y?= =?us-ascii?Q?kjfySdxRBmFvDeebM5Ld0X5BRZ7t8IJEBzgXiUiKpMhIf/X/XFgWmuDlQRfq?= =?us-ascii?Q?H3puLeg2q91lHWAlpO9+EQ05lQYAcZGWOVFzMvGm1J2zRvo31JZtR0Z0e4+a?= =?us-ascii?Q?9rMoGsYIC811XiOOX/AJr3JQ+37lOW7y917vAoghHwKJVk82xgFWbwgVae+d?= =?us-ascii?Q?+qFZg5P40araSXLjMaRjKsehAQgBaOHIZAJb5UOwCAITNiEZWvbTfhj9VAlC?= =?us-ascii?Q?viWK1jUMqtPbWNhQycaiowIw3g4LD5vEuhnvm4J9gd477tD1L33Av/qlxL0U?= =?us-ascii?Q?UpBJgLwelk+k3tNctPWapqSH/liy4GHl02l2EmF/KPYlpDJnZVEa6vkUiPTx?= =?us-ascii?Q?Fat4ES7JqIQGt39GNoOA80hWRPwMt1i8ANhi78C+dexsI+pJN8nkixPKlMxo?= =?us-ascii?Q?kyCQdmv9RyuAteKakwlsgeGrojRrTCeBRLAWipIttvRzPQQTmRuhu5ptayJS?= =?us-ascii?Q?tMTglCN48SbncFWMXxcdh9VdXGIzGyNF4aASkrdEfq1ZHjank9TDd3SdWk+g?= =?us-ascii?Q?xK9cHaAR3iHPCNYkgY5xkhOr9g/t7FNaaw+/GWN1oWrJ3TPSCAx+vW0CyVVo?= =?us-ascii?Q?dK39BO80WnZ0rdHS9oe+olAuVOdUblYHBMqe17k2Pw0dQpsDNqbsndVApA8S?= =?us-ascii?Q?plxMUc0XxIczmMHMREOBMFZxIjPpm//ceoWCyrr+8FDc8xVD0nFXw/1r4jaP?= =?us-ascii?Q?YI02mrATBDfI/NfzclzfcrxcraenynGFG2WIRxy5gRDX64wOoPWQ8cptuz0S?= =?us-ascii?Q?FQVgt37Mhckf7+DltS5eDhwF3yADzsG3pvjOmzhfgtH4IbhOPyMWnixX1Ix5?= =?us-ascii?Q?KvNE9kv2TS7lI+25e3fEs6scaZLhy+t5pOzEilh5G5oVLlvpaMFtKR8KTPx2?= =?us-ascii?Q?qgRrk4BVVybpmDWG5/MEdT/9fQjLU11nXO3TqgpjDEU1eqUtJx1/bA7fCBkb?= =?us-ascii?Q?sCBE7UCQmEuu2By+Pa1ohta8eKwzN+tQbZ6RJcSOnU3qAqSgs7K3oeIZfusR?= =?us-ascii?Q?QxQVG5td3+zUc8bZtYUPxQ82HvxRwCj6mLmRp2z6gJ/D2Eb6hv9FUla/2txP?= =?us-ascii?Q?lIt33uCY0RvNs2mcZYSUpyJjLOWPpnY4zJoteXsOPTQ/GW9WqkUpiQwsFxaU?= =?us-ascii?Q?lrNhuAC5RRwb6s1Z6gPQCBsuaoJl6VKJ915az8U5YkYJIhmhYf+HeTYZdNT4?= =?us-ascii?Q?no/762Ngb4tBAyeEizC0kstp8WBYi9RFOLP5dwZn+k+48vLKn9Gk+6Xa0QpP?= =?us-ascii?Q?jiQ4Ue+sO8RXaWsXokeMEfmK?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0f09426-3b9f-4348-240b-08d93a5c41aa X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB2714.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 17:43:36.4176 (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: pMfheGrgUwDDoqm1HbHh8dRLfazzJ/N+hnxbuNqKdBBbXjc2Sw/Fg8eaBMzS/60YiHjuo/pa2kBJx+N67szhWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4172 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Commit 85b8eac59b8c5bd9c7eb9afdb64357ce1aa2e803 added support to ensure that MMIO is only performed against the un-encrypted memory. If MMIO is performed against encrypted memory, a #GP is raised. The AmdSevDxe uses the functions provided by the MemEncryptSevLib to clear the memory encryption mask from the page table. If the MemEncryptSevLib is extended to include VmgExitLib then depedency chain will look like this: OvmfPkg/AmdSevDxe/AmdSevDxe.inf -----> MemEncryptSevLib class -----> "OvmfPkg/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf" instance -----> VmgExitLib class -----> "OvmfPkg/VmgExitLib" instance -----> LocalApicLib class -----> "UefiCpuPkg/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf" instance -----> TimerLib class -----> "OvmfPkg/AcpiTimerLib/DxeAcpiTimerLib.inf" instance -----> PciLib class -----> "OvmfPkg/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf" instance -----> PciExpressLib class -----> "MdePkg/BasePciExpressLib/BasePciExpressLib.inf" instance The LocalApicLib provides a constructor that gets called before the AmdSevDxe can clear the memory encryption mask from the MMIO regions. When running under the Q35 machine type, the call chain looks like this: AcpiTimerLibConstructor () [AcpiTimerLib] PciRead32 () [DxePciLibI440FxQ35] PciExpressRead32 () [PciExpressLib] The PciExpressRead32 () reads the MMIO region. The MMIO regions are not yet mapped un-encrypted, so the check introduced in the commit 85b8eac59b8c5bd9c7eb9afdb64357ce1aa2e803 raises a #GP. The AmdSevDxe driver does not require the access to the extended PCI config space. Accessing a normal PCI config space, via IO port should be sufficent. Use the module-scope override to make the AmdSevDxe use the BasePciLib instead of BasePciExpressLib so that PciRead32 () uses the IO ports instead of the extended config space. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Suggested-by: Laszlo Ersek Signed-off-by: Brijesh Singh --- OvmfPkg/AmdSev/AmdSevX64.dsc | 5 ++++- OvmfPkg/Bhyve/BhyveX64.dsc | 5 ++++- OvmfPkg/OvmfPkgIa32X64.dsc | 5 ++++- OvmfPkg/OvmfPkgX64.dsc | 5 ++++- OvmfPkg/OvmfXen.dsc | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 1d487befae08..f1cf2e916a10 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -807,7 +807,10 @@ [Components] !endif =20 OvmfPkg/PlatformDxe/Platform.inf - OvmfPkg/AmdSevDxe/AmdSevDxe.inf + OvmfPkg/AmdSevDxe/AmdSevDxe.inf { + + PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf + } OvmfPkg/IoMmuDxe/IoMmuDxe.inf =20 # diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index cbf896e89bd2..75d4b196057f 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -779,7 +779,10 @@ [Components] !endif =20 OvmfPkg/PlatformDxe/Platform.inf - OvmfPkg/AmdSevDxe/AmdSevDxe.inf + OvmfPkg/AmdSevDxe/AmdSevDxe.inf { + + PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf + } OvmfPkg/IoMmuDxe/IoMmuDxe.inf =20 =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index b3662e17f256..783622c61ac5 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -960,7 +960,10 @@ [Components.X64] !endif =20 OvmfPkg/PlatformDxe/Platform.inf - OvmfPkg/AmdSevDxe/AmdSevDxe.inf + OvmfPkg/AmdSevDxe/AmdSevDxe.inf { + + PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf + } OvmfPkg/IoMmuDxe/IoMmuDxe.inf =20 !if $(SMM_REQUIRE) =3D=3D TRUE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 0a237a905866..f2b13f7228a1 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -958,7 +958,10 @@ [Components] !endif =20 OvmfPkg/PlatformDxe/Platform.inf - OvmfPkg/AmdSevDxe/AmdSevDxe.inf + OvmfPkg/AmdSevDxe/AmdSevDxe.inf { + + PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf + } OvmfPkg/IoMmuDxe/IoMmuDxe.inf =20 !if $(SMM_REQUIRE) =3D=3D TRUE diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 3c1ca6bfd493..d9619ac5a050 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -725,7 +725,10 @@ [Components] } =20 OvmfPkg/PlatformDxe/Platform.inf - OvmfPkg/AmdSevDxe/AmdSevDxe.inf + OvmfPkg/AmdSevDxe/AmdSevDxe.inf { + + PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf + } OvmfPkg/IoMmuDxe/IoMmuDxe.inf =20 # --=20 2.17.1