From nobody Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67100+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67100+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604685218574793.3446023843417; Fri, 6 Nov 2020 09:53:38 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id TTsTYY1788612xTpMU7pX6dH; Fri, 06 Nov 2020 09:53:38 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.40]) by mx.groups.io with SMTP id smtpd.web09.594.1604685217820358420 for ; Fri, 06 Nov 2020 09:53:37 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LyqaiY7PmRCamNGwtKiDVdEetmSJIeuLOQMST+xX0BZEjVeEUR0rU8JuC5b4yf13a++NB+Umj5Le9KSGE+jj5QtKwaUWKPCRLcRhoRxw6mIyQY6qjSpDoK87j76fdRAJ5g8jXx+iAdCrdVwdG0I3DxaGbn2R0G/mc2B1Lt2UKbxTgCmdT7oY3nAy/7c1YNqF1mIpazfyXgPez4O4XzmLykAbJpp1ezzl64jYB/1Av5pDm9YelJYpSISLaHnacI90QQ4px75ov84zNzwIVBxdG3yvBXfwfEqhGybluDE1A44reN8w+KWnBogL526l6/WbpVhblGS0bRudYryoVAOZUw== 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=HSU0BeNz5Uy2U6qh/94mo5BRx4jSLfUI6SXNArQNmPc=; b=Qj/P1tqsJoO9Jeg31MSmWIbbyZd69f1Wfmu9uwuAvwcTfu/fpBMvzmp4ApMNjAjcJs4e6zBTv7F7se57Tin+hGSjUvl2dz9zllEb/r01TlBv0V+X4UAxrZvvCoEBxPjjosnc2OMzVAN4CVBFqqBU4sdqvMe2KZC8zR2XkoI0kQgYPmZ+3j0BAvSrjW1qNGE6x+grwD3H8G33yW/q7wCF8fJPxR7/9PfdKpApArsfGs+kWOcv44HeGLsu680mA1+VxGr8R0OJ6EimvyCQjHho/GwtIl019RYs4QPFTmZVDXIpajwdQY4LH1XBRYLtGPfrrlQqLvxP/BksJdlzsrzRFA== 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 DM6PR12MB4385.namprd12.prod.outlook.com (2603:10b6:5:2a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 6 Nov 2020 17:53:36 +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.032; Fri, 6 Nov 2020 17:53:36 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH v4 01/11] MdePkg: Clean up GHCB field offsets and save area Date: Fri, 6 Nov 2020 11:53:03 -0600 Message-ID: <5e9245c7600b9b2d55dd7586b8df28b91b75b72b.1604685192.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR05CA0063.namprd05.prod.outlook.com (2603:10b6:5:335::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 DM6PR05CA0063.namprd05.prod.outlook.com (2603:10b6:5:335::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.10 via Frontend Transport; Fri, 6 Nov 2020 17:53:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ec90147c-27c7-4417-93ae-08d8827ce29c X-MS-TrafficTypeDiagnostic: DM6PR12MB4385: 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: A3oz3xnsUhH0aeTlslBYX0SWdWLCMKNXaFzMWXTH/26oTsD9u4Tbk1vv8xaiE+UG2rtmOV+I0/ePYEubr5+J8GnQCAw3LJkWKwApE4u6YPkaeWfocM/JnrdY2faXOpRmWVMiz07ZtyueP4wXIzI8oH/96FpSJxiVNue3KxgE+VhmfL4YN3IEPKfLa4sKS5kxkalwostlOU5V5+yMTrve12uxUnfr48g4XozLgOpdnpu7LIU8fzBkqjVPkANBA7etg2ovZyDtHQkpZnQz+9SmwQypCmuZ1yHE2epfKrTrD3/B9H8YmX8RGGYG0sumyZ3PkFfRTbrHyEtuj3yxJJ8gJMNDIWmG6DnEFqt+HHmEMiBF0lTIubdCi4byuP058p3tfK15OtaEokbZjL+opnoz7g== X-MS-Exchange-AntiSpam-MessageData: yyMQbwlfDQWXc1XSPrVNBwTZ1tioeoasKHJsj1t1wVW2I3y3xi2tgktmc96GMzM83fzVGRSJxZcSaRxzJFDBBqijojVTAdwxehBxr9qSIrKjZvawEJ4jfRFeOlyh0UTE9K/QTEsJyd+y/qzigozgU2QnpBklFPte1zvjTHFopUMen6gkWwVJy2NIg89N9/3KJSG59Dm8T7R3dHM/ksO4AV8zbG7el0Lav2iaHPSJiQY18z039iZdWgkw6PhbTFmGoiLZcm1VnTfzhxiSzCuKOCRa9SnkilzagUkcwwKn/o9B9MmZkf8cNgEDQQaa2y9dJrJhJXGtUEzz1qlbW1ypzCAGCcA6O4shT65BNMQJa/TWQIMXwtK/lpeP0jaHBqeeNh8InF25AoDwLEqzdhuYp8ZzCS5oDbGeT/Hq+mkEWS+3paWVF6Tpx0gFWzOBc10Jyr1MH4WEW1xyoPNWlNx3XyLWyIbXyqqeCgp6OyiKPBgWN66ozxe84rUx1YuyxyJv4Zkk2k7vZtjuK5JQh17IQSz8GchxP7qovlMararTRI781RZXt5CJ/Zhz6imBgu6B7TGg0wHq8xAt8hecwOunMl15ozmS8A8Fs48OUY/3Y6Lxdm6mxCrVgxZrmFnfTuL/9z7byZBHkiXQ6az6B4Ux7w== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec90147c-27c7-4417-93ae-08d8827ce29c X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:53:36.5021 (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: 3QjI2kPmGlJZmfXwF62KNDCZtyMWMn/FhJq++YqlGXGkHMVMNObLbf4rIJvV6y47tHIiORRoMp+z9UySf0NPCw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4385 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: 8Mqhpn8wsznxoIJMcMQuNWv5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685218; bh=pwHcFM94Gb3IdACM48XA+4hu6HR8JmW/Oyt7DJyxQC4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=EHbUhqIGErjkowNSIOmX/1KSHXTcocR22vqOqL+2sMIAv8c/2CiwhIl3LdkaK7pBSpD U9/WG15gIBG634YVAPOEChvsSE5+q672VzOV6jgKqk5qnO0AXGxwndTlSUUJvyJOnFxps wqf6l4BMU+kACJUrKd1oDiCPL3vYF+0YCHg= 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 --- MdePkg/Include/Register/Amd/Ghcb.h | 43 ++++++++------------ 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/MdePkg/Include/Register/Amd/Ghcb.h b/MdePkg/Include/Register/A= md/Ghcb.h index 54a80da0f6d7..ccdb662af7a7 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,22 @@ typedef PACKED struct { UINT32 GhcbUsage; } GHCB; =20 +#define GHCB_SAVE_AREA_QWORD_OFFSET(RegisterField) \ + (OFFSET_OF (GHCB, SaveArea.RegisterField) / sizeof (UINT64)) + +typedef enum { + GhcbCpl =3D GHCB_SAVE_AREA_QWORD_OFFSET (Cpl), + GhcbRax =3D GHCB_SAVE_AREA_QWORD_OFFSET (Rax), + GhcbRbx =3D GHCB_SAVE_AREA_QWORD_OFFSET (Rbx), + GhcbRcx =3D GHCB_SAVE_AREA_QWORD_OFFSET (Rcx), + GhcbRdx =3D GHCB_SAVE_AREA_QWORD_OFFSET (Rdx), + GhcbXCr0 =3D GHCB_SAVE_AREA_QWORD_OFFSET (XCr0), + GhcbSwExitCode =3D GHCB_SAVE_AREA_QWORD_OFFSET (SwExitCode), + GhcbSwExitInfo1 =3D GHCB_SAVE_AREA_QWORD_OFFSET (SwExitInfo1), + GhcbSwExitInfo2 =3D GHCB_SAVE_AREA_QWORD_OFFSET (SwExitInfo2), + GhcbSwScratch =3D GHCB_SAVE_AREA_QWORD_OFFSET (SwScratch), +} 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 (#67100): https://edk2.groups.io/g/devel/message/67100 Mute This Topic: https://groups.io/mt/78079032/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67101+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67101+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 160468522598322.62208308712502; Fri, 6 Nov 2020 09:53:45 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id LzaxYY1788612x6fNwPSj34j; Fri, 06 Nov 2020 09:53:45 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.58]) by mx.groups.io with SMTP id smtpd.web11.611.1604685225041539904 for ; Fri, 06 Nov 2020 09:53:45 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FYs2KWRPoNvcuJjImfIaGdurb4sqOz4JQIpgqiPKYjHlSfJHTUYkjzLgcRVl2IlR+br7oHE1BNOj8aIrXTa6ITf6jqfVHVw/S1BndIgsCvpr7MEJWSMI7c8DE1IIwgA2BG748JE4xyOyKjeTxXku8j5L/O6/DgbEPV2Z8pGD7RuJEkZ8PIqgdKOuWwwI2Km1JCQsn2nAm296Z2PfuUapxOtjlKaccyoRsPXVhu9jn2If43EF4fDMWY3QnH9nrJHvv/qVTQEzR8NBKvNWju3+ZhgV52IMQWHG0/ytMeB0r3TZBi77ljXGZ1xJRKV8soz2gIp8lJH4KqL8fyUDl2R/UQ== 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=QSYt5XmuWly9/+653sq8UUvsfvq2lp0+rBHevq0KQM8=; b=DMt006VNd+Rf7nNRTiH4e04hpdhyMdmW/GLug1nTMPd6EmGKaKht4hltGoIo+0jBdA7Y/rOg7HLigoQQkCNVr7PTqIutd1Xz44E37gSv4PScj/VMFE+HJMnwvGBE5i7Yf/UgegGVIzronT9UITefcdSHJqfslV7I035xI+n/ohWHxwtUdSDRAbvu4Eql0pg8xVbfndTr6VO8xdJiKmleDE0TRidaV1Pw+5dgU/2MKNwzyyLQWygbPhi+m5S1Bi2OrLwYgPG3RDNQps8xxShLVVdVYVXFcake8tGboEu2Xx5Z5JUHwF1gy98yZtjEPdmqkyzC5QiYmEEH1tFv/HqjMA== 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 DM6PR12MB4385.namprd12.prod.outlook.com (2603:10b6:5:2a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 6 Nov 2020 17:53: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.032; Fri, 6 Nov 2020 17:53: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 v4 02/11] UefiCpuPkg/VmgExitLib: Add interfaces to set/read GHCB ValidBitmap bits Date: Fri, 6 Nov 2020 11:53:04 -0600 Message-ID: <0bcb2373f8c6e0171ae277d3d7c2eb284621355e.1604685192.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR11CA0024.namprd11.prod.outlook.com (2603:10b6:3:115::34) 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 DM5PR11CA0024.namprd11.prod.outlook.com (2603:10b6:3:115::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.32 via Frontend Transport; Fri, 6 Nov 2020 17:53:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5544c0f8-5142-466d-f58f-08d8827ce700 X-MS-TrafficTypeDiagnostic: DM6PR12MB4385: 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: PZSvXp+WS+/6pb39e5fVV4ytmfZ24CLkKQ1LZx1gusMopyfCBP/syTAQloh3oDk0RLOaCY4tM60bya22OqnwzGsV6c8ZgHRB4MGWsHNzeAYdcV2p0EWC3OOb7rO5jqKTS6MouQ+0V9ppDf9dQ6AbSj1Fbb5FZ6zFd3XHK03q8UlJyypg4p9GTU58QmMCbeiKatoqwISTFKtvDIEZLqm0PzDrxh5Y9h6zbTwEA5EncZXkfV2SIiS88FDq7PuPjwB0CkX15frJmxbmOyIIjJk1ha5yxvWlJf1xPWR59qEXTspfLYbZ1wQkUsbymKEpn79yMjC+o5TXNQP3/cSdn8AETY9M3xAP3xP75d1xBWJyCQlXBSxnZ4C/Hpuv54Zx0FO68tkvRGgizU5xycYKXEnmOg== X-MS-Exchange-AntiSpam-MessageData: qnONTq97Me5FYgouaMY2Dq6icglkknSTMvTJSd5qpTzK55qOnxrO52FZN2XD29wVd2/duY55HSwWC53vMfxlDQRfEUd10BQwqdq+x6aXck8ejA/N1B2DmxWh1zq7/7soVKgl0yfjiqUA0IKVJ8W0bov1iqaWyEuhMIPld2c0NHu/xisVb1Um619qXG96/A1KtgbGHYz9fMn52JQa2pvbNDGjBVLR9ZbqgIZ7qPSTNbQVnM6qbTgaNJaSBc3W9WzhmTp5P6Iyvw5Udmc0nibf+pRW7kKuWIYd+hPu7Gz7GApGkf/t/NHoibWQio6FxgsyNFhtoQ94LN6hAZzDUx2oSXXkaREiLJGJz+E+OLf5RBcgWymVNqn5peQNZQsQcYqz94Z9NnCQNL9/PYsL5ppYBuWWeN570pjCCr2CctKB3t4TTs6AEbbgYAg39Z5kJN7pP3y5KS3Hnbg5kxnZssfYZ8/rBJ6feU/Q8Ninmg2gs43SYPNv9GgXsaFqsOnSe8gk4cSoBl1O+lJMtJ2pwVyuFVw21qne9zN8LRIRHxua1hZhwz3BfjE+DHmfp/g8VArkzMwwBIlkxNbPUPOjEF1iIvzV/zkWokWuScK0fQ94AQDDvBk/q+SXt07Vu7PXqtDDkFgIP3LUc9OWNnKFPT/Xtw== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5544c0f8-5142-466d-f58f-08d8827ce700 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:53:43.8169 (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: IuOGSkcrDRb9INf+C6QVOB2Js9MgIHzmg9vD/sr/1OT7n1o5FzsSDqtoeC28feDLz3lUJMiLTpat4FxtbMjn1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4385 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: HCAyMqDceB7g2m92Zagpl7Yex1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685225; bh=V2HRHKZ7uPW/BjZW3RqIhX4KKRUksOJ+JTdmmFTXles=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=FIBeHvkmQo3x0mSOJzhNZbx4C+SGm++Uyj6fPFf5fy/p3ODSzdUyf59VhN7+ezdGv2a mXF7yx03l333yatYXoiOimoPcPPO97bsrIReT01lgTLcmO7XoZB3f/bq2yznDfCwWbEqe DzCevDHkrWa2CsGnWBcaJB2Jto7Aa900rEo= 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 Acked-by: Eric Dong Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- 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 (#67101): https://edk2.groups.io/g/devel/message/67101 Mute This Topic: https://groups.io/mt/78079034/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67102+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67102+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604685233382972.9222484832893; Fri, 6 Nov 2020 09:53:53 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id JZhEYY1788612xLUZIJdSwIs; Fri, 06 Nov 2020 09:53:52 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.83]) by mx.groups.io with SMTP id smtpd.web08.593.1604685232351302063 for ; Fri, 06 Nov 2020 09:53:52 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=il9oStmIweXuqiqaWBapBI6DLkzeDE/UgmZpuTrdBR3eb4XEYSxrkY5Nte6EIvBzcS1Xx0aK5/16aHH2USYisqHqbrp72lbOjMTtviM9gkf28qjW6j0PT8v4+/3ZwTmoi9XZc/43RcAuLbUoW8/rLEIfeyuZYdl/gDh22eUxi2d7aGd0CXaobnrebHv1VaOLnVWBe+JMVn5VVfNLMrQ1TaBccj9KABZGB2jgIVa7pnS+/CQP8MiFwgVHGuZpHVEcRqlIDtCtOLdPqiGqvClWoojZXtqNcKo2FG6sEEwyiucaQ9XJFOL11ZLIzgQvSgVLdt9MG7FERiQznmDwetQy7w== 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=DHTREM6QTE9bf78VCIcBCfHPprYqGqF9b0hW0r1K2z8MeSbYSEEnTj3+/IeBjAH+f/n1X+pmfqsCvYbS4WPFsq0HMucL5JkUphC8uxMM+X/RkWisNfBKeW+sZLNBwxiDmUNAwlKyGEbYFlsWYzSUoYcXNu+ge98iNSvmT+H2F3GOWkcylqeRB5XDUcifQTq9P/tOBD9lJvqrvUPovoEsdEZNeaCrIgotpD12PR4XHaQRMCm58IjVfWi0Wiu81lf4WWfei/xL9bkKP0lau+ph0utsQ+t0crGjwPh8gxRC/O3sZpTq3YK4x+qdN4i7so4t6+hJJRS2mX1nUpNJGByPqQ== 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 DM6PR12MB4385.namprd12.prod.outlook.com (2603:10b6:5:2a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 6 Nov 2020 17:53:51 +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.032; Fri, 6 Nov 2020 17:53:51 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v4 03/11] OvmfPkg/VmgExitLib: Implement new VmgExitLib interfaces Date: Fri, 6 Nov 2020 11:53:05 -0600 Message-ID: <939e9dc375e6085bc67942fe9a00ecd4c6b77ecf.1604685192.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR17CA0020.namprd17.prod.outlook.com (2603:10b6:5:1b3::33) 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 DM6PR17CA0020.namprd17.prod.outlook.com (2603:10b6:5:1b3::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Fri, 6 Nov 2020 17:53:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e55f89cd-b46f-463b-bf58-08d8827ceb6b X-MS-TrafficTypeDiagnostic: DM6PR12MB4385: 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: TQtNnXggDHRRI+SasgMOCSXuGmbffKHv4tEjEeMjTmIFG0kDP1wga9+nMEukIKBf8c9jOSSitsScWD+EvA4Uu2tRUOoLMDIXmO3LLwF23DW7z0eEPlxVs2tLt1niIU+JhTZAyuVx9bsH2Q7rHCfKoA/UoWIYF1Tsq+ucEZEhqEIW2BKPRJRynUmflZUsd0W1MLibgTrOHyco7M9C6Py3v1f1ARJ48Xvg328665o/qRHbLLL2RM4SH+WJy0frCoPpWdopEcBC9oweGiNxezgWboyVK9+/vP4hMiIiOc0ritdr5ocMy4ZhB7qdgDHQ6w4S2XljpJj/4Oe7H4+d9cDhZDZdsxKn1sxbvK1ui9J4v6pjAHTv5eFjqy/k2mow6XeWEN8DdS9eBEkggD91p/2W4w== X-MS-Exchange-AntiSpam-MessageData: MIKvF23X45etoWZZXAPuY+gp+MOs2ayCBvTXXeldbw+wjSucomh/YuJvopcIjOUF7TA0d2XDytE3IYvIqY/pCYA3CNMte/ujl9E8Couhh8ZXJgwDxmcW7UBUEpxOsbNRqqCkBDENwkmRW8rqkszvM21Yw0zx4WYZUkNQ3WADAgy/hBSfAft+6RsSYFdUiNhfF81XggTveDlaVnu7TkVpoL7cGE9zmtPdwNbmSjV3XY0uXE9SPD6xuo/Ux22IdjvorLSn9OE3bieRBNuHOmZBOWfhFRVQ9bUvgIPZ1yx/U4jWowZ3a4jrduzAskfwQvkN1IlJMVHjEtaXT0+wQ3FraHHQpaOpmKlhF9Mb3rZEroiFt3dvK4R6WHRio+QHjDy096YsX8KEzpP3lnsVWxxnqrGJxsQ5ts1iT7VTtfqgAAE85xBVTGbU4htkT78S6ZZmqT/4zGyG7l7awGVlHVjgzfJbf6/QhSmQP9vowhiyq0GcAwaNVhbMBNgWhAV3t8VgrR2z2OwJVdxJPgc0EKlHXXv9ir1o9QTNpvGyQ1SaEYABXliL70t3g8bsiSmUzToN+N0IRpwhblxNFYcVUiWuEGCEIiD1ZSMSt0Qto3D16mwAP6viSfcc8qN63eg8C8xOBJwyj0bhBuPeDNu/PbAqfg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: e55f89cd-b46f-463b-bf58-08d8827ceb6b X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:53:51.2286 (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: TiqMC0acwfdb2xZaFCQnoo/DNzjMS3pYB91G/p8qfhSx+QhaFWvrPRCyqOkgqzRebk6sbeGBZpufvbwQu1E4yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4385 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: KX7c52fuYGPXYfl6DCgRQwolx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685232; bh=tlf9p73bKYKVs/EhnggOf1H0rDkLWDbauet9NfQqoEg=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=GmRmI6/u9f/dvbhYM8mTLBgmcCIhDQiczTVj3h1IVUEK7pgB/rVeLrYtj4CqSEoScAM c+BHb7BsFwryZL5e4jUxMc2QGJ2Y3LQd/urZpY2ShoyWACuoRndaKBLXTj5jIfDGs0kEB IDr1GaKKH10soFs6quyt86RDknQLnHFzuIs= 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 (#67102): https://edk2.groups.io/g/devel/message/67102 Mute This Topic: https://groups.io/mt/78079037/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67103+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67103+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604685250286116.03078009336377; Fri, 6 Nov 2020 09:54:10 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id sT4vYY1788612xtq6g2wBBSu; Fri, 06 Nov 2020 09:54:09 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.81]) by mx.groups.io with SMTP id smtpd.web09.598.1604685239440336053 for ; Fri, 06 Nov 2020 09:53:59 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D4mhjlVR8Yw3IUb9rlOcm8cbDLPDQuErFU7KFKB70M5vRfl9OmtOywJeIyEv/kvmAJH9+qnvFYjJa7TiMkusbjX+1izWGCMQD28jXgMcFPatYlUvMQCHK6AucEU4R+9JFYPLyrVXlwGRlaxcJ92VaCJD/Q9g+d7/waKaHsxgk2wTKl6o5GtekUnAcrASzgB/ujrbw5YFcOWRUdaQR1KF1U+UR4P+SP+/SsQ2h7nYmo+rwdwEUOLYfWTGF5MEP5H7s7XjRoyOHR4VDUiRKA8VvDDlFI2dpQY7Nz/ScvHClNYb/kl0CRl2hgYsOTKjkgRt+bUbZkFmwDiphe0AB8cjxQ== 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=E9VEbNTpOG5KW6KIdNkxvmEnZsr7keOxwxBWptclhMlmx1Mr6jnlXS4dNcjpPyEkYVIGjetoEmHgSXhQNMXGKjm9rYcIevHCRSMc2qXN/d1u+443V2SqioiO6YsKkW5k+VJ7Mh2bkomvlOH/k9Tc47+oerw2bnXeUAH7U32sTR5DDlPtYfWo6F1u4OW+Pqa3JOcsc6WUYAiYPE7asIUpU1l/Z5czeIEJD+WwtoG1W7GPVd62Cn2PT0D1GmT0pXvJGvwIVGMYIGoNwWI/HbEsbK7oQJ9JFVinFVYbAJB5IwREzSC6acMzvz92qybVe0LkOx/YfrlEC5JmU8AtxgrbJA== 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 DM6PR12MB4385.namprd12.prod.outlook.com (2603:10b6:5:2a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 6 Nov 2020 17:53:58 +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.032; Fri, 6 Nov 2020 17:53:58 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v4 04/11] OvmfPkg/VmgExitLib: Set the SW exit fields when performing VMGEXIT Date: Fri, 6 Nov 2020 11:53:06 -0600 Message-ID: <986e157c13bf33e529b1d16ab1b52e99a74a734f.1604685192.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR21CA0046.namprd21.prod.outlook.com (2603:10b6:3:ed::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 DM5PR21CA0046.namprd21.prod.outlook.com (2603:10b6:3:ed::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.6 via Frontend Transport; Fri, 6 Nov 2020 17:53:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5cf69ad4-a7cf-4857-fea0-08d8827cefcd X-MS-TrafficTypeDiagnostic: DM6PR12MB4385: 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: yeW6Qcimiph5jAZYWt7SrNgaCHu5VDfLKPSMhuZuik0mdz4vnAhGK+BlaULAo59YPdjL/KU0VUnXjZcT0rSbPGhCJz4NacUR9SmByKDwR4iZ6Y24pt4lV0DGL+aZov7S7aFY/NtY7ShtzQUqZPXuNC/1yr17n/C12kWkNDF6zvrTHBfKkIpjCxHgptbTD3tVAB3Uou1xQyROcv88UnPCsvD6ZG7TWrDSzzGs7qvz+wzhdobiHkum8mvoLCQ3Fa857Q8kWxRzM+XKYmER74CLKQ050Ft618Dp9Fma4ELnfiO+8wUdZhtoUFhNU0xgLHyrH61T52zudy554oEFIZS2zz40xjsF1tKHvjCxUo4RD3Okp+dCpXI0EQNRYm2yJ4kno/FCEhwYxerDqIMp0mI0Pg== X-MS-Exchange-AntiSpam-MessageData: 1kbNa+ONMFRFyvn8ZNOapo3LrCLT+nl0ZSnez166tRdmVOs6UcVGLBrlUCi4arKSUEsClAnRpDiWHswqi17v0fvfW9R8Yy74B7rVn6ZkoxH1rSo2DPiVmu6vwDJ5iGzUJMHwiRkssZDapAtDIJyfGuMAX23A87Qdcmhk3VNCO13Vp487L/GeERwRWbCom6JIcuz9GZTfpO5eQaC3RHzjnZQDtsXr1MO8wGTJY93QIDWEvsp7CWgjkLcTK3iDLM7If6J7vWJoq6VssS1lwSvYwANese3OluzDTm1U1HtKVhbedymPS6YWXg94inZZnM2FdTmAo86tpgTfDFU01UW+L6OGvK4u6n4DGLELdbyj4pr/qah3Ppp9nOCFHSCuTxfQKJHQtgJb14uyo2AbzIABfDqw/t3u+3LArnL5Q7HdbnqH9vbjfsuDDlHtlJ/Nok1sgAhCajKB8B3LdC7zBtl+7NLDSHzQ8nZDrEqkcMPiIrzx8vwTIEGVOA4rIms9vzyMQGB8pr53tclH3pqYtQCnot7fO0xcni1vCLpYKYi2yRVpAvPPPWJvNNMCJ7e8H+5wNLcQA7ftCfrepf+Q47LZAlzrbml12aAr5BCAF2qGAv6CLAxcjtIaHx/4gshSRG5NR8E/oQXdVjO5B5yHO8VgWA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5cf69ad4-a7cf-4857-fea0-08d8827cefcd X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:53:58.4984 (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: DI2z6Zk4NY6pEo/NY53GJYVTFIfh7DhoZtfS7ow/fbaag1D2484kt+gMtXmcGnYe0j33+SvGDTl5k8X6H3BEKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4385 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: 6wjwCsPEB3Y3VcbNU89WuBDlx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685249; bh=L/emJ2+2Riz3JfA+HVjYm3MHsY0CcjcBEsqWxf7DSWA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=heJgEBK9MsBO2eo/sexexDDUrh4PJs/YN7TCsWqXquA+uRlZQd0Eyo7kkkvpPm0ecKV iBPM6MXS+NziBtK++TiYPF1XVwWLAtU62jr0fU3ab0dX7TOEsFIy+mCrSHcoocy/Ugqla qoj+k5uRKRpdNJL5f/6tZ/r/bjHiUA918GI= 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 (#67103): https://edk2.groups.io/g/devel/message/67103 Mute This Topic: https://groups.io/mt/78079040/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67104+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67104+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604685247825946.7744884325999; Fri, 6 Nov 2020 09:54:07 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id sOjOYY1788612x1xCvK25hiG; Fri, 06 Nov 2020 09:54:07 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.73]) by mx.groups.io with SMTP id smtpd.web09.603.1604685246855442182 for ; Fri, 06 Nov 2020 09:54:06 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dztG49sdMAAkARTrzkY/GZfVrv2xt4lxPEXVtTYlw1geLnKwFmDpwUh8yetetOMoojRXuIXXZ0eqmC9ydSc+ie+d6eGhMYsJkH3AoeM/iAZ4MSls1v9YcbuxDl9Eg3Aqhdbzk5jFXPgegtiZXOxJ/r4FxB3LI6EL9PWNzufneF9+FUbn6ij3CPH9pRsE9WXav8KBBN/XpQX4F62tvsdqArvzLIU4xoR3RF/wW6VAJ4VY17KrNr9SLWherlz5T/wrah4VCHyZoxSxa11S+53dnC31cviO+iXsLy1HtUUC+7sA3bmJ6pBAdtfhwQJA+k4UpLrC4LrzFsxJQ3trXlegfg== 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=CcqBrjYc+sQZuOSXDAXeQqhYIRCJLxiA9CO7OLQLE/zuNvMYbALDf+aPzS8KLZLfg5gRlbKup0ixQ9pVzGfkFpLj2qfhGfeycAwbc5nMTP5PJpDjrh+Xx4f3G2D/HyS/B2kWHBrTNcHYlnh2OfKbbk8SoiVYpUzhBoThlbwUypIyNAiwTl0yH1n8O9MX6iTsuciUFrD9wvsTtv5nlxb60yx7z9xpp4XlbvB/X4yQyiOQrvXFxEkz8LHoyX6+fM7YXgLZqHXv29VgjzW9cRjlxiq2wjbDvPGnG/E6uHvzKKXcNmvMzETyWbrtvihjvn0CM0L8qwGa8O0iW7ic9XpUOg== 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 DM6PR12MB4385.namprd12.prod.outlook.com (2603:10b6:5:2a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 6 Nov 2020 17:54:05 +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.032; Fri, 6 Nov 2020 17:54:05 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v4 05/11] OvmfPkg/VmgExitLib: Set the SwScratch valid bit for IOIO events Date: Fri, 6 Nov 2020 11:53:07 -0600 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR02CA0152.namprd02.prod.outlook.com (2603:10b6:5:332::19) 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 DM6PR02CA0152.namprd02.prod.outlook.com (2603:10b6:5:332::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Fri, 6 Nov 2020 17:54:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0f682022-a1cd-414e-e385-08d8827cf41a X-MS-TrafficTypeDiagnostic: DM6PR12MB4385: 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: U7cyHooHKf/dOlwQxyyQS6hPlTW5wi/Laxh7L7sXZAqX1fOagn+b70GOuzc2aDbX6EZdL81JCnhPfuC0NtOgTXPLC8LJOvVvuk0t0LNu1nx4m0BHAjX/3FQ01k3BQ6t1F0fdxgFtaa9pKAbF7r2ngOJUau2dm0ubXDxLt3J5BVo8ZyZ5BfmbLbEicvW4RHgdLsq03Cs0ngHJqUHijBfxJO5XhXYbZPuovifw5JdP6S5qpUTJ8qFL870pZDo3esqcEnrzyOxmmfUnUF95Aoq8TEt1CrDz/1HZWQUQSkLxobLNQvaMFh+Mh3xwgBKRrHDdSkjbFL1W+muu7FXFVdA0+t6ZcNVi1JFEkJocuoAyGQ59LFbuXs0DXu0Jv/D28wsm4KG8H8A8ziEBLfisgkX45w== X-MS-Exchange-AntiSpam-MessageData: Mv6J7R1m5K6araKubEZdwtxdJ36CZhe5Pi8ObUxprqnXvs51H85okhqLmQNgnAqg4YwTHza914tBp07tzYhCyABNs98vr0CMcKgtf0bKhp0j4m9h2egXwHH9drbpiibhfie3pn4qz7BOo8DjahsNysYy6OHLDXfbRGHiQTLWrY6UG0MQx0v/KONzkIkTBGXW8/haL9lR/48EDc8J3gT86Y1chgoYoJoBWFEUSFlrJsSnC/CmIlV4OR9+56cJUhghsnI+aIPexEqTBqXPa+6ODHXoFxY1qcR17zV0rjeyAXSwbXKR1yrUiOgelLjXBA5SA24nkeEjFYfJOsRCTt1OIajUdobHX+6rNN3ls/V5ivUXzRknYMBgqUDVAkm15yjIarPr8k/r6aNAg0dpXA/U+6ymwyVmDTV0dzfZX0kwhpMKe4PUBYdOyXRlcT+sJdrdv4N+Lc7SfqmFiTfyZAKx8wa4XD4vH6/F9Xzk3zU0wRv1rMBawfR5tgPMWAqcAFTNJOtfRM0UXc1qKbLnDsB4HijRajIXhRcnRxBQO/8CvqgUT47c990bIOL13uEBHW1AiOW7KEY8KFG5uY/mGIzVltdHsu9CStPx+7iOSAbe6qpuYOhSBOq/emFG+W/6X9FI5fbqqGLBYZaEKuGIXRzYYg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f682022-a1cd-414e-e385-08d8827cf41a X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:54:05.7572 (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: /yMrxFqCG/YMjscXyBiwdqAaIdI5kYC0W1hbyrj/5N76TF86E4GiORlr1c/4z6ksqT7oBlw5h4wC7OQudsKtQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4385 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: pYZGxGDcVwm9aEG5Fy4Ccue7x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685247; bh=A9QqKkJn7DTcXSQ/+HweB0eVXuaPeaP7DNHthUBVp6Y=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=hpNrWFhtgoznIwYfMo3FoYCo4TygU23ofuepfUH8IND8NCwQ/s9ScoK4axxCm/SKBxD bZ/d6zimCNWlNXgHJJNdkypIGrdmkQhybxnVsoQ+kL/a7ABfREcNfLJoIEbQohlqs0PrW au8Wqaj4tSWMB3UkrCdGNLrjk8P2KmS5TRA= 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 (#67104): https://edk2.groups.io/g/devel/message/67104 Mute This Topic: https://groups.io/mt/78079046/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67105+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67105+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 160468525561315.684995697577165; Fri, 6 Nov 2020 09:54:15 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id x4VLYY1788612xdOJPwSTsUL; Fri, 06 Nov 2020 09:54:15 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.85]) by mx.groups.io with SMTP id smtpd.web09.604.1604685254789661470 for ; Fri, 06 Nov 2020 09:54:14 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xpa0/yzjcwiiSh1onTE5cuBLiagcYY0YRnpB49q4891751Q/Szs2BhD+k0Rp+jARIN10JtlySlIoRptndNyqHtOtBB0uXntz+hp50DXId0JRqbjpr+paMqxjUtIPecHdua1o+H/2EnbFaY21A499lS3G03lxLVAs/AGcnmUMbKfWfmllpjXOdr7Mq6kTY92LJa1A/hZzf9e54Sc5BzectHYle+eqYuzxKiu6H0nB0QK3f79ejOiMC3vzgVB9lNxbnLA0Vs8fqEgyPU1zIkZTM0O30MLdtJ/TGKk1jJ1sgyzwGRjKAA6s29NHr2faGgssbQAgra+WC8h3XGXH7WlrYg== 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=XBqWXWpuN1AwRXhpCyQ2XgBGLX9DtzwGDzs1ZwSvo27Jekn8tQqD1xf2dLnp1/wOIOKRLpkFJbRn/V55HbE618+9jZWJKf5caPjOKMol3WyBBNW2dE5NLoe1nuQ/9dkczWbSftFIqdYdHahyeW4PAC8fUxIJPwsL4WTFk9f5CtpShUv2coTAEbr+BQtIca8Ik0K3FwQsqqZcWKB59GWhs/EKrYGKXv5u1p+9IbdgivhXp0Wbx8s6ReFnHRanTFs4078lyeHx7MyeaIz+K3oeLnCBWIcDzHuv87t9oTvgHDL2ckflb/gCZV0Y+jYsVEwFnyLwEJoWsFRGk+Bg93J9+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB4385.namprd12.prod.outlook.com (2603:10b6:5:2a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 6 Nov 2020 17:54:13 +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.032; Fri, 6 Nov 2020 17:54:13 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v4 06/11] OvmfPkg/VmgExitLib: Set the SwScratch valid bit for MMIO events Date: Fri, 6 Nov 2020 11:53:08 -0600 Message-ID: <45ccb63c2dadd834e2c47bf10c9e59c6766d7eb6.1604685192.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA9PR13CA0131.namprd13.prod.outlook.com (2603:10b6:806:27::16) 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 SA9PR13CA0131.namprd13.prod.outlook.com (2603:10b6:806:27::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.10 via Frontend Transport; Fri, 6 Nov 2020 17:54:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d0eebd41-3dab-47fd-8862-08d8827cf8c2 X-MS-TrafficTypeDiagnostic: DM6PR12MB4385: 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: ChLNTK/SUadA25LMh/WF4E9vf3m52pM/9ncWjvNdKot3GZodRlm99dac/y5JpeFRGCqzMMkL3nJTo8gygkXzeNYZeH8wcQ6K+TjaTokKx8xDqjlvchsVSyJYrdOVEVM0jEQElBGzE5hI/aTKk2WNdIHj7OwNFRVYXXs47pef0Lnp04ssC5MkW0DDwb9ntuUQ1bPe68O8Vl1uNSKQIziPjUc0+LWp8joQ6xpnkAzCwU5MEVLBiEBaSeFQWajiuiqoffPEyQGsOUS1v6uTHJcpD2TbZ8PxVN1OQ6CTMSj7xDA/t6an53nL1t9dmWVgbQAgsLYOf6y9h2W4QgP0wjFITrzBzEpWeD1WfNLhK53GdrXOkfyJ/n2qyEEX9h+SH9jesrIQjheoDTb11cJjhMU1Xw== X-MS-Exchange-AntiSpam-MessageData: bKgqQV2RE1/x83Swj+tMe9crBp5KY/qxmfnpOrYS3EDdZs/E0NmvDY3/n9pP97OJTLGICX+DkiFHSf77mzRq4afhlbFDnL6FM1wtQrcwg9LfY2p/xiBiULkOZpyDvye0KQ6TIJ9RU0zfJ6Ji/2bI8fk6bOc/MJZgfL2QJn+564pB+JEKu/UaH23FRglGYw7W7z0e+Tdaj+PXoizl2St1W9JbcllJ+zu8q6tfnDWGFvOYfjS6QHRArIhyZV3QEperPlWPsF0QovJtwK7b1HuodjwNmbH6N4TaMWs2OiBbrL8ghhwO6lz9fQYz66SXvewvbb68Rw1DH9yLp6Ob4q37L3w8R2ZLBak7B+5XsibpE+/aZvX6hRtktVbrRGLpA4xXWgsdTtVTlGB7XKUKNjjS46Mj+tEJfdsOeH9ooe5SULAsSrplfTLW9dnARfkfjfpH12o1inukygQz442NbzAcT79wDn5wfdlPZFXzNrI0MdOKfIZWBsQSEx4NCne5FDZEhip/bj1X6iqxrAc5iEIkXQf/osOPlU4X+bEMSaMQmOmjKWrJhSztZr9MPo5k6uuIydgTTfKy++jcK2Ja5w6LbV80kZN13fXejwn3hzBAjp/9yWJpXZnY7xwk5uzm8nKT39hFicM1p7fUbIIe/ftPgA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0eebd41-3dab-47fd-8862-08d8827cf8c2 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:54:13.6038 (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: qPwTWuRq37+Xm8eEuj6ZYnXxMBwmauoIi3WbubLS1bvJ1Ul2mBkvhd0fO/goOzCtj73OJlLenGnRZE8/r0le5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4385 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: sSj9kg6B3HQUK8KoKR2QeEljx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685255; bh=kccIHZ+cgsXEWRBTdE1V0PfXuEAQwAd6KmHM2LYGjLs=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=HD+uia90HDdHDRnTphe1+1OIEDVLtrRLjc+kMkA2SwEUYQPKHc+PEz6WtCTOBsAKkIM GEx/fnSGWh9WaP77HXCxboQLcnpKD/6Jq2nWfDHjVn3SE6veTl5uEJrkbvtWf01rKIX+x 2EMjyF1ZN7KnRABkWlTg4pmChS2kvRgCQpA= 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 (#67105): https://edk2.groups.io/g/devel/message/67105 Mute This Topic: https://groups.io/mt/78079047/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67106+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67106+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 160468526375775.47263953810909; Fri, 6 Nov 2020 09:54:23 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Qgd5YY1788612xB5A4Bnl3Fe; Fri, 06 Nov 2020 09:54:23 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.62]) by mx.groups.io with SMTP id smtpd.web10.621.1604685262832510722 for ; Fri, 06 Nov 2020 09:54:22 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n504FFE7vAH3Sl/E547cK4cq0YDnyfFjd7eege0DhVppZN9n6AeeqCabRNRRPNBNz3eiHtBI+V0kpuNIvXctk0df6JGsieRjpR5/PZQjOaEU03N/fPANOb0rAZowAZDP9pm2oThF4lZhcOX04DqnPh3n30guQIUloGKecyXjaBT9MdB2+YCy9LqlTpPd3ulf6wzqurD0IfIJQhc0/q2esGokJK+wrtt/0TnhHOL6rWZvijIACEH0fhQrFGMsFgoksZ2fH9rOTEZhO2uoJXZxibiZ2vFULps2MiOLQAH5MTHbLcsl42KUiFqsfyu/H8reSCeH5OW7T1Zn7sspQq6a8w== 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=aNeTYMSQLZc1ixZyWyTaezKS91KOoYv4q+Cx7EqRjLAY94ui7S3GPzV6K83rjTHSMNp+hmiVsPDuzq23YHbQXAlJvhbxf8x7BjPfg/RcgimWYjMZGif4Fy4xmkZO2OJacVh0B/ms8UM0OCku42jCmJt49Z8LWwVGWVaWBRpOD/gnxqey8YxMf0ek8LyHUUuUu+MVpZByehonnuoXCj7ONlPDjZqRcPLYmPJSkx71azr5i/2g92i7ZWLYY3mIXOX1YZCTWEkeAD6GpkXTm1AdzEeF2mVCjMRqtPfOYcvwRUh/NEa5qN13oRkXiEuk/UAy158lGuSEmQo1ACNvALDwug== 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 DM6PR12MB4385.namprd12.prod.outlook.com (2603:10b6:5:2a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 6 Nov 2020 17:54:21 +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.032; Fri, 6 Nov 2020 17:54:21 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Eric Dong , Ray Ni , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH v4 07/11] UefiCpuPkg/MpInitLib: Set the SW exit fields when performing VMGEXIT Date: Fri, 6 Nov 2020 11:53:09 -0600 Message-ID: <6e11dd7e161bddeacc3fb4817467cef24510c31c.1604685192.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA9PR13CA0121.namprd13.prod.outlook.com (2603:10b6:806:27::6) 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 SA9PR13CA0121.namprd13.prod.outlook.com (2603:10b6:806:27::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.10 via Frontend Transport; Fri, 6 Nov 2020 17:54:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: eaa1d12a-ed54-47d8-a10e-08d8827cfd8e X-MS-TrafficTypeDiagnostic: DM6PR12MB4385: 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: zKF71ONsMJEN5lK9BGCFrgfLXZiZIwZFZp85PVopvsqGE6wSG+PQLhd/N2hWKwyycy0uFohxeaoscDx/0cy2PU0yRK8qd0GQvVUynY41HNhpRc06WcvTOBxLc7brvi0/n3u6+MzfGPhUOk9R2EiXrBdTyu6Rzl9hBbKXkkiTPjdYZBpa6RVhNF0X3jiyu1/d0/yUtC/GBu7xbaWztIrAvGAl6X67AmJRLDLV5goUZlER/NaBGL/I06MUqEY9MpvREw/I4fqsL2Ch6ZzsBi/VrgMeuluKEDSJNvjU6qkcpvEn3YLYCz+Fkslg85qxcv3G1wMsQM+P4v5gyCq11/9KPKmFluq3HNu6dbkccXbkqaDYekPijSomqHxrr/KWXUP/2SjRZXEaydV7CDBEITm5dg== X-MS-Exchange-AntiSpam-MessageData: CHR3626LJOLxtxX2OVR1M7uZ8nVwF7AXtsAqRhNlpZiIqIRAiuiHsU7ChpsP9D1lrvwlExVcJPkhfVnQIftTSahDMzfJe7aXUPThx0A4JU0V9V8RpEAFACwc3bYHFrjwGk6xlrfNZ0WGAvEsxSzDpFHHvJjuS7NfXqpMICOBG2AIGZey5FBNT+N8JmpKhUqSgwJii/bbsp6D1jXBs9FRN2EaVT/IfPZ+WgmD0SP1kxw/1a4OriiVIJ41ou6j4hPDkhYxYreA19QTe+z2l5zARwGh8k7cMkzQYUuqt67V9h4K1ySVnd0Ryehh/k2zZeMBTnIdYoH6q/iGTkUv6Ztf++wnrSturAFG00CwUWbHWQ3JeA0mIkWnPqOJ3KoBgi7ZjyI4Gms9nDirLTmFlYM+vMnkaNJ2QpM93nto2jZ9JvnS1z7/+4TxNU9tr/EJNUsGtO7Imr2xq1GbKBc8NKs0olpFTF9puZz5wEWL6q2JY5wuQhfAbE6nzcOSuJPG5DT9qGMsxBIQRBWrvDE6zvTlBJVz0fI8LyyO4EwZcVWG+q/f+MgTZi9OcLR0jZ3a8fsElwIhjfDqqEsQVnLG5mnMAR/IV2WNke/8vLVVq97o64Tr+loJzeWxls5KJk6oGtB7vMJ6GS1F3xBg3athrLeWcA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaa1d12a-ed54-47d8-a10e-08d8827cfd8e X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:54:21.5983 (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: BA6oog/6arNFtrUnMxr/zDiO/uZBDYw9qf5VkTuEIVUUI7WvUi3873Rt6JaqV04NNiFNiieU/LBFMPV1A1w8QA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4385 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: Y13jFIapzlJm7yBIHB0Ov6Ljx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685263; bh=t8vuaALAmP+z5obKhnCygKnFzoWgrRftY4XparpF5qw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=rHIRWNMB60xHBN8dvevdk80Gbisc0KJnJFSWKiznJwPM8v9uIDDVZFS//oqyZnKxgAe NCLbJu02h6rS1igOMOPn49Uxqzhx5R9kZa5gdipQlgHBd3ougSqgbbPATxVI4C6o4aK43 jU/7HqsldD+QTVYGBXtbZh71LwjHmDkOo/k= 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 (#67106): https://edk2.groups.io/g/devel/message/67106 Mute This Topic: https://groups.io/mt/78079049/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67107+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67107+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604685271860326.0245507854628; Fri, 6 Nov 2020 09:54:31 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id WwNqYY1788612x5nwiQoyjrx; Fri, 06 Nov 2020 09:54:31 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.89]) by mx.groups.io with SMTP id smtpd.web08.601.1604685270833962849 for ; Fri, 06 Nov 2020 09:54:31 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cvb/4K+jK7ERK6rvG6vbLcCrWkROtsQkn4qeqzNZKqR/uxonf8e+UJQmj508rbejiq28He+a0VTKn/cTEtXsjXWq+L6S1qrB3yctM/iiqgSVJIyotJAgiKjxX5nS54nTDXfqxxkBhxjxfsu1npNjL2xYDCaR36DaYnYHNNhFQLMEAhwu4YAuF5q5tek84zzbkM3LUA7T63IuL5zmLFmdZZHpms3do3VRvcARc/1k8GLwyBUJ9xxOXTO9aFM9Y7jzaUjXpfKBht5VswAQLnAVWHnVvVAW5Pi8s+vsNdoOzhoA+g4WRqOQPr5x5kcYt15Q5WmgFmd+fgTstsSzWDbgmg== 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=AxW/yQzDNcoSu5eRQnrxtba0l1PgGaQz82274sb5JePSCY1avQVWFBuc6ZYvWuMsYLAb5UNDNAbLwIbOQEImhThV5zOY6SMUufwdC1heTcMw6EWnwlzqJ5BFu/ZJtC18XOTu71ad5FAeAHSWskLt/OVqTPe3QawrXDtHfm3vxLJLGiy+zAKlxTeiC0htkcChRWJtPdnAfnq8a9gGmy5a7bOIZ4Cf56YJsQzMEUCIE6idDqNF4OizNKcccC+Qg5px/yuMdy5KUjUATs8lXRTRTTSOzWpEWFcErdPh2QoUVnHT+N+w3IkM8+lJ+apDhewFAyVfHETIjgrDTSfs9f4v6Q== 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 DM6PR12MB4385.namprd12.prod.outlook.com (2603:10b6:5:2a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 6 Nov 2020 17:54:29 +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.032; Fri, 6 Nov 2020 17:54:29 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v4 08/11] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Set the SwScratch valid bit Date: Fri, 6 Nov 2020 11:53:10 -0600 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR11CA0023.namprd11.prod.outlook.com (2603:10b6:806:d3::28) 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 SA0PR11CA0023.namprd11.prod.outlook.com (2603:10b6:806:d3::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Fri, 6 Nov 2020 17:54:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5b36c42d-9c59-4ad6-cd06-08d8827d0225 X-MS-TrafficTypeDiagnostic: DM6PR12MB4385: 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: rCvo8VFNMlTGNQ7MXjY45D1j+1hQQ2eIqUBE+VXLNmOARcw2ozisoWj1qV+OyfqAsgRammJwvebc+7YPUjyb/g4bfQJFDaew4blc9E7KidVLbDsfTnV/QsZdb6iJjKRBd1M+HLq5MLI4IwVZKWreIulDCv+3RMb1rBgBsErjyceUbsCbOaW5YpvkaPdvXs0X9JbxdcPrqIYO/vCPPidiZD+nkkDHGltU0FuGPyErgOO3R1hyJK7jT/b8KB46PIwjNkHIukahMmQEga9V4/0ayr7ObtJU0sbQqZfSBPWlLKGqO7MC5ehKk8KGF6wwC9sKXDYdZThawn5/RHc26RZCwZqA0wqVVwytcpUW5vfU0JSHQ05picD7bvO758iDnBtzxHFz/6G1H6oRgqN91jcYgUBXSDdodmxAsvg5K8I4z7rGmWZhFVgThivlJjUAwWBF+7e8Nh7JMU0Mg6RRZmnS5g== X-MS-Exchange-AntiSpam-MessageData: 7ENOhKpnitl1Wt4SaOi8+oAhoGganNJE25IVZQlTR9/H+YL7lkxtVCTeCdkzWRgOkayP5sT5aRD/IbEbIuWfJN5JmMf4ZnvFiSl+N2uH8GZKaqljnqLAPSGGIdM7H/N3HkJ3SXBaP/Nt1KZn80G4+43woIiV+KhbZPbMpZOidmcbLYyMeDQKyh7+E+BJ4YJ1jCNbCZm4rLR8hGe5Nwyq4MIkh7HJG4ZEaco1a5RN+NG5MYXzYiwhIBRPjed+eBspjLJWmHMJUzVYpV0Qvh+Vd6lVAr/8f0FLRn21UkYAF+HIwqITfK7mpnTGvNrs9fEiJ0eCHQmuny9b8eif5oErQX/DNfaw6e/r8bCTTyLRF2LVyWUVrbhEqtXwQ/n9sMcAz8fQzpZQaI0KbUUa+sCCFZTlXe51FjQW8h7BbOhmtABzz1SrDEOJ4qpmoxhayI95BQ1imldcewhj5NBnCbIhsDlWMT0WpnJEA8Btk2c6+LMl/OvI1JaG5Dfc62ICFg/V45wFz+QIElKfeqf3ch6i+UYuUIKw55jOli2fn/Fzq/R+mwJCro9JZi18YpnDj9FUht1qkaWTP7S/YFwuFVgUnqFs7oZdpIiauSuQsSIgWmeQufjIocuL63WLX9vyvOlvsGG+3vP7wjjRSrGOx64Fpg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b36c42d-9c59-4ad6-cd06-08d8827d0225 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:54:29.4598 (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: QGL2yiybGq6W54XuJebt445NHxF4H9h+xYkTIFtqh4vcs/cWI0rSMW7Qd3G1oSTvA/hp63E5dfMSJlD3YRI6NQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4385 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: Dh9VFDPpK5BmIuH7WsaQVOA1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685271; bh=yj7Pyjg3nm6jJyVYrmxvL+DzU1TMbP3I4ajaBfz1eJ8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=F8XkOuiAmONLpFBGaQYqxG6302kZS98tVfwCxkWSEi7PXFi3aar9M08h5UeMkDfYiU1 e/x3xZ0PH216GbfmGOJBaOi11y3/CnvGHxq2htEMw6TyvHqR+KverqqHNiOmLaxVYLihS GKFc0ig9sFRkuyhGe+O1QLYZdr5YyGnFG/g= 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 (#67107): https://edk2.groups.io/g/devel/message/67107 Mute This Topic: https://groups.io/mt/78079053/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67108+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67108+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604685279155179.27674034955805; Fri, 6 Nov 2020 09:54:39 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id IoXnYY1788612xQhD5GfNPoZ; Fri, 06 Nov 2020 09:54:38 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.46]) by mx.groups.io with SMTP id smtpd.web10.625.1604685278365444744 for ; Fri, 06 Nov 2020 09:54:38 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q7dfQDRlFWSEKHFIjVx0HrH8HM5EHVQSkzFfpWpqshmKi2CTde8zUlMGB5SsPWFfDHU2MKKdrMHEQF91Rt74bsdPWWdgFol16zrmpHdWOM0dae2VA+rZoHQQjSXQYtvy24YompG51fbP+VZV1TuxM9ik8JTqEH9z2lN1dvcBAPmNNoO1BoZpLyd3BjLjZRBIog5RdyoaJIxvi5RX1QjiHC0+SArkRLR8mYPYFp1Y2YlmlHaPLHlNUXRA0KJH4FClvvrrG/rK+UHgRpp0yXi4vONqJ6wNlM5m1VmQ2frSJmhYhmd9tJslm0mDUX4adG5UkZuF80qzNaZ9MNwhh8oiqg== 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=K4GLd5XRlGf1xNsf5yRlAjjVbfT+SrQCmGpnKVIrUzIM4rK28/nhEgHLI0sDqd2HCTXIiAThq4Z2H+MzFsNcDuPYOIMbwSbTlK8CSuwXsLiEFXPN9Bwe5fgzzdkMGXnykjlLLhw/Mb43aGkQ5NFRqkOIvAFDFHmUfQqZAyHFZZWjSFn1U4Z75NDxh35xUgA+NMXwQU7GQWX2Gn5EDpXL1zeL1XD/8Xl+9Hh9XLgnl690hvJaZzkDuW+mQBPYmU3hbwwQvk2EjKFVfOBIJvohilYpBEzdE0QMtfa114iJbT7WWaqNFU6RSCpE4BUyCv+bX3Lx647ydSl+0w0jmyP6Fw== 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 DM6PR12MB4385.namprd12.prod.outlook.com (2603:10b6:5:2a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Fri, 6 Nov 2020 17:54:37 +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.032; Fri, 6 Nov 2020 17:54:37 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH v4 09/11] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Fix erase blocks for SEV-ES Date: Fri, 6 Nov 2020 11:53:11 -0600 Message-ID: <309c5317a3107bd0e650be20731842a2e1d4b59a.1604685192.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN1PR12CA0082.namprd12.prod.outlook.com (2603:10b6:802:21::17) 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 SN1PR12CA0082.namprd12.prod.outlook.com (2603:10b6:802:21::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Fri, 6 Nov 2020 17:54:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b604f074-c262-488f-eedf-08d8827d06e4 X-MS-TrafficTypeDiagnostic: DM6PR12MB4385: 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: 1JVxO/ZTZe5LR5HbGKcK/yH7x/3B+fUceWFXdTIY33jBUf266KbTn6SAEH51R4WttDLIbFUUuIG+aelE8cl++WdK2ngk+Ynj0Y/PbLjXpbSHSrZ6jqZXYcpDOJgdGXotW0pz1ZoILbNmTozWOr4C449nXLSk89qgin8ltsj655v8VBvsS6qPG5DI4sh5LRR277UAFMth3zqVdhkl9hS7lWM9P8xR1wv+QuGlO0eIYsS3rTBAWK4jC/I6qnRkRRF+Mwh/htKkY0Yrw7MhvxqmcayNB8VO1CVcAPwZ63YtoWwHowNNOQlSyQHwLEU8AY6hJHGXwyKygGR5kiSFfeoBWjxeO3jLRM5PVLFdikSneW970LtY0Jgvb3UyLkcWxAJCIBQ8yHXLaaI9Veul79WDiK7Co1WwhH7bbDxmi0DGU/hPkry79xv1mhfTAL8s9X3aQRevwiV+n8rTxRAa+jgiBQ== X-MS-Exchange-AntiSpam-MessageData: aDDFeMv7zf2apAqrH+3iWS2dIWq+v7w5dpMMZ62tJhvoiKS16KcE43Yux47DPVlCkY2GqBUFsmdUBWc9u8uhVSIwDyVGtmGjMXLjljEmnXkubfHmfmEnCZyOAyQSopGvt3hlj7xKc/jA5+FqXHa2OGOukn0pouScU9aRRhlFRzZX60Z5GfQx6DuNFhKqoi9BE4d3++G2AlqbuZ3grr+LDjP4bvHMKS2sl2MW/fYAVCXEPdHgDh5Qmjl4UwZ+X01KyFo9kwCsXWvDwiGJtEYZ/LIrABqZ7ROHxQTNTMUQOCMmdfoAUpVL10bGyE5pEkfptS1hEPth/XZrGHQBoACpzDqfX1GooIhTNrjvL0H30v7F7PnBpNaAbeIT3IvvFYZyIhU7IzFb1Qyha/yzOc/dfsNFYZIbnNOAZL6AdzcoYAU1WnoFQjfFTh+QSV2GK6f16/m+IBE3DxYkzCsUVkm3MnfidvZ7t0wieAd0WIF1zyMbUNJM77q6t+9xEsrSaXKAi1It3YRo/9dztPT+ThGsmxV16IxyQk0mwsbgZcI8EFz4qLf2lbhw53+bEOlHLCOikKNpyui/0+JM+3i7KXolz8XI57hp0JH+lLcHad15jfg/A6tT4QTcQwKpyKBNt6iF+tI2AAcnmuI8bjH9i0RWhQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: b604f074-c262-488f-eedf-08d8827d06e4 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:54:37.2943 (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: l4Uhr8QSXV3UrtBKxLdU5PSgvWW7FChtfi92uRBSP+rCCdWAtUGm43JU96FllJRrAqL4lqS5gspK7iy0qwzjDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4385 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: 7lFgCEQxwvpdm9NyPHh3MiB3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685278; bh=ghnZcdcKP0kJtEyNfhUn8meD5fkXA6KCy/YI0LpesG4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=T68e2/MJWlm12zYFZ92uIem/bX61pUq2j4u2tVnizajFlhG4jdb5zLUcmW2M2mKUVct OU1TjGrOrcU3LM1HbSL5w9K4gngZGiqmSHKZnuTbBj2CRcf+xI+a+iY9RKKlDzpREMlhN YKGI3+IkuwReAkARjdSosYn9Z9YMOzfRU7U= 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 (#67108): https://edk2.groups.io/g/devel/message/67108 Mute This Topic: https://groups.io/mt/78079055/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67109+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67109+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604685310165569.7432136246474; Fri, 6 Nov 2020 09:55:10 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id rYirYY1788612xEId9yRHu42; Fri, 06 Nov 2020 09:55:09 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.48]) by mx.groups.io with SMTP id smtpd.web08.612.1604685303779859290 for ; Fri, 06 Nov 2020 09:55:03 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TPEnOM+yk/t1YrDJWy0RtDVgK8cltbtoj7/wWxPoafajSqRPRHtuwYc+FI6lMs5ET95U+mHENBI5JkRM3VU7SB0jDtr+g2tBI1iG6QvVUZ0TJZaKrBBwxI5Tu3b0RZ0698imSnkyqdcP9JU9OvgZu78PCwRuNMqtONaC5KaCBINBurrujuNbHUISDP/WHdQft+8BxabKytRDx/rW8Q78UC5xDdnJOm/xE1Pquvha2zV48Z0qEnzQlZqpKYVltm53cPG52BNlK1jMqkXwjEtCCdf6/pbw+aJOScEvbG9BJwA75ClSJs/HUusb/J1e2VGyGtSUq1gzBej1xnOnzM9hyQ== 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=ZOAW4gtJsrTR7If9+L+3zfwRpqTmJdt8GTVANlGg7Z4=; b=PbdD09Mrju8bh9igE2bfoPXb0j1IN90qE2k7+Lf+deOSJJU7w4CUHUhql1AGXhsoi3SdHfT0VoTbbamkI8/7KFGBLGTB9rniUm0YoKqlz8mc8rIk/xHEH+Xhf9aS+lsvNEL1v76gbVs4GmPzDBOchuMJQT18tdVMsgWfLEagRCqSrK+IkG1TCEbNkIz5wkNFXTXkpNjY4FdkisEO8rzijt+DBFrXRsfF7P7q+RFpstp11kpgnYgFS+C26RZcQHpibIHU4Sg7EuZcZH4RskvcXVdvJG7QrTh2TJktIuW48HGIMf6aeVr2HzTkFuyjcKgFnEnc4buks00AlKiK4TvJ7w== 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 DM5PR1201MB0122.namprd12.prod.outlook.com (2603:10b6:4:57::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18; Fri, 6 Nov 2020 17:55:00 +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.032; Fri, 6 Nov 2020 17:55:00 +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 v4 10/11] UefiCpuPkg, OvmfPkg: Disable interrupts when using the GHCB Date: Fri, 6 Nov 2020 11:53:12 -0600 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA9PR13CA0231.namprd13.prod.outlook.com (2603:10b6:806:25::26) 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 SA9PR13CA0231.namprd13.prod.outlook.com (2603:10b6:806:25::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.13 via Frontend Transport; Fri, 6 Nov 2020 17:54:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6875a97e-57b2-464a-9b06-08d8827d14c5 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0122: 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: /o+HjvaEkjhIL9tu9oY4KjL1A185xtah8/WEPXM1lF+InF+NYSYUSxOwTcSMVEkHEEEzNXIXYZJ1ML1hqK7uGfY7PnyoVpEvH3LvLJFpAkEXSch5KjA63e8CpuGChet9N+Ax4JnPxkdDYJ53KRmrgJyOzIugiGZ7tPs3bTbVJq6noraJLXLijzsCvXyQNUQn0wU0CLQ1O5e2SunZSzi/hbknlDf+N83OoTya1JORjU2QTV0nBC3/1lS2wEEeKHweS4Y6krFBqIVjRr4VUBL/TVVeiiNtAa6AJ8bH5Hw0dHnINULCuoIS+4qGbJrelmKA1ZNwcelICH0J7hMWVoUivTDACiviHT/+Sdp6e84QQSdpbcChav4sMz01HPlVK3zJz1MqYTqPHAj47jRZH9HGBg== X-MS-Exchange-AntiSpam-MessageData: Qf3U4zL30+s5qccaFelegCrdMYJHHOoVxqATYmcNgJSymg3soxhhH+J4JrpZy0PUWdG9q6SPAZ/nvihbOTVZvmRWesuqYjZeAvajkjBwB7RBOUtD5H7N7sCtgJU2Vi4zOb+TmWxVZMmdjQsAIBzF29DazDqF3uVNbWlLNi/ETZ/mbM0wbbmgSf37B0Dxr+/2ITqWzqcjTo+ed7glqDiHkLxTxW/PiWOKMVxiDoJ6bVu+4YgfWAZU87qbGPXyj7rQJ4tRMOZ5g+Vg/vsc54h9DLOmg0l936T/cBEd11LTfytGRL58gn5iuy+YgYPD8jC9IOhb+QD2mP7pqgJrfFQ89RhvEneEJh7PX1Hb49GxnAhkdFVEnqnmh2gJMDmhgPlQw7sXG9IBBlCSP9wq39JO5AZWpd6Ek1zwGAXxnVP4mOZkMS8v7axNTiIPlo1i4AA3otpwJd9BVOPIhxZNsCOwxE5DyCCsFKA7LDWnDQFfzPbMOS9FgtjuJ9wMd3wN8Zz0ofcv+wqj13QbggpJ0ikn4G3xDKJMe30yiMNWm0lo/uHc8d1x9cvKTjhrq46RTYAlnQygUN2R5CpUPBn+NXqD1Y6EYKUQKwBozfitb5uHtqFch3D9rIVRyRr6Ka1KsmvwND65RDE6Tv8RX2qP76OzWg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6875a97e-57b2-464a-9b06-08d8827d14c5 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:55:00.5921 (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: CSpTEl0P4AZ547v/i2v8chtarjOGd7y50v7KnnmibqWpQxYyMvtPyZF3Z/JH9fqhGv0NtXFjr72O7t5exF1SWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0122 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: MOZnXeGyRY53SDIbcMabeEtMx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685309; bh=pV0rNr3UJdLA/KRHwv8ugLZCx/zNhTeXQd9SKfL3DTI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=WH6EfovgDNFSQJLcAosKGoaqFm8TpjHx8RVhZkaUQyh4jyzDHS5jpfkp+961lDMCTm/ yRG/047JASSQNT3gaLtAPTCcxcNgf8jj0Bo6Mudj13jJ+CJBhk2LaCm+KyV36YqgNMusN jrHwrzsUAd/bKzg32QzzShXzOKtx41AQ9IE= 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 Acked-by: Eric Dong Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- 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 (#67109): https://edk2.groups.io/g/devel/message/67109 Mute This Topic: https://groups.io/mt/78079065/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 Fri May 3 09:58:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67110+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67110+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604685311223113.30267081246689; Fri, 6 Nov 2020 09:55:11 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id daZ8YY1788612x4zIpvtqslO; Fri, 06 Nov 2020 09:55:10 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.72]) by mx.groups.io with SMTP id smtpd.web09.614.1604685310457901336 for ; Fri, 06 Nov 2020 09:55:10 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T5IM0Fmk6LtfD6k+7+1mfgExqb127f3Gh9Oi9RK4JaRl7ZBwPTO8P1FyVLMlhjkhuVmO/bgvRNt0Iu84rieu3sElTSlv3NommoKiTj1e6ehUXABY1vRqZP/HfEfRiOIwHjnvq061fxzAQqBuLDB/GDnCDh24KDbLM3iyAC5DZWJZOpqReRC5u7wX/E/A/DjKz00WXsHgGFFZcC2Pr8uPBU6JMnDQKdCx9V50puWMforrQlLNCRtv1ZKCcLckL5Uo5dNIHtfz3Hm1vdWm6MJJ9+jiIXYw5FmOXKisT6eLsRbq8Z7iOZ0jiZP/X2CEbiUXdSYJG+lQi7xNDSG+7RGCvw== 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=CDn4NKdwReZ60zmQ5sDkuExSs/4L7yAqMofqO+QXcVI4sA8covfYy80D+AjQ9Zyfhds7iCFjN1SJMfN5tmCsLYD1nc1xdE61qemXW/E2k7huK1ZnUhySKZwpMwuzTyHo5c8Fubiq7x+j2hLSEfa+xAjCA5Zv1d7rQqgVtlwtJStI27DE++bOkWem7k/U9ePm3w8zwoCFjFJRaBGN8e3PeuRpy3HjrMazVTHtRsPUuIcXP1jcNGPut+JLQJHcS7uW0aiFbh7C+vj5ipCtezXBJdYyJnyrA+A3gul/6fA1HzpHgQI4ecrS76Hszoq+2g87ZYQo0EpdDHOshdu2W2gc0Q== 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 DM5PR1201MB0122.namprd12.prod.outlook.com (2603:10b6:4:57::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18; Fri, 6 Nov 2020 17:55:08 +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.032; Fri, 6 Nov 2020 17:55:08 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Eric Dong , Ray Ni , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH v4 11/11] UefiCpuPkg/MpInitLib: For SEV-ES guest, set stack based on processor number Date: Fri, 6 Nov 2020 11:53:13 -0600 Message-ID: <24866de07d2a954dec71df70972f1851273020d8.1604685192.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN6PR2101CA0002.namprd21.prod.outlook.com (2603:10b6:805:106::12) 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 SN6PR2101CA0002.namprd21.prod.outlook.com (2603:10b6:805:106::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.6 via Frontend Transport; Fri, 6 Nov 2020 17:55:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b1aee71c-a821-457c-4606-08d8827d196b X-MS-TrafficTypeDiagnostic: DM5PR1201MB0122: 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: bvTys1AsK4jzmS6cd+hwuUrCEd1j7AzwbS3EDPwx5uKEMWBFIeWs/diDNe+4EvHllLP+JqTuj3VkfjlSGUArh2Iavg9K2vOk4XMlys2akPK8opmL9hsYtMGBQvLi7CkhzdOJdKEyTCRz0awSxcjlewIkA5zNZAcbOtTfc4wxgeA8Ijdg4tZSY2QuxDV1+NnHN4XnzoEWQurbASo6IhD+r4zNm8IGpq8pqufc4QrPkLHb/JmFrDniiPEFRRlTwix7qckU0mMzXt9z3jmrzg/cURL81l6Rd2aMSzxgcKDSO0G5Jd0Q8XRvX+lhORK6P9OpdApWwUqA0q9gYbxzTQDU1LDUncSYcQWBExcC1hJxnoaUbKNk8l40HfG5eRQIdfMMqLXEWc1R5eabZNFPWHKcng== X-MS-Exchange-AntiSpam-MessageData: +4H3t0xDskr5UByquJMEISZctTvjnQ8YumoLQ+BVaPiboXq2i5X/a6vKVkqhFgPFaGeiNCwkYCsTTTNc+vhEgGShYHXz41elC+sKnO8TXI+5iLtLziBs1ffbLzKt2BEkwffy2ayxn3QNfSFSPybFjZQEs3Wf8GWnzcXBRNLKJrmhf9yMWTEAXWeZ9UeC8fVwOaOtP5AC/tibs+m3hfJA9zjFoVjoZSo1BzBWdtHtbQ8dLnPHohjelwl0TlbWGsZQb4YaT1RuasbHvdqAvIfSvknZUnSStNL2+wMuqOaHaW27HQ2ydJZzK4SbuUIaNOx90fq3qwav1fXGH1Dx+iUMbIo061k00AtXybISys+7tz9j2q8r4jqL3AZXfAnlXdnKT72PYqRtGIdwue6uzbvI1s4SN4ZNFTuhsYd3dj7QKvxgzl6yM+LEyCvUbMT98o8P6ZAWjlSby8y+ieP/BuCU/lmg2fAhUMkH3nlCU4hqfK6YNQE7IoD2DYCohHVs3PI7tLns1Ljag5IMOSrGrEu6bngaNZtzK/OixlJX6lRZNky04vYs/AvMbI7GqKH9UEA+OsCI+H0maMJZ1lleGgCz3j0/yxmLXczjH9AdDtCnIjNBr4yfRokEGNsfn6ehKE6jLzPqRIXNGO+k/fL25QF5ew== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1aee71c-a821-457c-4606-08d8827d196b X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2020 17:55:08.4417 (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: hjw3iCVztO9hS2CBYzc/SbTOV3KRkyPftAdR6/CpzFOI6W5b+C5mk1zZKx5eT+M/HEeWyeY3mz5X1eKAiCG+iQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0122 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: w5r0nIlzrtlAtpny5uTpTpD5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604685310; bh=vnL7r6ix7WGvGoBDpztU6hTKSvDo17j9mfwJVgScUt0=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=dBzsj6HLA5tYVMcOpv1fA7nrxfK6XdKXIk6egG7N2ruK1d3+ZTKMCFWnwGyq5lt5CbF gyodPVWKVd/tCLOiiXzyNqtH7cIEqlN5fcRXb47EIxB3aTCMgUemIoMDwXCHcwPCsh4t2 D/YgwPAIL3XeH2649xClcjsj+SidKHWL2gs= 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 (#67110): https://edk2.groups.io/g/devel/message/67110 Mute This Topic: https://groups.io/mt/78079067/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-