From nobody Mon Feb 9 13:59:34 2026 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+74609+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+74609+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=amd.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1619716359362377.20206801710117; Thu, 29 Apr 2021 10:12:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id oBlyYY1788612xLWtnWpoXlg; Thu, 29 Apr 2021 10:12:38 -0700 X-Received: from NAM04-DM6-obe.outbound.protection.outlook.com (NAM04-DM6-obe.outbound.protection.outlook.com [40.107.102.44]) by mx.groups.io with SMTP id smtpd.web10.10201.1619716357662335255 for ; Thu, 29 Apr 2021 10:12:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mu5dcIxQCojRQM6C6udLKeXSNLVR7gN5GX03LCTN7pReHBLFpiDjWPZ/ZR9pBZr7PyhYqNxbKOm3ELu7vvGf6MUQq7zOFtXJ+26SfpT33okQNaAfSHZIQRt8Mjr+tDb9OedDRGc/iOu9akH7bamw1ckCncDZ2QKgOci7LMLdBvTshUuVh2qao+d1ZrEYFox1V+5dcKWQ6QmB89exW/DZePp75keQ0nQL5zrTuVm8CXr4smrBgXwMcoGN++55uVdoY3PR0uNn3G62NFC+WXUbYMQX2tG+1ngCA9dVnV04I7fr4C3C1OmaBSuJEZQvM/2rU5VT84MeZqpKeFotDp9zqQ== 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=XWcpYLomQE9UgdSmnLbBdNso2tZYsHmhPG3l4ez3CRo=; b=WJnbQ92TDSMgOlnhM0aLFG+f6zXau9kwcvRDAWW6xj1USblY9/QJ8A4XTLrNQaJSoPU6wyVF4NlZpoppaWGrg3XXGPJGLUIXc0q17RUWh1OoD53Z5rF+ghxfi1a+haiadysmhoMgARkOnxToAKmsaUgHmMIOE6QVSKzZ37h4VOB3xivU5c+TI8rYjUMqC2voFr4wgd9MItPhSka0zyHItcH21ieeYyOztMw0rbYv0GOH3oDT67Xeqwic0TBsOiDsT01ndm9ZeUAogfpkQ21B08XIa5WiPP6eTTCE9DyudJkApQD35TBjzk1hb8IlvPscYfV/lE/dGJJj1Uwd7qY0lw== 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 DM6PR12MB4218.namprd12.prod.outlook.com (2603:10b6:5:21b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Thu, 29 Apr 2021 17:12:36 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::b914:4704:ad6f:aba9]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::b914:4704:ad6f:aba9%12]) with mapi id 15.20.4065.026; Thu, 29 Apr 2021 17:12:36 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Joerg Roedel , Borislav Petkov , Laszlo Ersek , Ard Biesheuvel , Jordan Justen , Brijesh Singh , Erdem Aktas , James Bottomley , Jiewen Yao , Min Xu Subject: [edk2-devel] [PATCH v3 1/5] OvfmPkg/VmgExitLib: Properly decode MMIO MOVZX and MOVSX opcodes Date: Thu, 29 Apr 2021 12:12:10 -0500 Message-ID: <5949d54cb2c9ab69256f67ed5654b32654c0501c.1619716333.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0060.namprd04.prod.outlook.com (2603:10b6:806:120::35) 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 SN7PR04CA0060.namprd04.prod.outlook.com (2603:10b6:806:120::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Thu, 29 Apr 2021 17:12:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 31a397b3-bdad-40bf-f7d3-08d90b31fc13 X-MS-TrafficTypeDiagnostic: DM6PR12MB4218: 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: PgQLljd1nKJoInqv2j6YAi/Ab/99WgFw7b+0P828vNtKZGIba22+Yje7hLEPiMLXosTPU0MYOPs6KW+RG8X6hwyFs59pLBTNRCh46tik/u70Go8X9j1wDqLfF9S3a5Qe8Tv5mfF2cZ5zsQZHt70vimLUp5Jp4YdzNSwwKKLnFE/bLMBYfLHxjRa2TIEi4J1L3U0Xcpliv9OUun0iBovxMBeKaLEQbQP0Yv+x0deJU6CAriIQ865yreWB4AcDZNa4U7tbtOJqw9KPjBV1eTHAtb4TyNPd/S5itdOkFWk8PRz9suB+GBkt+weXJoyVZvO95feLG85dnGH4HyV2mFcZC7r+QsDOzVt4uZlDr8Hxpez8Mpcuzy+o++if2fgaT8Gm+hy5e+kaRKFI8slYqPw/wrOh0n2C8YdTJFp9MMoeAmlI9h0RrChCbbZkyGXwjK0IZkBOB4t5RzBvOiJKN9IVieUS7LLWD0WKWT36hUBGyfkr74+2gZMdKtqy96yRYpKyFMewWu8QDYEQsTwWeCTHeFqSc2btXdmicL95pFHw4b3rr3amieSj+mc1o87jtiaxR8b2/vwoSfSSsTja1J6pOnbbNaBw7F/KE73ck+PZgFy5B57EUKTT6VQIkMrq161vUMlLG5cYq5I+RCDurEbIe66Vd5BlcrMfVWQx3i8DBYrheFeQgfmMb22b/sTfS5ez3hW8NWFbj2ApozNa88Vych0Z9Yo3LKWQdv1GeUHFKTVBEn+01seDXncHzHQvdg2z X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?vKa9KeWLIALum+/3majfCFERMetn7+2Gzxs1KJ+iwyDe6o6kkHUMofRdUYK9?= =?us-ascii?Q?K0JOB4va+OFfsgxtEtBVo9GZkXs+LZawWSUw6pFv99xeoQEk160erOzxRH/L?= =?us-ascii?Q?d+LCDsD0qhetVn0JGHnQnPR6pngPJgkyJ7ZMKEDFVBn8CZVhS9vWXWV7fdM2?= =?us-ascii?Q?TANHddoO3bbynGn/zZCjdPTkUonHBFIIFbH8DoixkazwU9zW9ssiFldVlhSS?= =?us-ascii?Q?vEoWbPV/3GO6n7x8eRuLZ1DzuZyYEMmLvgDrP1SGBL1xK8aOyGpfRHuQxqXh?= =?us-ascii?Q?XlAHVq5YwYUyzzzoPXyo4qNVIAqxkH0kXuwIE8XlwrY4NfBYyX15Xm5x18Gd?= =?us-ascii?Q?a8P8HrkR7Ff3mut0Bc88C6nWjnOfkAuEOWKPCm3jKjDwYhQ2SGXgzHNEi6dg?= =?us-ascii?Q?vYzfnqC5WfBZ+JVZFHHSoGQQQGYArBKeicDJqzw/1EtGFtv0yzTgb24LuYaA?= =?us-ascii?Q?XcWwhbxzsdDSgQfiTIOx7lVbnVj3TiSnjY68OYPmUvmcg2V9799h0oGi9Tvq?= =?us-ascii?Q?+EvVcymnQdAKomCIQ9eUBye7wjwU0nkjvzjnTPxuyPLFj8gAk5AXowg6/0I4?= =?us-ascii?Q?v7Dk9GcGpvExgoxEzu9r4KUm+DVzAIbTeSYHC93cpeM2RHHGuWnoJUXD8v6l?= =?us-ascii?Q?rYtM4k46kIsyZ02CxjsU7wZKXghDFm9zat/B1df12z/j6kOiij3M8A4AQl1G?= =?us-ascii?Q?Wi8KOLqLv04kfw5ylKWZ3SDv1CHn+6qgWbDVm1cTdeisZC7XuIrQIIPqzzhx?= =?us-ascii?Q?eTvucB4YgOU1l+JtAdLcrMNEfFZHZ01MA3AeSy3l1tqbGBRxmWqsBRT+p0yg?= =?us-ascii?Q?r6F6Q4sHzUwO6cgJL+iD8/QlI7xKLIl2loVQRIrSV9LA81A63lLrIoPtrkw2?= =?us-ascii?Q?HW3yQjlWCNYKtNK4/bN422fibIN3DW2ck+pBXS991TUhaBGgP2QhKBI5StY9?= =?us-ascii?Q?dd5iDC/9NYLFIgdH6Gv1pp1cmJhpdP3KR6Zpc0jTL5lpI+TifXYJZtSXjE64?= =?us-ascii?Q?mcLkkBCQGVPCtBXZYCMGt569RYs3K0AMhcGs7MlAZsZQJycTkOezCeoDKc1x?= =?us-ascii?Q?1A5UJJKrxNJi9SW6iClA5KUhXFBXFzgHIvowxjL5E/ZcyJkzP4zqoGA9DKZ5?= =?us-ascii?Q?IVJqPc2EUcX3Dx+3z2vPe8f9sEFlbhSK32ODPNULVLe/HuKnUNMySAl7Fg+g?= =?us-ascii?Q?geAnlO4nl7PM0phBWs8vDOVUURLQWA30x4TBlogmbHefSASerR6JrbaQVoXp?= =?us-ascii?Q?EDum9o6qE/ioq2/hnSabVFg4pBOda+SfQHrKGUlKHV96AQwzSIqzwg3LV4Kc?= =?us-ascii?Q?2zBv0z8EwmvRV0o757tt/WKb?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31a397b3-bdad-40bf-f7d3-08d90b31fc13 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2021 17:12:36.1735 (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: LJSz4e3LTQE1zWrBFN2S069x/RIgXtLxmcca1xQggZTWG3xk1+DHSrbKuSuF3/ysAIZpgdA8pnrQ6ZaEWHLQXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4218 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: D3I6q5PVeafGM5k1TGpwSYXqx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1619716358; bh=ppcxMzovZ95om36y4fuySJPeGjeKO/f6hUftw33JQqQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=OkdOfi0BlxhZB5gKQgabDjQRg6b/Xv7uvt9I/CAdCYFqs8QeohreQ3HrtLmNAyokWQu o5SOm9+Ew0B6tjPxxGR1Y5VbBXp1gHb4fYenD4lKnKKyM3XTwXmAy8kJQrSArO+ZKERwB m2xXVAWuFlPLFNBtC3lig7C8vHjXQ9GwmgA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3345 The MOVZX and MOVSX instructions use the ModRM byte in the instruction, but the instruction decoding support was not decoding it. This resulted in invalid decoding and failing of the MMIO operation. Also, when performing the zero-extend or sign-extend operation, the memory operation should be using the size, and not the size enumeration value. Add the ModRM byte decoding for the MOVZX and MOVSX opcodes and use the true data size to perform the extend operations. Additionally, add a DEBUG statement identifying the MMIO address being flagged as encrypted during the MMIO address validation. Fixes: c45f678a1ea2080344e125dc55b14e4b9f98483d Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Brijesh Singh Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Min Xu Acked-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index 24259060fd65..b716541ad170 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -643,6 +643,9 @@ ValidateMmioMemory ( // // Any state other than unencrypted is an error, issue a #GP. // + DEBUG ((DEBUG_ERROR, + "MMIO using encrypted memory: %lx\n", + (UINT64) MemoryAddress)); GpEvent.Uint64 =3D 0; GpEvent.Elements.Vector =3D GP_EXCEPTION; GpEvent.Elements.Type =3D GHCB_EVENT_INJECTION_TYPE_EXCEPTION; @@ -817,6 +820,7 @@ MmioExit ( // fall through // case 0xB7: + DecodeModRm (Regs, InstructionData); Bytes =3D (Bytes !=3D 0) ? Bytes : 2; =20 Status =3D ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Byte= s); @@ -835,7 +839,7 @@ MmioExit ( } =20 Register =3D GetRegisterPointer (Regs, InstructionData->Ext.ModRm.Reg); - SetMem (Register, InstructionData->DataSize, 0); + SetMem (Register, (UINTN) (1 << InstructionData->DataSize), 0); CopyMem (Register, Ghcb->SharedBuffer, Bytes); break; =20 @@ -848,6 +852,7 @@ MmioExit ( // fall through // case 0xBF: + DecodeModRm (Regs, InstructionData); Bytes =3D (Bytes !=3D 0) ? Bytes : 2; =20 Status =3D ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Byte= s); @@ -878,7 +883,7 @@ MmioExit ( } =20 Register =3D GetRegisterPointer (Regs, InstructionData->Ext.ModRm.Reg); - SetMem (Register, InstructionData->DataSize, SignByte); + SetMem (Register, (UINTN) (1 << InstructionData->DataSize), SignByte); CopyMem (Register, Ghcb->SharedBuffer, Bytes); break; =20 --=20 2.31.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 (#74609): https://edk2.groups.io/g/devel/message/74609 Mute This Topic: https://groups.io/mt/82461181/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-