From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com [40.107.95.45]) by mx.groups.io with SMTP id smtpd.web12.43.1622070710472126111 for ; Wed, 26 May 2021 16:11:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=DZR9EpAe; 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.95.45, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V25b4B9UmOwzngd4ZseGL1Hzd3OqezF06WnLiBpsxd0vggiU+NEVNdNpukfZH+9n6UHy+oqUs0NSzgpzBtbPMzccRcxBSPCNO4IaZZvZcKrsAyV1fmUxCs58iHaT2Hf8oej3lSYOepp5/Ve/LmdvZa1MyzFpbxKCMkBU8Sxx0WRNB+imcPQJi1TtUXlH4Vbl1Q+EU77gx6SJcNRWcECzgfCDwk/RfrAjHMkd7lRQAtb2Yd9OkwHmVVNOQEVeOWI+MF9gSvCdXPJu35qHuTzvEarS8ShWXMWt++gBsu2+sOdSyzP/awFrLymLBCZ0J2NHlgZfwkag8wRBJ987SIvk5w== 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=05jxyx9l/E194xuRwQGmDQmK7gfBFntI1Itu/qASJ4Y=; b=MNBR7N9IqrXA/eZJyBZwYEYtjhYiU9w3Cdmf2xp8b4/Wwnl2U/mH4VzY3OpJ8k1X815H8yKcyfh2v2Jwmr1d/YaENxvO9DTQUurEuBVR3It7NWSCrnI5i+NEAZV4YEftjS2kNUc4CQKV04RQZi22tWvpd5fTOch+Pji1kQaPm6mAm5ebFEDOlbSqibAdyG6lzJ+KqrjZFPi+j7pB1ozOF5aZZp1q3s6pLZKv1UFffmkyNjc1DsS4lH4EVoPKfkiNDpbebWjf27iQklb4ZqAeqqndszWHJ3jNb0yMEaR6ssRVm6mWrDDAdhkblXs+kU+8Mw9z931H80GO5KYCdsHqzw== 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=05jxyx9l/E194xuRwQGmDQmK7gfBFntI1Itu/qASJ4Y=; b=DZR9EpAeTikM1VfUQvwoPhyqDW01srVpxBa6d6AoAblFxPRxKLhO1QTAf5G8U/FWFcqX6e69jppn9WWMiA/Xepd6/mbhfsEf9CEvabTbtyfBc0P+62aboj7BOTJ955e2uwbqN1emxoBXRWF4JMcFiaHoOeZ74kzSm9AiNx3yPuc= Authentication-Results: linux.ibm.com; dkim=none (message not signed) header.d=none;linux.ibm.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN6PR12MB2782.namprd12.prod.outlook.com (2603:10b6:805:73::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.28; Wed, 26 May 2021 23:11:46 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4150.023; Wed, 26 May 2021 23:11:46 +0000 From: "Brijesh Singh" To: James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Laszlo Ersek , Erdem Aktas , Eric Dong , Ray Ni , Rahul Kumar , devel@edk2.groups.io CC: Brijesh Singh , Ard Biesheuvel Subject: [PATCH RFC v3 12/22] OvmfPkg/AmdSevDxe: do not use extended PCI config space Date: Wed, 26 May 2021 18:11:08 -0500 Message-ID: <20210526231118.12946-13-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210526231118.12946-1-brijesh.singh@amd.com> References: <20210526231118.12946-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR11CA0202.namprd11.prod.outlook.com (2603:10b6:806:1bc::27) 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 SA0PR11CA0202.namprd11.prod.outlook.com (2603:10b6:806:1bc::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.21 via Frontend Transport; Wed, 26 May 2021 23:11:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 739dd410-95ff-41da-7a1c-08d9209ba25a X-MS-TrafficTypeDiagnostic: SN6PR12MB2782: 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: PihpNHXK4D6teEgR795mPFZto/ot8l9MrOdTJYrGSIZ7SxXxEfTHvOABwVoYtRSisjwk599cMF1q/ZbcCNI4p3YAfSRER1lO551oIKiM4nUYQVJHkVwKldfx1vTJyyMfSyn1hdY7MwQeegHUEgpZ7poJ3EHVXKdc74ZWRy82gcv375wcpajXQRTQGoKtw2NqKBfOabS7OGWG6bmHTmRhUenphNcCORjC3OA2N4g1ZqpK8kOqMgB+LOghYWHDZ5x/o2cc3SdRzZ7rB+lShpcv+mkHBUozDW8I3dlCdAB2h19nldpbMWXmgCEQF5MJPbatvi3AkgirqaiHPFcPSzfZSLZEvpDMkkjrn9Ao9HRaMKekh4A7Ng92G4NQVieMvceHrK0wglWUOrSBFpDClyTPcAKW7Me+wp3WNbsJ20g2H7Laam8ArywKlwd3EgSdYuNeizThlS07l7Fh3vZJf3jLq2PWSgvYQpbJoh0oAxzPEwxVEa5HCvq9OUXc4LM4KDotojWS1mKawiGLEF/kx0VcXqpc017rF9CRGOrCYXEDbvdRHlzQSACqXkyc2xrVzMdhDh9uHbNADlw/pc0tDq1wnInLaXCvcrsyGvtUEBzXj0xqaG+Fg5suH10G/cmKDT/BPNAWUM6pUy1BLiIM7ZnO42Mti3tNAHnRMUt/YIAdAit+dsmqRYgiG/7WEWKSZbFUbOKj0nL1tnX+faBBT1sOgNsYbgMXR1fhf4HmEvWS6HDpLV7LE4oDTWd0kaxIvPZLAa7nkDWaz1MhQJya333D7oFTFlz3XwnHc7Ejnw3NVUE= 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)(366004)(39860400002)(346002)(396003)(376002)(136003)(26005)(316002)(5660300002)(8676002)(83380400001)(186003)(38350700002)(16526019)(478600001)(54906003)(36756003)(4326008)(86362001)(6666004)(7416002)(2616005)(110136005)(44832011)(2906002)(52116002)(66476007)(66556008)(7696005)(921005)(19627235002)(6486002)(8936002)(38100700002)(66946007)(1076003)(956004)(966005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?tW85RjkIIe3ZyXi6TKgywUyqmysPbfNQamQOtV2o+znxkwv6QKeIxF9M47k2?= =?us-ascii?Q?/rS4uOH6BM7g2OBP2bJ8vmm3m7QtLbz4EaY2nOjPPgyCpeyegIG1g9mipfbi?= =?us-ascii?Q?ag9Gwe75wJLZEZ8EE+ew9oHx9i3v0pwXh/w7t9NxFrMXGFwBLlXjR84xlRqk?= =?us-ascii?Q?nlGfgQfxqykViZs6jLfFDNbI3iWj6/4M8IVxT0oQ4nOXcX63Z5Xb48JgZqx0?= =?us-ascii?Q?98MYATRGBuMhUMlspopTELmG8rtaOpSsl5HIr/FEsqGDpADImn58cGzK6EcP?= =?us-ascii?Q?fphN9FnF9WmTnaSk8jp5lGNvnwiibGw5UrMktsGRQeFP4CSMAvF7Acd5dqAx?= =?us-ascii?Q?Ox8z2fmCOhkXgssXrGoaBk9P82w4IHHhtcw6lW7C57QigtNS0mSAOFoWp3l7?= =?us-ascii?Q?kL99EI5yivzfp481HUENYnsHfJaVlwpoO0KhTS4uC5/UunjVOxZqIJkp3wSt?= =?us-ascii?Q?uzdMXaamdfRG72xaLbCWRjj2M3gj63l8EoBrtfMf0aHLkX/Nj+jmEOuUmlkt?= =?us-ascii?Q?LbNkjxR5XnKUDCBmPE1WXuH/sVDCZ4VhV/OiDVkXefoqGbGT/KjRdcI8yaGN?= =?us-ascii?Q?y8C4OY8wCSK++hXOx8q+aW6Xj2GaFJEEDhxewfUIOwIrkZGdSBGjteXVQ8j1?= =?us-ascii?Q?WxLC4RT77aqzApkyx4rVKkTjE9a28HAxdl63Nj1HO2oizY2sEOxfH3yB1Grk?= =?us-ascii?Q?F0+eMxL6EBcJAftBMcMxhsQLjkK6bASDzquJ5N1hYIwhXgr0N6EXsBVG9kUw?= =?us-ascii?Q?1HMW+5ZR7ucUxt36IS8McRp2+gqQFiF4LKfRBZUpu3uWAz2Kq8AP3/Kzf4Hd?= =?us-ascii?Q?p5MRfjCItHmJyCHjVeLReqXCgyB98V4uEYRJANT9aKP2LQpOEPv8YCFVqMVs?= =?us-ascii?Q?4VXO1+pu3wONkhopRzr+1YbRxAniKhYDxewya8vpUUuGT7oKIpHYSdj1zAZL?= =?us-ascii?Q?I7JnA53na1CKzNS2GVMZbFqIMtzSxyOj909SzXZ5C8EzcwYPMyEmtrmBj+XW?= =?us-ascii?Q?cR77bqdxb6bPWoa8LP6qbZQ2+84KIagQQjfrogjvhgOZJMAW6MtNgw/rfHEk?= =?us-ascii?Q?vnkppKf0z8MSjl6FA7I99uP5glOUfcoZCgasPiklUz96qJJXM0bQW5KF9U6x?= =?us-ascii?Q?3IeP8gmozcg4TnCCY9S95teo92GZEL+Elxr2RerT2uZ1sHcaSO3sp+lFqTXD?= =?us-ascii?Q?9gwupTbMVbCZTWmC2xtutdr/3g0LBpKf1hz+IBUFPG+y7i/ZLXCxvSE3vIgP?= =?us-ascii?Q?IR97B9UVd8rtqhVmFOAFcfld1YnxnYXVYoX+liwoRIP687MH89LzwXH7PLSQ?= =?us-ascii?Q?nkR6qdj++ynmRkh0QK1rms2K?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 739dd410-95ff-41da-7a1c-08d9209ba25a X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2021 23:11:46.7123 (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: JvZvd9owT8GIDUMvP4U5vsurKYOfg0iwEp+UTlMFuJx+oUNl/QUakSG1ePdxKEj4e43aZtfh0ZbbqaCa9Rygfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2782 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 66bbbc80cd18..4ef3d71877fa 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -814,7 +814,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 7d9e88040000..b8a7128b310e 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -824,7 +824,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 6b0bc02bd536..75f87d311454 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -967,7 +967,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 8d9a0a077601..7f72f4150440 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -966,7 +966,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 OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf =20 diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index e535503e385d..d549f1b14378 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -727,7 +727,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