From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66742+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66742+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981114545931.7852302905314; Thu, 29 Oct 2020 07:18:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id EYNjYY1788612xtSMTxgTC5K; Thu, 29 Oct 2020 07:18:34 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.61]) by mx.groups.io with SMTP id smtpd.web09.9405.1603981108448866000 for ; Thu, 29 Oct 2020 07:18:28 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WDLFL8gc8EupVo0tlq1L30kBBihlcFrXO8gGdebPR872V1rNalnRoWGF491xuKq8tGlCz0XHELXQIq6lQyYZ2hn26zCJilYewfKynjlPnc8WNSThFUb44qs6eW2qtUM9It6xmFscLKo6YiHeuCX5llfJOU515G+Bd2y/UXycoAlr+aIgAmLehpJlp4kV3wovk8aB6f4AtchbF4+9SSruorNrL0Rt98hdeyH/5m8DewY4k+k1HBqZ14yIUheXOsI0Qi1bXfjWBPKtyXTIxqYIV7CSXtVfkbDXm0uahahC3x3jttzmJ7MrG0BzrIgsu1pRyiJNv9maymxdkMUFGbU/7w== 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=27z00h2amcGLVyvGSXkua/4UQf6K5QChGaE8Mh9kIe8=; b=DGknWyD8j7UhymcI1M0WeZSTimbmikUOZk4UMGDyV9XaTjq4D8xh57kyHAQ5ZhI11XlmWzJB5ECVWpMNGS9DhqEB7wY/ylx3bezxtxHsTRFC5hDJ1t1IeecRnvTthgRgNh0Om+10awFgBtLr76XNtvn7HJ6s9PEj+nqA5LF8vXsjyZ17v803hz2YAPn6AWsOEwxmQ4Jm/1CD2/FwP0h0sFqTT6XBGaXPxDnSjMNjxSU6CFWcgx6ykxeZ5yvP0blfxEMyNgdXxhXGhnSyDcWz1Cj56VHe3/9lSy9KUsXvOVPMrnkEEm4x4N7+i67WDNbyRJDUozw8cUa6AHCbYSeqjQ== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:18:26 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:18:26 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH v3 01/11] MdePkg: Clean up GHCB field offsets and save area Date: Thu, 29 Oct 2020 09:17:52 -0500 Message-ID: <11164899a8f43cfb79beb98e113141c14f0c2240.1603981082.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR07CA0113.namprd07.prod.outlook.com (2603:10b6:4:ae::42) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by DM5PR07CA0113.namprd07.prod.outlook.com (2603:10b6:4:ae::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 29 Oct 2020 14:18:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 099012ac-d1c2-4742-3dac-08d87c15804b X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: GkU9G0m20iQnxWSUjMUQqSNE6TF1/1iBXZaLISlbHgVan0yhvWJDf5ZFYwyZMoO0JYG7V9xt9+NzmHSnwxP4AwgTRcTL1Aq4dObB0EUNhRfqWpWhZml4wWjPMDlFNna1P8cos6wQXnjIttwKSBItIG8L0uZ/NDJhh4iQ1qSPHs+KV8ZhaNLCZzlg38do+QPSCl7Iab74KJINeNMjwyDBIrDBsV0o6BTu64TXPrzVLrZgk+o19g6RgZO6Nt6ySf5gyYyp2fGiVqqHW3b0YTEnLcTP/Mw+nrW9H5OMU+ZR+HxyKTfgpIL5LmnZkO9oXIneKfiJJH9WqoEiegKIqb1fvk9YcrYI8zLgWQ05oWUxEz6eqMe40jc0ml8/4XOCW/BFJ6Igu+SWfWAUXAE7OHeo3w== X-MS-Exchange-AntiSpam-MessageData: FnK9wIJX6QOaAGJuHbYb5sgdLXTxk2rrk78vnP7tYqrX6URwpFa/h5jDaXq/KjNZOTXNTsxQoqWV7zYLE5CRPzKSxsa7rR+ClAKABoV3cT4F4MIeLHaLKYfISSK9J+Dw9HfPlzjbN6mSnlBRASsfe49aZM6OX0TVtQ0Hf5le3tmOocaRHKW/PuvyTDqMQBNvadsEUx+3DMMczXQYbCFTLkhmgrkvaZrJOjaZ+CcZGT17kZ+VnjEB3CV9PgQ1aIjqCqZ+YZYl1uxBH+2XLdbSA2Z8KBCO5Y47/En1uzlwhaCumvRlTwaSRbvmtw14s2x7qq76cCknqFiByLPaRrdi/Fi4zFSS+xQBbY2Ek2HXlrWh61/tqjD3IVtmtdw84OYUwcaTaW1U0Oj1Y53t3LUc2Vsv92A2mwe8TvIwHMY7Hc02ixVWpnVvgfddHtysLQh/JUwUk2iQ+EO0uIXKw0XLkfwMnMPY+cHkj+pUvh+7z3LZEe1kwUW9WIcJ3EBBgmlyb7RoVK+ctKUHl54UP9kyG8eTZZJeQma1WtKlviY1JRyYh4tZChiHi/9QrITK2HwywMgNyztl7D4+lcNWHjlgKoi5A3hyp+89OvBVcq3mpTOIUvrbEF3lFefm9Skuu7ynqLFHssFKPc3oh/opokIQNA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 099012ac-d1c2-4742-3dac-08d87c15804b X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:18:26.3016 (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: VvIkqIQ4iJsekGYbHv6hD01EvyfA5YExkd7cwX3svz2M8Px2As5C7sGg245DH1EmXzY+P91I/KXfpwWMBzOV+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: 28lmYvNHBAHX8lDoTRtDL3s8x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981114; bh=c+LPNYo5pWwlZf2geUmaEelkscsK6MmKaKamBFPm1gM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=sOjFF7q383Zjh2F1FbkdIF5RI53lRzRCnmjvEtQ7kscjUmHdZFQQ2Q+sz9kzijowCwQ P+Tv4WGGRS+8mYAL0d7hJfMiLSwFyKSCdofAMKZexxd3nwdMjBidzdBdoV7a7HpVWUXGn acsqM1qg1tITSJSiQ7zb37Z2d54LNxz+ksQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 Use OFFSET_OF () and sizeof () to calculate the GHCB register field offsets instead of hardcoding the values in the GHCB_REGISTER enum. Define only fields that are used per the GHCB specification, which will result in removing some fields and adding others. Also, remove the DR7 field from the GHCB_SAVE_AREA structure since it is not used/defined in the GHCB specification and then rename the reserved fields as appropriate. Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Tom Lendacky Reviewed-by: Liming Gao --- MdePkg/Include/Register/Amd/Ghcb.h | 40 +++++++------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/MdePkg/Include/Register/Amd/Ghcb.h b/MdePkg/Include/Register/A= md/Ghcb.h index 54a80da0f6d7..1fce64d5b7cd 100644 --- a/MdePkg/Include/Register/Amd/Ghcb.h +++ b/MdePkg/Include/Register/Amd/Ghcb.h @@ -82,35 +82,10 @@ #define IOIO_SEG_DS (BIT11 | BIT10) =20 =20 -typedef enum { - GhcbCpl =3D 25, - GhcbRflags =3D 46, - GhcbRip, - GhcbRsp =3D 59, - GhcbRax =3D 63, - GhcbRcx =3D 97, - GhcbRdx, - GhcbRbx, - GhcbRbp =3D 101, - GhcbRsi, - GhcbRdi, - GhcbR8, - GhcbR9, - GhcbR10, - GhcbR11, - GhcbR12, - GhcbR13, - GhcbR14, - GhcbR15, - GhcbXCr0 =3D 125, -} GHCB_REGISTER; - typedef PACKED struct { UINT8 Reserved1[203]; UINT8 Cpl; - UINT8 Reserved2[148]; - UINT64 Dr7; - UINT8 Reserved3[144]; + UINT8 Reserved8[300]; UINT64 Rax; UINT8 Reserved4[264]; UINT64 Rcx; @@ -136,6 +111,19 @@ typedef PACKED struct { UINT32 GhcbUsage; } GHCB; =20 +typedef enum { + GhcbCpl =3D OFFSET_OF (GHCB, SaveArea.Cpl) / sizeof (UINT64), + GhcbRax =3D OFFSET_OF (GHCB, SaveArea.Rax) / sizeof (UINT64), + GhcbRbx =3D OFFSET_OF (GHCB, SaveArea.Rbx) / sizeof (UINT64), + GhcbRcx =3D OFFSET_OF (GHCB, SaveArea.Rcx) / sizeof (UINT64), + GhcbRdx =3D OFFSET_OF (GHCB, SaveArea.Rdx) / sizeof (UINT64), + GhcbXCr0 =3D OFFSET_OF (GHCB, SaveArea.XCr0) / sizeof (UINT64), + GhcbSwExitCode =3D OFFSET_OF (GHCB, SaveArea.SwExitCode) / sizeof (UIN= T64), + GhcbSwExitInfo1 =3D OFFSET_OF (GHCB, SaveArea.SwExitInfo1) / sizeof (UI= NT64), + GhcbSwExitInfo2 =3D OFFSET_OF (GHCB, SaveArea.SwExitInfo2) / sizeof (UI= NT64), + GhcbSwScratch =3D OFFSET_OF (GHCB, SaveArea.SwScratch) / sizeof (UINT= 64), +} GHCB_REGISTER; + typedef union { struct { UINT32 Lower32Bits; --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66742): https://edk2.groups.io/g/devel/message/66742 Mute This Topic: https://groups.io/mt/77888110/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66743+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66743+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981122274644.9256054737338; Thu, 29 Oct 2020 07:18:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id crdnYY1788612xEqo9ji0dLm; Thu, 29 Oct 2020 07:18:41 -0700 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.62]) by mx.groups.io with SMTP id smtpd.web09.9408.1603981116168419981 for ; Thu, 29 Oct 2020 07:18:36 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AysS7u4zRcksLn3TFT8sv8+mrTcN9k2YrD+YODGFGR7FwKn8aYTVFlBeVQIwrh12EIdW/YBFx7teJvv+2dth4S6K04UqeUoeyn9rcfTwqktbME1oWjVVeUFfH4NQg3RCUbcSq+KUgIynJTzuV5X2spyHpTNNNsfE6DREPgtU+EhU8c83lkOVgcskE8WDkThvGO9zqI36LFQWlu+UINOdvegr7CnDaqqOuqzUQGh05xdViTnkSKwh/P0JbrOU8a0n3iVk9KGTj7bD9uJ7e5DSIfQre+vPa54aHapwz35YdJYRdnNqp2nPLONx3GLeTVAoebBby0ODNeaJo0ITTei+TA== 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=NT61b4Dm+Fnzl13snR6nsCS981hyDrl5yw4qJCcHTOM=; b=eC+u/Cl/tgkPpvPRzvHjgHC9OW5eyYBflCmJ5Z8z9SknXqBXqjMWBlktrFA+cLbAp2vDpg9LaRczUJeW7t1Bci9KX8lGDXjoSCV5NtrAdylAlfrKzvfVOFX8CD+g8avtUAhhzXl0cQhWKgghPOOdTBc1ump92JxK0+Y5LM3EQkZ+r3mPRxfDy/adsr/1kYUp40m1MGvw5RmcnI4G6pkROtXXgx5IuQE5oQdnG1FJBcBYNTgGlSx9ZeaMp3dHchRUrVQb230TgPp1vqAkbXevBNWUkopNbd+gota8vkC1mT8nOP0stwu589F2Zfi1bysy/Be6ew2qmJZ8/hMreth8PQ== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:18:33 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:18:33 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Eric Dong , Ray Ni , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH v3 02/11] UefiCpuPkg/VmgExitLib: Add interfaces to set/read GHCB ValidBitmap bits Date: Thu, 29 Oct 2020 09:17:53 -0500 Message-ID: <360a3882884716ebb60276220c18e33e127a83f9.1603981082.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR2001CA0015.namprd20.prod.outlook.com (2603:10b6:4:16::25) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by DM5PR2001CA0015.namprd20.prod.outlook.com (2603:10b6:4:16::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 29 Oct 2020 14:18:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6a82642e-b44d-42ef-cd1d-08d87c158489 X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: zAj+mPjm+m7jL0pyvX2RPfrTVlP83Rwht5oPNopGsClftRrgc5Q+iawXBfHU5eoeDNtTmVQmgJKrWsj/HVZVfrLQtHwt0PGoucUbRFrNK8t/nJEwgfUzfrmkPl8dC1LqfY7F1KZmKNzMUZWoX3bBpKc345IsP0GSqiH+AiMxl6Zb8jkCFpZ1BpuOFjMVSXIvL0dts0ZelnEMFfq3GzMnYmwciR91WsJuR8JqnmGhlvW7e+1T6+xet8UU6ncx3FiRz5tqn03Y1CTKNHTT/t3ijRgc+Pn/YeEP8ccg7ID0bQIZI7Pg+BzCxiled77lqMPcMvIlcP/X/SLDAuMPBbbzcAUiW/O2XB5DdBI4D251CU+7Kl8KwuOIh1W+ouCz85v3SJFJsHQBgHjYFXLicGW27w== X-MS-Exchange-AntiSpam-MessageData: AG17KgI9+S/+gjnftOvsjAequdo48QJkUw1s6M11Q0jk202ya4gqwxtE/sw8xN0lrEnqnfOSwy/pmK8TFxKPRZko/v3ikKIbMGpfrSfp439WwW+k2QcPmpeJysmhiI/05cPJALW0ZFL7gPyNQLdTDnKdtAD+EZEvkTPZR4RYjrC+vKgWlJp8i367GotX0+IvPHTnwYGOQQrySVaQxVoM4OmK9zBfx61tS9WVPqKvuSBJwY+FbBkYGnNq/aHh9gzotjypwSYTL/AtqHOmXzO6KjaOyvZhCL6DfJ4CqatRB6kAPpbCjZOqBXhajTBR86LrYBbu44LEXjbIk10accR8jZYk2t+CqKRbtzVzC09DonE1plLtml57+EDRax7HBGm3zblcII+GH+yeBQi6PLZSotWa9zHgTQ2KVIWl8SVliSHpHfD9Q3gHzGjORFawbnz7712piuScYR8gfbn6f+37vK2i1dgGrtLFVQ0GK7hN0HDszgKNMqkaJFF1db5Fu6k0ZuM69A824OBNunn7F9viAcivrNZNQxKY+77ErpgSgn9gDLAUMtLeznmS6WgaxsATYj6ofpqyMgd0K7gfWcwRfak8tBYI/C9Oxb5C0hpzTLHu+7ECOd92BSTKokkPVEYUCEUqTHSlRhHRG9F1v/rtqA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a82642e-b44d-42ef-cd1d-08d87c158489 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:18:33.3985 (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: 9i3HAzTr8RvJ1R78IsWv6CDzD4j25bri2dPGceZOWx6+QeJOV1d0qKZyJhvgWSOJRuHwDo0PPW5gNUTeOf7YEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: HekSKp1acJbLgl9WmHwaDvWVx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981121; bh=Wk9s9ZeHI5/zFXRQQtkoJh2sJehOsmyQWKZjXred5Ek=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=e/e1c3JfGtEnjtcUGH6Tx9KfjFFZ3nBax4ytPISg/nFPwmVEY/Y/lyIzk0TKPszqZhx cOT8/nuMq5mRz7g1364CJNieS5HUs4/52wxc71hRKYEt4M4ey51WsCpFGx2DbFt6FNJ0h +ZDkrx7m/SwpCNVqhHE6/KZfjFV/LIs9wVo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 In upcoming patches, the setting of the bits in the GHCB ValidBitmap will be performed in multiple places. In order to reduce code duplication, add an interface, VmgSetOffsetValid(), to VmgExitLib library to perform this function. Also, to keep management of the ValidBitmap within the library, add an inteface, VmgIsOffsetValid(), to return whether the bit in the ValidBitmap is set for a specified offset. The new VmgSetOffsetValid() function is a VOID function and will be an empty function in the VmgExitLibNull implementation of the VmgExitLib library. The new VmgIsOffsetValid() function returns a BOOLEAN to indicate if the offset is valid. This will always return FALSE in the VmgExitLibNull implementation of the VmgExitLib library. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky Acked-by: Eric Dong --- UefiCpuPkg/Include/Library/VmgExitLib.h | 37 +++++++++++++++++ UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.c | 42 ++++++++++++++++++= ++ 2 files changed, 79 insertions(+) diff --git a/UefiCpuPkg/Include/Library/VmgExitLib.h b/UefiCpuPkg/Include/L= ibrary/VmgExitLib.h index 45fc27d35e29..07e8af6450b9 100644 --- a/UefiCpuPkg/Include/Library/VmgExitLib.h +++ b/UefiCpuPkg/Include/Library/VmgExitLib.h @@ -74,6 +74,43 @@ VmgDone ( IN OUT GHCB *Ghcb ); =20 +/** + Marks a specified offset as valid in the GHCB. + + The ValidBitmap area represents the areas of the GHCB that have been mar= ked + valid. Set the bit in ValidBitmap for the input offset. + + @param[in, out] Ghcb A pointer to the GHCB + @param[in] Offset Qword offset in the GHCB to mark valid + +**/ +VOID +EFIAPI +VmgSetOffsetValid ( + IN OUT GHCB *Ghcb, + IN GHCB_REGISTER Offset + ); + +/** + Checks if a specified offset is valid in the GHCB. + + The ValidBitmap area represents the areas of the GHCB that have been mar= ked + valid. Return whether the bit in the ValidBitmap is set for the input of= fset. + + @param[in] Ghcb A pointer to the GHCB + @param[in] Offset Qword offset in the GHCB to mark valid + + @retval TRUE Offset is marked valid in the GHCB + @retval FALSE Offset is not marked valid in the GHCB + +**/ +BOOLEAN +EFIAPI +VmgIsOffsetValid ( + IN GHCB *Ghcb, + IN GHCB_REGISTER Offset + ); + /** Handle a #VC exception. =20 diff --git a/UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.c b/UefiCpuPk= g/Library/VmgExitLibNull/VmgExitLibNull.c index bb265e1700d2..b47e282aff82 100644 --- a/UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.c +++ b/UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.c @@ -89,6 +89,48 @@ VmgDone ( { } =20 +/** + Marks a field at the specified offset as valid in the GHCB. + + The ValidBitmap area represents the areas of the GHCB that have been mar= ked + valid. Set the bit in ValidBitmap for the input offset. + + @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communication Bl= ock + @param[in] Offset Qword offset in the GHCB to mark valid + +**/ +VOID +EFIAPI +VmgSetOffsetValid ( + IN OUT GHCB *Ghcb, + IN GHCB_REGISTER Offset + ) +{ +} + +/** + Checks if a specified offset is valid in the GHCB. + + The ValidBitmap area represents the areas of the GHCB that have been mar= ked + valid. Return whether the bit in the ValidBitmap is set for the input of= fset. + + @param[in] Ghcb A pointer to the GHCB + @param[in] Offset Qword offset in the GHCB to mark valid + + @retval TRUE Offset is marked valid in the GHCB + @retval FALSE Offset is not marked valid in the GHCB + +**/ +BOOLEAN +EFIAPI +VmgIsOffsetValid ( + IN GHCB *Ghcb, + IN GHCB_REGISTER Offset + ) +{ + return FALSE; +} + /** Handle a #VC exception. =20 --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66743): https://edk2.groups.io/g/devel/message/66743 Mute This Topic: https://groups.io/mt/77888113/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66744+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66744+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981130035384.9737323972938; Thu, 29 Oct 2020 07:18:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id wkiKYY1788612x8Q86Sb7aMa; Thu, 29 Oct 2020 07:18:49 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.74]) by mx.groups.io with SMTP id smtpd.web11.9522.1603981124021917294 for ; Thu, 29 Oct 2020 07:18:44 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ll7lgzoY5nT1QkXlKTK6KiAO9Zj03HS/Yjd805OYhz1XyiFr7NOuKMgd8GqIv/YujxaIDNwi6XzSMWELyfI1DMcxM508fhIs7dn3+JYWeAvMnjPPYzKxiNoQ/sHFv1LO4VT5WShQLAoSwN+Xh1v62LFVcNqZa/QktrvJMJFngo19R31JZ0YhgWUnYMRyHknkdjCEomBjauNiBJ6tM601Yr/zKGwQ/Ap7tVVoMre4VQKdqXE+NLOyTKNjNZgOzIbEJpTGX2Fc3/GeMV+ReZ02vzgHF4fcFWEB4GA5M1/C8IODe8GF4h84L2OsXo3iCVqtQT7/jY1kkmeIAbaR43BxwA== 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=IR//qSoYbrMNyS20r8rsUYpi7HMVjVjpqeBDsmhthe8=; b=Koog9bdhhF0CkYvAbtSpE2Whl1KNsvDME5rrrn+MsotxuHb21EYZ8UJ/9+JZgDSkuUvCc4ZY7n15M/nFburKqSOQl8Y1g251v+6bBVsIw+H++/iHYNf1lt0gyZWuCH0PzkgdizxTBl6bMqJF8mnLLbIMpX+p9uT1E04p/7rkYlt3XABnMs9/5oW/tPoecFbb8CD0Ygs0udUVBfRlfMKKFzS5PZCIh9uLpib0IPbRQM3s6bj+vYFO5phmQ0Vnu/dW29gSh6J6i4qmw/7TnVLecnbhDAB5dlf9SBy7p2zr321ZEg0vkRSp/ggst8Kg0vBa2HsQxR05u5to6ELUMVWOOQ== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:18:41 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:18:41 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 03/11] OvmfPkg/VmgExitLib: Implement new VmgExitLib interfaces Date: Thu, 29 Oct 2020 09:17:54 -0500 Message-ID: <0e7695dce56e749e80d5df1e484cc4ac8011717c.1603981082.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0501CA0092.namprd05.prod.outlook.com (2603:10b6:803:22::30) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN4PR0501CA0092.namprd05.prod.outlook.com (2603:10b6:803:22::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.10 via Frontend Transport; Thu, 29 Oct 2020 14:18:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 21825954-1789-489e-a705-08d87c15892b X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: i/c38vHsdlPYopAxXAmUTtDvOZyMn5G1N9UYGtuHB1RlRXMP0sKnW561mTvwmCThcIg4gihfWII92ekSqXbuBah8NZUk+g2TJaR7ZtxZ9/gkh1T1hDDLBctZdEYAGSqrkYrPeyOqGmsACe1rom/Cx9oNSelnhmp3ZUZ6tDGuaVBSlnUbHXShHRyNnW+oyJ/iPutHdt7vBjsyS63fL3TAQSGPAbrcIXTVPd61qdpI6t5vRujHyy5yR8iWPf47mLqInLhH6ortugYx5WxJUTR59ItBrhYCw5Umvc+ryfydILPntMAK+ZWof4YhgDy7hPi7KQNwWZlu+Q9tYvR8fEvzz/sM+yDW1OAX7wTSl+VwG9knyk7GzpBbgK2Q2GI6NiJWSogqjL42gYs3A2jWv3oU4w== X-MS-Exchange-AntiSpam-MessageData: XBazzTJNB5iylHfCAJy2Zu469Cv/L3qEneHJkFBlyFbpTJJ3KtTjBHi3Z+P354HKupm0RG3EDLvtP1c7ctWGOIunb5rk40K8903l6PcTUAW9dl3dt6dPLK1isgvdAH8qqU9kk/hRQWwG0rTNLgP4qNwqFL5eQb/mtgPqTZPY1dOHdIr52SPs/ivY55ZuuNSTxBcrJ/HdW3CC/7bUqyVXrYhT3iMknVLXP4Cr7oN3uA3EftNeUeKlfSgUDaGQzcdPD7xMs7FvVkdp9bOjpD5R2yAguZrxtbjrFFqiKkHATAjY1LxPPQ/JFoVy6hXTTtxfvP3eMJVU2G37ARhrhN3jEoxUHI5lstsy8qYmZvtYsY16HXXmVVvBcKZXD1OoI45wN7Fn5pCEL+6LraUN47qParprRXA0RYA+wFe9aJCi829Xh4+h5tlfvjn0QkctsMxLIZY6Uo7dVfxx78HsPhzDLr907TNW7PvwvEl9H6lpnEfh6BNIJoJ6gBPU0Q/loPtr+uS08fgce25lMmQkDa2UEjK2kIKaVE4KwX/sR4g+E+/OmArt7BnS8TxVn0PNKs9Yz77dqQONkkfR3cyzx3ByER0D74KAbBdM4gmyOhx7ay72cWhAUxgCYqj/YwJmUDMo37klkGhwmN3FX/IY7b5yiw== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21825954-1789-489e-a705-08d87c15892b X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:18:41.2121 (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: i1Fi58NeOO57YmYFalOfaC9xdr7gB5LlpzCGfA+5wAdrL9917oPNWCtdjoKE+L9fqzOwoyKeuMF9ggeDNDSkag== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: ZcsuXli2iYIZslBms4iPaG2Lx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981129; bh=IfQHvZPiEGspnZ145+ILCCD90HZ52zKH6x2kxMWJKH0=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=p33XQpB7g/LJjjH7QAbQlRSkwwJIXPkFtFGbAnpsHYK2Wda7SJNs8s8aIxHbvLf9dHr 3TFqCul6lT2E0F/8WZUqis6mZ3ZjM5kl42fIH3cTw9lDyLX2Nv1nu8L8YXuw2hUaflpxp jM8BqAhPs9N1Jpl0cY36k0plCUCkoT0MTJE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 The VmgExitLib library added two new interfaces, VmgSetOffsetValid() and VmgIsOffsetValid(), that must now be implemented in the OvmfPkg version of the library. Implement VmgSetOffsetValid() and VmgIsOffsetValid() and update existing code, that is directly accessing ValidBitmap, to use the new interfaces. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Tom Lendacky Cc: Brijesh Singh Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitLib.c | 54 +++++++++ OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 118 +++++--------------- 2 files changed, 85 insertions(+), 87 deletions(-) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitLib.c b/OvmfPkg/Library/VmgE= xitLib/VmgExitLib.c index 53040cc6f649..21f68b19c94e 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitLib.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitLib.c @@ -157,3 +157,57 @@ VmgDone ( { } =20 +/** + Marks a field at the specified offset as valid in the GHCB. + + The ValidBitmap area represents the areas of the GHCB that have been mar= ked + valid. Set the bit in ValidBitmap for the input offset. + + @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communication Bl= ock + @param[in] Offset Qword offset in the GHCB to mark valid + +**/ +VOID +EFIAPI +VmgSetOffsetValid ( + IN OUT GHCB *Ghcb, + IN GHCB_REGISTER Offset + ) +{ + UINT32 OffsetIndex; + UINT32 OffsetBit; + + OffsetIndex =3D Offset / 8; + OffsetBit =3D Offset % 8; + + Ghcb->SaveArea.ValidBitmap[OffsetIndex] |=3D (1 << OffsetBit); +} + +/** + Checks if a specified offset is valid in the GHCB. + + The ValidBitmap area represents the areas of the GHCB that have been mar= ked + valid. Return whether the bit in the ValidBitmap is set for the input of= fset. + + @param[in] Ghcb A pointer to the GHCB + @param[in] Offset Qword offset in the GHCB to mark valid + + @retval TRUE Offset is marked valid in the GHCB + @retval FALSE Offset is not marked valid in the GHCB + +**/ +BOOLEAN +EFIAPI +VmgIsOffsetValid ( + IN GHCB *Ghcb, + IN GHCB_REGISTER Offset + ) +{ + UINT32 OffsetIndex; + UINT32 OffsetBit; + + OffsetIndex =3D Offset / 8; + OffsetBit =3D Offset % 8; + + return ((Ghcb->SaveArea.ValidBitmap[OffsetIndex] & (1 << OffsetBit)) != =3D 0); +} diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index 8e42b305e83c..7d14341d592b 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -135,62 +135,6 @@ typedef struct { } SEV_ES_PER_CPU_DATA; =20 =20 -/** - Checks the GHCB to determine if the specified register has been marked v= alid. - - The ValidBitmap area represents the areas of the GHCB that have been mar= ked - valid. Return an indication of whether the area of the GHCB that holds t= he - specified register has been marked valid. - - @param[in] Ghcb Pointer to the Guest-Hypervisor Communication Block - @param[in] Reg Offset in the GHCB of the register to check - - @retval TRUE Register has been marked vald in the GHCB - @retval FALSE Register has not been marked valid in the GHCB - -**/ -STATIC -BOOLEAN -GhcbIsRegValid ( - IN GHCB *Ghcb, - IN GHCB_REGISTER Reg - ) -{ - UINT32 RegIndex; - UINT32 RegBit; - - RegIndex =3D Reg / 8; - RegBit =3D Reg & 0x07; - - return ((Ghcb->SaveArea.ValidBitmap[RegIndex] & (1 << RegBit)) !=3D 0); -} - -/** - Marks a register as valid in the GHCB. - - The ValidBitmap area represents the areas of the GHCB that have been mar= ked - valid. Set the area of the GHCB that holds the specified register as val= id. - - @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communication Bl= ock - @param[in] Reg Offset in the GHCB of the register to mark valid - -**/ -STATIC -VOID -GhcbSetRegValid ( - IN OUT GHCB *Ghcb, - IN GHCB_REGISTER Reg - ) -{ - UINT32 RegIndex; - UINT32 RegBit; - - RegIndex =3D Reg / 8; - RegBit =3D Reg & 0x07; - - Ghcb->SaveArea.ValidBitmap[RegIndex] |=3D (1 << RegBit); -} - /** Return a pointer to the contents of the specified register. =20 @@ -891,9 +835,9 @@ MwaitExit ( DecodeModRm (Regs, InstructionData); =20 Ghcb->SaveArea.Rax =3D Regs->Rax; - GhcbSetRegValid (Ghcb, GhcbRax); + VmgSetOffsetValid (Ghcb, GhcbRax); Ghcb->SaveArea.Rcx =3D Regs->Rcx; - GhcbSetRegValid (Ghcb, GhcbRcx); + VmgSetOffsetValid (Ghcb, GhcbRcx); =20 return VmgExit (Ghcb, SVM_EXIT_MWAIT, 0, 0); } @@ -923,11 +867,11 @@ MonitorExit ( DecodeModRm (Regs, InstructionData); =20 Ghcb->SaveArea.Rax =3D Regs->Rax; // Identity mapped, so VA =3D PA - GhcbSetRegValid (Ghcb, GhcbRax); + VmgSetOffsetValid (Ghcb, GhcbRax); Ghcb->SaveArea.Rcx =3D Regs->Rcx; - GhcbSetRegValid (Ghcb, GhcbRcx); + VmgSetOffsetValid (Ghcb, GhcbRcx); Ghcb->SaveArea.Rdx =3D Regs->Rdx; - GhcbSetRegValid (Ghcb, GhcbRdx); + VmgSetOffsetValid (Ghcb, GhcbRdx); =20 return VmgExit (Ghcb, SVM_EXIT_MONITOR, 0, 0); } @@ -988,9 +932,9 @@ RdtscpExit ( return Status; } =20 - if (!GhcbIsRegValid (Ghcb, GhcbRax) || - !GhcbIsRegValid (Ghcb, GhcbRcx) || - !GhcbIsRegValid (Ghcb, GhcbRdx)) { + if (!VmgIsOffsetValid (Ghcb, GhcbRax) || + !VmgIsOffsetValid (Ghcb, GhcbRcx) || + !VmgIsOffsetValid (Ghcb, GhcbRdx)) { return UnsupportedExit (Ghcb, Regs, InstructionData); } Regs->Rax =3D Ghcb->SaveArea.Rax; @@ -1027,16 +971,16 @@ VmmCallExit ( DecodeModRm (Regs, InstructionData); =20 Ghcb->SaveArea.Rax =3D Regs->Rax; - GhcbSetRegValid (Ghcb, GhcbRax); + VmgSetOffsetValid (Ghcb, GhcbRax); Ghcb->SaveArea.Cpl =3D (UINT8) (Regs->Cs & 0x3); - GhcbSetRegValid (Ghcb, GhcbCpl); + VmgSetOffsetValid (Ghcb, GhcbCpl); =20 Status =3D VmgExit (Ghcb, SVM_EXIT_VMMCALL, 0, 0); if (Status !=3D 0) { return Status; } =20 - if (!GhcbIsRegValid (Ghcb, GhcbRax)) { + if (!VmgIsOffsetValid (Ghcb, GhcbRax)) { return UnsupportedExit (Ghcb, Regs, InstructionData); } Regs->Rax =3D Ghcb->SaveArea.Rax; @@ -1074,15 +1018,15 @@ MsrExit ( case 0x30: // WRMSR ExitInfo1 =3D 1; Ghcb->SaveArea.Rax =3D Regs->Rax; - GhcbSetRegValid (Ghcb, GhcbRax); + VmgSetOffsetValid (Ghcb, GhcbRax); Ghcb->SaveArea.Rdx =3D Regs->Rdx; - GhcbSetRegValid (Ghcb, GhcbRdx); + VmgSetOffsetValid (Ghcb, GhcbRdx); // // fall through // case 0x32: // RDMSR Ghcb->SaveArea.Rcx =3D Regs->Rcx; - GhcbSetRegValid (Ghcb, GhcbRcx); + VmgSetOffsetValid (Ghcb, GhcbRcx); break; default: return UnsupportedExit (Ghcb, Regs, InstructionData); @@ -1094,8 +1038,8 @@ MsrExit ( } =20 if (ExitInfo1 =3D=3D 0) { - if (!GhcbIsRegValid (Ghcb, GhcbRax) || - !GhcbIsRegValid (Ghcb, GhcbRdx)) { + if (!VmgIsOffsetValid (Ghcb, GhcbRax) || + !VmgIsOffsetValid (Ghcb, GhcbRdx)) { return UnsupportedExit (Ghcb, Regs, InstructionData); } Regs->Rax =3D Ghcb->SaveArea.Rax; @@ -1311,7 +1255,7 @@ IoioExit ( } else { CopyMem (&Ghcb->SaveArea.Rax, &Regs->Rax, IOIO_DATA_BYTES (ExitInfo1= )); } - GhcbSetRegValid (Ghcb, GhcbRax); + VmgSetOffsetValid (Ghcb, GhcbRax); =20 Status =3D VmgExit (Ghcb, SVM_EXIT_IOIO_PROT, ExitInfo1, 0); if (Status !=3D 0) { @@ -1319,7 +1263,7 @@ IoioExit ( } =20 if ((ExitInfo1 & IOIO_TYPE_IN) !=3D 0) { - if (!GhcbIsRegValid (Ghcb, GhcbRax)) { + if (!VmgIsOffsetValid (Ghcb, GhcbRax)) { return UnsupportedExit (Ghcb, Regs, InstructionData); } CopyMem (&Regs->Rax, &Ghcb->SaveArea.Rax, IOIO_DATA_BYTES (ExitInfo1= )); @@ -1379,15 +1323,15 @@ CpuidExit ( UINT64 Status; =20 Ghcb->SaveArea.Rax =3D Regs->Rax; - GhcbSetRegValid (Ghcb, GhcbRax); + VmgSetOffsetValid (Ghcb, GhcbRax); Ghcb->SaveArea.Rcx =3D Regs->Rcx; - GhcbSetRegValid (Ghcb, GhcbRcx); + VmgSetOffsetValid (Ghcb, GhcbRcx); if (Regs->Rax =3D=3D CPUID_EXTENDED_STATE) { IA32_CR4 Cr4; =20 Cr4.UintN =3D AsmReadCr4 (); Ghcb->SaveArea.XCr0 =3D (Cr4.Bits.OSXSAVE =3D=3D 1) ? AsmXGetBv (0) : = 1; - GhcbSetRegValid (Ghcb, GhcbXCr0); + VmgSetOffsetValid (Ghcb, GhcbXCr0); } =20 Status =3D VmgExit (Ghcb, SVM_EXIT_CPUID, 0, 0); @@ -1395,10 +1339,10 @@ CpuidExit ( return Status; } =20 - if (!GhcbIsRegValid (Ghcb, GhcbRax) || - !GhcbIsRegValid (Ghcb, GhcbRbx) || - !GhcbIsRegValid (Ghcb, GhcbRcx) || - !GhcbIsRegValid (Ghcb, GhcbRdx)) { + if (!VmgIsOffsetValid (Ghcb, GhcbRax) || + !VmgIsOffsetValid (Ghcb, GhcbRbx) || + !VmgIsOffsetValid (Ghcb, GhcbRcx) || + !VmgIsOffsetValid (Ghcb, GhcbRdx)) { return UnsupportedExit (Ghcb, Regs, InstructionData); } Regs->Rax =3D Ghcb->SaveArea.Rax; @@ -1434,15 +1378,15 @@ RdpmcExit ( UINT64 Status; =20 Ghcb->SaveArea.Rcx =3D Regs->Rcx; - GhcbSetRegValid (Ghcb, GhcbRcx); + VmgSetOffsetValid (Ghcb, GhcbRcx); =20 Status =3D VmgExit (Ghcb, SVM_EXIT_RDPMC, 0, 0); if (Status !=3D 0) { return Status; } =20 - if (!GhcbIsRegValid (Ghcb, GhcbRax) || - !GhcbIsRegValid (Ghcb, GhcbRdx)) { + if (!VmgIsOffsetValid (Ghcb, GhcbRax) || + !VmgIsOffsetValid (Ghcb, GhcbRdx)) { return UnsupportedExit (Ghcb, Regs, InstructionData); } Regs->Rax =3D Ghcb->SaveArea.Rax; @@ -1480,8 +1424,8 @@ RdtscExit ( return Status; } =20 - if (!GhcbIsRegValid (Ghcb, GhcbRax) || - !GhcbIsRegValid (Ghcb, GhcbRdx)) { + if (!VmgIsOffsetValid (Ghcb, GhcbRax) || + !VmgIsOffsetValid (Ghcb, GhcbRdx)) { return UnsupportedExit (Ghcb, Regs, InstructionData); } Regs->Rax =3D Ghcb->SaveArea.Rax; @@ -1531,7 +1475,7 @@ Dr7WriteExit ( // Using a value of 0 for ExitInfo1 means RAX holds the value // Ghcb->SaveArea.Rax =3D *Register; - GhcbSetRegValid (Ghcb, GhcbRax); + VmgSetOffsetValid (Ghcb, GhcbRax); =20 Status =3D VmgExit (Ghcb, SVM_EXIT_DR7_WRITE, 0, 0); if (Status !=3D 0) { --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66744): https://edk2.groups.io/g/devel/message/66744 Mute This Topic: https://groups.io/mt/77888118/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66745+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66745+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981132605447.22472358146297; Thu, 29 Oct 2020 07:18:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id R9weYY1788612x1CRTZBzBw3; Thu, 29 Oct 2020 07:18:52 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.62]) by mx.groups.io with SMTP id smtpd.web08.9515.1603981131321097633 for ; Thu, 29 Oct 2020 07:18:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hXfXo2cb1m1J3cP8s967HOVGZ65jXh37sTnR6bCC7/rPHlVl3h4yKzyYD9Ee98Lpw7jlPE8jtB4tkm7JHd2kSoOtwZnO9IfdhJPXv9tqG9GIfdSOsdK0Mj0tlEp3zbBZj7hgTMsJt80E2vINIp3fYoaqFoqToZQl0yshAFi/8V91u25ldbXHdKZHPKL9IPhtrx/3xhwMQf7cNbtvmjFV8ImschASVsFdKbU5q/oaQjMr+h/kaxqMyH+PeMMT8IiTkXnEzf28w9XDZbEh6wpPv6zFq+SAwi2QLHPFKi9s+zNlqIa0slwV4xY7aUp/NbYOXzmt54QPiUFciAUuR17bdQ== 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=zQmfdxszJdrCUDcjqN+iZA+fpdnf+lanHbe30lOlSzg=; b=ZXBMe9tvqRdTrO3zI4O+1Z5zdwPF/sI2kRdqN3rsAOg1/ew44Zlu/b0DyRpaYmFcM9wU3tYysJpKHsRFmfudZ9E6k9MreEW+jKzUCsUUik7ti3JUEl8q7QpSnkJNJ0a1+77yVkS69TFxq6qeGB8JyYTriaE4Kcqmj9dAQDDc4g2dUn0szy35TCxXVHMUTVupvUhxB/dGfieQTh7DugI3XSE+VvY36gGmtfRmTIzNnqaUcxMlEXcSqb3UQ1aYoWV9FOXhMfstsJieVskIY3JSngC+g1k7td8GbPO+ZtKuseM4VmwdaU6dU+sjW7H3r6PrwBlD31RXbQwc1hqPoqk2Cw== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:18:49 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:18:49 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 04/11] OvmfPkg/VmgExitLib: Set the SW exit fields when performing VMGEXIT Date: Thu, 29 Oct 2020 09:17:55 -0500 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0201CA0003.namprd02.prod.outlook.com (2603:10b6:803:2b::13) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN4PR0201CA0003.namprd02.prod.outlook.com (2603:10b6:803:2b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 29 Oct 2020 14:18:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8cc6308b-e353-4b15-b443-08d87c158de2 X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: jMZNiIFmPQPAb7RFVDBGtPkXU20aH3jx2fs5XLWhGb6ZbvxezHLJr338K+f+P1jrEJ/DsIB/HwCy+jTXXyG29VgygYAvgBRrDKcjoGkAyZpyq1NR/RiiW6245+cSgHtmjc3XFCSUivJmY34d4Cjpl2ZAkokSxO0WIgZ8n4tLQMI90f3ofcIVz4ANuKN7JneTE6zcUhh0FJ21eDNgCrD6AKAh4s90ZORQMCXJ4sdBooYUxWSSPLzXB4jK6F3ufSQlTTzkpSMMjp0adfWuyRe/n2tapbrCaRDrqd1/U7CtVoHqR8d+4LVQqBRMOajg2f6j6OR9w0QlBzq1L+qoVFBnVgrloRxnMnPnojDAJvUJc36XOCtz05c4IqXEsHqRW8gJNYUs7JHkA9g535xFGDMR3w== X-MS-Exchange-AntiSpam-MessageData: oB5HEXG3S6iwDiIcDMF+LJywrkUFGMDIsag87FrDVrQLlYGyP8SqipCnCV/ajzn6Hrx4cbadPxwgsUJAtAjpQ02PAM+51OwppgeUYdG6qrDLvGgiOT8dQg5XOHVurTq2JuIAqxOatpmct5xnjk1Q6sTrowYu6PgVdxFOlD7ddPgoShU9CiyZ7ea301azw5oPvViyZ7wseg/JNiLHh/5PQv14FmuXgBTicCHxai1vWJdQYoe4HNlelq92E7RJtyOgB26Uq91vo9+cnSoEew6rNk0I8aK/Chj0YmW3DkDcBqWd/16EtbLpEquYap7mfqkOesioQlQbHpN+LRIngatW2fL+7LJSOhYymjSBo9z3caH3HA+63Yk8MJjzqKVKJ7ymQwD4wVf+tbLH78pXtZduLmEyy1Ake9cm/Efa1OowinVt7DNgmOvqY4CM7M8lBxbLskVJr1bLNEI7bYqnC1ga1bvr3xVm0YeK5xQoEgOHnZGWmfvIU5jIwFZo5j1+5hJ0dVkki8AItk0nxrniGPgBOkEUjyn33FhLJmhSNTdcFVHHS/KJN9jd9w+vEoAbPxIvRc4uLeejO20czSZNFp1V5cR7vignxUygFEKMcYVcw4blErRpNPMv31HrOPvd8vOes7wLBwg6szNKT+ExQMQpIQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8cc6308b-e353-4b15-b443-08d87c158de2 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:18:49.1316 (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: g7LeS7Krw2mvxsYYt//hdKFu29itA7lNJEMZIPU0KLKF24CIEiEkCqvwfr+wZ2ajoJ48RHfBx5U0fH3DSOHKuA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: 475fEQcJYaWLLQbz9duhxuSXx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981132; bh=HFHoypzKzb3DPVbtkFREWNl9FkjWhrQznjeHMdCJJA4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=k6yUqRaVgyfF8jGps8t+TZathVhehr7k/JgcdQKGdA5E8bwvO9d38obaaMR43EkY0Ct 6wvvwPuAPAZ7E5ild0uStzDokLQaObgm+/Pse26lcuPZNGvb3iNh/3QgiyCWQywunp/ge 89KKiCCpDwYJPM337pyOAzYBuzqWsq85k2s= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 All fields that are set in the GHCB should have their associated bit in the GHCB ValidBitmap field set. Add support to set the bits for the software exit information fields when performing a VMGEXIT (SwExitCode, SwExitInfo1, SwExitInfo2). Fixes: 61bacc0fa16fd6f595a2c4222425cb6286e19977 Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Tom Lendacky Cc: Brijesh Singh Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitLib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitLib.c b/OvmfPkg/Library/VmgE= xitLib/VmgExitLib.c index 21f68b19c94e..0540df8a04d4 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitLib.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitLib.c @@ -110,6 +110,10 @@ VmgExit ( Ghcb->SaveArea.SwExitInfo1 =3D ExitInfo1; Ghcb->SaveArea.SwExitInfo2 =3D ExitInfo2; =20 + VmgSetOffsetValid (Ghcb, GhcbSwExitCode); + VmgSetOffsetValid (Ghcb, GhcbSwExitInfo1); + VmgSetOffsetValid (Ghcb, GhcbSwExitInfo2); + // // Guest memory is used for the guest-hypervisor communication, so fence // the invocation of the VMGEXIT instruction to ensure GHCB accesses are --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66745): https://edk2.groups.io/g/devel/message/66745 Mute This Topic: https://groups.io/mt/77888122/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66746+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66746+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981145916171.261923250039; Thu, 29 Oct 2020 07:19:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id K0xtYY1788612xnSdR2l00yB; Thu, 29 Oct 2020 07:19:05 -0700 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.44]) by mx.groups.io with SMTP id smtpd.web09.9418.1603981139828668773 for ; Thu, 29 Oct 2020 07:19:00 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=US+rk6DHWyWxhyJoCRfXy6bKKFXluK4OM60U0cSRtho5151EjncfjBawao436cIF5AjM4RjP4KWWdujFsybVQ/wWu83IcRSd+49JpU0t8DvJnZXsPfL7kXN+mdrVM0HddXtih3CguXhAIH0su0DHv7N3M+H9d7R25Nq9k56Sy/L4bNGMD0vNPXfnobs/QFzCrnlU8SVm61QfoG4r5jHetz9hbtcMmYdRJtVuvhWsX2TExB8pCTf0TzGbYzRuvU31FtQY1pEw2LsNq1NidSGIw+Q5AxVhN7vXKYiMy0w428iH3RtjnNdCjcnAHjynr7e47HP424QHAvrP+aWzI1W7yw== 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=GXhuA8Y2GwEBqBucn5j36BHXZl4O3V1D9dzlOb/Psyk=; b=ogMNijWVixxcAyTCn7MUd8t8dIa85CnXGW8WWyl8pRhSjic0c/d78/T2BjGBmQYCqTCXKx1TxnkOsxfFfGHdpytqTFPUQKPyDORGFj4k2cVlgpaVfHmMiv/MuBMCs/j3XyL/J/BamW/6pcSI0tkwrCRonL+Y2aN70YKTIh2oUd5TXBPSZNzG371E1oXUbzRTCe55ty2x8X/0Ci27EKiAi0nfBf1bWqfIrt7Irjjs4geqIorrVcgtzNx8rcor3lmC+aCnGJ3AgGn2QIPEFxP7+501gp1CuI9uFTeSC3licVu07zryG59Cu8fORVGmduoXPT2hmEx0NDMdt2B0s8K2Bw== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:18:56 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:18:56 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 05/11] OvmfPkg/VmgExitLib: Set the SwScratch valid bit for IOIO events Date: Thu, 29 Oct 2020 09:17:56 -0500 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN6PR2101CA0030.namprd21.prod.outlook.com (2603:10b6:805:106::40) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN6PR2101CA0030.namprd21.prod.outlook.com (2603:10b6:805:106::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.7 via Frontend Transport; Thu, 29 Oct 2020 14:18:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 167a2daf-e040-4d23-c77d-08d87c15926a X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 0+LmQyXV51aT8pS43IEZJE9B0ie9/QF5DlQYD2OnP+s/2Qrl2QPJPKwSxVFZmKh+uKgavatSolTd2NBN/cFP69m5UzXiW/i9UnRCt39SIUkiviYhDuYo+ToMZQsnuX4IfP6FNVeNNk5hfzWVs0jWpKSiU+7C2wbEQQVGsVWVexeaepN+Du/jfrLbGJ7diAoALTO6br5SXXakuvqxf+QuDQEVvPgJthb5ZDDSf2Meu/6QxNLODd+hdyn0eogd1h+gjGNCqw0SEc696RAL461veybQZJ692st5kXT6I3FFGi8VZaXXHgWP1LmvVBV1JHRBDfQDJyFXuFIwyy8husbuA9gFajLQ8o2dtpDMJ1DfZnHrW2jOVr+Fba6SrCWAKnQcJ5itfktM+KMVjcNBs1Pe9A== X-MS-Exchange-AntiSpam-MessageData: eZWfjcaSuqpOr0C3I3e2lRQlFibQPg98znw6Vvs58WcNRBD0wAaIwrUf8So+l/b/ru95N8Tx7HMeaLVJioPjoX0tnjv+W0qo2iyOGwO7AZ2lBe8aCzvrLhOGHYrxwHU0rvQU28HZUuYhZd0vVeRTMN5ZI6GQsvUby0zKrbLk7Cv4rYqgnsuBY7eDHNXaDfGt2l0U/1cf4w2ytDdlQ99Jbc9HefBtrBU1Av99mKUi1Gx71Vx4Yh96Hw83q036T4q+pyHfMmmWxwZYyDYF8b5EWLPBiQfsFKiiNovkngc1TnV3+IAj4VyMbOPFxMjT3vXslK5GGYb6cRPFgMydafmZS3LriYlCNQfvU71x+iydFrQnxcfJmmLaSioqpSCiXh2F+xKojKf8VwnUwgXvkYoYOThKKEDoQOsCx9MbTzPOXwKPQI62yWKd8ZVjMjgVcCnbwQFsap1Pi5pJZnBwY+f20GAtEF7vk/4TEJZQ94/UGZdU0z6+18g+Adp2ThBr6kLruCDxUFNypQ7XNrwP4JczVab/HLBMxtknhRdM0mdY6rhCfcVjeFUlAK8ZePOUGjmbjBjBdH+INe1HAUCI4Kt/35jaqiHgSjc+gJhhlrENSlTjpTRjeQCExp4t9D4t2VR18bXNSKgMLNTzV9+3J1EoxA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 167a2daf-e040-4d23-c77d-08d87c15926a X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:18:56.8342 (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: e+RD7aJq9PaFm/rRcFaAG5OLyKk8eIv/pH+7ihB3seypmH8RopJz/5MyhKnO+6Roz9ToepybY7ewMaBWFehPaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: MZ0o0OsNiz3Wy6hMLz12CtHvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981145; bh=et8ueLzSGccRh3WS6ZVRvWbtczi21u7u2hFYDiu7YNQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=K6oMH6uPXUPgsUoRO2+urqDAui/1VPFI0d2ff4YrQktXYJecThFYjoM3JPBipJUmIVi qAztJz/PI2E+yIRuUiAo8uUNeXRgTzvbpWRVP63z/t5oonV3EbqMqdOYsh0F9DrcS0tio dWL0SsVfXwboP5tCmaaORdQT60aOPSiO9jQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 All fields that are set in the GHCB should have their associated bit in the GHCB ValidBitmap field set. Add support to set the bit for the scratch area field (SwScratch). Fixes: 0020157a9825e5f5784ff014044f11c0558c92fe Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Tom Lendacky Cc: Brijesh Singh Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 1 + 1 file changed, 1 insertion(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index 7d14341d592b..e5f14035b06f 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -1233,6 +1233,7 @@ IoioExit ( } =20 Ghcb->SaveArea.SwScratch =3D (UINT64) Ghcb->SharedBuffer; + VmgSetOffsetValid (Ghcb, GhcbSwScratch); Status =3D VmgExit (Ghcb, SVM_EXIT_IOIO_PROT, ExitInfo1, ExitInfo2); if (Status !=3D 0) { return Status; --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66746): https://edk2.groups.io/g/devel/message/66746 Mute This Topic: https://groups.io/mt/77888128/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66747+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66747+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981149030290.13600334736327; Thu, 29 Oct 2020 07:19:09 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tzvHYY1788612x4GqevoNVAu; Thu, 29 Oct 2020 07:19:08 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.80]) by mx.groups.io with SMTP id smtpd.web12.9402.1603981146984679906 for ; Thu, 29 Oct 2020 07:19:07 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GeBpA27Gk1rCjWsOFgmvPOHaBdKFoyL9Q9/09UywYsjy0jTt4XNM0lbOu6JqHe3gapSynVR1REArxnosc90WUMUQCU4+GBzCZQKFJWi7kQzuIQK1nb7WSe55NOX9WcrOkrKj5438s5UXNbOBzzQ9UYIHA+eG4PlvPWgnDT7xPPLpPiem2i8Ro+9qnsusf3/ebsVBjeqOxLQ7kdxpI+15zeg5s/LrNMD6kZvWPFeRori89hUOM9Vz6Fti3RpHTWqC01rapkR9ACYYr0dVg5NmuRRqRYlRmgbnL3mf8FLUuAxsTNfAG4UmloSpQ1NpP7s9JnBtI8i2ArO2elzwWkGJoA== 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=SgZCc6wxVnz/Nrtf4qAOaxmDIT+GUm4Z4PAifjXDTCA=; b=jNOqQsk5JpSVoZWiIUkUiDAt6na+g2qywssi5YvyqzuYGJhiyieizLNCbdW0RQsJzbuj2SRT7yZ69rXQ6V2NeKIyehuuJiqAmx00IEtleLwK0GXAqlqbGtBiI181PrqHzUloC1yvCbwFnQhmoOlwwm003ObQz52xfXRiDjufjur7DaA/PZECWnoWhELzl2YLIvj6wt4qoZMhQ5XP7ISi+5fNpH0ANtxhz9wotgxfLWj1+EzJjposLUw/9k7mMs10MAo25y2Zrl1VrIP4IXujk7km0MTbyD8QJFoNNNI+PvkoSMN+zblvGFssrw6ckB3BgqBPfsqOROUdWeeNxf9exA== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:19:04 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:19:04 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 06/11] OvmfPkg/VmgExitLib: Set the SwScratch valid bit for MMIO events Date: Thu, 29 Oct 2020 09:17:57 -0500 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN6PR05CA0019.namprd05.prod.outlook.com (2603:10b6:805:de::32) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN6PR05CA0019.namprd05.prod.outlook.com (2603:10b6:805:de::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.10 via Frontend Transport; Thu, 29 Oct 2020 14:19:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0cd77b38-a05d-4972-8bed-08d87c159704 X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: iAXLbZ37xCciFclCD4Ajr44KdpFZFkE43CNfSco/Ei++6kYtzCcnB8YrsL7xpNNEHJhiCsUVCY2/QjCC7NEOM/m0fC+SVGrD3DGXj90GjVYvTSOSahe/B5Q0H349HmbHsBhpDBpDLVIQUdons7gGYe2qysXuXfVpJe8ATslltrrmaet36+/dEsRxxHN7eLrwwTM/VduAH2p1jiZMIMbH0ULbqktCUHke5PwXupWwrHpzOjhCV4iiidZuqiNOoS0xtt0kaEkMzgpeGnO7hT6+bFdgd6ETP6kJQ0yT3qWlu2awJecgU9TlREAMcvkHarbpJ/UL/spDOlR5MypWF6amMiXvfWLcfJL8x7uWSEi+cg6xEIW7DK8b1poH5w8LPQjD6+TCc5Qc3wypb16mY31wJQ== X-MS-Exchange-AntiSpam-MessageData: rAUIKkDWzjIp/54t7kyDXc8dHpcElJVubb1ArFJ88rcE4q2Xr+sqz9SvwBzfM9/Y38Nja9+2BrV5TZo7QaGeI2LCFsglMNY1OkZhviHqXd5cT37ugzOFvAQ40dA/lo7pX5lgnyJ2sd6TYIUqZmVlX27k5+g9BhE7LEFtGP5YWCO9B2BUXIC0Ul/tzmEScUiFU1jRjb19tBTxDdH1QrPCbGTHotUGNXTUM35qNSZQzQPrT1LFfuchU0QDKdD9qCRr3ZRhGJkc0xc1j0ZTCIh+8Nq/9dEqGR/30kz9vrwZnRbILSYtt2xB+gSO5datzHY4hzAOs1ryf+uzFiyqaB0rDll9o3wrl/Hpqc8p99/i9epCpfP3QX/Su7XIg6KY3pFo0wEt+UP6/Ob/6aXhbpW8ihHOoU7hYpbt9/WgcQghP+4jm3rh9zxU6gZOtsIfpacvwNOdMuzdQo0wbeRoyPCFm2odyuEoBuHisH05ddjzA0QEs5K2Eeglq6nqOAP5TFaAXzmhqYAT3/GIy0X12hmHFmTRZRXpf+LmsXKyR79iN6suXQ73YFR9c+iFriSXYvhednWoUveCC9tRtR/Ia4h+ROUozY0gcW4BDCIbVjo/hc2LoIqMA2qKNplb+xiuHI+9eG51xSW7wDBaeeTnrmxdXg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0cd77b38-a05d-4972-8bed-08d87c159704 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:19:04.4099 (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: z+SUpPrbwndojLLIV15mNDGGfzN4+mAvy7f2B3MJPQx8A1L9rPJUQMhqkniiHOZf8CHa2jgFh4K8QOo+qQsYWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: pUdhzcTOSxNTcsOtWXlgk70mx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981148; bh=KOqO79wR+u+xfe9m2+HUoUvD/Ig25kYAW4cwQzcQraE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=p52druFiCPFX4iKarg8JKNICnf/Xy+mtDnXtOS/inRxr2BS081CD04wF0ZZlLLNmshJ pEWxyVr4qNGGHMq0jK+8jEs+cW3P02prUNKFO9uTxw1tNI0YLBEhPssdAXvnlzIHd40EQ Vfa94/WehIRq8L8GunZCfASamThHN7NVfeg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 All fields that are set in the GHCB should have their associated bit in the GHCB ValidBitmap field set. Add support to set the bit for the scratch area field (SwScratch). Fixes: c45f678a1ea2080344e125dc55b14e4b9f98483d Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Tom Lendacky Cc: Brijesh Singh Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index e5f14035b06f..9bf9d160179c 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -664,6 +664,7 @@ MmioExit ( CopyMem (Ghcb->SharedBuffer, &InstructionData->Ext.RegData, Bytes); =20 Ghcb->SaveArea.SwScratch =3D (UINT64) Ghcb->SharedBuffer; + VmgSetOffsetValid (Ghcb, GhcbSwScratch); Status =3D VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, ExitInfo1, ExitInfo2); if (Status !=3D 0) { return Status; @@ -693,6 +694,7 @@ MmioExit ( CopyMem (Ghcb->SharedBuffer, InstructionData->Immediate, Bytes); =20 Ghcb->SaveArea.SwScratch =3D (UINT64) Ghcb->SharedBuffer; + VmgSetOffsetValid (Ghcb, GhcbSwScratch); Status =3D VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, ExitInfo1, ExitInfo2); if (Status !=3D 0) { return Status; @@ -725,6 +727,7 @@ MmioExit ( ExitInfo2 =3D Bytes; =20 Ghcb->SaveArea.SwScratch =3D (UINT64) Ghcb->SharedBuffer; + VmgSetOffsetValid (Ghcb, GhcbSwScratch); Status =3D VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2); if (Status !=3D 0) { return Status; @@ -755,6 +758,7 @@ MmioExit ( ExitInfo2 =3D Bytes; =20 Ghcb->SaveArea.SwScratch =3D (UINT64) Ghcb->SharedBuffer; + VmgSetOffsetValid (Ghcb, GhcbSwScratch); Status =3D VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2); if (Status !=3D 0) { return Status; @@ -780,6 +784,7 @@ MmioExit ( ExitInfo2 =3D Bytes; =20 Ghcb->SaveArea.SwScratch =3D (UINT64) Ghcb->SharedBuffer; + VmgSetOffsetValid (Ghcb, GhcbSwScratch); Status =3D VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2); if (Status !=3D 0) { return Status; --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66747): https://edk2.groups.io/g/devel/message/66747 Mute This Topic: https://groups.io/mt/77888130/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66748+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66748+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981161306630.2958067192718; Thu, 29 Oct 2020 07:19:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qwPcYY1788612xUHygCGuS2z; Thu, 29 Oct 2020 07:19:21 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.62]) by mx.groups.io with SMTP id smtpd.web12.9404.1603981154651626984 for ; Thu, 29 Oct 2020 07:19:14 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cWe9n+Ecrto1M5Zx0Tzz1bOe6zHr0/gKo8Tpxtl95ZPC+yvxWomjONA5VPHB2uBFEPhR7RbvVzoJUFbYFnZRSsTtwwtZ2U6Ad3PrPtB5IKhvTr8b+VBEetSTJ0Vg52zhaeX79nxdEhThC2GJhrZqsvQHec67nh5HeLDe776kq4DxZu7E4kJQocAWN037rHGCFg/1VbZkIL4icR1Id3YBANbBQlNS6OokU7rE7Ro5T6PTi3upwOsoxttoh2jkUJ7T5ivkdON5W/PajLfjAya2/8oOiQYtd81T67eGjiu0BJ+P3g/VgrxOOG9UIuxmK/bGty5ut6SOTYh7dCVec0Jz0g== 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=VbDrtzeDnb9bg6l8LG2kTd3VlkNmpNPXsk2R3WV/nIQ=; b=MPAx4ipca6cxq0dbDfk4z41NYGdS+NtqIcAxOxlMNGHNvfsJFr2p2VT5OvOs/8tHU+NJsW6aUhSQYEVlqyBUcDycKyhY931nMRFlG8PGulI6BbD83p3xrzZPfAE5jpeBwA+TSrk96AHES5TY43Pe0R7L/Dgs5aS+Ie1PCxE2r00/w9jVLHvYEaHbp0TKmW/7pYLUN4sZm8W2ph1YwarpXOEGCapzL1U/3/L593AJ7DuDRJRFoNzDuXbK49dAEb9jdHfSx+Maf/FvN+v3LulHfwQ25Vrl1Mg33yMac2+CB4dthKkl+AM3/9AhFEduUvvaK6lxk+KeLZdigUdMXDvU3g== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:19:12 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:19:12 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Eric Dong , Ray Ni , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH v3 07/11] UefiCpuPkg/MpInitLib: Set the SW exit fields when performing VMGEXIT Date: Thu, 29 Oct 2020 09:17:58 -0500 Message-ID: <55a090da23698f4988861461b31b5ee81b4667c9.1603981082.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0201CA0035.namprd02.prod.outlook.com (2603:10b6:803:2e::21) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN4PR0201CA0035.namprd02.prod.outlook.com (2603:10b6:803:2e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 29 Oct 2020 14:19:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a1a1331f-1fa5-4fdd-da8c-08d87c159baf X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: HwmW749hr3B4P1kyhkfZRrPP50NTCYEYwbRb+l/1V0RQVNWLL9/4PcahOmV5T3qulw/cngGOeNy7HgmWsJxmf6MJzq9oUVYz2COMwFORcxnSac06uTCNO9OVdJXSfIDlb0+d4IJ7x5YWqjzlZIJ9gU9vt+gQcc7szUnxwmWgWGdNZy2N2gz0pEVRcN0s/LEhhObmAx7RkXkXjYq27sn72VCy2Gy++k6EAfgCVm9IU0YkNRBEmH1q8zQ2pVB5JAPKq6WPrqd0bK/Cf/UWJytMiAYcwg5T9ujhvDFhkxEfagnEXd0joTDp0YFUSC44oyk4WFtw8Xs/kPEytVDpdUUCkuu2prpvAMNcatYWL8Eyv7XXwMbpb8dwqIguB6rYnkOqSIQU238zQVmQjDAib2uSog== X-MS-Exchange-AntiSpam-MessageData: li0xYUUdu0NgF3uQdcLHBvozUPzWiPWjeGKG3g7YZP4EJlGIvEVOVQB4T+ccja5NBsR4SP4waNWYpgvRfofVkGO0hU1Dm186nVu/iAKY7cb20OuEKqApbyLAehEu0MnfuFRqH3LnpVzT394hZqm0wsV1rWUxpzyDBLuZDuBK+eYn7hBWdm0Jyg03d+TtpbieFsxdqRT3bql0HyJmN++Z2AjZKFxE6vcBAQAXb/lLERoRI632gqoPXXvDHlL4sTaNMXVyR1S9IO/cFEzR88064RRGhIVNSbv/AZWvwoelarRZGRneduVitnuwRulOTR4/qNK6ax9ImZeW/EJBMmg1+hdN8CVgNeWP5QwlXH9YMRuqHb8fpCgVltlb2fXhGxIXlslzYIbYmjPiNudQ9eeicJ2vJerJHSaEVc4HP11tv7xh/XCPtwamr8sKjbzjAj51LJO9+4b+UI3xzjoy4gqFEphkKk2Imf2Tgfo0hN2brcS33GeEOo5QwJZnl5GluuS0wg2LvckZve+4+ULXyz8MHJcaw5sZlsxwp5m1eC0WUMzL7LHq4cHXpHz+Ubxs7ofHayqsQSE0fwTWthELFz23hjK8OxdxSlQvt+dMg/f38Wprka5BekNKMsRB6dn5hdsfQkrNAugOhGWVteUpi3lRYg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1a1331f-1fa5-4fdd-da8c-08d87c159baf X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:19:12.5164 (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: iWbDn8crA8secetMYQJ16Fiq85Wx6YFHv9HNLL6CgTz+fj5pLrb7h36j6wjkpl3VvIq3jfMVUSE/CT7D+/0Ezg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: 1EbWFstKqRjkCPUAulEc0nU6x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981161; bh=vofSyoVpDtQGYeym//S8nD0ALkd9UHTASvkVjx0LSgc=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=YzUPWS0WREo+z4wQlCFy6P55JiKcu7ehfsvj1ymawX45Jhe3u2GfH7tt/rvJl/IwZ2v 5FkrxBVqUZNZyCY97zeNkvyRve3N9Tvc7naZwmVxKKavMLbYQYXejWLdaV6HTco8F6l/l MByKkfP1Pc7MLuteAOUuf686zXsLHtwSTNw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 All fields that are set in the GHCB should have their associated bit in the GHCB ValidBitmap field set. Add support to set the bits for the software exit information fields when performing a VMGEXIT (SwExitCode, SwExitInfo1, SwExitInfo2). Fixes: 20da7ca42a33d3ef767ce4129f11496af7f67c9f Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Acked-by: Ray Ni Signed-off-by: Tom Lendacky --- UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Lib= rary/MpInitLib/X64/MpFuncs.nasm index 5d30f35b201c..5532a1d391bc 100644 --- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm @@ -533,6 +533,12 @@ BITS 64 =20 mov rax, 0x80000004 ; VMGEXIT AP_RESET_HOLD mov [rdx + 0x390], rax + mov rax, 114 ; Set SwExitCode valid bit + bts [rdx + 0x3f0], rax + inc rax ; Set SwExitInfo1 valid bit + bts [rdx + 0x3f0], rax + inc rax ; Set SwExitInfo2 valid bit + bts [rdx + 0x3f0], rax =20 pop rdx pop rcx --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66748): https://edk2.groups.io/g/devel/message/66748 Mute This Topic: https://groups.io/mt/77888135/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66749+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66749+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981164215583.967220301062; Thu, 29 Oct 2020 07:19:24 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id N6XNYY1788612xadU0ZUAHpc; Thu, 29 Oct 2020 07:19:23 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.42]) by mx.groups.io with SMTP id smtpd.web09.9423.1603981163093961836 for ; Thu, 29 Oct 2020 07:19:23 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iNKqRv9Vv9tS0seb79F5WfPbaV6hGtEF5yrDrpsI0VPazoSxovr0zaYkBykcJVKn/g+4JHt/97xMT4pbPmxYcc1Ullp9b+Gb+10dRcfJShhOW0aOOA4l6osnoJzxLbUuYCpDV1OspNVgvZu/8oEGz3rwKL+/exVJm+Z0iI6gHvH7zqdQ+cWpDCbt5VIogoJ7mIYvkIDCxTZjYT9mm3ZZX+jf+xkGuNzLBeRlHCozwl5fkMB8cu4DckttiEdB4IGD5G2RBup4B5HRYfiwPU4qcllknsdtNsbLC9IFqMYwdz8kZi8eqJOPbQyDBbrIcZTGOr7JS1+4BAv99Aj+bttTqg== 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=YI/F1sIEQqPoOtwVs7AMbdLrlk5wZGUWavLFWuupfLs=; b=IOVxSVTjRRKwRdM8ENsl0PeKhGISdWEHpzsVzwAJDeHiNr9efpSBUzvyowKZa23j5EanLhaGgkEm0Jha0tLVtCayr4X1TP8ikjp2XdZBzXYGb2+INFelj2/z+IAFLWa6wiR3L6AhC/mAUxQbimWX+YgiP7Q87c6x0x6LoKPYCEGLxgzbAmOapkX+B7EiV0ycUk92UHdXA+G9K4Qq7wy5uz/UYvVQ3V2gTR81qhEuv8nq8eGXrUGYLlB+mc6LKTQAfzH1uiKnocqeJPA32862V6KSoPaluQCPfz19LCE1sdtSSi8eJFtnEx4H1a9MxBvJC0AHufVBcryDi45SIxo3Dg== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:19:20 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:19:20 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 08/11] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Set the SwScratch valid bit Date: Thu, 29 Oct 2020 09:17:59 -0500 Message-ID: <54463dadda03ef4ff6fae89ec5e9a1c20a663f31.1603981082.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0401CA0005.namprd04.prod.outlook.com (2603:10b6:803:21::15) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN4PR0401CA0005.namprd04.prod.outlook.com (2603:10b6:803:21::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 29 Oct 2020 14:19:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c174d3c8-a23e-4952-9e05-08d87c15a064 X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: hWMIgShV4TdNxgwiwgSYtcneoLmgVw1UWK419ozTkpUZaPzXvpCJqS+VYEbELZY4e0Y9VB9aLLJiW/AufXvtG+8nDaMEb/EvgkFSwGN0qd5bc8TTclv90AdoFxSRm15sm+hKclgEySKB6Rl11Qgs5rOQqwMuycu7m95OgmH1UfitlbOwwVGLgubqLpH/EwZklNrMlJvVnmldL1bBv1eudiDGPlNm8Uj0XQc7kGgyRZMRVEJQT9P0/5/4EgcWTnZWikWAyHm172kzoSg2UKH5Kq37SvDCD8gnf37QYc6+yA4waDb0LOfsUTHvkCUnqVoN60qKijSaJaEqHbY1lG0ksxp717WemJUm9UPTVasCTE/ed2jrdlKhPiuabjAMzVO59vlt00c9R25QHGWRUj296jMSLmnRZA6Eiu+DOHhjcHulNblXDC+kB3eR2JiWk9yiWWm6ATmT6lBU6nw1OcqoBQ== X-MS-Exchange-AntiSpam-MessageData: CNruG+72tGc/1V+qCCWUBR3Pc0uS6wYqe40vxn8ViE+mIjg2J16r9LC5b7VdjOcRRU+jj5AgnuYXmEN8nUxz7ncc4pJYK5/e+ornHsOvIrLPTvd+aMg0sY+Z9z+/LRjgAxi6jJmgvglZXGldEgWoZ2fMGedJJ1LaQC784hTGRGfPFXVw+qhjVMpszP2Wets27m1gO0kHKXnxKiPDvPz9C8Q1QTM2rGZKj4+qCRA5304kS/1GhX2GXhlmipcY7tMzDVnrmQ1P5RzhE3IRyCrQmIWc8/MU99IZ9VzyY6uNDvqLli6Orbz91AsgGrHl6jsVYMGsXIVPhGajLMQbV7Hr3ro+FjMBraw/eJycg6xb4KvKcKTjtoOWjX0HgZieNl19kuih68YPLbQMtRu1Wbqep+jY4gNLiVjxkJew5abTOEckOBLwLGt2hAp2+MPg5bbp9ML+jkq0mGn0vsES0ZRF7vl5tQ3gZdin8htQaFGv1WEhgae59XbfQWR6s0niw4vpTe3lskogWFxKZZNDuN0kdS1kxfx0rV2a6QtJC2PIP3KuNkAPke4S0eUJjtXcOu8vYBDPik0r5M+0KhH/9YMRyucJCjvQ1MwZqBCI9VvE6qZv+CaPE4o/ygzkyH8gUPmHz8gLfOSMW253iPSFgDJ/vQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c174d3c8-a23e-4952-9e05-08d87c15a064 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:19:20.5248 (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: dCxazHNpMfyzjfVuZVFNQ46uPmCo4UiTv5sBfIeeWZ2F/X9YoYgzuEyD/42VvmbdZzsG6dYkYod5dO6WFb3Scg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: Q5mjOuqvSxSPPmohcz0RhqXpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981163; bh=3wI0Whj+6DpF/yrC/BxVWQmE4xYFUN2Q/H5Pn8u8xfI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=t8HEXpvuFZfaQ8/8WjyVnBcKvamgRhKn9kacwfS1DGlWl8Ik9jwIcA6sJRzsge3YHQV exnQXVvwy9jztJZxL4qY3rL/74PRQwRf6Gl0il673IxC4ADOUlLwTgOCfT/lgU4dAGVZL noQxWrVLwP+JIpR0zBrl/E/gCjpWMinpIoo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 All fields that are set in the GHCB should have their associated bit in the GHCB ValidBitmap field set. Add support to set the bit for the scratch area field (SwScratch). Fixes: 437eb3f7a8db7681afe0e6064d3a8edb12abb766 Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c b/OvmfPk= g/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c index 565383ee26d2..f9b21b54137d 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c @@ -66,6 +66,7 @@ QemuFlashPtrWrite ( VmgInit (Ghcb); Ghcb->SharedBuffer[0] =3D Value; Ghcb->SaveArea.SwScratch =3D (UINT64) (UINTN) Ghcb->SharedBuffer; + VmgSetOffsetValid (Ghcb, GhcbSwScratch); VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, (UINT64) (UINTN) Ptr, 1); VmgDone (Ghcb); } else { --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66749): https://edk2.groups.io/g/devel/message/66749 Mute This Topic: https://groups.io/mt/77888136/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66750+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66750+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981176740955.8429680658535; Thu, 29 Oct 2020 07:19:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0exAYY1788612xLwlYdGh481; Thu, 29 Oct 2020 07:19:36 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.72]) by mx.groups.io with SMTP id smtpd.web10.9517.1603981172701399516 for ; Thu, 29 Oct 2020 07:19:32 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PC5Vy1HE9T9DMja9NGVHzx6jGBJoLM/0zCds5f/Fk3pfaehchEexXHYV4ofuwlNWstA4xkqYsuNVmkNvUHwhOmASnEmP++8yBf+W4cMyOIoUkjOOOwzV5+l3aYNKAy3lEOiqpZw3JnctAj/YxzY6l671mLFsi5hy+nGW4CKywswyJ64ihQ1imD80ed+HgLkBaQiao8etd960la+ZRTHxOnS8Y0XbagrJ0//sr9OQXP/ZCgsdnxdcRWzRiTXN1rRFKc6v1bwP8Fb3GeKUxff0fFduny7UQhZcqay7DmRpbLSVA3UOpL3q6GJuXc9NLIMtXKHTqbbpjNM9cHrcZtnWGA== 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=5GsnKvm+rfQaEf8t7738xvVSDnqJ92knwcjJva2/1ro=; b=YL7yl5wCCcPlb66WK2P2g/dBfIMEChJ/oN4tu7yDOSPdnjl/iEWB02rJFA8CqM48/h6jZZG38V4+52PJsnGmj/+AlSNi4ek1szFDqzzWT4hpmu1qhunsW3m9Ho0LU/6f5aJd9eHpsE7sowrhLPnRLxhlkx4xJtTBu0bAVi4HcHs4vWNe7SHs+wARt0Yuk1AmVtixmX48RqP9fjGZRC3hELr/eDM21utw6bF0hiiLeel9ZzN8MrgdZCLlOw2EGrWiDF67g3xl6n9vadzGBywRjVZBoAAkyoHoZZ0SWN6izSAhbSnXry+NBgdET65F+AIkZ8jB8K00l3lfY5tjxsNGPA== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:19:28 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:19:28 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 09/11] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Fix erase blocks for SEV-ES Date: Thu, 29 Oct 2020 09:18:00 -0500 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN6PR04CA0108.namprd04.prod.outlook.com (2603:10b6:805:f2::49) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN6PR04CA0108.namprd04.prod.outlook.com (2603:10b6:805:f2::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 29 Oct 2020 14:19:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d581a0b5-084b-4506-e642-08d87c15a547 X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: HNOlHvPAbhZ6RsTpaReiVTrE1q2YYcMYqCydljA2Z95gjW5tcPqwST/3pi6ri1BChse1GLOlg06VX4ozYRZKpC04Q3rMDdL/QLlAIsYuRbbuao0Dn1Qnn101zWwAvAGimSqXWFL9SQIhJvUFqaOjlr5IrljMdkylXOEGLXH+C/Woq2ONjyl3EcCf678jByYzKOo1t25n7GBih9FQ0PVC4/lxapUlaNZb6IzwoGi8TZXvu5nyAm8On2o/jtCYw7oa7+igfhYJ5SC5TOWGV5cozXsiRlxjbXe6KRYvxbH38zNcSlf4vvQpqSbkrY3ccPkLJPTA1K44XMPoO8KPz0SNrYYWfYgDxE5f+e3mYCZPZaz7gOyGh3Winc2uHMi81ng/NuTRVSUtDNVcSU+KxNOiGstPpUvMLu47bjhQzNrURTkibvRKaA+zaQ2QfXjrUI8Vym+bLRZ7h7NkFKjurz+LqQ== X-MS-Exchange-AntiSpam-MessageData: LmxQ+cB950tda3ZK+sWjlhw3aDhcuYyxb4vgvHL/LPnZBNKIikIOU4gf36oRc51Bip6tfa8EgJP0r0LooiGaye+s20VcXnEtl1/+WeLAsMNmED2y/BYySTuHwcMbm062ZzU3QPDOZc0YDDPsQeL3kQv0aB62ihlkHJWficVROT8pkl6+gpZbTlP6sJnbiNJNYUadMYDQbI/OjzeTpnc+xMKBWdtwUJekRdfZBKF15D4WBeiligM2c7xaBtHINyUVr+G3QFAfq9eOdDUbFVFvJ53gmpGtl+mLnPXrgbV6OI7R0wKZuKfhh17BGxGYB/adc5LIeWNc4DQAiEnpFvI5SYK3hz/Ht/zjMHAVxMQ+B9O3dEeNF53pY7R9W6gFNSHwFunvT9OO0dtzIbaEEKjU+kMwEfel8xHOvu5ZBbxzNoH+sGZrDVTFAItIml2TMMJ6C2Jjq+1IXH5D8cMlrGccMCAZixDQUw5Va//a5ictZyQioeWQ4VRHg18v9rhf/8nWs/fadW9+cUdI19MBg3CAKmA3ySf8jqMOl3FOX9cdm8pjTzI8akD2StsIRy9IgzZSL+wcGu4yVKkDx8lHeQuFhAKb7bk+ErbS9c6faYYwBqDlnSMon77s9LyJ2+ahJhFdOfQ2mHsMqhjF4GJu8PQALQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: d581a0b5-084b-4506-e642-08d87c15a547 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:19:28.5303 (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: 8ZqFFq1B3mzwawdqacS1Z6pQv/rN04Y+0QA4Y+6BWH/Bj8KwVQ9LCSzMSREWN4UOG34BYHa1VnCREC46e6pT8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: x4MrazEYEEFI8tgq0oBPfHFlx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981176; bh=VjuAtJu1mbTK0swiEqcs/GOtprPAgGqSOVTe6rof6wA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=f54ToQeYmUygZfumqqUuZ9LawzEPJtwsz0DP+dyVmu+nqEpA5XZC2yZuotVm+L1h0Fx R8b5B9iYugNRrEN/wfo4spNSi5q7XNOReX3RjUX3YQR4wbY9ftH4Vx0SXF/xC/dLE4b7C rIrAzSbWRv2edJqNiBEUp/OTtW7OEYMEGjM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 The original SEV-ES support missed updating the QemuFlashEraseBlock() function to successfully erase blocks. Update QemuFlashEraseBlock() to call the QemuFlashPtrWrite() to be able to successfully perform the commands under SEV-ES. Fixes: 437eb3f7a8db7681afe0e6064d3a8edb12abb766 Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c b/OvmfPkg/Q= emuFlashFvbServicesRuntimeDxe/QemuFlash.c index 0d29bf701aca..d19997032ec9 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c @@ -232,8 +232,8 @@ QemuFlashEraseBlock ( } =20 Ptr =3D QemuFlashPtr (Lba, 0); - *Ptr =3D BLOCK_ERASE_CMD; - *Ptr =3D BLOCK_ERASE_CONFIRM_CMD; + QemuFlashPtrWrite (Ptr, BLOCK_ERASE_CMD); + QemuFlashPtrWrite (Ptr, BLOCK_ERASE_CONFIRM_CMD); return EFI_SUCCESS; } =20 --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66750): https://edk2.groups.io/g/devel/message/66750 Mute This Topic: https://groups.io/mt/77888140/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66751+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66751+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981186877195.89507451088002; Thu, 29 Oct 2020 07:19:46 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id TZvTYY1788612xtqTLneFOOC; Thu, 29 Oct 2020 07:19:46 -0700 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.51]) by mx.groups.io with SMTP id smtpd.web09.9429.1603981180095068951 for ; Thu, 29 Oct 2020 07:19:41 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MWrmJlIsy8H/Z4yLnFQ80cxdiqaZr+PvScG0qIEWLJuGgQ55N9bMMK1Yjc4vIz8K3NdtWXEL1C462DJD1UgRahdsdb+sjdslia/4u+NMpVL9MCftEaT5xcKbn3tWCX19E3346dN62TiDyD6ACNYLcaF6CD2pTcODcITzK7r5wRfLLHWb2QnMe9SyTABPebrthLIR3J5Du58czEyAlU0rM2pfYwny9qlRFtc+EwbH0PUTX/tkpQau1RZzOA97rLroBz+r6Eblob+US107EaRA/N23FCXkDw7AWrh9DrYVvIJaJphyxRak7AY9/eqjo+yYd0VGsfTCKkmjnPp89Vv6dQ== 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=jQ7SI0mvfufgAjIlIXnOXi+VpDt9/K8/vYZNLZ1SsLg=; b=LrdCwt+WCFOlzRjXfEddhshADzgKOcIzBI24sf4uvDxhJbVt2RTKm21EK8nhX+ljB+lExYarvAA2S4YnqXqpLDOrVu0WF8VFwlJUYQGc3SGwQyL2SbujLTQszza9AQzxdfHIdiNmgrGa6VR/J+8DEBNDMtUFLrzVjzsf+9Xgi+uZoNnYzEU2WIb38a98DSMF7GnTjqZAJdtQ42XNCAv8U3RozFBV/W1mcCwsZeMpraapkU38BwHqZIdcHXNxrbfp2Golp93R4tTNTMSdvoIOVRp1zkTydpLyXRU+h7lTx63sNcPvVnQ0clkNsr7i/W4t6DKU6VeFdCPcKyIi/ItLow== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:19:35 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:19:35 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Eric Dong , Ray Ni , Laszlo Ersek , Rahul Kumar , Jordan Justen , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 10/11] UefiCpuPkg, OvmfPkg: Disable interrupts when using the GHCB Date: Thu, 29 Oct 2020 09:18:01 -0500 Message-ID: <0f3f11bec870bc4f10843beb53c6a919ac549ef4.1603981082.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR18CA0012.namprd18.prod.outlook.com (2603:10b6:5:15b::25) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by DM6PR18CA0012.namprd18.prod.outlook.com (2603:10b6:5:15b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 29 Oct 2020 14:19:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ae0967f1-c50f-4a5f-e49e-08d87c15a9b5 X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: 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-Message-Info: fStmiBoLTAmXNLf5FiFts+fV8hGM8xoqQSvAiJPJbiSxnULcoMQwPWN4OWoMCeg02ESie9J+LHlY8Jzbg1BgfamlfEyUC26MjAsHQg7klDrk6Ln+v+MxNXd3bvDGs6r2WJws0ij3VhZl5hB+hUVJMhyLvEpavTx+ahbHnQpmBgoirzQjiXQulXwBH4T4YEg3r7z+rwttunf1ACI87nsTlzyWdeZtGuAos2EJz89CDxqLLueaQzBkAQvmFveSLvzii+lprNLvUvSFi9x4mGisH0mjX2rFEXJcuNDbVoK3SKzUDWFoJxGsNwJawyc9XVQM5xxzd0oXk4fdbbh2Xd1Qucg8n5l5utsyViY+CahMwp0A2c5XXbsGZQFCt5Q1Q+uLTht49DT26WiEqwsjUbc//w== X-MS-Exchange-AntiSpam-MessageData: 1P4S1IB4JZF8cFGMLLnnQrnTETOzm4OwRIen9RJn1sPE55auG/ptd5g2yC+cwAkV4LSpNGrZ1ZCV8zDUX5zkEu6UXUoxkQOtUIrrfod/m8qHLzhybSb/0V10+gtC2J/28qS9w6eRYYu80PRZ+CQZTJSGbQCIFoU4H4/3GtESzud9LEg/+ipLcXNBAmFnmKYbhHZcpAHbxf1WV9CH1QABJRas/1iOmpQiOndhRFSFAjH6xFt49RaOqkER3NZP3Ty2e9GhvpOpb3ZqM2acYjPXZNC/Li7drghkY2GKHWx030Gz0Tik/lxNNa9fr6GCE723BQW7Woh2fzxIwAZwL0LPqly7Wdo1yEI3wkvrVCm/RkyAaXR2FtR3GRO5L5AM7W6rzWtCnohD3CSTOCHFGI+qjDoscaVHLPQgGVjn9hC1l21B7pVBoHFF/CIxCTJQp4yxDSfwVHZzAZV3KbQXw0QAmenxlnC4+CInaIqWOAIr3gTS3CpiuCibeTpCL1vlgpB4GSC148Vi9qrwUg6kx4dL2vxueNvR6I/HP5YRLPEMko3cqIuklJYgMgZvAge4sbrG6CqnmHX0PuRhRSziHdwkqG+IjSVkkUChu4P7SUJu8GO4BfuaQj22WD/KSrUg8qAKStf44+WiNrJShHc+IZx2Yg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae0967f1-c50f-4a5f-e49e-08d87c15a9b5 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:19:35.7971 (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: Njb+VkVQZrY8ZlsYqlmx01hOnyutjEEAMXtXv6EUtg4P9dlPC0DsPRVPH9P4AERj4gsxZSMLSkRwEY+b2CB/tQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: QjSYFnTjtNe8ES0hvUarGQjax1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981186; bh=EalCzSISSwS0vf5z16b6jdGdanh2OucQh9cYFBY3vqs=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Mudl+hFJxvP8GnZFtK+efWS1d1Rg8z90I1m7iSmos1Hb+ufa1k3oUG+vtWzf52B7DpN YDeqsRz23gzNwqoJUGqaXTiv8IzxB8fpvKeWKoRU/q20aLh/3J1YF+5SWCRrGquxTYMoU kk8GfXPQU/G9/vbhJ2rWMDmquON2hgkSjC4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 The QemuFlashPtrWrite() flash services runtime uses the GHCB and VmgExit() directly to perform the flash write when running as an SEV-ES guest. If an interrupt arrives between VmgInit() and VmgExit(), the Dr7 read in the interrupt handler will generate a #VC, which can overwrite information in the GHCB that QemuFlashPtrWrite() has set. This has been seen with the timer interrupt firing and the CpuExceptionHandlerLib library code, UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ Xcode5ExceptionHandlerAsm.nasm and ExceptionHandlerAsm.nasm reading the Dr7 register while QemuFlashPtrWrite() is using the GHCB. In general, it is necessary to protect the GHCB whenever it is used, not just in QemuFlashPtrWrite(). Disable interrupts around the usage of the GHCB by modifying the VmgInit() and VmgDone() interfaces: - VmgInit() will take an extra parameter that is a pointer to a BOOLEAN that will hold the interrupt state at the time of invocation. VmgInit() will get and save this interrupt state before updating the GHCB. - VmgDone() will take an extra parameter that is used to indicate whether interrupts are to be (re)enabled. Before exiting, VmgDone() will enable interrupts if that is requested. Fixes: 437eb3f7a8db7681afe0e6064d3a8edb12abb766 Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Tom Lendacky Cc: Brijesh Singh Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky Acked-by: Eric Dong --- UefiCpuPkg/Include/Library/VmgExitLib.h | 14 ++++++++--- OvmfPkg/Library/VmgExitLib/VmgExitLib.c | 26 +++++++++++++++= ++--- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 5 ++-- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c | 5 ++-- UefiCpuPkg/Library/MpInitLib/DxeMpLib.c | 5 ++-- UefiCpuPkg/Library/MpInitLib/MpLib.c | 7 +++--- UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.c | 18 ++++++++------ 7 files changed, 55 insertions(+), 25 deletions(-) diff --git a/UefiCpuPkg/Include/Library/VmgExitLib.h b/UefiCpuPkg/Include/L= ibrary/VmgExitLib.h index 07e8af6450b9..061948cf840d 100644 --- a/UefiCpuPkg/Include/Library/VmgExitLib.h +++ b/UefiCpuPkg/Include/Library/VmgExitLib.h @@ -50,13 +50,16 @@ VmgExit ( Performs the necessary steps in preparation for invoking VMGEXIT. Must be called before setting any fields within the GHCB. =20 - @param[in, out] Ghcb A pointer to the GHCB + @param[in, out] Ghcb A pointer to the GHCB + @param[in, out] InterruptState A pointer to hold the current interrupt + state, used for restoring in VmgDone () =20 **/ VOID EFIAPI VmgInit ( - IN OUT GHCB *Ghcb + IN OUT GHCB *Ghcb, + IN OUT BOOLEAN *InterruptState ); =20 /** @@ -65,13 +68,16 @@ VmgInit ( Performs the necessary steps to cleanup after invoking VMGEXIT. Must be called after obtaining needed fields within the GHCB. =20 - @param[in, out] Ghcb A pointer to the GHCB + @param[in, out] Ghcb A pointer to the GHCB + @param[in] InterruptState An indicator to conditionally (re)enable + interrupts =20 **/ VOID EFIAPI VmgDone ( - IN OUT GHCB *Ghcb + IN OUT GHCB *Ghcb, + IN BOOLEAN InterruptState ); =20 /** diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitLib.c b/OvmfPkg/Library/VmgE= xitLib/VmgExitLib.c index 0540df8a04d4..bc5cd61d751f 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitLib.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitLib.c @@ -132,15 +132,27 @@ VmgExit ( Performs the necessary steps in preparation for invoking VMGEXIT. Must be called before setting any fields within the GHCB. =20 - @param[in, out] Ghcb A pointer to the GHCB + @param[in, out] Ghcb A pointer to the GHCB + @param[in, out] InterruptState A pointer to hold the current interrupt + state, used for restoring in VmgDone () =20 **/ VOID EFIAPI VmgInit ( - IN OUT GHCB *Ghcb + IN OUT GHCB *Ghcb, + IN OUT BOOLEAN *InterruptState ) { + // + // Be sure that an interrupt can't cause a #VC while the GHCB is + // being used. + // + *InterruptState =3D GetInterruptState (); + if (*InterruptState) { + DisableInterrupts (); + } + SetMem (&Ghcb->SaveArea, sizeof (Ghcb->SaveArea), 0); } =20 @@ -150,15 +162,21 @@ VmgInit ( Performs the necessary steps to cleanup after invoking VMGEXIT. Must be called after obtaining needed fields within the GHCB. =20 - @param[in, out] Ghcb A pointer to the GHCB + @param[in, out] Ghcb A pointer to the GHCB + @param[in] InterruptState An indicator to conditionally (re)enable + interrupts =20 **/ VOID EFIAPI VmgDone ( - IN OUT GHCB *Ghcb + IN OUT GHCB *Ghcb, + IN BOOLEAN InterruptState ) { + if (InterruptState) { + EnableInterrupts (); + } } =20 /** diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index 9bf9d160179c..1671db3a01b1 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -1568,6 +1568,7 @@ VmgExitHandleVc ( SEV_ES_INSTRUCTION_DATA InstructionData; UINT64 ExitCode, Status; EFI_STATUS VcRet; + BOOLEAN InterruptState; =20 VcRet =3D EFI_SUCCESS; =20 @@ -1578,7 +1579,7 @@ VmgExitHandleVc ( Regs =3D SystemContext.SystemContextX64; Ghcb =3D Msr.Ghcb; =20 - VmgInit (Ghcb); + VmgInit (Ghcb, &InterruptState); =20 ExitCode =3D Regs->ExceptionData; switch (ExitCode) { @@ -1662,7 +1663,7 @@ VmgExitHandleVc ( VcRet =3D EFI_PROTOCOL_ERROR; } =20 - VmgDone (Ghcb); + VmgDone (Ghcb, InterruptState); =20 return VcRet; } diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c b/OvmfPk= g/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c index f9b21b54137d..1b0742967f71 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c @@ -52,6 +52,7 @@ QemuFlashPtrWrite ( if (MemEncryptSevEsIsEnabled ()) { MSR_SEV_ES_GHCB_REGISTER Msr; GHCB *Ghcb; + BOOLEAN InterruptState; =20 Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); Ghcb =3D Msr.Ghcb; @@ -63,12 +64,12 @@ QemuFlashPtrWrite ( // #VC exception. Instead, use the the VMGEXIT MMIO write support dire= ctly // to perform the update. // - VmgInit (Ghcb); + VmgInit (Ghcb, &InterruptState); Ghcb->SharedBuffer[0] =3D Value; Ghcb->SaveArea.SwScratch =3D (UINT64) (UINTN) Ghcb->SharedBuffer; VmgSetOffsetValid (Ghcb, GhcbSwScratch); VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, (UINT64) (UINTN) Ptr, 1); - VmgDone (Ghcb); + VmgDone (Ghcb, InterruptState); } else { *Ptr =3D Value; } diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c b/UefiCpuPkg/Library/M= pInitLib/DxeMpLib.c index 2c00d72ddefe..7839c249760e 100644 --- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c @@ -171,6 +171,7 @@ GetSevEsAPMemory ( EFI_PHYSICAL_ADDRESS StartAddress; MSR_SEV_ES_GHCB_REGISTER Msr; GHCB *Ghcb; + BOOLEAN InterruptState; =20 // // Allocate 1 page for AP jump table page @@ -192,9 +193,9 @@ GetSevEsAPMemory ( Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); Ghcb =3D Msr.Ghcb; =20 - VmgInit (Ghcb); + VmgInit (Ghcb, &InterruptState); VmgExit (Ghcb, SVM_EXIT_AP_JUMP_TABLE, 0, (UINT64) (UINTN) StartAddress); - VmgDone (Ghcb); + VmgDone (Ghcb, InterruptState); =20 return (UINTN) StartAddress; } diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 6d977d45bcdd..1f47ff3f73b5 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -884,6 +884,7 @@ ApWakeupFunction ( GHCB *Ghcb; UINT64 Status; BOOLEAN DoDecrement; + BOOLEAN InterruptState; =20 DoDecrement =3D (BOOLEAN) (CpuMpData->InitFlag =3D=3D ApInitConf= ig); =20 @@ -891,7 +892,7 @@ ApWakeupFunction ( Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); Ghcb =3D Msr.Ghcb; =20 - VmgInit (Ghcb); + VmgInit (Ghcb, &InterruptState); =20 if (DoDecrement) { DoDecrement =3D FALSE; @@ -905,11 +906,11 @@ ApWakeupFunction ( =20 Status =3D VmgExit (Ghcb, SVM_EXIT_AP_RESET_HOLD, 0, 0); if ((Status =3D=3D 0) && (Ghcb->SaveArea.SwExitInfo2 !=3D 0)) { - VmgDone (Ghcb); + VmgDone (Ghcb, InterruptState); break; } =20 - VmgDone (Ghcb); + VmgDone (Ghcb, InterruptState); } =20 // diff --git a/UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.c b/UefiCpuPk= g/Library/VmgExitLibNull/VmgExitLibNull.c index b47e282aff82..89b065cb3ff3 100644 --- a/UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.c +++ b/UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.c @@ -57,15 +57,16 @@ VmgExit ( Performs the necessary steps in preparation for invoking VMGEXIT. Must be called before setting any fields within the GHCB. =20 - The base library function does nothing. - - @param[in, out] Ghcb A pointer to the GHCB + @param[in, out] Ghcb A pointer to the GHCB + @param[in, out] InterruptState A pointer to hold the current interrupt + state, used for restoring in VmgDone () =20 **/ VOID EFIAPI VmgInit ( - IN OUT GHCB *Ghcb + IN OUT GHCB *Ghcb, + IN OUT BOOLEAN *InterruptState ) { } @@ -76,15 +77,16 @@ VmgInit ( Performs the necessary steps to cleanup after invoking VMGEXIT. Must be called after obtaining needed fields within the GHCB. =20 - The base library function does nothing. - - @param[in, out] Ghcb A pointer to the GHCB + @param[in, out] Ghcb A pointer to the GHCB + @param[in] InterruptState An indicator to conditionally (re)enable + interrupts =20 **/ VOID EFIAPI VmgDone ( - IN OUT GHCB *Ghcb + IN OUT GHCB *Ghcb, + IN BOOLEAN InterruptState ) { } --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66751): https://edk2.groups.io/g/devel/message/66751 Mute This Topic: https://groups.io/mt/77888143/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 05:36:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66752+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66752+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603981192138151.84847452555027; Thu, 29 Oct 2020 07:19:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WcLwYY1788612xdy48odv3S1; Thu, 29 Oct 2020 07:19:51 -0700 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.53]) by mx.groups.io with SMTP id smtpd.web09.9430.1603981185425864204 for ; Thu, 29 Oct 2020 07:19:45 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tr6pmt8kJBfKvnn2XFMGyjaeYOoe6YYHLlLzCI4fHDVV09rVEmzflpg9Za3NFW3V4TQH9Gp56siYHdpAF6HfQOm3jRcMILb0pIsyf5R+xosoSdeABAegwYJr8W5jUnI6FXUzNumz/A5GwS9Ctw60uxlTA81wJD3AqSErJj9nMRaBwGlr57T11qzWfxsXA/MkPxuxLRAOOcRiylMUZGgcrXefaQjZt/XkN1MAtdwHBPt9vV1VtmNTstQALjzDGBO/t4TpIsAKQjNGvGuNAvnfhvtt6pzxeRX8ZwBBx0XdIG4IhRuW/GpnZfK8pOn2m5+y2MfrGTdpbsf7bEBJDb5e7A== 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=YizIqpGSk6OdeqMrTc1SwpHMZJ+B/yvtMLYEXL/H+rg=; b=grEF6MU9Sli8Do8TyEjBpCcCCy/vYky/oKxbdYdzYezVkJsu4ZV3Q5o2Cln9NtqoQ5RWJrzaA26Qzff+mrVrSAKArkUc+lOKzCKDfoghNAVlfCWth3DNwOlOFRFeM9jTj+TqqJxNohb7M/e+51Az5ZcavxBAuOcoeC53hNz47VvVy5B4Bf5dPGcss9n+3mIxK9QHmvXNB8bAad7CTgdTNNY7o5ODGH8i7Mfb2YahUaciU1x/gSwYKdGX0e/fVNCvoUSU+lVaalFcSs4vf4zX8njP3HjcPiAyFRbRhsnktA+AFzjXSdUAilGDQ/f6kX67UjNXLcmdKdG9CMCi5J5Mog== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB3276.namprd12.prod.outlook.com (2603:10b6:5:15e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Thu, 29 Oct 2020 14:19:43 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::e442:c052:8a2c:5fba%6]) with mapi id 15.20.3499.027; Thu, 29 Oct 2020 14:19:43 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Eric Dong , Ray Ni , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH v3 11/11] UefiCpuPkg/MpInitLib: For SEV-ES guest, set stack based on processor number Date: Thu, 29 Oct 2020 09:18:02 -0500 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR02CA0158.namprd02.prod.outlook.com (2603:10b6:5:332::25) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by DM6PR02CA0158.namprd02.prod.outlook.com (2603:10b6:5:332::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 29 Oct 2020 14:19:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8b466c47-16f3-4a0f-6aaa-08d87c15ae01 X-MS-TrafficTypeDiagnostic: DM6PR12MB3276: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Ee0bDJ6zHAf9bOgDT7S+j7WhgzJSxBcPJ3TRaybyFEdxQrXHPLPQlONu7qLx3YzVchJSqCysBkRWCBOtQsarEGD7/Bwb4xxJOd7QQDa20mAdEx5g5ne8RiLmDmNVZ4s8RnmMyVQtfg14oJcT5ezKIhkcf7adjaS1wECEucI/37Xx9QH9Of/Wpxwuyw7Ao7iGCqM4mbuP1egBC3Wb8kuhiM+yWQed42Pxo1QVdXBs3xTqNKalNkye8RRnG4cHqf+W5Nxs38a2zMUm0dZoNP43VdNhMs1jGfrZH0/Gb1DgzKmwZtAtk+k6RZnsDQCUbGDyGPv/tMWd9Ly9xPFb+leb38VOkuSUcX0C3RCgkhU3fH7KCAABraCdiuuJ8hSirYZ19QFjy03KLTQmp0eUranARQ== X-MS-Exchange-AntiSpam-MessageData: WDzpSZ8r4hsneTjgmQPd6sLWgoKFKkCY4+LGAkKRZ5CTXS6Ol8flB4J4yW0tRGFNYG9B8dUqytxliRFQvY46Ki6Q20j+Me7ZZj8KH/IJ6vf2quQSDe4cFCjcUjjHuC2dyYjljdxmdjERU16THcewPzEw4fBqskBPqVyCM89FgrSwVDP0JIjJKK0K0qMLTn2aaMlIschnebUcAHQEpaTomKA7F5pjb+fRYFsLf7atfdJgP9fRFPhOw/55/hlQ1rtHhXeJ/QM7ZMBcXihneN92SqFxydWZSyk+wVtfrAroMp7BbeLxo1Ak8jlD4LvUNmV04nntUzObgRrnOwVT1xVb8f6xAKoBuGZwj/1ZLRF+sWm+lfZeeBBRDPjxIJgy4rhvU0uWSjOn0X5qw2pBzbhQnpeiIj72ZzJFnVXkm4Vg1UB5ItVKzUpj9M2TG1p96FgSSa4npyTsoSkd5nepfpib7Pj6jG0rZaF1pIK3xZQ00J391cspb0lHY85TolNJcQO2y3BpEBdPftZvsKOYhD4WFM45IBHDiSUTLPhR/Qm/zfo+kN7p2yu5ixLxEYqhDZKUBvLRHaRyiQiW/ie9n6sCu916wGUYz6N5j1NMTsL0smIIY1cYm9a9KTohk1k8ZkRwwGxH87Q0044KarDnIx0Umw== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b466c47-16f3-4a0f-6aaa-08d87c15ae01 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2020 14:19:42.9610 (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: B52RjD1veNk30pizNhnGDlxhNhJYuX0BK9i3Qn6UpZczOqHdehRYjbvbF4tSqo+e1BoThZex92Mbpyj8BvI1fQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3276 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: xm1AqT1Q5vF41F8BfUCcL0gox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603981191; bh=jAN2yQsvbCjLofGhSrFEBNHTunIi0mw/04b6f5D0h88=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Ja047CeqHvqe790iRY2MQQVKDgv1lziDU3jCqq8JXlqc9iN6W+kykKMoRhfzHdmw7UO 6u/Pi6EBPx41GiHwVKMTBGlKRqChGfll/hcb2kDYtnf4RKfbYguqq1O1UqR3JzYsJsAN6 KiQXpUxOAz2rx8b4mM4rstqJGUbxiNFpwdM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3008 Set the SEV-ES reset stack address for an AP based on the processor number instead of the APIC ID in case the APIC IDs are not zero-based and densely packed/enumerated. This will ensure an AP reset stack address does not get set outside of the AP reset stack memory allocation. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Acked-by: Ray Ni Signed-off-by: Tom Lendacky --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 1f47ff3f73b5..681fa79b4cff 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -680,11 +680,16 @@ MpInitLibSevEsAPReset ( IN CPU_MP_DATA *CpuMpData ) { + EFI_STATUS Status; + UINTN ProcessorNumber; UINT16 Code16, Code32; AP_RESET *APResetFn; UINTN BufferStart; UINTN StackStart; =20 + Status =3D GetProcessorNumber (CpuMpData, &ProcessorNumber); + ASSERT_EFI_ERROR (Status); + Code16 =3D GetProtectedMode16CS (); Code32 =3D GetProtectedMode32CS (); =20 @@ -696,7 +701,7 @@ MpInitLibSevEsAPReset ( =20 BufferStart =3D CpuMpData->MpCpuExchangeInfo->BufferStart; StackStart =3D CpuMpData->SevEsAPResetStackStart - - (AP_RESET_STACK_SIZE * GetApicId ()); + (AP_RESET_STACK_SIZE * ProcessorNumber); =20 // // This call never returns. --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66752): https://edk2.groups.io/g/devel/message/66752 Mute This Topic: https://groups.io/mt/77888144/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-