From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.61]) by mx.groups.io with SMTP id smtpd.web10.176.1630513061970038126 for ; Wed, 01 Sep 2021 09:17:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=lJGaClF3; 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.237.61, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZoiluRxs3TJKpCNQhk8VujrwHdMuYqRTuGff6YngRaRiecqxyTiq3T0s7WYdBCvM2KDmmkiiO/U3ZcI6be5wqoTYNpzxFAmZnoNTw+592ie+r7txnG/eqVwcJFG0HMCIyf1Kgw82PJQT8zq7AR/oTzT+iXhMGB+ofQqof0+9s7Zp3SIvhhT5gAGJ7M/h9Wnd36MV3NROLqn6HzugG+wzunH0doarwStZv7fLB0OvbWaRXhJ6537iOv4HBZz2KKK95PI4uf7Jftwvujp4iA8BOiSAmMlQsHgpGWmGkHWPLwDsOrSFbPIHKCw2/6bjTAF/YMWC9xomCrhiYXyrbJkxCw== 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; bh=uNNQ1zdLZAZq7eRXHcLHUI0iXyIX3VjYX3n8lV1RdbU=; b=jpCigKg8OHOaKBi6KJ6eP1BNflyYMvvlcLNgYOHtkEQl/VMVqdyRhFSGvXzfx5JDuiS1YrNsHMMEfq1pONQKGGO77LI+N3pK87w3AqHEsdxEIcVcTyjhPH5yij/J1as4mUYm1Cxbj5eHfz3HAwclDD+5IDtrHQEKgrHZrU3i919wKlFmjsG3Uz4neqtMPA8IHG6mGgSHyvBaHtF4oijwPvkzxbh5XrmbAu66dyGLpKkqJe24/65LJEGu7yNf9JcNlgGP/DR6SXuacrwnkCG9MUPk0NRqzVd4t0TO96Fu2AFhOd7fExW/0X3b/RZQBl7zvP4iSUdltx+ksaBUAXH0Ug== 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=uNNQ1zdLZAZq7eRXHcLHUI0iXyIX3VjYX3n8lV1RdbU=; b=lJGaClF3xkeEcaZ0tTBFZ58vzS0cekxfjyRnZ0pZ2ynXSStZiGJpgpsvfsXynJchEyLxtyAT8YS43oTuCqN+u9kjro/tA/p7yewuxSz0kz8Gda/uU4HL6SDdDgvNdgtkEEA6KnCSx2bKPdwMlPZ9aPP8PSYlivUmFes/zdJJck8= 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 SA0PR12MB4415.namprd12.prod.outlook.com (2603:10b6:806:70::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Wed, 1 Sep 2021 16:17:45 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3%6]) with mapi id 15.20.4457.025; Wed, 1 Sep 2021 16:17:45 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Erdem Aktas , Michael Roth , Gerd Hoffmann , Brijesh Singh , Michael Roth Subject: [PATCH v6 14/29] OvmfPkg/AmdSevDxe: do not use extended PCI config space Date: Wed, 1 Sep 2021 11:16:31 -0500 Message-ID: <20210901161646.24763-15-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210901161646.24763-1-brijesh.singh@amd.com> References: <20210901161646.24763-1-brijesh.singh@amd.com> X-ClientProxiedBy: SN4PR0501CA0062.namprd05.prod.outlook.com (2603:10b6:803:41::39) 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 SN4PR0501CA0062.namprd05.prod.outlook.com (2603:10b6:803:41::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.12 via Frontend Transport; Wed, 1 Sep 2021 16:17:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c539649d-cddb-4b01-7741-08d96d640852 X-MS-TrafficTypeDiagnostic: SA0PR12MB4415: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:773; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 029ahu1AIx6IOv6lf6XMrxu/6leTFXUBHEyBXYqdW1Qxb9u6e/pYUjuJz7ktXEBfwKhX+0Hf2Luu3LrbxXJjAASVNJK+sgtA6VoPYU3ib6GrA8fqBDeL0KOePf23uZ830lSh2bDmoztu+zOi2rFP9d9Mn6YaQveBwvzePjpA7wZHjsdXwXOIoP3Q1wHnFUAR7sruFrV7ace56AX4cHarOixvyLnXIkxb2z5x8AJ8WjnfMtUgg2ilrg1bvayDE80JhME9PPP6LVhLI4JxsOPHbmmN7E4KVb30JwVXQIy7gQB9FAO8Hmc9W8Jw4RXpZifODJVTKfzjhk/Y916MwbRf+dODjW98cDiOno3Bc+ifSoR8IxZGlqtTYHU1nUTuLECtrQbbKday9m1bst+FI1Tl8T+ZiZNenDUuvlzyGeHAM7+diDbvBU/nIfT4VnyFNZrVxt7wH+VqnHqjKSYv141yGoEsDucolAYrGdwG11vbIpcDiPzr43e+RBCuyVq1w6Pb842D8LQQWgORxxz0l4Dmiu9F7pIDl46UcPgjqYK0h+1iElnD1gxLyur9jGq3zs1Pq0Hjd9jY6DbSIcXSPTleQNEYEOoryD4WbHP40NDtdqwpa0fsQ9evadglLs/oObDU1ZV3ZcN58TSDOC5eubb+JdriTQpXWzP8omiByJG5t/UkbED37AfWnBr8LHMzHHOSunOdKCRwHGj19xshgu82ue/fGvTrV8z72komHkceRvG7zJ3tc/gNqfIGPEpUqWyEz14gz2y/uvrYY6SdqYtAu5LQW6tqAdg37UBCnPr/5mk= 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)(376002)(136003)(396003)(346002)(366004)(66476007)(1076003)(83380400001)(6916009)(2906002)(8936002)(8676002)(186003)(26005)(66946007)(86362001)(19627235002)(66556008)(316002)(478600001)(966005)(44832011)(2616005)(54906003)(6486002)(5660300002)(36756003)(956004)(4326008)(6666004)(7696005)(52116002)(38350700002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ErMdZviD9BfSzbGHZFIW7DDKh31Gf1OLIa9QeFbXs40LH3VGrXly3yqggMYQ?= =?us-ascii?Q?Y1tQPc93JciW0+7frXINDbqYTWsLu+Iv2EU2AtlITlAuE3Unl5Kw6k43xkH0?= =?us-ascii?Q?cElyGuwdGY+wuf0w1HJXGYwRW+ZVs4GFAtZwLx7vhGpN0AanPZBqeBnrQUuZ?= =?us-ascii?Q?sVGmnAE9iNplsWLWa5dZnKjZDrXOJmExmCn1tKC/MkgyZUpgtjdTKOceD7nH?= =?us-ascii?Q?nuSxqhdgNxve9AHXbpOboGuJEQQHuOtVHJQ5oppbHSXW9csTeo1zTieR7Rkp?= =?us-ascii?Q?D8L+aI+nnA9P68moazH1WZZGCXpZJViPpiKv6U+FxJF1d85ogSXZh8hoE7nS?= =?us-ascii?Q?Hp1ImbTwdjCwejqTthWV/h3gyW6rV2i7WieA/0OOLo5r7Cye57hMgbBVKhT7?= =?us-ascii?Q?B256Ak4g1PudYTz+sgLQyc/zpzdeJwTDqNl/0DA7lfKugwigos2JVgs3FbUC?= =?us-ascii?Q?2rpO+aWGFt6yHE1kPjz6xGTzJon6OaHVuIxaRA0wLIHHzGZGL9pvA4B/nd8q?= =?us-ascii?Q?4NqLxKON48e7nGxriXYErYXPgqzlrCNj8denBacQzLP16mWyc6Mxw2lWX9S2?= =?us-ascii?Q?Lpabpr8SbUwFx6FV+cjKTO9ETbQ0AOYk+3ZAnhxbcvx39cx2rStYeefOGAIU?= =?us-ascii?Q?WfpZiiOrwNSqIzNJHu8v+yQQP60cmR0lRcyRfdckPYgKeGAYArFGqMWXY5oa?= =?us-ascii?Q?YDT7D6zlA9S98Ave2pegOp3+Byf5MLap5qlPytTPer01/sltlA0pveDLhFVr?= =?us-ascii?Q?UkdIerdgiXUTr9tOuz6iwsIPWT7A062fG3HDyqT+HweBa2S2wjoWzSSVKrOF?= =?us-ascii?Q?hzavyTLNJEHNvMIDjBjZDIhDedUfdsmRYBULVvclebDxsUCRpGJMrVppYSWa?= =?us-ascii?Q?SQpLwczZrOhrIq3cJpL3bAlCpYZPvUHy/UiO0V3TBZQTUk/rjIFAoRebj0fS?= =?us-ascii?Q?Nq9f6Lu0kJtv0reRD4HzdZCQAWq9mxPjS3ft19+TghM9UBzNAj7B8CisqcMp?= =?us-ascii?Q?bT7atshkfsPpm+QN3L2cpwbwJwRM11vzwm2vdd2itz2ydWdaHze9ix710czQ?= =?us-ascii?Q?pbv+6Yi9mhFID6Ll/pXyG1G03A5c68mdFBgkLrYuC2C/Qtuf4K/n5GwwBQUv?= =?us-ascii?Q?RJ2ptSuajuEfnLjwyhMsw6tvF33pQ97Z0Fz4JZBcGxon4Q4Q9cAHzn9Yc48i?= =?us-ascii?Q?MvW7SGk+9dqfRuKe8C6ykHOBk9CGQfqjGtqGCwKSlle+MA8jEL0JEaOMTkwI?= =?us-ascii?Q?qr4Rkg95SogVX3GOOxIj1TtKkGL9ubrQC4hu9tw0+ZXLAfUoAk9GtBa/aE0E?= =?us-ascii?Q?dMClXGoMA5v3V5cjNYc7zU1k?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c539649d-cddb-4b01-7741-08d96d640852 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2021 16:17:45.4904 (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: gliWi+QwdOcNDVGnNf2kqgF0OmnmiDvagpSLOWhUwumXlWrErbL3vdOyogeE34LUV+uCiPTerj9PSgApU3rcoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4415 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: Michael Roth Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel 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 e6cd10b75922..a8ea08a10a99 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -812,7 +812,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 d8fe607d1cf7..f45634996247 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -790,7 +790,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 a467ab7090fb..f42abc041c0c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -965,7 +965,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 e56b83d95e09..19cc5d4122e2 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -963,7 +963,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 1a9c06c164a8..5ac12a36b981 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -726,7 +726,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