From nobody Wed Apr 24 14:12:12 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+74491+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+74491+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 1619540495814277.08818367833214; Tue, 27 Apr 2021 09:21:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jn7GYY1788612xMEliEy7dfJ; Tue, 27 Apr 2021 09:21:35 -0700 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.72]) by mx.groups.io with SMTP id smtpd.web09.10583.1619540492174143872 for ; Tue, 27 Apr 2021 09:21:32 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aSPZTBzQmCydN5B5DfXM3C5XvCul4R5kSM3QCHdC+PXh3HUIEzfGP3Lm4Qf2zd7FAPhrWJhN0FsI+tE0cG5VZNsVYLF6+6BHaQAPGn7jG1QnB+vbQpkaepqFGYfBS167DbznNNBcFSf4upjWJLam2qraWVr/w16O1fPsuhOpRdM3eph2epMHQWfddAhn4BtQNIaQHlc6V3Ymhgv6QFCitEBAZqECcWgYcD2yrPgUOcByQGHq2nJX+Pq3cb4Af4X72q+ozEz5pRcUBXC65aJXH9yKejjBlLVyPn2CbCc1/KVdxj0X1EVFsj3nvu7HIPAEruUeB2zDARl/qQd5WujjBg== 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=ogEUKlfanqGgyKrLTSWpAv79jflWYpVi76olKsFuEoA=; b=Qhc6A9XcKFplktYM62CGsqygn0WMlSbRVNfgBQ7pxMCUVaHujTrPyQMFF+jJmC0b8pLVRiFKfHRlj6OKRpnyLkw8QlfcAPtrJtqtHsuGJzZk3TAt3qMx03GQ4V5gRJkWEX+6Xhz2bJtrvkXdBaLtt0u0gpmNLcCuBtDVzNLRJa+KEgFBrbOJtQ9JnJFjS3paU+sL4D5rSR6eD7zNZZmDUlkQMlk+i3xxur2Kzj307hEeiK/d+Nlr9j8SYI/2o5+aG4H0kadQQ3Brs6zrozihmxxwjP346U/QfmoOTEWLqqiSh61+Ck0aEKXef5UpA3YMIoTp64KPYSDyDWWPCgIRCg== 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 DM6PR12MB4960.namprd12.prod.outlook.com (2603:10b6:5:1bc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.25; Tue, 27 Apr 2021 16:21:30 +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; Tue, 27 Apr 2021 16:21:30 +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 v2 1/4] OvfmPkg/VmgExitLib: Properly decode MMIO MOVZX and MOVSX opcodes Date: Tue, 27 Apr 2021 11:21:07 -0500 Message-ID: <9678513eb498c7ecf147798211f37075437790ab.1619540470.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN1PR12CA0048.namprd12.prod.outlook.com (2603:10b6:802:20::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 SN1PR12CA0048.namprd12.prod.outlook.com (2603:10b6:802:20::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Tue, 27 Apr 2021 16:21:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07f55b76-99c9-42ea-e643-08d909988422 X-MS-TrafficTypeDiagnostic: DM6PR12MB4960: 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: posloDlKBgO0eOC3doXaOb5rWTliJ0bOUnUTpCY0ATHrpfwLf1BOhPTsV6OhRf/meD9ibchsSkeAk654/6Z1KM3jUEVvZrWHTfFY5XAUtXR3XahWgvlDuEi7bMfiQmCkmmiSYSTdV1Wl96EXA8JkAHUS2Evs+lmAJc/l7CA2heQIQCLhfmGGRKCQtOjIVeLCs1WSJzZaWcDnChvE5dEXpRyo/YofjJhKsYDL81VcHFhPzsY+hYJ586kRFKK6rxZ1Hlsu5BY8Qp3jjoTk8ICi4Y3UYhUB3QMrdiIxOR0w9HpD26fNG1fn851imIuT9nNEW6eudYo8hp+M0PwHcbQeXh8jmYC118XK+UC1l4nX5iaNve8PydkljoFOL+zKhpx34dQFM44gClZoIS9zOj2gR8D/puVBY8NCtQ7lTLqm3y9coS/2+kkpe1KKibcvwhSOU7a7yfWzSsQ5Kxbbbk/lzlWPlQa5P10A71V1ki5dZ2VkBLH+hVKa/m6F3VDrpd6MgUkReDUH0exc8lkFhQZGtx8z3Mw/4ZKrYW6/P1wUJRAAb6a7mV0gvUjgFO+bncOUFXGrEElTmoYon9ednclmgRuMaSEC8lF8e2LCgqE1bL/g6n7AG2x1B0mplG0fx9lHbwD1wtNnBcYJnOSVdzxb3S77TmLrtkK7VTZCzXKy//HvW9PPmRXH6pw+LTdL+u72rwcdqmWXsaV0KheCiKhDuOu9ZvoAuu56s+sFA1hMHtOvWEFmQSA7Z5yBJuf+okO+ X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?XjwJbpPcFCYQSGqwHZtu6DEEtuBSf1crO5R2IYkyZbZdJCZgjFwiINzxPd/K?= =?us-ascii?Q?9QkiYDsRnynOe7v7UuMg2TEfDe7gZdn9Z5TXCEbcjm037Mpv9auRegrUSd5r?= =?us-ascii?Q?f8Rjcz0N+VbpUwz8YK4U3cWU90Wd65xsv+z0B1tozechnYsZkeOPNm5vzhVx?= =?us-ascii?Q?y9/Umss67PE4KqXw2IdkkA+C+7RWO6o/s56Zp3jTYmWF86YHTL8GSSFShU6l?= =?us-ascii?Q?OyxRXQtBPnxGQnv9G0xnUaDgmMAanxVhPQunpOb6uW/XwEm3yVSioTWqsVnY?= =?us-ascii?Q?nj/Mu9ztk6s0qmdNbvAfXq5uehoLeIJY/WTCa1boOnfghii/ZApzAdw3Onok?= =?us-ascii?Q?MUZ0kAr+I7iPxmZJ2sW3Q3IwAZHJub4s5qiUpFq4v1kegBY2wKXp8MAxKWUG?= =?us-ascii?Q?iRSW8/+UDw5OQkiVnwdG/DVtsq99HfNomIw7kTGaEd2Rp5uqPR6cqLJh9jqC?= =?us-ascii?Q?oA0t86+S3b0sxU2xFtyIkO7j8VhY4uNbIEj7juAUGiFqf7miMPyrKfRjFa6D?= =?us-ascii?Q?4lQZo5DPgzbzAxvfvk/F5WptSFC8NT/5GJUJYe0Fcg2m6hzo9TuKXGcRG0SD?= =?us-ascii?Q?/y5jJKAEOJLEkSBUMMVZH4oCK4Du1CFhemC8RV0/jhnxoFLecaYe59Vrrb20?= =?us-ascii?Q?KpqUDdIKeRgJZwW0YwXkMf/9mUoFqZ7e7dqBHhCeJMvr/SqfCo1RdZIqNRJM?= =?us-ascii?Q?2eghPaKPSmrFwGHu15+PDC2j4CRkKRqOjzx2NVIBO2C3drpUs2uMAC4FP69L?= =?us-ascii?Q?PfL1qmNnUs4FQ3T7p/q50mHQrlVVC72dEMieM46mlJuTLwgO6t8XrLUdQ+Ji?= =?us-ascii?Q?QAKhx6tr9kbRdmHdzEn1rCjzqajDirFMblQdIUmZLvZYI2Rp7yQMpC+m4ob9?= =?us-ascii?Q?MSv5Yc1uruNZ32tmxQ92R0gFrlHKzeO4yYBuuZjHF0iOAS9//M2mj9kXJBS8?= =?us-ascii?Q?hjyu6xGpYxZn677UKZHMNkj4ZZINMt3Gue1m4QQDe7LdmR9b9u98bEjc1tmO?= =?us-ascii?Q?FyThQZedvkUOfxwhDixq49UztxS65GqOQcrqfVYn+d6tpQRGOwXOQjhoYJe/?= =?us-ascii?Q?75iItfW14VN20m10CSmaKq+DQuvoOJceF3cUAGkZioHyo4stcLiS2iw87tEO?= =?us-ascii?Q?PGAPfyNhzRSoqxbz+fEsyF1vY+ZrXMbCrMFiu0qttsXV8uk2y8SompcqPQd+?= =?us-ascii?Q?hOI79yRT9NtGSAzGpbPo5DlEdkEudt8vAJBVm2qwDpf1ByBflMBkkf3Fbq6q?= =?us-ascii?Q?LpsgnGJs169KQQfVhOfICUmVBWiyoEyNwOOJhx8WrfWADK6kpAj1wJ8RAkwb?= =?us-ascii?Q?r4nKKEMUMTRBJvYR9MDnv9ET?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07f55b76-99c9-42ea-e643-08d909988422 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2021 16:21:30.7363 (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: 9u53DG4mJ3t6w6gxKeodcAsRlthT7wz0w6ROFMQUy0ZAsAIJqAVMW0KrPcG+amS6sO472gHmMcKET2XaqlnNRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4960 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: szzbBk1XcGd76euGZ6wi0lnTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1619540495; bh=nLx6HaRhO8F78YjtjCYkZaBClr9nzFMGRl5VcrOoEy4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=lWaHd0n/ETCdAmgxu7RDFze/RJmURQKUnrv4/VwR+H0zzi21Zjr3zDJZHR/xwUr9hQ3 SENtLzriSYU/BL1hAJMtV1TOZQIg3zkLDUrlsIxdSFxD4vp818D69NfbI0hM7U6reVMZj NYjwYgwyguKTDS8qdcTQZaF7zJwHkdB1NM8= 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=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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index 24259060fd65..dd117f971134 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -643,6 +643,7 @@ ValidateMmioMemory ( // // Any state other than unencrypted is an error, issue a #GP. // + DEBUG ((DEBUG_ERROR, "MMIO using encrypted memory: %lx\n", (UINT64) Memo= ryAddress)); GpEvent.Uint64 =3D 0; GpEvent.Elements.Vector =3D GP_EXCEPTION; GpEvent.Elements.Type =3D GHCB_EVENT_INJECTION_TYPE_EXCEPTION; @@ -817,6 +818,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 +837,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 +850,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 +881,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 (#74491): https://edk2.groups.io/g/devel/message/74491 Mute This Topic: https://groups.io/mt/82407851/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 Wed Apr 24 14:12:12 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+74492+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+74492+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 161954050173652.0877276806159; Tue, 27 Apr 2021 09:21:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id i8uOYY1788612xXuYR5570mY; Tue, 27 Apr 2021 09:21:41 -0700 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.83]) by mx.groups.io with SMTP id smtpd.web11.10849.1619540500416858745 for ; Tue, 27 Apr 2021 09:21:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nscF5/YLLQmOF+2epgp0w8g1uoDfEwaK4yJlS85xUVEnf7/27ncNUg4mv7boXgsuaEH1mrgkE6RHBch+2MqwnwPZi4thE350resT5YVGXgUcwPKeIJJK0099scPaCp8bmy2r+8Q6maHzyvF1kJkcjzvmgnECXny0OxicZMc9v/WEF+cpctXckqFNsc8El78Lddc9+tvRaWai+t5k204kKe/Swu08ZPhrsYwMufH56Fmc6KE+rtqWBxMqDrlQm4eu287xj9Dhr1Va2E7xLN5Ue/axe8cQc5hvLLxTUI1U61XDnHdLCQOn6DAYpPxvjhMBJ71SQ+OZ718JNKNcLJIiTA== 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=CzyBn6AyjMETyz23YU2ogF6/ASt3/TWPpReD6QVAaMY=; b=jfKPdRs5NCXonpJ6M7Pm9nITw8eSQLXyFT+8V0Guh5eXtBafYM2x1o5MT6DwIM50U/zw0sBLe9roTZmxGpRO7ZdY5194EzgpvkLMLHlxUVMv6XPBWB5x2QCyVvYKgHvcNboXcfFv382zMKSmiYH/suy3Ld5+UXrdGE8/HVZFgTyZvs0O799sUjyOwVZJhMZVwInjTolFzwSf7nsRWuDKYYC4DV98ETUeQNVTvsSLTuHTjWpiFMcRNBajL0k8t89OF6Dti4Aiq6s7q4y4gFtAP1ih0gKeBISl+z017ob9Erq51owxlQVx64nPQBKAg1Ciz5Pd6yVejsJQ6H5WLtwzgQ== 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 DM6PR12MB4960.namprd12.prod.outlook.com (2603:10b6:5:1bc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.25; Tue, 27 Apr 2021 16:21:39 +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; Tue, 27 Apr 2021 16:21:39 +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 v2 2/4] OvmfPkg/VmgExitLib: Add support for new MMIO MOV opcodes Date: Tue, 27 Apr 2021 11:21:08 -0500 Message-ID: <3f4995357e4c980eac70e9b3be070a37b3a6fe66.1619540470.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR11CA0184.namprd11.prod.outlook.com (2603:10b6:806:1bc::9) 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 SA0PR11CA0184.namprd11.prod.outlook.com (2603:10b6:806:1bc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Tue, 27 Apr 2021 16:21:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bc9aab4b-b33f-48e8-6de8-08d9099888ff X-MS-TrafficTypeDiagnostic: DM6PR12MB4960: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: kCpK0NIf9lq7XC/69bl8a/BCELTHOl5GBG4CiSfV6OzDQ2y7p//+VqUuqjlsjpK0GoaCJe1hXOrMuVQWKmK9ZN7fs832Kizc4QPMxKjExYnqF1Apdg4OBD7cVsJyxhGGnfXvHe3puJIDCr/sHAHETDyB7vSyN2TS/UjeKCjj8oJstF9zNoB4QnXVofHw1nusliF+RKvgl5Rz0xXjGMsmLc2YkVfau9a3r8VB8RJzlbO0LU/jJX3mq6UMSwPCtd6OGFWJm0XwTQ8pMyCXfDilAHEY1KY6rwJF2AkqGmuSDpw8iphNMbdrezx32sDOvJYyUvmRLhXLAkgI00dyywBnPuzmCVKRVp7DbgbDo2yJqyeLbEuxK2bKvdSft5w67MLWI9BrKit+3/b0Fk9vV20mdugIvClGqiIwuEsGgB1wpRPJgPHta5TzAfjGU6UIM4vmU9eP73Y0XFjjh8hYTEoy7G/o+0iuL11EAr3lxViiW8KI5A04KNxLbzpRJDnlua35mtHfoGWKbGD3ccZGlyn/ymMZQ0Dyw5UKgeBSF75aDvaADsqkjwhlkB1tDgpZ65PQhmJifalxtewHXoxx2RSCzpFUwm2OOi4zBKPSg0w8+PeimiM+Gnc2Q8WJ6hjKotbbzVV5s1/jKzPZ8nSTccHPiMFB9ZnRC1d3DIK8iQWrUAKZH7W61BrEbNWcX8/YGbudA+h8dH18rlsVPZ3n7EkQicaBz0ISzUiYlqAqoXOyhHl8hY3MSWYjcYOL3OUaSmJ0 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?vNDibJLfJ68rjiN+gJgstXpdi9Eg3O6cW8RR5i8WM6wfBqFdincSTgNtxfye?= =?us-ascii?Q?sS0foQO8XdPdZVJV0mBavwgk9m4oHvr1DFtZ+1OCBiWPS85qo4gV1+nZC0E2?= =?us-ascii?Q?DxDVYHPSBjlYMcGfhYeiso1m785aCOGCMe6aW55zRrhzl4yhCT04+Ao4MI6I?= =?us-ascii?Q?zLv450GnZ72RlqpVbEcI+bfASwNZXKZbf6CgJvn7htLJ54Kom4HUmaz+lnY9?= =?us-ascii?Q?tdFr7PaY3NxWHTMM+4XQbdwAMor46RKJzom1OPn0YId1c++AudJw8cHU0FqV?= =?us-ascii?Q?96gyXnznuuOpJ9L3aalCEY+hk69OiPeyC6lRjXyHOf7OV8MuVhuUOn9ICA0z?= =?us-ascii?Q?6LZOAiPr1PJwDTrrcqjxkqheU6KYAV2W9RU2aEv6IYvIln518I+2LkzJJ217?= =?us-ascii?Q?ylOomJ9e4wZF1Fg0I/CoIKBxdkYe6v91N31jpVtr9xMHhURxdCWZ2+hAeati?= =?us-ascii?Q?jfxn4t0enq0i0kd9uzL+KmEsIEQgIuAgi/PZZ3PkSUBYizD6l0XO7KZMw9gB?= =?us-ascii?Q?BmJe8tIHPJp/XBpT40orQPjHufvIfM3oBngtYrBFcQQXif47I0TkOTCK0dc+?= =?us-ascii?Q?y5aatGma1wqqX4V2T0+/iEXwT3DXYdm1onez4THpPq1DvHcuhHeL4LwlPoEy?= =?us-ascii?Q?nba+dVv/OfrXS1aLvVxKVsIJt6GblxAJssBJ914j2KbyXNjOtz0/FSQOo8oz?= =?us-ascii?Q?jxDPdLqM3+BglhhQdzuMPWx3tqvHricym/8GQ3jHTnsUqdQXvh7IBHqFCT6o?= =?us-ascii?Q?oOzwdWhqs1pCmxaNjaHO/Vfn/HdPhWgiTDcCC4ze8FU6uouhSbqbi1j0AvN2?= =?us-ascii?Q?xFnkqw9loTPFrkyTS2NUlqFirPjw6f9mxC9JgGxz2UXdoAX9MTegognU3OjY?= =?us-ascii?Q?T54wNQe0xzOIFZFFq+xhAKqvNUFvXQoT0uIFkadD7rWxcTLqZfABeEcwwBSy?= =?us-ascii?Q?oQj2ruteu0rtnSgCna+Urml6Iwv9z1VFbjW2W4jUqQ8SM6G1FLuGHLbimhLp?= =?us-ascii?Q?JjzesLS3PtMSvcxkqzELmkQpNHoSL2b8Bopxzsmc+DGW4rGqMwX5gBreFdUx?= =?us-ascii?Q?cZraV/dleCNjZ4IlJj5WGNyAWhgwleKP0PieLfDlHx5tDDgfcU8maaBSMHZB?= =?us-ascii?Q?ylHzIiHALzkpOiAD0/zziG3v3vBu61TAiSX5qhOjJKGIzmsWS+L3E3UgUR5m?= =?us-ascii?Q?2nJvXB9+Ey2DuuV6uGBLFPR1cfpu24Z4PhN07BWneyCVHvgbqh75c3im4jw4?= =?us-ascii?Q?/ipU5SCkTMiTj3Q7oJl1gJJ6K5wADD6qBBYeyYdmO/5N+1sl5gTgRPIZAhfV?= =?us-ascii?Q?B09+BQ/LVjwl/wTav+eJpMk/?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc9aab4b-b33f-48e8-6de8-08d9099888ff X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2021 16:21:38.8885 (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: q1J3XtbJZHetilZ6wUi1Ff1RTCHV6Ml9K8MtbD4nPewhlwj2VYVTrBAYb0ViPkWuWML9Un9cRPAxJ5J/OO8tkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4960 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: MVOx0UY9LRodZGYxMM4kgLeKx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1619540501; bh=tZZ02nM+9VmTZMiFY9fQPQ+/OtAsEWL5YfxgGfyQd0Q=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=l8yenaJXKfn+Avk7PxmYX4TsMnsUszu4J0yOHYa0Jpuhf4U+Pu3lixyddnd92ojR7Iq zMOk9H4J1wO9keoI7dkOwmSCeRI3SwAkh/TcZlsFHnNM3Lct6XgEXwaf50YmT7qNzK0n4 +Xpy9jfPmNT9Pzvr4LZ9RfsWc1gx1001zT4= 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=3D3345 Enabling TPM support results in guest termination of an SEV-ES guest because it uses MMIO opcodes that are not currently supported. Add support for the new MMIO opcodes (0xA0 - 0xA3), MOV instructions which use a memory offset directly encoded in the instruction. Also, add a DEBUG statement to identify an unsupported MMIO opcode being used. 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 Signed-off-by: Tom Lendacky Acked-by: Laszlo Ersek --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 111 ++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index dd117f971134..4d001406d30f 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -678,6 +678,7 @@ MmioExit ( UINTN Bytes; UINT64 *Register; UINT8 OpCode, SignByte; + UINTN Address; =20 Bytes =3D 0; =20 @@ -727,6 +728,57 @@ MmioExit ( } break; =20 + // + // MMIO write (MOV moffsetX, aX) + // + case 0xA2: + Bytes =3D 1; + // + // fall through + // + case 0xA3: + Bytes =3D ((Bytes !=3D 0) ? Bytes : + (InstructionData->DataSize =3D=3D Size16Bits) ? 2 : + (InstructionData->DataSize =3D=3D Size32Bits) ? 4 : + (InstructionData->DataSize =3D=3D Size64Bits) ? 8 : + 0); + + InstructionData->ImmediateSize =3D (UINTN) (1 << InstructionData->Addr= Size); + InstructionData->End +=3D InstructionData->ImmediateSize; + + // + // This code is X64 only, so a possible 8-byte copy to a UINTN is ok. + // Use a STATIC_ASSERT to be certain the code is being built as X64. + // + STATIC_ASSERT ( + sizeof (UINTN) =3D=3D sizeof (UINT64), + "sizeof (UINTN) !=3D sizeof (UINT64), this file must be built as X64" + ); + + Address =3D 0; + CopyMem ( + &Address, + InstructionData->Immediate, + InstructionData->ImmediateSize + ); + + Status =3D ValidateMmioMemory (Ghcb, Address, Bytes); + if (Status !=3D 0) { + return Status; + } + + ExitInfo1 =3D Address; + ExitInfo2 =3D Bytes; + CopyMem (Ghcb->SharedBuffer, &Regs->Rax, Bytes); + + 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; + } + break; + // // MMIO write (MOV reg/memX, immX) // @@ -809,6 +861,64 @@ MmioExit ( CopyMem (Register, Ghcb->SharedBuffer, Bytes); break; =20 + // + // MMIO read (MOV aX, moffsetX) + // + case 0xA0: + Bytes =3D 1; + // + // fall through + // + case 0xA1: + Bytes =3D ((Bytes !=3D 0) ? Bytes : + (InstructionData->DataSize =3D=3D Size16Bits) ? 2 : + (InstructionData->DataSize =3D=3D Size32Bits) ? 4 : + (InstructionData->DataSize =3D=3D Size64Bits) ? 8 : + 0); + + InstructionData->ImmediateSize =3D (UINTN) (1 << InstructionData->Addr= Size); + InstructionData->End +=3D InstructionData->ImmediateSize; + + // + // This code is X64 only, so a possible 8-byte copy to a UINTN is ok. + // Use a STATIC_ASSERT to be certain the code is being built as X64. + // + STATIC_ASSERT ( + sizeof (UINTN) =3D=3D sizeof (UINT64), + "sizeof (UINTN) !=3D sizeof (UINT64), this file must be built as X64" + ); + + Address =3D 0; + CopyMem ( + &Address, + InstructionData->Immediate, + InstructionData->ImmediateSize + ); + + Status =3D ValidateMmioMemory (Ghcb, Address, Bytes); + if (Status !=3D 0) { + return Status; + } + + ExitInfo1 =3D Address; + ExitInfo2 =3D Bytes; + + 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; + } + + if (Bytes =3D=3D 4) { + // + // Zero-extend for 32-bit operation + // + Regs->Rax =3D 0; + } + CopyMem (&Regs->Rax, Ghcb->SharedBuffer, Bytes); + break; + // // MMIO read w/ zero-extension ((MOVZX regX, reg/memX) // @@ -886,6 +996,7 @@ MmioExit ( break; =20 default: + DEBUG ((DEBUG_ERROR, "Invalid MMIO opcode (%x)\n", OpCode)); Status =3D GP_EXCEPTION; ASSERT (FALSE); } --=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 (#74492): https://edk2.groups.io/g/devel/message/74492 Mute This Topic: https://groups.io/mt/82407856/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 Wed Apr 24 14:12:12 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+74493+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+74493+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 1619540510140311.00030544966853; Tue, 27 Apr 2021 09:21:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id q1WPYY1788612xyUdZPj2NkW; Tue, 27 Apr 2021 09:21:49 -0700 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.89]) by mx.groups.io with SMTP id smtpd.web09.10590.1619540508666343360 for ; Tue, 27 Apr 2021 09:21:48 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dSgIfAEr38wkFV3O9RBoF+4qTMwHE5BPuANqgnWWhZKU47RyGfdvPwsUv0ArFv9adHDztwLQgiixoF0i8peuTW4XNggNW3GZZYnZwBknKiapRejbjYe7tm6BYnHZWAABa8ToDnTZrsZ+PfzjFz3GWp5CHfy6lsg6YanvQWiE8WmuVkS7BTowlxWx/v5mZWKZQgP397zcqgLy8hFqyurMnn225meDMEf0+piePyaiOEuqqFwTT/2UiSUjVAiWOATjW0pCFX/Pv+vG1ApVx3aa9NmALKKBc05NNn82oNgQHlgp797AgS+qTrre9NiyK4F4kMSgqtLAGUipNdkETrmrcw== 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=MRa8M6V+KjH3osHFMDV9fafJHbmWxtwtYy+gq/vkjSM=; b=j1hWOZPxT5IIzKIQMBjLQJPAcdtkAG/5LjlmlWtplPL13GzKTjv54LiBqfnxeNK7uWLu9K2mCu6mZ/QXR+d3uf7tw7iukZXt36B8sNVP/39HKObETGcuQxpDloXvFsBZVoML5QXf7XAxs8wQN6Ai4jeKaRJObE/nn3BvVkwpEE5y3m3Wuhk6lYMLwTucGn6bq6J4bIlG7Ql/s4DTdqm60bOo5qj/NyXAcWXaDdvTOYdfdvZQLVM68++amtQea1A/kstzFUp7yeoSm2nM1JrJE7B3s3eYv2kW6dQNWDy9Ui5iMsKjPsznF+ywPVlrYSDulfXxHimL5LiSHir3UJBaPw== 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 DM6PR12MB4960.namprd12.prod.outlook.com (2603:10b6:5:1bc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.25; Tue, 27 Apr 2021 16:21:47 +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; Tue, 27 Apr 2021 16:21:47 +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 , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Berger Subject: [edk2-devel] [PATCH v2 3/4] OvmfPkg: Define a new PPI GUID to signal TPM MMIO accessability Date: Tue, 27 Apr 2021 11:21:09 -0500 Message-ID: <9624a78abe08398f03b4602cf93f9acaa440be11.1619540470.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN2PR01CA0077.prod.exchangelabs.com (2603:10b6:800::45) 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 SN2PR01CA0077.prod.exchangelabs.com (2603:10b6:800::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Tue, 27 Apr 2021 16:21:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20443c46-fe6f-42e7-c060-08d909988dfc X-MS-TrafficTypeDiagnostic: DM6PR12MB4960: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: k11YYD/VdSs9RbR1VBDwzUwMvmOJM7RiVqU7Vlhgrsi5sw+rbXfKFWu6xqsktS1ZWGiv4jOKByd6cNVRwHhSn5Ygs3ZhtpV6ogN1Oq28/V/v8SCORMOHacNSUS9P0G+XcNP3YkHeSnROWamBHhP0zfBRNBd3Or/dos/bGL4mB//zUYoH6RKjeNMvesRnrEIZI9HtOLnBvtAixTtwB59G3x3I5DhLrDFxF5r7UzZfYSEyEUsCmuC/xc30i5T8O7qWJQX/QcCMbGBAJ6GVQgVoF7exZpKq0kgolwrpabuCDYQo2xB+yju+cgI5MVlWNDjAqsME1JJUZonqLe6HNVEUUDbJXg5XLScjkAFgHLu7gt1PHsHMj3rCJScwXM4nKA4z/KQ/03uY33AJHExzcnHRB43NevqEj5Wft4sQSMkDUPeY3E704Mb2kMafi4zl6tjz3BiMLrt2pbijWOYnkzwqm4jtje/dkrZZ8zxYzWlIAZWWapuagbq1eJc2jCmwBzsPj81Np2tTX80ZNusVFfX11jaeXb5L3hmnzR/wPeSnKfC9RIyS+SVqYgWiFsOxJKkDpAkIoyH4rOrVXmMkrG/v0h/1zLgf6KDd2BQXf2RwdU3rYpyoW+YBJQ2S5gs9ipZKF/vs6R9UpkboSDKdRK5EljGY0fyRlr6PvysOCn9MW5o= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Huv/Aw0wFDmQ9sFTN+krLneyvoccpw8sQg8ywUgNLVTgtkcym+KaizUrxJ0n?= =?us-ascii?Q?R83pZlNlmRnZbvEScltG6EMVGjOkCtP6RNmowUdWjTV6zRk1R6sVrRkIK5wO?= =?us-ascii?Q?nzY/yz3q9fjbrmEQMej5KDFwEBFkijiCDItA4DylokSrxrUqWUecNYKl2msN?= =?us-ascii?Q?LYGrh3FxX5HGjEKVCXccag/ZTYL97RIc1Y0/VxEfUAT/6MY6jIXuBAr8l2A3?= =?us-ascii?Q?Tue1ovuEx8yEsifAxRx8lLx1LBXQDRKSs0Pu8BrMqIEfyecKhaAQ/oPyR49E?= =?us-ascii?Q?c9PqCSGmYJDi1BNdCqDBVJSbG+wktgYXCk0NLXRTGPf8gFThzfaNhHYmiclS?= =?us-ascii?Q?ib//BsW3F+gOWiqxCjMuwjJUPQlBZtNp+sg4ndAmSrwuy94ZuopDI6NqayvT?= =?us-ascii?Q?jYMLvM1C4NxL8keGvqTiVUSh5dYCLOW/dRQnRNT3/T2EK6OTB6A/IkcFqdzB?= =?us-ascii?Q?MTuhkaTAqzfRX4UsFx/6VGKiTDnDH+o1fXMG7g0bOOoGY5AzToCr4bYFcL49?= =?us-ascii?Q?lUd3do+RFxS4kH+3hiCnXOso52mVO2I/7Xe9YwKA/8BuGqDZ8xbFpK7QQ309?= =?us-ascii?Q?PWqdAg7IlJm4GqmGePQ0Jr1mGIEPNb66CjJOtFHMhnqCoAnzgjo5OlrO5Lpz?= =?us-ascii?Q?xgTQ0UeWlkd22Zph7RVE/OWCNJBstkRbFmzfqozNDtE9cwDMIqvqY4cIgQoC?= =?us-ascii?Q?WHrg2uyxRNZW8Pd4LktsqaCVHelo3BoMIrCNEmf2fhp8ZRALgclXuuFERzjB?= =?us-ascii?Q?fzT/ZhJCnWbjM736IOBX4ua+LRK9JIiFa026Dq+2r6HJKUGP83YDhHqSUcgC?= =?us-ascii?Q?C9DENRaVNligUsK6utnTtusQHEV+wx975Uk7O0pk5Pbwj4bObLX+oV4WHUpA?= =?us-ascii?Q?QdCQqWN3bKZe6cFm6cChva+1qobqtjF08lu3J++uRk0zsur0Ifwnq/9J9w2w?= =?us-ascii?Q?ro04ZwZkDBfF3T7P9JR95Qmcqj0Xsj5jg1KeyOrCTbdjXkxgQrfZ5dBFgmWu?= =?us-ascii?Q?AQ1FeCz6dfVgc4J8Npw44BtYoJAnsAEHo8Yyq5SogpfsrFo0Cs2ERrtgCkbL?= =?us-ascii?Q?6Tr65YpPR5jGVavlMtf3pAmFBTVQMkF5YFXdqNxxOJfS/3tv4Oomn+BkVar0?= =?us-ascii?Q?kL8B5eOanWHGQ1IDh7Z1gwya9BJ+f0hnBAD4cR3CSt0zVfMSGzQhIbxef+PP?= =?us-ascii?Q?8aP75bRLhxE/lvjhStCmTiJ1JpjYtfOok0NRtV24d/nSL80kmJqfAUMbL8PO?= =?us-ascii?Q?LDWv+ub8+sJzXKd4oE+5/7wlh2OiUurZ5a56soSmxAO7ZPFhEe1UojxcNmCC?= =?us-ascii?Q?YkoqIyDpJyGAF8DFGNw/ABKQ?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20443c46-fe6f-42e7-c060-08d909988dfc X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2021 16:21:47.2955 (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: v5pn67UC+Z7l4uhyZQx9UJMmKNfiJPsfZ46SjVfTINcQ3fxyttDqjDYw+tbj7TwKQVu8Pneic5hPOHarBc4kbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4960 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: VIQBbuY0cZehDVlt5eJQifH6x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1619540509; bh=Pvd/tGu8L7t1MeaQvpefhGLqmuVQi6JdV0ujVnGY1q8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=CSgmGd/YH+xelif+OzzeUIuWyyqtVZdZYARwjo3C9iG4XLJ0FULumdbqsAnVNXOO7tA tb7XfWa9zfW9s9UrFt7FO9YV2TelHdnYVS69IR/wvE7J+hqxUM6gbeZUJLib+nILLOy3O ORo688TC2KFDQf4ee+NkNM5ls7C9zX6heVM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Tom Lendacky Define a new PPI GUID that is to be used as a signal of when it is safe to access the TPM MMIO range. This is needed so that, when SEV is active, the MMIO range can be mapped unencrypted before it is accessed. Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Brijesh Singh Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Min Xu Cc: Marc-Andr?? Lureau Cc: Stefan Berger Signed-off-by: Tom Lendacky Reviewed-by: Laszlo Ersek --- OvmfPkg/OvmfPkg.dec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 9629707020ba..6ae733f6e39f 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -128,6 +128,10 @@ [Ppis] # has been discovered and recorded gOvmfTpmDiscoveredPpiGuid =3D {0xb9a61ad0, 0x2802, 0x41f3, {= 0xb5, 0x13, 0x96, 0x51, 0xce, 0x6b, 0xd5, 0x75}} =20 + # This PPI signals that accessing the MMIO range of the TPM is possible = in + # the PEI phase, regardless of memory encryption + gOvmfTpmMmioAccessiblePpiGuid =3D {0x35c84ff2, 0x7bfe, 0x453d, {= 0x84, 0x5f, 0x68, 0x3a, 0x49, 0x2c, 0xf7, 0xb7}} + [Protocols] gVirtioDeviceProtocolGuid =3D {0xfa920010, 0x6785, 0x4941, {= 0xb6, 0xec, 0x49, 0x8c, 0x57, 0x9f, 0x16, 0x0a}} gXenBusProtocolGuid =3D {0x3d3ca290, 0xb9a5, 0x11e3, {= 0xb7, 0x5d, 0xb8, 0xac, 0x6f, 0x7d, 0x65, 0xe6}} --=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 (#74493): https://edk2.groups.io/g/devel/message/74493 Mute This Topic: https://groups.io/mt/82407866/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 Wed Apr 24 14:12:12 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+74494+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+74494+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 1619540523064570.7389135626729; Tue, 27 Apr 2021 09:22:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id badTYY1788612xMuzSq1JxYr; Tue, 27 Apr 2021 09:22:01 -0700 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.71]) by mx.groups.io with SMTP id smtpd.web08.10724.1619540521018051898 for ; Tue, 27 Apr 2021 09:22:01 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q5BW5b3y3tnHW5gUm1Z2zENj8zDflUryr/I/bZAhk5ewYRHLsaW6JOA65LWbXW9D3KGyhU2VwpyZQJ0avldWlCW7ZCEl9aOf/juk+ltpaDhGdvzYQiN2O83MxR2e8KjoKteryL66JlsVBj7nf3+5FNj+g1+feG8Sps4mPw1t5yLK4GWfb9MoX+snONhFjS2XEltOc3Luu3ItdN/tiDisMN2ARE/nDmuSzfKXJsBZfeiK5zzhhutKSbO9pBNrWvDy89v8cu/fRcI0lGzfd2hxUOEe15y+9zLqzdeweiZw3XoWDR/dUzIX8bUmD/XDNdbq/n79cKUi2zuwcaPHCBIjiw== 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=YgJO1z1nHquxy0yd3Id2yL/gpPCNxfND9n8LfRNz7kM=; b=NkWkrIWemyZlu5Iq24/8/5MYYDYlqpicUxc/LJD1XixXcwN2h0KYu1EZ41ptgcRPAPsRZLGBRRoyoP3JeWK/+kyjz6l7dEc8hyJpP2yqoMq6pYIuYwu2bBUMJHHR9qe2PJOctxAHFHpoIZmSXsfFHrA2PN0VVuG6FKWLrKJjgXMEB/HTJYfDyN6/+v38oUzxeGANKCziUb1gC0rDTryI1DmS2W7y71HwC8SHs25ghajbGpmWx50vlxTB96/W2OU6w5JjI5AeXYOWkU1xEqfu4SnPi1avHscmaz0n3Fcz2PLh1aGaqR6LtLV7Y+Bso4w+WZQZFekpBtYXzuZ6ODK8xA== 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 DM6PR12MB3692.namprd12.prod.outlook.com (2603:10b6:5:14a::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.25; Tue, 27 Apr 2021 16:21:55 +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; Tue, 27 Apr 2021 16:21:55 +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 , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Berger Subject: [edk2-devel] [PATCH v2 4/4] OvmfPkg/Tcg2ConfigPei: Mark TPM MMIO range as unencrypted for SEV-ES Date: Tue, 27 Apr 2021 11:21:10 -0500 Message-ID: <00ff47c80f180b5b9054890de0ce5e1975fe2b1f.1619540470.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN6PR04CA0090.namprd04.prod.outlook.com (2603:10b6:805:f2::31) 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 SN6PR04CA0090.namprd04.prod.outlook.com (2603:10b6:805:f2::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.22 via Frontend Transport; Tue, 27 Apr 2021 16:21:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fb20ff2-016e-4519-05e1-08d909989300 X-MS-TrafficTypeDiagnostic: DM6PR12MB3692: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 3EQ3/iBnk5SyHEAWdyf1O/zDMS7ViSXn4Ub8K2c8/JsydlwrZeiOpM7eCTeQMeo9oCenJ8h87rly8NbAzGG79NbCBByNSo+A8ejV2eIt41B9p0Whm7SMjorxEDrDi7Np2zU0URDZuEl7nn3b/oZWbJG8hbV0dDM8BCGGFK+KuV6fM4Ru+uJ1sd5XULwr0L/wwQlnQZy3yeNa7v/DO4oJovWRvoIwiltX6SXJvxUAu8zR+9N13DCDu05XcVAedJLZ5g0L4ROwhWrSzCupRh56LXq9qX0fgI2vx52yOUSW2j4sKw9f+d/0DdRcz/QdyU4/N2iIxZbXRlwlPcumCV0H+F2ClKHCnKbTognn9QUVforSGe+w9C0kQvMAcmp4MiFzOQIbqP0j933sTPfF54WYWFKFP0/FqLY7pax3eQFvxHeB+ziDbg/xHQBfO6T7XnXaLj5HUkqP2iypxSYA7NsSc34wO2jRGurzH7r7OvNxcaOV8YaJ2k/9KqRTCkQrWjGPgogV76Ouqvty6BfgoEWo+jgh9+KzxlPBZrILK0aQGPDct3TsKbYioXeI1cbVWYcVA3re88PefX4IpLMN8rJ/G6IErhGg45RFLQ/VRI5wfsXGfOeuR+XXq56wuhqEKtgBPDgcirelqxhzleCI3JnQBqlSW/W4LLIBzFniUQgHfLbT5Ulo+d5fTsG39JMC5ySkcxV+E7+Ak2ZQUipf9PGgjuLgZJXYm6/AbIQ2hn8+Q/o= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?VejUO4/iqWM5LB/FG9fujj0UFYPpl/ESjKf4i9EJTuFACqIyGGO/xEwuKy2L?= =?us-ascii?Q?VD8iMFYtwvxWyDjNFWYErzEdBhxlLgeFp+zKtgslT6MePuom4OxktND+9GWC?= =?us-ascii?Q?9XrPwIW/OW8/S9a9CgwT4hxrK8CcctWYCWjz6SxiSbpKsXCTZGdXgszPTIGp?= =?us-ascii?Q?gF4nIMNZDC0ZK4fmxqX6ZWTF1JXxg3Ra1E327TBaihsG/dOhPezbf3rhW9wk?= =?us-ascii?Q?dr+AnN3eOGb35A9SoH5vtm70CGc4RTu/NxyPrjAXvgZpmER7tNoaLhlO7kWH?= =?us-ascii?Q?F0X/DSN2BccNUNmHk2eUrjgXe3HTNZKE5KP9JQuCPwJY50CRag19f/kbjnd8?= =?us-ascii?Q?gv9IpKIS68g6MxtJ+t/njPrjTYiGfYAvKJijbPoMwpreM1HHDv69Flxz2lOz?= =?us-ascii?Q?92OBREdFgVNxj83+prBRjBQR+EMwLcEpZMwUe0srvfc2PGfK+kHitnaaKKaw?= =?us-ascii?Q?zHK7czNNfXvU75AVS++PC+gWwZ2f045b6edJ0DC3YA+E4NJBJone9gD1em6o?= =?us-ascii?Q?/jGhZqyJCNKfaR/JRvFubmOKtK/N6IYUpE7pzZcRrfZE0ndigWjT4fZ3GMe6?= =?us-ascii?Q?bd2mTSgUmmTJtbRaz51IW1++cfaOLewu5DaQ/0E98nHfUO68Zl0mdUlPcg2P?= =?us-ascii?Q?57ZLtyFiu4ZVkVFQQs44vGqS5fwZc9zKwKACReJk0BtLq4+UY+YX6WY39NOX?= =?us-ascii?Q?QZQNMEKqwDUM17bFvv44UkAcEmm3S8sFBnAvN/SwC1FIPP9NIXUMAG6ju3xn?= =?us-ascii?Q?/oDn6GUL5UsbGeDSC83AJQT+Mbj0nSAUY2yC49kNoEAZHnHKEX87iU+wWv2y?= =?us-ascii?Q?DVh1I6yUlpkwtiES/ymnE7C+PvrVlqTgTo7aY/d3MZxiX5d4OyMIPk3zNTRl?= =?us-ascii?Q?UmzKpY1aUoYvFt5Rr+sooa9daXyQXjxNFl7CqnSKyas7xISZWaaZudIaiTKv?= =?us-ascii?Q?7UymIeN9adPbz+i+rQhaHGmHuAS30toYfxZB84cDbd1B3s5tb2wgnPnfQ5Xk?= =?us-ascii?Q?XdkQEo5VwCxgVxxj4NfVI6GrYKyhDM+d9BpVcHEYUROKFQP/1BMfhiNvIU7j?= =?us-ascii?Q?FxGyMs1PVJ0txJoTxGqRI6QWYIHGvI/OOnh3B4sSIgVOaxLDdOkCiyWkZVwc?= =?us-ascii?Q?2EOxP/6s7GJ/qIfyp30T/hkObdqL1R+BbqMXIkbpA0v7nRqPmCZRqEJFkE98?= =?us-ascii?Q?RsRqcUVrGhavuixADIbmC7tkNyVOlsvl3nUpnEzwBHi6CGpBndbLdnI3K8qS?= =?us-ascii?Q?xUUK4qu1uPBWvOkFCgGD1G60+uD3haT5jmBeLielZZGHLo/6jqIYv8cYnuEK?= =?us-ascii?Q?OVL7jgVt3dUdYIY74XixeQAs?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fb20ff2-016e-4519-05e1-08d909989300 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2021 16:21:55.6706 (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: 3MspVl6GfyqrqTVH3M4lFGVsSTq3wvh13/WA2C84V4BqpNWzyMYoxlkOAXQ/sEuzzlmbwor2rH3D+ybqKlgXiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3692 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: 2oGv7IcPSyfEAH8Ew6bsHt3Sx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1619540521; bh=wG7gipxhrnyD3iWVAfMt5zU40+v2wQZG4KOWSmydQS8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=om+xbHxmMXE4tge1ZGFh9NkUblkfIGMFCN0xbo4/zWh4cpq80LQtXhmJg4G+LSgqKw1 bZr29Y+nJGSH4MMR880rR3chnDRr8yf63tr4yi4sW5fkQGljUAbfkqE+DOwp82D/lU50e IRTWZgIdSL2+zmum324hXhKYWXqH1kQ0o04= 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=3D3345 During PEI, the MMIO range for the TPM is marked as encrypted when running as an SEV guest. While this isn't an issue for an SEV guest because of the way the nested page fault is handled, it does result in an SEV-ES guest terminating because of a mitigation check in the #VC handler to prevent MMIO to an encrypted address. For an SEV-ES guest, this range must be marked as unencrypted. Create a new x86 PEIM for TPM support that will map the TPM MMIO range as unencrypted when SEV-ES is active. The gOvmfTpmMmioAccessiblePpiGuid PPI will be unconditionally installed before exiting. The PEIM will exit with the EFI_ABORTED status so that the PEIM does not stay resident. The OVMF Tcg2Config PEIM will add the gOvmfTpmMmioAccessiblePpiGuid as a Depex for IA32 and X64 builds so that the MMIO range is properly mapped for SEV-ES before the Tcg2Config PEIM is loaded. Update all OVMF Ia32 and X64 build packages to include this new PEIM. Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Brijesh Singh Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Min Xu Cc: Marc-Andr?? Lureau Cc: Stefan Berger Signed-off-by: Tom Lendacky --- OvmfPkg/AmdSev/AmdSevX64.dsc | 1 + OvmfPkg/OvmfPkgIa32.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + OvmfPkg/AmdSev/AmdSevX64.fdf | 1 + OvmfPkg/OvmfPkgIa32.fdf | 1 + OvmfPkg/OvmfPkgIa32X64.fdf | 1 + OvmfPkg/OvmfPkgX64.fdf | 1 + OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 2 +- OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf | 40 +++++++++++ OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c | 76 +++++++++++= +++++++++ 11 files changed, 125 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index cdb29d53142d..5a5246c64bf7 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -627,6 +627,7 @@ [Components] =20 !if $(TPM_ENABLE) =3D=3D TRUE OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf + OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 1730b6558b5c..a33c14c673a0 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -707,6 +707,7 @@ [Components] =20 !if $(TPM_ENABLE) =3D=3D TRUE OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf + OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 78a559da0d0b..a4ff7ed44705 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -720,6 +720,7 @@ [Components.IA32] =20 !if $(TPM_ENABLE) =3D=3D TRUE OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf + OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index a7d747f6b4ab..3fb56b3f9ff9 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -719,6 +719,7 @@ [Components] =20 !if $(TPM_ENABLE) =3D=3D TRUE OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf + OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index c0098502aa90..ab58a9c0b4da 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -148,6 +148,7 @@ [FV.PEIFV] =20 !if $(TPM_ENABLE) =3D=3D TRUE INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf +INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf INF SecurityPkg/Tcg/TcgPei/TcgPei.inf INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf !endif diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index f400c845b9c9..fc0ae1f280df 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -163,6 +163,7 @@ [FV.PEIFV] =20 !if $(TPM_ENABLE) =3D=3D TRUE INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf +INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf INF SecurityPkg/Tcg/TcgPei/TcgPei.inf INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf !endif diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index d055552fd09f..306fc5a9b60d 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -163,6 +163,7 @@ [FV.PEIFV] =20 !if $(TPM_ENABLE) =3D=3D TRUE INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf +INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf INF SecurityPkg/Tcg/TcgPei/TcgPei.inf INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf !endif diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index d519f8532822..22c8664427d6 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -175,6 +175,7 @@ [FV.PEIFV] =20 !if $(TPM_ENABLE) =3D=3D TRUE INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf +INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf INF SecurityPkg/Tcg/TcgPei/TcgPei.inf INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf !endif diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Con= fig/Tcg2ConfigPei.inf index 6776ec931ce0..39d1deeed16b 100644 --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf @@ -57,7 +57,7 @@ [Pcd] gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ## PROD= UCES =20 [Depex.IA32, Depex.X64] - TRUE + gOvmfTpmMmioAccessiblePpiGuid =20 [Depex.ARM, Depex.AARCH64] gOvmfTpmDiscoveredPpiGuid diff --git a/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf b/Ov= mfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf new file mode 100644 index 000000000000..926113b8ffb0 --- /dev/null +++ b/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf @@ -0,0 +1,40 @@ +## @file +# Map TPM MMIO range unencrypted when SEV is active +# +# Copyright (C) 2021, Advanced Micro Devices, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +[Defines] + INF_VERSION =3D 0x00010005 + BASE_NAME =3D TpmMmioSevDecryptPei + FILE_GUID =3D F12F698A-E506-4A1B-B32E-6920E55DA1C4 + MODULE_TYPE =3D PEIM + VERSION_STRING =3D 1.0 + ENTRY_POINT =3D TpmMmioSevDecryptPeimEntryPoint + +[Sources] + TpmMmioSevDecryptPeim.c + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + OvmfPkg/OvmfPkg.dec + SecurityPkg/SecurityPkg.dec + +[LibraryClasses] + BaseLib + DebugLib + MemEncryptSevLib + PeimEntryPoint + PeiServicesLib + +[Ppis] + gOvmfTpmMmioAccessiblePpiGuid ## PRODUCES + +[FixedPcd] + gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## CONSUMES + +[Depex] + gEfiPeiMemoryDiscoveredPpiGuid diff --git a/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c b/Ovm= fPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c new file mode 100644 index 000000000000..dd1f1a80b5b0 --- /dev/null +++ b/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c @@ -0,0 +1,76 @@ +/** @file + Map TPM MMIO range unencrypted when SEV is active + + Copyright (C) 2021, Advanced Micro Devices, Inc. + + SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + + +#include + +#include +#include +#include + +STATIC CONST EFI_PEI_PPI_DESCRIPTOR mTpmMmioRangeAccessible =3D { + EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, + &gOvmfTpmMmioAccessiblePpiGuid, + NULL +}; + +/** + The entry point for TPM MMIO range mapping driver. + + @param[in] FileHandle Handle of the file being invoked. + @param[in] PeiServices Describes the list of possible PEI Services. + + @retval EFI_ABORTED No need to keep this PEIM resident +**/ +EFI_STATUS +EFIAPI +TpmMmioSevDecryptPeimEntryPoint ( + IN EFI_PEI_FILE_HANDLE FileHandle, + IN CONST EFI_PEI_SERVICES **PeiServices + ) +{ + RETURN_STATUS DecryptStatus; + EFI_STATUS Status; + + DEBUG ((DEBUG_INFO, "%a\n", __FUNCTION__)); + + // + // If SEV or SEV-ES is active, MMIO succeeds against an encrypted physic= al + // address because the nested page fault (NPF) that occurs on access doe= s not + // include the encryption bit in the guest physical address provided to = the + // hypervisor. + // + // However, if SEV-ES is active, before performing the actual MMIO, an + // additional MMIO mitigation check is performed in the #VC handler to e= nsure + // that MMIO is being done to an unencrypted address. To prevent guest + // termination in this scenario, mark the range unencrypted ahead of acc= ess. + // + if (MemEncryptSevEsIsEnabled ()) { + DEBUG ((DEBUG_INFO, "%a: mapping TPM MMIO address range unencrypted\n"= , __FUNCTION__)); + + DecryptStatus =3D MemEncryptSevClearPageEncMask ( + 0, + PcdGet64 (PcdTpmBaseAddress), + EFI_SIZE_TO_PAGES ((UINTN) 0x5000), + FALSE + ); + + if (RETURN_ERROR (DecryptStatus)) { + DEBUG ((DEBUG_INFO, "%a: failed to map TPM MMIO address range unencr= ypted\n", __FUNCTION__)); + ASSERT_RETURN_ERROR (DecryptStatus); + } + } + + // + // MMIO range available + // + Status =3D PeiServicesInstallPpi (&mTpmMmioRangeAccessible); + ASSERT_EFI_ERROR (Status); + + return EFI_ABORTED; +} --=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 (#74494): https://edk2.groups.io/g/devel/message/74494 Mute This Topic: https://groups.io/mt/82407869/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-