From nobody Sat May 18 14:10:06 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+75390+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+75390+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 1621448412274638.4372766220905; Wed, 19 May 2021 11:20:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id BxEQYY1788612xO9FrhzGAmD; Wed, 19 May 2021 11:20:11 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.15905.1621448408814808065 for ; Wed, 19 May 2021 11:20:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Su3A0JvbNzHbXlZOYbdNQcm/ccr1yyQUKR2iWs3yG2znlgMpDNne+AX1WKC0G0KdX6ZpKv/yQAdX5AMb4NsGSjUAbfSn39ChYqUUixejBoUPiEzbw4VLyUJ8xbYVntdnKv2tx1jqlbjQfAD1tCwGOXjmmDRZXn1HjFwi39yQ2Q4wP7H33e4mxRDCISLhtL2/g80JEvbFSOTuQ+nP9W2c1xf934Ha0PCiPdpRMcd236KD8MOuVhX4SJhA2XHDXX1NYQAFp7LRjapS1QYHSSYomKXpcPk9/SbdXC+HFMemYMIWDqaGL7/GwiBxPkGQ57AwOb6dEjQj1VP2vGkIyMePwg== 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=/iWLAyzv1rDMl7eS3XN1gv1kWhC/MgUk8otFi7ogzgQ=; b=oa6iGKCTs+Jd67H0DAOdDVsKeGsEs9S6+pndq0IJ+sW3tdbAuIBgbTL5Kbi+Ix7XJyQACMKRwGa0hlutS7DdMhhL8Z64Gfx2+OLP7j9O7CmUDtOq35vXFf/NK3Gr/84JHnoQ1VUZdNoYtfdwj/fph0sY/pWWZnVUh3aea8vteiu3jT2Wk47OBWBAq+VG6niF2Eg5lqplNF0tvduGHs1LwqK2jgUjF3htdb2c7GZzc0kURxlgpV8D4r9e2eyA6A8JP3A/K6azQYaWBylQQ9Bm0mOEmh53lOuBM2UxpNPdsx6TQGkz3Sd+kLtulJlB+0moRlqetu41WQ8yQZQhdsPgqw== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:06 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:06 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH v3 01/13] MdePkg/Register/Amd: expand the SEV MSR to include the SNP definition Date: Wed, 19 May 2021 13:19:37 -0500 Message-ID: <20210519181949.6574-2-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c72faec3-133f-4d12-cd2d-08d91af2bab2 X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:813; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 8s68S8jvwMtfQnWdZ6rphuDl2cGEyYgZUIVCTG415ypc4Tb62ZmnhV3xOBdY+b5dZCEJz3KgnTNarxhRBPLS7NvXSZrjCCCvvW/BKQZQQZXvuQqR2VLciv/6KLGtWSxJ4/cRYFsFfCkZjLKdWUo9h2L4rlzp36jrJwbTjRGdCrAqUNoG+IGVei5vVDW/vtHaTDi1bsWOKSFGgyDpUG48PTPNLFYpUl3kqNJDPld+sjXljU/MxmcgzyfYlmVeMTUupvN+2Wk9DeOEETkdvwANMDJL5j0VI+8zPVR4VtoRqQxLtOglTGNSwn9YHYydHHDCG5C+62BtO8p9m5AcnZntM12seRKuX/+W43PJb0OOL6H5N4/KF+evE4iOO6SMUzR/LhpnebKKTipZKp4knwZN9rnRDtAVc4/FPSsn6jqdee0Oj+LYgBFuvw40xNbmiXIPa0OIYLHAz4P942M1suOMXYtJ9QoGjVO0bHAFViz1G6RRSlNO/1Hv+hTC6xWPXoLvGrIrvFTFPl1RkA2QRulKzd95LjO1l4Gxs3AgK1INCTa80Nvp57Km5o2T6C7l5i+jmZVU7DuqJJKYB40J63+aXh89OLQk/kp/rGCTyeP5TVNWZzF+q9ftRBE5MNdnwVdEoAtwxX5nIEtYzXP8CaU3OYziDywLMXjsW2PAOiEjDD2rc+J7uY8NQrDHGh56j7W6k7j11yj3YzXw3ybjhiFZw+SyWE/yVyxKmbka2NGYviWvff3tN3pySLj3oblYmAPQ X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?wn/WcbnaJizq4rV5MwqqR5okNovOPktZTrYjPV4uq0an1nWWAOuqqgvggHNO?= =?us-ascii?Q?t3XixQ+YQQ2OuaeyQyilvrM4ZVLREr0roYraVBylzryxtePYiHGv97KLb6Os?= =?us-ascii?Q?jBwcVrdwjyz6W+Pplnv26+EJsQEo4WGjtSXWmd4U1vIVf6bH9xwvP1fW+39V?= =?us-ascii?Q?pWzw5HWsrOwfKzxfllJQarO5sCTRJNvpx345FnWSKZu2R/Yc8wx1qwrfeX2S?= =?us-ascii?Q?vPHXgGz9Xh/fJPW7hepNtORsUE5Z0o4n9sVnA9Cfkggt56JPhbbum8xjZaq8?= =?us-ascii?Q?I5pRlF+cYlZPGy49d47vg3LI1I/rcI/5xWdSFUyFJGn/zX7slgz8RPPiPf3c?= =?us-ascii?Q?59G7bucIdqMIzZZof03DSWBcHu+tjIOoKl1O4NzJuWdxT+0r4MNW6ghiIONH?= =?us-ascii?Q?Obk9AOPHC5SOkkRC4wgbg3434ZI7ekus2H5zxKpg3tB2zflXH4SYsnBq6fWB?= =?us-ascii?Q?2ww/daRiqNPrZQp0pPxBPbv58KUHl0Y8UE5V6Fpxqf2M6YmLW4cOqN6Fx6OJ?= =?us-ascii?Q?2WVHG9sBPyTnEZHZfFusn7TiZv6wXIn6JZVYyu5N9vVqk5eNdKjtPVFv7Ng/?= =?us-ascii?Q?ssYx1dJBvchEt434fJ+a5L/N9fpAoZTxO631eFbo+slVQt/WFnMwj52qrTJ1?= =?us-ascii?Q?ypbpdXWFh/VaLY0icZR+uahdiQV9cOes55HNrtcKacAlGMkMMCggKRdyOVAZ?= =?us-ascii?Q?RG1BdLinpyKtxOhq6Pun1ul8aEl9JzhJFvkBCIUfTyklqc+HPejrgrczH/ZQ?= =?us-ascii?Q?2IHT784XqgMUMSHjgrkTlnl1owENKoRAZJJhQ+f90k1mBKt4YjyNrKHLh1Q/?= =?us-ascii?Q?BFLeT4LBNOpYT4iUL3336E91LdQk4FC3GVivBU5b1Om6i9Q2gF61WZe9RMgO?= =?us-ascii?Q?N8I+bXFXN5cTF6KuygHQpBM5T1/pRfCkMvsTUx99DsYRmWlFWgNFebZlaeB2?= =?us-ascii?Q?duGlyTkHgs9Y41Skz7VeJibN7/0VgLSF381/HW1MO2P/U6sX5R2RxxFztrz8?= =?us-ascii?Q?aBUNufsgahmtCPV74l3RWdEYrmIm+fwAE1BMBlW3XNv7lHb714HapULeWIY2?= =?us-ascii?Q?ZbN2UU7iNG+Qm4HFsZLIT8AfhjqQo4NOks36isJF7HytFB9SrM4ie1xgKKfe?= =?us-ascii?Q?CzKOBjaj8mBFJAr3ynPkg+es+QbGhsK8wtjkkBhTBaL4ZKipBv6Bb4ty6yMo?= =?us-ascii?Q?V93cUpVRbcHpL6NcrMtEtv00s4JUxf/Rnp41lHPpm8HB8jhwYmxAnnF/nDoi?= =?us-ascii?Q?u0UaVTnaxXBMsZsmYJKHwikzK789Rx2/H3SNhm9mAwsBOFrsbCA/B6fDI2U1?= =?us-ascii?Q?+ggyu8Bl0WkwituDy0NX8pn+?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c72faec3-133f-4d12-cd2d-08d91af2bab2 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:06.7453 (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: 8jj3NSSawnF/pLFllj2eZXtsQUv2T52sHxTZHGwi93AoLyRp/JyYdZu4Jz2ezD4aZ0sxvvsE7Z8ypoSv4uKRNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: Ix4yU4UtO38TlCoEue2AjQtAx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448411; bh=Jiggy2eTbfoWHtx+YN2jtnsJuOm+GY/5BFj6cr+Iijo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=lUrJ02gC4zPXmlFqpmgCj/aMI3qzfW/TETkZ/blo/Dvu6uG25deyyiuBjNsBXAw0oms 1T1v/9pg+02ryDPB331v5vksww1XeE2WYv/0c6wnU3HOqij4XhL4cpZOfdXs+m4e2D6dC yMk9dId9FeGxRGJxfmKa1kqWtS04642K5s4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Define the SEV-SNP MSR bits. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao Signed-off-by: Brijesh Singh --- MdePkg/Include/Register/Amd/Fam17Msr.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MdePkg/Include/Register/Amd/Fam17Msr.h b/MdePkg/Include/Regist= er/Amd/Fam17Msr.h index e4db09c5184c..716d52fd508d 100644 --- a/MdePkg/Include/Register/Amd/Fam17Msr.h +++ b/MdePkg/Include/Register/Amd/Fam17Msr.h @@ -87,7 +87,12 @@ typedef union { /// UINT32 SevEsBit:1; =20 - UINT32 Reserved:30; + /// + /// [Bit 2] Secure Nested Paging (SevSnp) is enabled + /// + UINT32 SevSnpBit:1; + + UINT32 Reserved2:29; } Bits; /// /// All bit fields as a 32-bit value --=20 2.17.1 -=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 (#75390): https://edk2.groups.io/g/devel/message/75390 Mute This Topic: https://groups.io/mt/82943400/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 Sat May 18 14:10:06 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+75391+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+75391+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 1621448412757375.77065856906177; Wed, 19 May 2021 11:20:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 59i7YY1788612xLT4tgZEfdC; Wed, 19 May 2021 11:20:12 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.15905.1621448408814808065 for ; Wed, 19 May 2021 11:20:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hYIghwGRiCluREW765rCxbxBrm0WOvfmjz76e5jOqLsCEmHeXv135lziKtxz4Sji9uM/ZWwkbFBxTHabx8td14r11NXqF6LAHn2Fm0mgyiiVeOrqwRNfDSZRQhknixZp51hky+QytZkMtwCGJuzFfyB12uKmVwxpve80e6RqzzBgiRjggc1AUgPQbeOmA/BG1CpgdlGqQaNZw+EyBhI3OLvWfuEU0EoZO+ZKNkBHK3tsJ8cFIDuEeMwfXvv6z+hc0Of8bgway70PG3MEZKut+iyLLl1CO3xUar0l04IgrVNq8Oyvh+541xPt0VYbIpQn35jyf5AJfk3/EW9Vvcr1uA== 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=8ucll7LZ+tCrr/1hdfNUd5YivsHSPtAuaUgGDCtgkDA=; b=Tmh8/8NdNXpAxDJxZhmAaNVFyvNztuuKLo2dFaEdq7wI/jyKGhjSAbCjCtX1Zd2ZAFa1+CiCrX0/H+NX9wal5Ria3QxJ3LnVrgh8D7LmXSKCtvve1XEQNVLKPbyf5wo/nTrKtRY4a192WVL8Zyd0H//QTI+akRWeW8woNkgmk6dhRQ9BGEOrv4/kuSafagovS7kdnJd3N8WtJFg29cAT79mM45UB/qkkWKm+y77W51TL9nI4DvkK5vmeoFg6xeTXOiBKCkWcxcHD5xPbM/q1xntKQfE0eplwk9TOBhYIf9otEpj5kK3Tb81Ea0oqw57I1T1GrxMat01DvoazhqNpRA== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:07 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:07 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH v3 02/13] MdePkg/Register/Amd: realign macros with more space for future expansion Date: Wed, 19 May 2021 13:19:38 -0500 Message-ID: <20210519181949.6574-3-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d7f3464-a6ea-4aca-3fc3-08d91af2bb14 X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: aj2UVirGqZuL79lU4X5s2v0j+Ek3kw+qZYD32BCqfFZZBj45I/WVrVbHStzMBTQHtIm7F8BaOWAqSAgcqXmlL9ePm0zeD3+IoVMtI4rnqN8d2xVZIhfozf3wj/vdEaoKwDHu7iTtlNh/pcPlTa4rRFuCobn/tEapLFGpTv0DL649768rogw7OyeI9VszLXPF9rTdt74QmcqlGPWfLLlLJCHAF3DfKWpfCzN3dhOfdbEIOLrEzBLkulgdp+ew7oibQGcV0M7ysrPnB3f3ksSukuawT7uCKuWLOiBD5bhp2bZEigap2XZQa/ObYoUC1BCAIaYlcoHZQ/DiEz9wTp/W1UauAfNuv8ruLZ6b8CjEzobJ7flndfCb5ge5AeA1nlsHdlJMvuXvnsITI6UJaZeiekNskWlusSbuQXlcLNb08lnph64e9nfltjo3Ri4JjrWqij7rnaecYJHDxFFnjbfSOGdZ9UVENyeZ+i6YuIgTw6+5KyXoYPmLklUBYi2rGWJis8vH3pmIw3JwMsyy3ZrXAncIvkfr/kijxMEHppi3LQMzKD5kOjuHaWF0EWBfTJbFYNj2BKgrpDbtwCJYPGAEIC1/pmnQYrav7hCLlp+3WrvlpvmSL37mS4TyiPBnG7BbXqY1J+pN7wGRtPSJECfXTVMFlWpWoD6eRNrkSsR+okIEZozKpMEYe/b77y8BnX57QPd+tDa3NecHca3eFa85v6LPjSfworBVnyzpWVli666Vj/U9ZMHGRZGvglZ/3I4d X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?uBqSz4hiM1UTi79+Hghz/Sdewc6yMYTf14cG5PE6IDct2famZxSVtvWqdz5g?= =?us-ascii?Q?XbyPC/S8btGWXnRHTDj27zyzkdsLwAT0zJI/KAOjJFqOK33RKG7ksPu44jRy?= =?us-ascii?Q?vLBtyZQuukB0illDGSPZTDstzctgINh317m8X6v1CCKKUjuosaqfvanbSIXk?= =?us-ascii?Q?t90tridU8TXU3nScGlI7/fE6apm96LfO3Gcnd5k6xdDJfI6b6hp+GW58OMk5?= =?us-ascii?Q?up0FTGrKM5eykBKWXSnI88nMfNlZ+1SgnUg9VcEA/2v7SQT/ict22/bZfglQ?= =?us-ascii?Q?glaxmQNgpV95UL2SAw4oAQCj122QEehtIBScEKz5OLBKM3ERWJgvEyPYCOeZ?= =?us-ascii?Q?svkQaYV/U+W53qW3a9GLJ9CmnH3NmE0QI5P/GLSeQC2GIwUrFxNBK83ZqNaD?= =?us-ascii?Q?ytcaKfIzaW27mq5k8H0Q+SBNzrXn8UCYW/1pxdy3r5XTKFLSeBsU8ZCVb6By?= =?us-ascii?Q?KyX6K9eB2mvlwbQYvtlnYIeh87ffjCUgBsSToXkgOBFV+N7yD+DP+uGtX1DZ?= =?us-ascii?Q?pcoD4YbKAsJ1PaPs5HeV/DH4Tw3GPUMbaEYlwKGYO2jhRpWxSc2BiIixuj16?= =?us-ascii?Q?6Yl66QwO1F/wcToq+eKMpizOEcdaWT72aCKClpQ+/fCUGJpQ6W0xnuIgME8E?= =?us-ascii?Q?7RNGX6gzIcrAVfh7nLPpmA6jVANKt64mcK0ugRhqgrSvXmTyqG0ucUbsE3Na?= =?us-ascii?Q?EFe0Uff4M2cISgQvqkYu61BMJxDHzGHe7VltRS+fFNbHnNwO7PQTAYiNGyp5?= =?us-ascii?Q?ooNBw1bc6C3Ex2zLxumSHGWi865Hv4IorWxlmJjFTgkGQn8WPvKFLEEkWBdL?= =?us-ascii?Q?l+6UiVrodY4POrPL7VdKZd0+Z2rUqyI9d+2gJI5eTmYPFkdfz18ZUcOY0VRE?= =?us-ascii?Q?beaPZ2XwXQpJ+v0i5Vkxsl8ZtDWyWevxK/hDW9NYR6Vqde0chdbbkCPBatF1?= =?us-ascii?Q?F0NJvaGHx70y0E4n7lbbU5Js51sqikl5yvrnZVssBy59Th45A9qgkoBZEK01?= =?us-ascii?Q?Dsg8HRGE4IyU1BsAsSz7hh1DnP02MLwfnaTrx3G/r/MDiwzSWbPKJI/0SqUW?= =?us-ascii?Q?u2dkZZmVIH2QbBK12s3wa6KpRxnHm+KJ21I31CtKxxefAofqmhtgU60bkJCr?= =?us-ascii?Q?m+/yadsCyOl6/hhoq8UlfKP/iJ+NhTu4K5C+wr83Z7YMDmA9cXwXnt4vKb6i?= =?us-ascii?Q?nxqSxdvLmtNUQDwFls2adGwTFIH5aJClQ7wTEFJh3SYyehp+nSKBtBB1PEvm?= =?us-ascii?Q?4BCSavG2jZlMFyD3Sh9YAfYMNUnc/7y866U6OJ6ISGXNG0OtAf8BM7NMD0Fl?= =?us-ascii?Q?Njd0NkC0u9I88OTbjlGUQOE2?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d7f3464-a6ea-4aca-3fc3-08d91af2bb14 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:07.3769 (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: 4swz1AHaAGpU7K4SuBcqGyTq1bgvi33QZgJdBFBC0Zof7lp9KH85g9B4filUG/zhWeKk56z8mYgNArpo1uoCTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: GhcwtEiK8Bj0rjXaCsIu9Uunx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448412; bh=pI7ox9gfB7ED5jRkB4U+GUicMAG37hy3smRKsRbCoBw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=wMB9u41z18Gk9CBw/iWUfv3pTKyfWAn0j+nUMtguZMP0+Gwb9ZPVpZaAEt7e9uf8RxG fZy9duKEkaWRZrzeW/BB0o14B6g205s0GAyWgmanWHI7kRfdaVgnq6LYaoBf+CCQNO66r 9skKroie29V8yjbkCfwGCBolcvh0m50uMew= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Version 2 of the GHCB spec introduces several new SNP-specific NAEs. Unfortunately, the names for those NAEs break the alignment. Add some white spaces so that the SNP support patches do not break the alignment. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao Signed-off-by: Brijesh Singh --- MdePkg/Include/Register/Amd/Fam17Msr.h | 10 +++++----- MdePkg/Include/Register/Amd/Ghcb.h | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MdePkg/Include/Register/Amd/Fam17Msr.h b/MdePkg/Include/Regist= er/Amd/Fam17Msr.h index 716d52fd508d..7368ce7af02a 100644 --- a/MdePkg/Include/Register/Amd/Fam17Msr.h +++ b/MdePkg/Include/Register/Amd/Fam17Msr.h @@ -53,11 +53,11 @@ typedef union { UINT64 GhcbPhysicalAddress; } MSR_SEV_ES_GHCB_REGISTER; =20 -#define GHCB_INFO_SEV_INFO 1 -#define GHCB_INFO_SEV_INFO_GET 2 -#define GHCB_INFO_CPUID_REQUEST 4 -#define GHCB_INFO_CPUID_RESPONSE 5 -#define GHCB_INFO_TERMINATE_REQUEST 256 +#define GHCB_INFO_SEV_INFO 1 +#define GHCB_INFO_SEV_INFO_GET 2 +#define GHCB_INFO_CPUID_REQUEST 4 +#define GHCB_INFO_CPUID_RESPONSE 5 +#define GHCB_INFO_TERMINATE_REQUEST 256 =20 #define GHCB_TERMINATE_GHCB 0 #define GHCB_TERMINATE_GHCB_GENERAL 0 diff --git a/MdePkg/Include/Register/Amd/Ghcb.h b/MdePkg/Include/Register/A= md/Ghcb.h index ccdb662af7a7..712dc8e769c0 100644 --- a/MdePkg/Include/Register/Amd/Ghcb.h +++ b/MdePkg/Include/Register/Amd/Ghcb.h @@ -49,12 +49,12 @@ // // VMG Special Exit Codes // -#define SVM_EXIT_MMIO_READ 0x80000001ULL -#define SVM_EXIT_MMIO_WRITE 0x80000002ULL -#define SVM_EXIT_NMI_COMPLETE 0x80000003ULL -#define SVM_EXIT_AP_RESET_HOLD 0x80000004ULL -#define SVM_EXIT_AP_JUMP_TABLE 0x80000005ULL -#define SVM_EXIT_UNSUPPORTED 0x8000FFFFULL +#define SVM_EXIT_MMIO_READ 0x80000001ULL +#define SVM_EXIT_MMIO_WRITE 0x80000002ULL +#define SVM_EXIT_NMI_COMPLETE 0x80000003ULL +#define SVM_EXIT_AP_RESET_HOLD 0x80000004ULL +#define SVM_EXIT_AP_JUMP_TABLE 0x80000005ULL +#define SVM_EXIT_UNSUPPORTED 0x8000FFFFULL =20 // // IOIO Exit Information --=20 2.17.1 -=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 (#75391): https://edk2.groups.io/g/devel/message/75391 Mute This Topic: https://groups.io/mt/82943401/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 Sat May 18 14:10:06 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+75392+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+75392+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 1621448413134337.7689360422261; Wed, 19 May 2021 11:20:13 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id JXitYY1788612xWg9mSnG9kx; Wed, 19 May 2021 11:20:12 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com [40.107.95.53]) by mx.groups.io with SMTP id smtpd.web10.15905.1621448410666870008 for ; Wed, 19 May 2021 11:20:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZhuQvPJQu9SGheipQFLKE6FF97N0J8m8bVdKSa8LdHu0H/J9y0JNQZboMY6KDaAXx6iW7iG9brTlGJomqcavJcIQnB3dYPTvJsYpiE7o0LwcnBj7UgHoqIE7VcfInh2apT6QTTSJ0huDt7R0C6zS8BUd2ec93z1bWOeFV3ddlADqCxCQARJCgpmEIZ+QTwF4iwEgiavatLuD/ioJQUIO+LZJpl/MZQkTfE0Q309mThMbGOvsbvHntranoMe/e0+gZHzOXnMLkU66vST4D0ALchkScuSAmxMWnbAwshUFzM6DUREJMlzHA1ssfjMCXDjj+aX93xaapBPKlBjq9ZmZRQ== 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=u2LbfNCJukhAV4ENQzPNVSk0e1OZDuJxnP30T12t8XU=; b=MRgGpUB3t4/yaIrbSvRa81u6qaYzBKAoWiPqZrulZJ7F1fzE9NhHTZLqpwn7MMJAMpiB4jtxWCB01p0Q5guablvpSu1GY8T9kSW+3Q97RGNIlG+3pTNm/Bph4Bdq4/tdktyEVgNdT2HPYquHeDUMNYXpzeOl2+Njp67hivHT0LACG1lNTqfaEeECT+FTkVW53NHn9jz18iZ0cqgECX7IEc3d19wTdBKSJIJ3YGsoU32fCfjyif/6lIKlBhDQjh8t/mHagJBa9jG/DYZKwO8B07Pc1TbwKK4AfckLIF0y6aMtalUw0e0S/chOxfEFxPuTcDa+mCb/Ihk6uO+wpfWKFw== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:08 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:08 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH v3 03/13] MdePkg/Register/Amd: define GHCB macros for hypervisor feature detection Date: Wed, 19 May 2021 13:19:39 -0500 Message-ID: <20210519181949.6574-4-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2a8d80af-81c6-4e25-fbf9-08d91af2bb77 X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: uBVufeLU6MqFxsx4Z5Y5oYspSz/bkAXfsOrpayJMMTTKqSnzgUNIsdxY4cYaQhe2Hp+MQf6cm6tV2AabiJBnMj7Pb8I68vN/fHuUqmX4Huw0BmfZW0WxyML2k3yLeeuWJkZMlu4djP0kFQ7HaiXfM97hBOr/uSvoXw+lmOs7s1Ho8ZDq5BIJqxWoaiHCelfZ/5qqqsswj+RkR1LlR42SjlDX22/K9LhTz0Lqd/7QJYKn7+irdp7aDibovk0eFg8pm8Z2NlLdRemkhG/9k6vkgzvmS+XeqXwW9CjmiR4t5lhixWlv5eFrfsgxkJR9aD9PWFOmLJ82O0JfQd/2ayBLjARQQd5M7iLv8mipkPoLrElFHa25Bojekg3ZRTkwEzq+dwffJ6MJSgRE81OQvT658zNvcI7YI93nSnxxR4pmsb/+hJh6ErVfhuZLfpvo0hehDYo8AcB8ViU3cY9Q0ctyEm4P2ViEIu1BU8364pu4GonqkFzBdZAU76a/cGmgL2CpWYJokrSieTl3YuQ55BodVVt0x3q/EbyWY0ymuZL7LGC9yGFvGEFisA60LRri5g70CH5mokWC7b5jh8URJ15nml5u6ka7hV4CIfrQpKG4ZM2CnO9HJ3sfJb1NR0ubFkp8FeCsWi/jdiV8lu4GEb0lZGPAsZxLh3KceSNUqKIhopTjlfklyMvSN8Qq+shB1IWk6StUaOYRinEvfe83FsD7sd02pQg1jsyuoBjXHqtrXDI= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?rtEkCHSiV/qFkVasNFcGfxRylD7EIgkMG9VE1rU14Wb4osy2bMjVFNnZbIUA?= =?us-ascii?Q?SdD8JdstKDHGTnKE99G6aCxCZnRdwrwQJmhQC8DWuy1/AN/dSF1EZw1E+BUH?= =?us-ascii?Q?+L1hKpIQSKhskJPDc6iNYr96qoSz3mdkqzu5BKkmZ3VEGA+FGPzLuwoLE1YM?= =?us-ascii?Q?I52evIF8EAxqaV8kSKBtFktNPtTdauFU3wOCbvXtZrZ74tKFacvfs7CpcuVn?= =?us-ascii?Q?g/l/lYMVB63iJJattqYfk295Cj4OrCXQh854cl9Q5v2pg2ZFGzv+1A+DwTh5?= =?us-ascii?Q?b91qqSCQGnG9IfCP1sU/2hKDVSaXMR+KDe5RCz+BcVvUKyxFUL+UpuwXeuQD?= =?us-ascii?Q?RLt4vHmT6vbkZFzKilnYx5/E3UgXoXLB9vMDfEmD6jH09AqvTvKycC1dB6gY?= =?us-ascii?Q?FsQSSaWFeu0AUInK4b4JB0vBPmE0naBElAsiC0DKreczdnCBYOLJBmxlEcOy?= =?us-ascii?Q?wwnGc6sEqVbaJnlKqQvSecTk/o7J7nQX6vqhIGpvTPlFu2CS8HfEVC7/uvym?= =?us-ascii?Q?Z0oIjs40tmAB4zIKJ37jXtig5c7WL/rcjKXNZBnGTohvBjVTgDb0YV/nocpa?= =?us-ascii?Q?rWPgYaMxtWPhyQ0f/8npL7b/prmAoO+53tcXNP3x8evkcdq/qnjT//KiaAbv?= =?us-ascii?Q?lmKwlA3xb5CiwUmsT97ZLuYisbayM4cqb5MUMCMzPTLvgriuOacx1lj7pkeM?= =?us-ascii?Q?kw9XfU68uX/Fou8ErOftPrJ6GUtlhqBXx4PFo43ABBWxP9Akhg0xx8YnXk/k?= =?us-ascii?Q?EemiXQ1/pWFccmdOFsu7BfxSeuxujIgixt3HJh+buSjRdtEfflPjz9H+YJ6v?= =?us-ascii?Q?YFEPb37hrFQZ++VUXpxJVX8cRahbpr2zEzYHEMMkRLK7VMXqejjt2loVnKkA?= =?us-ascii?Q?bZKPMGtcelCRYI35K8aUzyMIOOhwNjTZXLUrsc5hUb1owPSOyAgRAvT8wasP?= =?us-ascii?Q?yd5PunTkdGmeeNNZLWHb+hSKuUhaCiWkFs6qS6WVGMfnLCXF0yqA+UFxe6KE?= =?us-ascii?Q?uvC3MdG8oQgRZbXK8BFEQ/ukgeynSTGYuKfqHaIt3EkAvLGzovecqvAZp4Ms?= =?us-ascii?Q?DnKfUjA2uDQd+zYAHUddq6ByiPI6nshozJqa6VFhSyTj3+XzpJPb2Qe+cQY/?= =?us-ascii?Q?7R0c/3B4z8rPrttDy0hhaME5VBSX/Lw9k/vb4Mn4oQHDYjOz/XyKDARU5eGv?= =?us-ascii?Q?9Uu7GJFYGRN0E9J4I03H6nukSIeI/zmh3ZxzjAPg28b3TsUmg9PA1uzC4vJZ?= =?us-ascii?Q?dH81aHAHIuMD8O4Guoa7g+477iRYSWv93eMxCYxQw519kCZPCf/HBPxxpb1g?= =?us-ascii?Q?nve2C9YHADgJwAhl/EEnus00?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a8d80af-81c6-4e25-fbf9-08d91af2bb77 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:08.3104 (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: Htm28BcJTAVlb0Jq5Wn8LyU9k9ajSP2IXKwybeGQ30T/ziAaZLcrSrrOMMWLkn6xKqCoJaORtGtkLjcm8a2NlA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: Oxbow3XElzE76z356XLpmGgvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448412; bh=HcAdjqjGyq6DLRDVXrAzX4R0Ylg6Nq0ekaEtfl++B0o=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=YJ9THTgmX2XychU0Wv9fAnhzyP55JlPUGYDxNJjL0IW87tDlvXpePejXCIFYBhZZh2b RLJmW1j58lap2jeK2D5s3fkNVXX+eK7/6EsQE91ISFdmEsuEe40YFE1DgGOHK/HBTZZZ3 RP3SbkILvbXsdtBSojfVsQyKFul8IElkPjs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Version 2 of GHCB introduces advertisement of features that are supported by the hypervisor. See the GHCB spec section 2.2 for an additional details. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao Reviewed-by: Erdem Aktas Signed-off-by: Brijesh Singh --- MdePkg/Include/Register/Amd/Fam17Msr.h | 7 +++++++ MdePkg/Include/Register/Amd/Ghcb.h | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/MdePkg/Include/Register/Amd/Fam17Msr.h b/MdePkg/Include/Regist= er/Amd/Fam17Msr.h index 7368ce7af02a..cdb8f588ccf8 100644 --- a/MdePkg/Include/Register/Amd/Fam17Msr.h +++ b/MdePkg/Include/Register/Amd/Fam17Msr.h @@ -48,6 +48,11 @@ typedef union { UINT32 Reserved2:32; } GhcbTerminate; =20 + struct { + UINT64 Function:12; + UINT64 Features:52; + } GhcbHypervisorFeatures; + VOID *Ghcb; =20 UINT64 GhcbPhysicalAddress; @@ -57,6 +62,8 @@ typedef union { #define GHCB_INFO_SEV_INFO_GET 2 #define GHCB_INFO_CPUID_REQUEST 4 #define GHCB_INFO_CPUID_RESPONSE 5 +#define GHCB_HYPERVISOR_FEATURES_REQUEST 128 +#define GHCB_HYPERVISOR_FEATURES_RESPONSE 129 #define GHCB_INFO_TERMINATE_REQUEST 256 =20 #define GHCB_TERMINATE_GHCB 0 diff --git a/MdePkg/Include/Register/Amd/Ghcb.h b/MdePkg/Include/Register/A= md/Ghcb.h index 712dc8e769c0..ec232ebd3807 100644 --- a/MdePkg/Include/Register/Amd/Ghcb.h +++ b/MdePkg/Include/Register/Amd/Ghcb.h @@ -54,6 +54,7 @@ #define SVM_EXIT_NMI_COMPLETE 0x80000003ULL #define SVM_EXIT_AP_RESET_HOLD 0x80000004ULL #define SVM_EXIT_AP_JUMP_TABLE 0x80000005ULL +#define SVM_EXIT_HYPERVISOR_FEATURES 0x8000FFFDULL #define SVM_EXIT_UNSUPPORTED 0x8000FFFFULL =20 // @@ -154,4 +155,11 @@ typedef union { #define GHCB_EVENT_INJECTION_TYPE_EXCEPTION 3 #define GHCB_EVENT_INJECTION_TYPE_SOFT_INT 4 =20 +// +// Hypervisor features +// +#define GHCB_HV_FEATURES_SNP BIT0 +#define GHCB_HV_FEATURES_SNP_AP_CREATE (GHCB_HV_FEATURE= S_SNP | BIT1) +#define GHCB_HV_FEATURES_SNP_RESTRICTED_INJECTION (GHCB_HV_FEATURE= S_SNP_AP_CREATE | BIT2) +#define GHCB_HV_FEATURES_SNP_RESTRICTED_INJECTION_TIMER (GHCB_HV_FEATURE= S_SNP_RESTRICTED_INJECTION | BIT3) #endif --=20 2.17.1 -=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 (#75392): https://edk2.groups.io/g/devel/message/75392 Mute This Topic: https://groups.io/mt/82943402/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 Sat May 18 14:10:06 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+75393+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+75393+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 1621448592200620.732378250606; Wed, 19 May 2021 11:23:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id dDt3YY1788612xnCUrCPye50; Wed, 19 May 2021 11:23:11 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web10.15905.1621448410666870008 for ; Wed, 19 May 2021 11:20:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=erYpwzyz6VatyFI8aFI8MKjybfPCddryMMLBfAlvrMo7SjBDXYAN78lKJ8Hih34lsn1BK2xJDfpOYwjU4DoEODXNsbT/VUKhPD0v32PPEc2jybmGli/frY8LDWJVjqJ4uW88IDmB9Q/FSIITfVg+g/KbLuAj4v51d6VJxVjFS1Ven6m6VUDpr0L6gUpVb3ezKGyxBERQIutd4LioDUjk5v7zZL2ESadbBHyJbSN0/4IxJUj8wx1Wg9NN4J4q9mbxO0OG6WG/Um3J4S9YJ+DO9NK+uLtykQLaRhUw/w0c5NWewVWXDiB2v3i4IrqOz25IRZgiCQNUSZ/C9WF7y9LheQ== 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=tnQ+oHlwu7RfpxQBFrGgrc80m0aRBSJRLPFhlNBtd4Q=; b=dT1t59dzdk+Fv9eoSKjCIG6GNQv2rSYs7GdPy+7dC/7ZVaJbyFHsw7Qf+g4SsRLtTuVmas33cu4xk3SPDJKBZhWs0SiFqBGMMvBvVa8HxMYMixEeBnqgCUevI+SOKQEMSxUshdv7RdE59nsWl9smVPzZKM6vxaiYX57jHuI/fslqRGw/Gu+djaAY4ze4lIAZUe9SkzgbDEYIop0HBvFxm8V2hMtBwlkjPlaiHKCFF6uERJGsMObc9bvdhbaewOH0TlgzrQSfcBHjvC4IOJxMBbr8idTiatBjaJqW9JNZQsJBw5y8VZ+U1D+ZG1DbvsoAgU3lJt97vpXXnAHJnBquYg== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:09 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:09 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH v3 04/13] MdePkg/Register/Amd: define GHCB macro for Register GPA structure Date: Wed, 19 May 2021 13:19:40 -0500 Message-ID: <20210519181949.6574-5-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 830767bd-5185-43e3-0c0d-08d91af2bc05 X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Kwn1vPdP3EPQrQD1goUmtjEcnswydI/5FGBgyULZdQB5nhv2uzRO3o1P3MEBHl/LTq7Y+5Qp1n3TPyShN/R5eTucenKQQrsrJcCu5Zim85VWs45lbNJH09v4cHg27/WbecXAy3mnJg9Ot78s7cECgUo2BqQQPZuK1X+1fVoP8KjbQxkmbKdMhajMHtIU1Nb3az0C2HJJxZEbbvHFZscw8EuYr/mXHYvfzQVsj93Encciu4m1GS4+vARwJcJcLKM42CmtMkLoc1foLGkWUxWqeyC5cV0xaHgG4uyV8rEgwu6BdlHByTUkuFElp2G4gxYnmb8ORjAi8LEyJahYEWJf0xTDQspvkgm22VRlFyklPdYIQKL12/LSz7UIoBYWJg0+WE1jcWCF4gN+bH74NuX+JMvFRxgpfiqluiFgiuESZfpf/wrq4ceIBRGUJQHpnj/a4xxrQvZV/v8IausSrUCdCMx1Vk56vjN9b1+n7wYxL6d3dAiOg4KqykYrYXrj3M3eWuEqE3fg/ed8733KrZBtQWHwW+zaORnHXOclHeqiRrCWf1Z0DWxiWpfu8NmKEwUGm7ag9OdMGLq77WBKo/mXhTByXgS51LvJBolyXG619R1P7/mpN8BvsdDAYBReKNwqJj4SJNaWTKG6/4aTZC1kI8Qlc+9nDZc7gblbMzxRkjpLOqixp88eZvZnMygsVXYXe6zwJiIAb5rMisl5bfPXyAoVbjYOUcUdkQG7mLV+m84= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?oWDO0eTdPjHDSNrFzcAPlCjADDD8TB/THLGkkS9GLbjG63ftnbWCkdWOO0is?= =?us-ascii?Q?qR3djqGxv8y8MOZ7I5B45r0NX975nL0DJH9l4eB3f0rxDg7l23AgIOZVEZ1u?= =?us-ascii?Q?v55EBg2nWn9h+KxB0Aqn/ZDphZJkvRoc9NZGUW5jWhMhVgHmNvnUC1M10P0N?= =?us-ascii?Q?nykBIKDVJqhCcKTMi4DkHuIWGnGGJMeSrZe9uRWTf+dJpH4Z6sCsKF7WZLz9?= =?us-ascii?Q?VZXxFgEzXMjaAIy/uTPgkJ8Gx8jDAesGGhyPRu6s1FAQ4oHw6TQPE1MqtuL/?= =?us-ascii?Q?XWxqSW2bqz212ksVLr8CB738K89bxL8EMwtix+5Dtk4pSp2wiGyqkyDJzR14?= =?us-ascii?Q?mRrR/nzbwVvH+u9l7PhCfQD6Dgb+8fCda8oGzaa/qwJ0TvCpvz3wk+LJnWcs?= =?us-ascii?Q?ODxsktHhFWcOLCQS56O82PhLFr4mRjqYPXn1YN174LTC+iAPNrB3cpOEap+0?= =?us-ascii?Q?/g2ou/8T4gBhrbPaTRHNBU0r58ootIODSP2MqMVoVFNfxTTdn1BrQnLZDeos?= =?us-ascii?Q?xeZuX6wtgCBJRxBv/GZxvg/q7h1hCZ8ntCnt+kANSgUN2CvhwCj+VS4/b725?= =?us-ascii?Q?pDxWCPUsTU/mkkHVAuMmqzZH3oSRxIa+mKaHgdkjv00y2149fXsSIBsAd1kv?= =?us-ascii?Q?yB1ZoxBXbEHfjQnp6+6pvHz1QC2zmJQD8Gxw/5GL553sWhvBzLJrOmQhLuSc?= =?us-ascii?Q?fUjTXYx32O39nsT2IW48byEpLGLS8nVlYwecHn8c7Fm/j6PtlkIxM7u0jzKd?= =?us-ascii?Q?vunIn7IPysYTBI4tU19rfFnp5tAv3Eoj1Ny2cBkd8QlsjrCUbTY5VcKQfvEg?= =?us-ascii?Q?QYO+PBpKPpHr5wajxMXbTRWkchBiItE73xKDoEYDFJk8s5cFLBgYSNYq4CRG?= =?us-ascii?Q?GLK4KcAkhtoD483y4ghIDYEAvnwcX29u0sVF0jE6C0otAZopqQwpstcJ1NVS?= =?us-ascii?Q?DSpEAOuY9LRo7Tx+3QJ7LpRYAIvXMfD+4DDJMheKaeAlBzwjOx/8+GK+jxzz?= =?us-ascii?Q?f4/9ClAE8iPdQRcbPuQph3PmTP5G9My1dzqCJzVyszjsCwdpujrO0AJ4+4Wm?= =?us-ascii?Q?K9X3q8wHXPyOF+6+toU9atUwqCnhoZlo77OzFDgADVtbEygKw9EJZXHsszvx?= =?us-ascii?Q?FeyrczoU9UW5tleAAMGwg6LmuviSDmQLMUzI43peVACX0KZnopOKNsfOBHJW?= =?us-ascii?Q?vV7S4NckdYKk7c57lprF+YIuVmbPam/47Inx9LfAT+fTnxed748Y6BmLPwWx?= =?us-ascii?Q?at+9cvgxFC/k8VMvCrZN1V7+H0Oa0ndHaXCL5fZSgK09aDYB/or808t1cmCa?= =?us-ascii?Q?y5PdnXTTNF+gK/Y5jFi1P61p?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 830767bd-5185-43e3-0c0d-08d91af2bc05 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:08.9820 (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: IWHma0B78HtvBr6Hd1fR+m9ksjGWMtQzkVzjq3Jc/3OXFDINWcZ3/bhFubBKHmERcB47uLcdyGxOLFljO8IA/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: dF4oHQlyYzDqkVanqOKSI0Yjx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448591; bh=6iVnzOhY9/AqThK6KKP0jhn1W9YPdxf+itJCMzg1pKc=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=VXk8DMt3FPujSZJCVytFh1S3aRJFetqoFoxa+zIR9z23CoO8c3DJJfel2J8J9QfKWnN 4D3YRVoDymOlYe2gTYjPJh3KLxxlXctNbYDNsK/1RhmkgfI7OZrDAFafD/Z5qBk5Ovpif u1InDeiXTc/BpcRlDq/yF/siwvBUpvije4U= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 An SEV-SNP guest is required to perform the GHCB GPA registration. See the GHCB specification for further details. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao Reviewed-by: Erdem Aktas Signed-off-by: Brijesh Singh --- MdePkg/Include/Register/Amd/Fam17Msr.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MdePkg/Include/Register/Amd/Fam17Msr.h b/MdePkg/Include/Regist= er/Amd/Fam17Msr.h index cdb8f588ccf8..542e4cdf4782 100644 --- a/MdePkg/Include/Register/Amd/Fam17Msr.h +++ b/MdePkg/Include/Register/Amd/Fam17Msr.h @@ -53,6 +53,11 @@ typedef union { UINT64 Features:52; } GhcbHypervisorFeatures; =20 + struct { + UINT64 Function:12; + UINT64 GuestFrameNumber:52; + } GhcbGpaRegister; + VOID *Ghcb; =20 UINT64 GhcbPhysicalAddress; @@ -62,6 +67,8 @@ typedef union { #define GHCB_INFO_SEV_INFO_GET 2 #define GHCB_INFO_CPUID_REQUEST 4 #define GHCB_INFO_CPUID_RESPONSE 5 +#define GHCB_INFO_GHCB_GPA_REGISTER_REQUEST 18 +#define GHCB_INFO_GHCB_GPA_REGISTER_RESPONSE 19 #define GHCB_HYPERVISOR_FEATURES_REQUEST 128 #define GHCB_HYPERVISOR_FEATURES_RESPONSE 129 #define GHCB_INFO_TERMINATE_REQUEST 256 --=20 2.17.1 -=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 (#75393): https://edk2.groups.io/g/devel/message/75393 Mute This Topic: https://groups.io/mt/82943404/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 Sat May 18 14:10:06 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+75394+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+75394+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 1621448413551809.8603783916084; Wed, 19 May 2021 11:20:13 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id b2gKYY1788612xQd7NV3BeXc; Wed, 19 May 2021 11:20:13 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web10.15905.1621448410666870008 for ; Wed, 19 May 2021 11:20:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G4WXiNluegJa++6OVVP1VZz3wTdjCqbzk04TXGL8Eu94JCrFk4lDPh573Pw8f92hvAB3zZn1IhjIm4hGcyx43AFtvumKCLgFb8lVkZ9zl2vo6zYmKwIJWJv75bVesk5KW+80c7kTYKYC9pLaAIJIx/Nsp3g4PfiTZSX7/60l8q9qj7j2mSDRprgf3Wtsi+YeieJWAm5CpwEOwYt637fr0o/aDS0VmDuWrpF03ohw86kudHGjH+/ZOz1mecbhk60cDxKl2ly+5JGDZSVGmuSonwBVvnvHrOQru56bOYPhgpdzqBOBXbpTggrj6ekevbB18WFguAyxTpd/dTprCvjBBA== 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=lVOEtRY1adYx87Yl+ActXP+rxwiCAvWfkRSRczrhFO0=; b=AwoFqOFu2jgGqMOL+4CB+LX2395Z2eeB/rbSwaDzzclBPBo+gK90piXps99XYLNZVQJLG1xSkpr8Tz1LoJv/dwOU7mnNXfr3e3SxnZoxvx9DD8OizNZWYzj9XCEcVCRI85Z09xTH43WRX/fw9rrnZV3bG6Cic4d7ZH4sUSEYA2B0dYXd/ZXDY+UZ7tqyUCTbzTGmLH9FVS++qFqAjW4QuUlzWkjsot60meIZnCN+seL5y6seV1lJ7i4eW4sN6l6DDzNTPwnJUsAWUNOBaZoRJGEeqgUsWR5g+vieUzKMjDq7jv5ptf5mUsifz1ddS8N1RYT3gj6E+PdcnfkfG+ZzKw== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:09 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:09 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH v3 05/13] MdePkg/Register/Amd: define GHCB macro for the Page State Change Date: Wed, 19 May 2021 13:19:41 -0500 Message-ID: <20210519181949.6574-6-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dfe19f1f-3757-44dc-eacb-08d91af2bc6a X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: 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: px1ThYgKHbYPrL+qTQEKQoS27f9BzjA+swygUy+Q+AdZXRwQUFXYp+PTzfap+6kFZNN8BmJ4bEiuyqCpj06vxXP3w422zB8k2MSxQxg9PdTLyxjPJupG/O1XVa82nyk04p/YR4j9RwqMmE4aCifnpr8VRcOG6Qd6WHqp7qhd1GxA6INCJzpZRT7szbdFnmjJZQQ4iGXvI0BdoAh0iZe19oGICKEpCasCYzh7U7OSg5wo2IKw//i/rQIQsaRWLYaSmQoS+wlFmEnPeck1pONCv6kG8CbiZNl3BSNT09dy1kyP+9JaHfYjGI0JZ/BO7NjVA6u/FqtN496TF307SQrz0bf5vfeNYOfiohLAhcwHX3NqjAmJ0/ie+2UPpYRW4hki/7Hyrgv11LCSXzNyy99pQrOazfW7XKBXGsmJp4121NRHeWp6o65pSyhN8IJznWzH7p+hYOHWnYRn6B1Yrs8Ax/vixR6b5J31xLj2tFiec+G3dAiAdBeHDjJ4veWHCnVaSgfQGqpdBIfDzwGiwyTACqrIHs82xjnllsKMMzzAOYEGDW0y2k8XJE67Qk/JtHwM1+x2o5IBrJqRVdfHX/YW/7V0adcl3wwpszyKQp4R2/JxsXnJRNpAbncGI/5/h5WaH2pAeby3XxGqNj62NIcyrvDi6NvPoF8KN/74/osoi/PKEckXMuXQRWpUoGlnP2BShyljPVEIOQysuVfTCP4a/IFuAEo35+khW7+zbuMie6g= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?EBM6Ucm0yT5M+hR7v+XoQdDc7FfENmqvQPPqeqio9etcg0o83hgwjmWpNXnP?= =?us-ascii?Q?sTWMlSbJlDsT3RlbezLEq0KKQ3ahE8fTTDNY0r8HSA2L9WDpDV0wOIEDQvDk?= =?us-ascii?Q?0hJnCNhAcj2vJK7Mu9OqOIPByoV7WJs69TvTay1dCvutvDvk10lo+TrUMKt4?= =?us-ascii?Q?iQvfa2mssncrr63pvyvr3xC3UeGa7L4dDZa5+WKnCBi27Kv71iuiSGeQh5Q0?= =?us-ascii?Q?Y1qr9vbwQTblk2aLFSCw7VrulJsh+VSbD2WgnobjdMOzEbm8cyKijqc1hFua?= =?us-ascii?Q?4OAflVrAnOh2GOvEZ1+sROsJG+aaWA8VadztsXL0n6rGzCMSPsL4M+IWMtsd?= =?us-ascii?Q?rXxBZC8MlTNP7L2K0ZM2HBSoN2dVz9XfDyrCbaze2lHTw2OVKJ1z2CeXC0Dp?= =?us-ascii?Q?r8SS6WJf1TdqWHPm+gPBepmFqg2KOZE/PfDUqL8wcRs3M2awEmYj4jF4fGt2?= =?us-ascii?Q?iC9ObN6/4lfW3zbC8Kw2qJrVbV4UwIr/vxrgP+eAPLNiFyqipVorpumUN1Q8?= =?us-ascii?Q?fuOt0NdophiTgTJqUdYkxJud55ykUgtgyJqyaNeo0SpcK0iQhaDBF4klhxT+?= =?us-ascii?Q?y9Kagv/xTvkaqP/ve2J5g0NyStAAt1CZFNPuz4DHoKm2g+0Kv5jQeMn0RGUg?= =?us-ascii?Q?3Oza55JNPHB/aLQi5JKsXCSlN3NZp9gqbTfxHyn+mN0/kWapepT2fCqYR2JA?= =?us-ascii?Q?wOtxIm0dUB0cDPvMGDvCettIaa9QdbjIb7qIbivRkXcZ6RNJKkZkcjcQSrz7?= =?us-ascii?Q?tc/lnzIhzxkTMIZyGD7HqDeN/A82ayH7Cg2a6M6hhfv5VQcbUlHup/a2uLIH?= =?us-ascii?Q?T3EBo3CLAf1lSmRg78YVzN7b5272JOmWsv9UwukGWJ2mAoIxNB3xXwyiZYUS?= =?us-ascii?Q?JDuyTBTJTyin8e+7G908S/ptUhNHwgiljpLI3xkA7wy6sfGN93kADSf6QNKM?= =?us-ascii?Q?agVV4Tbmfbj3pEsg3vtlvUDM5l0zGSJ6Vy4n9mb0SI6UeazH7nc8ryM2VeY+?= =?us-ascii?Q?zZEdbBfLiMSWJeocYTbHqqlwtp4G0OSEGIP2a9GvDfsWcDxxVmZAzPw//yUd?= =?us-ascii?Q?H3C4jtw/2TrgsK3v3aRSdQFJbMbP490cogXbLoJ3sXCnVp0UcbI+Qnja+yMq?= =?us-ascii?Q?0OixpDqghhGF3HQgqYiH3yepuQ1otFq7EkMkTrVsEcwqqtIxXfsZ4H203AVC?= =?us-ascii?Q?dpK53c6HUEuiqvbZMZrpOR8/Fjdk6ESYCSYEx0pLGdI9LeVyve04+/Oawzy5?= =?us-ascii?Q?1YhWiZFicpk4K6+1Svdlg3Nha5ZYiV4aodN3Gfti1Rd2nXUjH9CgoFfeQ6Nq?= =?us-ascii?Q?Q2Riv6RAbq5XrDAbzZvpdQxe?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: dfe19f1f-3757-44dc-eacb-08d91af2bc6a X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:09.6326 (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: 4eS1jEhjZkhvmseDRco6VI/sulUnDuxbQOVkrccPrDX600rCA/IP+gwGfe6UdR2lKDsxzGFIRvQFqCELAP+BtA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: KHkVQk5RfoT5YNBR7zLXS9tUx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448413; bh=rp8WW8ja3oMooSHuI1yi+IoGjFzYbL10Fl/go98M/FY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=SDrf/JgdPGa0wEMt/RmlagjXyrpqalUtqaGAGMAUDOZB2QH/RaDh7RBC06qksJOBWrV ylZmGhKh0XQK0HL6z+4pj4qOpydjSgEk72WkIEes61hvJ3fKCGlO4klSPCJNUBdzLFtjn vPYihc7FTbO5J7KcLLhGLmIME32EM9ZK8dY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 The Page State Change NAE exit will be used by the SEV-SNP guest to request a page state change using the GHCB protocol. See the GHCB spec section 4.1.6 and 2.3.1 for more detail on the structure definitions. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao Reviewed-by: Erdem Aktas Signed-off-by: Brijesh Singh --- MdePkg/Include/Register/Amd/Fam17Msr.h | 15 ++++++++++++ MdePkg/Include/Register/Amd/Ghcb.h | 33 ++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/MdePkg/Include/Register/Amd/Fam17Msr.h b/MdePkg/Include/Regist= er/Amd/Fam17Msr.h index 542e4cdf4782..62014854d9b7 100644 --- a/MdePkg/Include/Register/Amd/Fam17Msr.h +++ b/MdePkg/Include/Register/Amd/Fam17Msr.h @@ -58,6 +58,19 @@ typedef union { UINT64 GuestFrameNumber:52; } GhcbGpaRegister; =20 + struct { + UINT64 Function:12; + UINT64 GuestFrameNumber:40; + UINT64 Operation:4; + UINT64 Reserved:8; + } SnpPageStateChangeRequest; + + struct { + UINT32 Function:12; + UINT32 Reserved:20; + UINT32 ErrorCode; + } SnpPageStateChangeResponse; + VOID *Ghcb; =20 UINT64 GhcbPhysicalAddress; @@ -69,6 +82,8 @@ typedef union { #define GHCB_INFO_CPUID_RESPONSE 5 #define GHCB_INFO_GHCB_GPA_REGISTER_REQUEST 18 #define GHCB_INFO_GHCB_GPA_REGISTER_RESPONSE 19 +#define GHCB_INFO_SNP_PAGE_STATE_CHANGE_REQUEST 20 +#define GHCB_INFO_SNP_PAGE_STATE_CHANGE_RESPONSE 21 #define GHCB_HYPERVISOR_FEATURES_REQUEST 128 #define GHCB_HYPERVISOR_FEATURES_RESPONSE 129 #define GHCB_INFO_TERMINATE_REQUEST 256 diff --git a/MdePkg/Include/Register/Amd/Ghcb.h b/MdePkg/Include/Register/A= md/Ghcb.h index ec232ebd3807..029904b1c63a 100644 --- a/MdePkg/Include/Register/Amd/Ghcb.h +++ b/MdePkg/Include/Register/Amd/Ghcb.h @@ -54,6 +54,7 @@ #define SVM_EXIT_NMI_COMPLETE 0x80000003ULL #define SVM_EXIT_AP_RESET_HOLD 0x80000004ULL #define SVM_EXIT_AP_JUMP_TABLE 0x80000005ULL +#define SVM_EXIT_SNP_PAGE_STATE_CHANGE 0x80000010ULL #define SVM_EXIT_HYPERVISOR_FEATURES 0x8000FFFDULL #define SVM_EXIT_UNSUPPORTED 0x8000FFFFULL =20 @@ -162,4 +163,36 @@ typedef union { #define GHCB_HV_FEATURES_SNP_AP_CREATE (GHCB_HV_FEATURE= S_SNP | BIT1) #define GHCB_HV_FEATURES_SNP_RESTRICTED_INJECTION (GHCB_HV_FEATURE= S_SNP_AP_CREATE | BIT2) #define GHCB_HV_FEATURES_SNP_RESTRICTED_INJECTION_TIMER (GHCB_HV_FEATURE= S_SNP_RESTRICTED_INJECTION | BIT3) + +// +// SNP Page State Change. +// +// Note that the PSMASH and UNSMASH operations are not supported when usin= g the MSR protocol. +// +#define SNP_PAGE_STATE_PRIVATE 1 +#define SNP_PAGE_STATE_SHARED 2 +#define SNP_PAGE_STATE_PSMASH 3 +#define SNP_PAGE_STATE_UNSMASH 4 + +typedef struct { + UINT64 CurrentPage:12; + UINT64 GuestFrameNumber:40; + UINT64 Operation:4; + UINT64 PageSize:1; + UINT64 Reserved:7; +} SNP_PAGE_STATE_ENTRY; + +typedef struct { + UINT16 CurrentEntry; + UINT16 EndEntry; + UINT32 Reserved; +} SNP_PAGE_STATE_HEADER; + +#define SNP_PAGE_STATE_MAX_ENTRY 253 + +typedef struct { + SNP_PAGE_STATE_HEADER Header; + SNP_PAGE_STATE_ENTRY Entry[SNP_PAGE_STATE_MAX_ENTRY]; +} SNP_PAGE_STATE_CHANGE_INFO; + #endif --=20 2.17.1 -=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 (#75394): https://edk2.groups.io/g/devel/message/75394 Mute This Topic: https://groups.io/mt/82943405/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 Sat May 18 14:10:06 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+75396+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+75396+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 1621448414598639.032831294555; Wed, 19 May 2021 11:20:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id VZzsYY1788612xK3G3xGW1Xa; Wed, 19 May 2021 11:20:14 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web08.15796.1621448412898053018 for ; Wed, 19 May 2021 11:20:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gW9BNhWwld7ta/M4NhXKoU7Q17kd5kP1TcNZ8hM5STR7DA4BhEhhiJE9tdApz0LeltbS1VidoJB0BKjuyHbWiQDwSAdx474N+6NPko4EnD2kV0zgOCmVNBEly1yHDeyw1eQoHxgDtgScw1ZuJN03Nw6E61IoCPtoh7f9RG/rmFlN5rs2MzQDreLTmqRnKj/tkeX8cDC77pgpWjwgcbJf3/UHC6DZEhDFfmiFcJgU1qsOuFlzwaexfKnu49k7scvtkLzitFl4eFpjL31eHvPo6SUOmI0MbExqISJYdV79+g59qi3hKH2SKty6EC2aEM/cU/dPFgXnJraxITvR3DgeAQ== 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=G3khcQ4xZBYeH5Nt9s+emYkyq7ndSveHK0psWNxobaY=; b=VAVHpfZGV+h9XoDw9KTivanfmPtrUdtA4nufD53OhF5DZ6d8XHvY9svSLcs/K4T1Q0q38z4ynS+Ce04QLRgF4x/gNCMKSa4lR6//skKY6Cnw+kVB2t1sVb/BYaiAT2ik02XIMFPvhZ5zz95fSROxtnM1na250XUNfx+brGJbLtxg6SDETIkpOL+xbeV9/TIBuuSMUXdNy4XPMTpAEdFUZOOSiMj/0bWRJ6tEgQvZ8IzlZhReOZ4Pn8pvPFu5ol9rKVvlNFdVY4LH1Pb6NsnJRE/QOBi6Vk/b1sn5m5uToOQ6M4tOPRvGfZF+T2nkyL5peD/UdMkFz8KXznFlBBKYwA== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:10 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:10 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Tom Lendacky , James Bottomley , Min Xu , Jiewen Yao , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael D Kinney , Liming Gao , Zhiguang Liu , Brijesh Singh Subject: [edk2-devel] [PATCH v3 06/13] MdePkg/Register/Amd: define GHCB macros for SNP AP creation Date: Wed, 19 May 2021 13:19:42 -0500 Message-ID: <20210519181949.6574-7-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2566881d-a454-497f-028a-08d91af2bcc9 X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: 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: mY54ZOmtpl6UZ8yqbI27dn2352VTwDzGKmhnjU9g69WkJADSOVIPwgl9gPp/niAyQ7yPdZtTsZK4PaCFysXxKyACdqiJc/H7yZPDc36ivcjwrVWswBWCD5Olm/Is9e4+VpfdxWLdZ4NsaDpAG6FwHHAeZGB5GlNz/Mv+73r3STpMfUvijeS1Mn1NHRBTvsq+IdSFkkwNGkS2kZfmkJQr098eMzAFpuq2oLGBLzKNnWAb0P/b+l7GL9/BSqpKnPQbZXtRFLr1sapNRGIX7q/3xF9T5tpW7dvoojonaeF5KyXkdEuGSquMx20cX8MFFPIDI+XLRdZuArDMpJ0pCm8Mjcftu2u6Y2akI9IruNlPzWFVXV/jtUL5+05TkoUA8eCwdEAMTMfx+UrbQoCOyYzKyuocpBvsXrfUs4GdHIX2GjxhCjMi+PovpSeMZud8B5BriOBjuv2hp6MZZdHNf7B9PVIRGCUmW+2Z7+dSA9mewY8ecjEiBbe3QJuYjEQ9X2qqchiQfoatpOBzEbUGtGnOCZRExwjeF0r/zeUhhDrf+8/aLuU9Kjj7hHu6havEFQn/kB/p8drPyakWtHnXFVac6SnyarlKLsxpBgS4uAHVcdB7+d9ca4aA3R63Z86/0bUNSRy/QgXOIVS5BQRIq5dhhD2dlMNEMvnHqPB7YSzaoikfbtkBJURfBNfDWOTa6x6SkKr6mVb3x1DilbX5vq4h1ATo8Q2HsU3n2VVyT42ghr0= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?WkWKoDVPt8CaGyNnHRlEGDXLUhe2BIx6W873KqyabCXQsTaZOmHHRdrsv4Uc?= =?us-ascii?Q?2XVSu2mYV9/kiSYxR1O1GLhXtxLEhTUUUAvaA1aYpA8fk+hNfII9vaV5DGpP?= =?us-ascii?Q?lkGqkSAPX/zIUk/i9fg4n99xiO3xVqksyqCgfVrnDOPixceqwthfSkwTTyQS?= =?us-ascii?Q?A0l4zMiVz/CUh2Ozky8MaPiCx8XByuu3eAVZ74T99hVqA4QpqM3havYaoTuL?= =?us-ascii?Q?OkodT5iCVZjSGi6gTdQTuPXBH3OlNAR9iWrOPVYwKSqEuS9G4D+s9p3iKHoK?= =?us-ascii?Q?vObYv+ulX/nIA0LjDukauFkCAW0ywkxonBeSa2vo988mSIboY6ICbgUtgMq3?= =?us-ascii?Q?xpdyaLPbQNO+upsvny6o9SqmOHNZFVhgvXmxm0BgHj58INsovp+mxKzs12yI?= =?us-ascii?Q?JzK3QOSBITvmM7iLMgaW+SB9ku7X6rfkACCthgS8+7KwetcKo3pVxT4XYYsZ?= =?us-ascii?Q?RZjtC6GK9rRAYuTlqNpdXypy1hnoYlk1nSKI1wKwO4QT6XQr1KLzwLF8Fbu7?= =?us-ascii?Q?sg4mD9KGmU8JrVUK3cMrDDfICp8N4YWjOFfs7BNpG9Uuo4d366lWoYeJuJMF?= =?us-ascii?Q?QyGSys6ePX1zz1jH+IA7uUfZ+PC62HS8g2D32FM1aT1Lcug66EbOtbiBtPIz?= =?us-ascii?Q?RL+NX/GETGyUeFKmAqjkp1EpSqnUavD3qSp9HjWGQhPlzMW+QZJJ0DdGhj7c?= =?us-ascii?Q?hN2IOTJdh6o2VRRuHVM3HAy49iMBPEc3qaUA/6y4zaJ8MiTAlr67x44wJBu1?= =?us-ascii?Q?omfxCpTrP7qiE3tuYRc8lFvxH1dNnIgZv67hfrxhc+woSLVYy/1RXbG6kbv0?= =?us-ascii?Q?jPTRmLliUuUwnuse6dAK4Dk6+N/Hi5EqzNLRGuacxI7C/8l2zUm0hBufmAvh?= =?us-ascii?Q?M+AFIvBUHdaFNyIn0m0fAMAcWGL7FqOob4sDGYYMtH/c/ZKsHZq818i3EyO7?= =?us-ascii?Q?yKzKE3doguA+MONgXs0969Uq5BkyjLCp++KeKY8CHvIMiSSD6AsFSYbxbuU3?= =?us-ascii?Q?1HM8ssG9tlSp9wCfm6FDNcAr7yiXIeLnEPQQiUfbVBA3lD/lqrEL9ewWWSDR?= =?us-ascii?Q?udzyUYSsH2J7ShOiMctNSN0++pGHSxK4c2eT6Z7+gpRWtQhYsNqhG9pmlLAA?= =?us-ascii?Q?U5n2kBXcItbhkWVphQCpwtLs/QE1iqx2XLKVYRZMCVlcYth0FFOBOLjsGhDS?= =?us-ascii?Q?ZUWZQoXUGlN2XJvbDd0omjg4WYqCkhXzasujRMITMcuLTI9M4Vyn6JXcpvcR?= =?us-ascii?Q?goA8RpoEEoSZFuAwIu8qEAbMYFRjAWgFRPueD+Hr3zOMsgNJWuw7Vt7wU3Im?= =?us-ascii?Q?FjBhVRz8SQMlfzsUyKsFDtcz?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2566881d-a454-497f-028a-08d91af2bcc9 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:10.2932 (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: JxtHXl0yw3JfzYkhqsrICmd1knh0a26PVuSpl7r6hZa9snJuNBgwTj4fAx6J/Sqz4FJgbjpLKX4y6KRwNCapFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: GdQJlWyaApDEh7TV6P0d09f2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448414; bh=lF2C9EpE8jKad4h/bXYcNLSJXrwsas1GKaaRweihKko=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Deb5zVnytDj+OEYxP7Uq/B07R6P8qW0MyUQturmMQ2PDafqvbtED1gUjgrnsDPm5M7E UsGZANCWwlnYKIXtiYTzU9+lJNILFSLYnNLEWY3ZvpG0/51vLotiapSdSEW110c5ABLjZ mvr2Rc44Q8I7Tktfo/rfglYSeRHh+/mysf4= 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=3D33275 Version 2 of GHCB introduces NAE for creating AP when SEV-SNP is enabled in the guest VM. See the GHCB specification, Table 5 "List of Supported Non-Automatic Events" and sections 4.1.9 and 4.3.2, for further details. While at it, define the VMSA state save area that is required for creating the AP. The save area format is defined in AMD APM volume 2, Table B-4 (there is a mistake in the table that defines the size of the reserved area at offset 0xc8 as a dword, when it is actually a word). The format of the save area segment registers is further defined in AMD APM volume 2, sections 10 and 15.5. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Liming Gao Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh --- MdePkg/Include/Register/Amd/Ghcb.h | 84 ++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/MdePkg/Include/Register/Amd/Ghcb.h b/MdePkg/Include/Register/A= md/Ghcb.h index 029904b1c63a..8c5f46e4bb53 100644 --- a/MdePkg/Include/Register/Amd/Ghcb.h +++ b/MdePkg/Include/Register/Amd/Ghcb.h @@ -55,6 +55,7 @@ #define SVM_EXIT_AP_RESET_HOLD 0x80000004ULL #define SVM_EXIT_AP_JUMP_TABLE 0x80000005ULL #define SVM_EXIT_SNP_PAGE_STATE_CHANGE 0x80000010ULL +#define SVM_EXIT_SNP_AP_CREATION 0x80000013ULL #define SVM_EXIT_HYPERVISOR_FEATURES 0x8000FFFDULL #define SVM_EXIT_UNSUPPORTED 0x8000FFFFULL =20 @@ -83,6 +84,12 @@ #define IOIO_SEG_ES 0 #define IOIO_SEG_DS (BIT11 | BIT10) =20 +// +// AP Creation Information +// +#define SVM_VMGEXIT_SNP_AP_CREATE_ON_INIT 0 +#define SVM_VMGEXIT_SNP_AP_CREATE 1 +#define SVM_VMGEXIT_SNP_AP_DESTROY 2 =20 typedef PACKED struct { UINT8 Reserved1[203]; @@ -195,4 +202,81 @@ typedef struct { SNP_PAGE_STATE_ENTRY Entry[SNP_PAGE_STATE_MAX_ENTRY]; } SNP_PAGE_STATE_CHANGE_INFO; =20 +// +// SEV-ES save area mapping structures used for SEV-SNP AP Creation. +// Only the fields required to be set to a non-zero value are defined. +// +// The segment register definition is defined for processor reset/real mode +// (as when an INIT of the vCPU is requested). Should other modes (long mo= de, +// etc.) be required, then the definitions can be enhanced. +// + +// +// Segment types at processor reset, See AMD APM Volume 2, Table 14-2. +// +#define SEV_ES_RESET_CODE_SEGMENT_TYPE 0xA +#define SEV_ES_RESET_DATA_SEGMENT_TYPE 0x2 + +#define SEV_ES_RESET_LDT_TYPE 0x2 +#define SEV_ES_RESET_TSS_TYPE 0x3 + +#pragma pack (1) +typedef union { + struct { + UINT16 Type:4; + UINT16 Sbit:1; + UINT16 Dpl:2; + UINT16 Present:1; + UINT16 Avl:1; + UINT16 Reserved1:1; + UINT16 Db:1; + UINT16 Granularity:1; + } Bits; + UINT16 Uint16; +} SEV_ES_SEGMENT_REGISTER_ATTRIBUTES; + +typedef struct { + UINT16 Selector; + SEV_ES_SEGMENT_REGISTER_ATTRIBUTES Attributes; + UINT32 Limit; + UINT64 Base; +} SEV_ES_SEGMENT_REGISTER; + +typedef struct { + SEV_ES_SEGMENT_REGISTER Es; + SEV_ES_SEGMENT_REGISTER Cs; + SEV_ES_SEGMENT_REGISTER Ss; + SEV_ES_SEGMENT_REGISTER Ds; + SEV_ES_SEGMENT_REGISTER Fs; + SEV_ES_SEGMENT_REGISTER Gs; + SEV_ES_SEGMENT_REGISTER Gdtr; + SEV_ES_SEGMENT_REGISTER Ldtr; + SEV_ES_SEGMENT_REGISTER Idtr; + SEV_ES_SEGMENT_REGISTER Tr; + UINT8 Reserved1[42]; + UINT8 Vmpl; + UINT8 Reserved2[5]; + UINT64 Efer; + UINT8 Reserved3[112]; + UINT64 Cr4; + UINT8 Reserved4[8]; + UINT64 Cr0; + UINT64 Dr7; + UINT64 Dr6; + UINT64 Rflags; + UINT64 Rip; + UINT8 Reserved5[232]; + UINT64 GPat; + UINT8 Reserved6[320]; + UINT64 SevFeatures; + UINT8 Reserved7[48]; + UINT64 XCr0; + UINT8 Reserved8[24]; + UINT32 Mxcsr; + UINT16 X87Ftw; + UINT8 Reserved9[2]; + UINT16 X87Fcw; +} SEV_ES_SAVE_AREA; +#pragma pack () + #endif --=20 2.17.1 -=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 (#75396): https://edk2.groups.io/g/devel/message/75396 Mute This Topic: https://groups.io/mt/82943407/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 Sat May 18 14:10:06 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+75395+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+75395+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 1621448414031521.8744130200763; Wed, 19 May 2021 11:20:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZkcaYY1788612xr7MFF0nYJh; Wed, 19 May 2021 11:20:13 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com [40.107.95.76]) by mx.groups.io with SMTP id smtpd.web08.15796.1621448412898053018 for ; Wed, 19 May 2021 11:20:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ou3Oy0p3W0tfgTS1+GafuymZzFJwvTER85eIm4XqWYlcUTC+NVfKgpg7GxWc8rc3BQ8vbM3E/6Uap/5DRxUKexaPJhSjzNBZy14X4wQCdsFy/+b9egilgL0JNJPzjJxuzHAfRnRpO29AV7AwGM2y3PXrqKhkGgTV6bdJSObUShULekEZ5fWx9AcYYbC9wBcxz5MTMR8wYpzED8MZMsoqWlIelKfmxRyz8RBcdLKC7qF3AJht1eYSzuaFBZLWlIyQrvRQZPuTWgAcFfy1WwHuwy6Wpb82RPxU1zOEqA33VsAhk0RukK/JubaR1nFw6GzSNJCqqM+dALtuUkAugqDn3w== 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=fxgvpD8/EsSxA4HrdIYKlc846HxrtzYWvHKJj5lJCkg=; b=PJ26GEYg6IIpMyMq96aUDPUjuiQ+O7nbGNoDhxjpI6bpRMKgStPXq3f9brMZyEI4q5b+6jKBij6DeO49Qeg5dk0N3XfjJANce26mQTxh3LLe72GKvmnZxT0SV7T92zssyKXizRkoUcsmcyqG+j6poe9WzZvfmB4kRVN8dm1D/vJzvlQSmnFQaJsdXkmLgESecDo9yC1oEOwaVpMIk3zlHgRum+IEi3W5ph898QmLrYTR1JtUnRVUWGxv6+iOjh8deGV7eMGalP3QiqO5CWfC3Vz5i2a8b4OmJvIskv+0kmsCL8mw+eXpDs0mR43lapC27Nz/lVEq15Tj2Shil6LneQ== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:11 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:11 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH v3 07/13] MdePkg/BaseLib: add support for PVALIDATE instruction Date: Wed, 19 May 2021 13:19:43 -0500 Message-ID: <20210519181949.6574-8-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92de7e46-8f08-4e0b-d85b-08d91af2bd32 X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: 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: at4HL0PR1rppZjoty0X7xcgynsuG8a/i/T0IOTxxvljW7tpkiKO8D3+DHvR/D4fBzdpFtXjqg/z3LJK3lSZgmzY12uVGQD3+0EQzvRrjnPiBXnVl8PtUrRIfQwbIttV0eNPeFA44g2iz+a3vWTW7eBvYMC69P+b1Cop9elr9dD5Ej3V42Lq4Zzp5K7/vXPoDe6CNaRV3+qO+oHk+9vBeK45PHl7moLYBx+OObKiNccFLPrNGZcRbOsSiEX/aGJRISp5TZtXqk4fS5vBk4pr8WJmIf8YFJEirn/gfwMBnIElNi5TpCQW6yIZz88BhZ5bwMjZLn/eg8e3sR4Ir6SqNhCwggTUzFpS355lFL0tottRKkncdnZ1009audx3JomSwaGSR+iWviYm62E4NEEonvrYc3EbFxHSufXua8mkYpkpWK++9vxu6/GxHRRASDlcY01H5BUhTR6aFDHUSEe58K1BlFEgCGmuGPuEPEzz//CVSWlwpNyVyMLBRUj6Hakcjzrmy+uPmJKZCbJPrlkjlPhwvx60b0XVdUTmVhOWn1fhREOhS66u4cSRP+2royLsldVI3KBgReH35cSBPwIL7RUx1pTwZZiP5n4JtKdICbXHk5E+Bix5e1v8e8a+V3/Rxg2DunXonSF5XnnfE1wyku6dt20V4cAekoMbbEVBxS8xVAGfubo6ih6MHSOsbUpvL41ODWVGntfHdiOjQEJF7XVZk4g5iDza2c36VibpfJJc= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?t4619zLEoVI6PX5Yj9dympNLbmsfOTJr5g3sWVqavfxV6INGjCkzhFucrAb1?= =?us-ascii?Q?R0G+B3SHK+1DeDlTOmHn7v1CWrH4/3vfhDNL95xBApF0UA49ZRlU9BBQaaCc?= =?us-ascii?Q?3p3nDUxT1ZlhbZxqkpNWz1RJgW+hlPiXsnqfHMMABswVnyP7KtshQM71vgCS?= =?us-ascii?Q?+jxoKE3Bl2BwbXcsxAkpnRLqCdj0vrn4ZzgUZU3eDHFipHWAfk9xZIvi7/OR?= =?us-ascii?Q?nQYO8Oa36swDziAa66hQ4tXAXqfNZ1LbM1xyph3tAf+1JuTdDa/3cgB46ZCV?= =?us-ascii?Q?YQ/rq6/2zZvf1kSkbGmxA6ZsKKrKgIOO+2+ljWbXVJcXT51qNipkHNoqReHq?= =?us-ascii?Q?8+I5uA2g2H7a1j0aTzfcAQWf7kvJchhSvBEwZIK8q6u5rVuNabmEjAo/BRl6?= =?us-ascii?Q?r6JBDfb7lkQwWoO3v8Y52bwTTWcNprRUaPNcpnsPCxjYEmEWj58/3N4Akmsv?= =?us-ascii?Q?0410ONynqaR/lNzFlhe2TbkItOaVYUu64wD2/y7gOfYX7Bldja/u48qQhwG2?= =?us-ascii?Q?IEOnxaeTBHHBILOxzuTCpvwSVjwQJvWQTCPhLnJ6DNN/naZc1H9oI84okmdh?= =?us-ascii?Q?S33z6D7aKoSvcNMLAoZiP5cxkPHAb5VBXnsvOyBRInTWabUC2o2roGosEyMR?= =?us-ascii?Q?ngCoUc3ljLt2MrS1YX6TCn88yQYj5qYcfQh29Qyrr/0l77BbnGxBkj6WPSIU?= =?us-ascii?Q?czKe8/+CdUUnDhUuJJfYZfGU+TtbnIChdEPy+OjWofoEKIVHLI5xlLBzN367?= =?us-ascii?Q?zIw6q+R3xoQrZ8TgvoICKwTzA4jlcky/F/2sdnYbFkFo2FHRd+hwo06yntLc?= =?us-ascii?Q?BYRu5jNkJflWjXDVl6gRaP9NF5wXiS8Po83j81x66922ubAC2Jk98eeg5k3O?= =?us-ascii?Q?vX8MEDmyedMxHu+0MMtLaowpelZf4y7vuL0ohLrIvR4iTpW33yrvIidnRh+B?= =?us-ascii?Q?/vhsvFurRExbipdhJwZxGitmvPFZJJkRFjk/SJArfeDwTTJWj00vTkRwfLpC?= =?us-ascii?Q?bp7RyKv8iLPcs+0GTT3BRr58D0G/bWhswCRkG9Lc1WWn2xQiPasvTxATF6dk?= =?us-ascii?Q?kKRED8Yne5hrd9kL4pB1Rmz9TD64dQD1f7eniqnjvni7OLDUhmunzh4lTBf2?= =?us-ascii?Q?xLa+/HcgW9HzbiRpyvkTIpjGp7YW0NQuB9heHxRa+YU0hEsFOACWO09F/ZbB?= =?us-ascii?Q?uznKI0SoUJ8SdbQzAx8eSWr2ueaIaCpN8BWC7OhadEWS4HqTqzafcOB/fkb8?= =?us-ascii?Q?CLLEkjHkUFzw9pu89gsoW3QWCLIA2gxZhbAESyU3A8FtC4sdLDKsWYqDf2Qv?= =?us-ascii?Q?iBUlG1JUnntASl7ZS6KD4/G7?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92de7e46-8f08-4e0b-d85b-08d91af2bd32 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:10.9448 (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: z7RFC4gRPQuAwGQBSZfWI7t481UBP76Fa3GA+oHjxqhU7PTZOgS+rqdibd3SFVRPqsTU10q6/QrG8hgRSSgzmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: G0loed4dXjk9zwruCGmrflQlx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448413; bh=U7oc9lDk84doE8HXwXHXb8oabLbA8YCD4QNSxp+nAns=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=wxounDMkJ9/gNPq8y+B5gD8YBub1xQtDVy/+jHuZLJkgpG6Rw7ODJf4iMWA8z+zzA/H 4pVjGvB08UqTYdfrO6z3ODxxGT/ObfQbjx4A4uSryakC5E/kyxCC+5Ed9t4j38LLqGrVF SvImynJAAgXgKnAtN3xHaJDlDM0HXw1gobE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 The PVALIDATE instruction validates or rescinds validation of a guest page RMP entry. Upon completion, a return code is stored in EAX, rFLAGS bits OF, ZF, AF, PF and SF are set based on this return code. If the instruction completed succesfully, the rFLAGS bit CF indicates if the contents of the RMP entry were changed or not. For more information about the instruction see AMD APM volume 3. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Liming Gao Reviewed-by: Laszlo Ersek Signed-off-by: Brijesh Singh --- MdePkg/Library/BaseLib/BaseLib.inf | 1 + MdePkg/Include/Library/BaseLib.h | 50 +++++++++++++++++++++++ MdePkg/Include/X64/Nasm.inc | 8 ++++ MdePkg/Library/BaseLib/X64/Pvalidate.nasm | 42 +++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 MdePkg/Library/BaseLib/X64/Pvalidate.nasm diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/Ba= seLib.inf index b76f3af380ea..89a52f72c08a 100644 --- a/MdePkg/Library/BaseLib/BaseLib.inf +++ b/MdePkg/Library/BaseLib/BaseLib.inf @@ -317,6 +317,7 @@ [Sources.X64] X64/GccInlinePriv.c | GCC X64/EnableDisableInterrupts.nasm X64/DisablePaging64.nasm + X64/Pvalidate.nasm X64/RdRand.nasm X64/XGetBv.nasm X64/XSetBv.nasm diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/Base= Lib.h index 7253997a6f8c..a2cd134bea9a 100644 --- a/MdePkg/Include/Library/BaseLib.h +++ b/MdePkg/Include/Library/BaseLib.h @@ -4813,6 +4813,56 @@ SpeculationBarrier ( VOID ); =20 +#if defined (MDE_CPU_X64) +// +// The page size for the PVALIDATE instruction +// +typedef enum { + PvalidatePageSize4K =3D 0, + PvalidatePageSize2MB, +} PVALIDATE_PAGE_SIZE; + +// +// PVALIDATE Return Code. +// +#define PVALIDATE_RET_SUCCESS 0 +#define PVALIDATE_RET_FAIL_INPUT 1 +#define PVALIDATE_RET_SIZE_MISMATCH 6 + +// +// The PVALIDATE instruction did not make any changes to the RMP entry. +// +#define PVALIDATE_RET_NO_RMPUPDATE 255 + +/** + Execute a PVALIDATE instruction to validate or to rescinds validation of = a guest + page's RMP entry. + + The instruction is available only when CPUID Fn8000_001F_EAX[SNP]=3D1. + + The function is available on X64. + + @param[in] PageSize The page size to use. + @param[in] Validate If TRUE, validate the guest virtual address + otherwise invalidate the guest virtual add= ress. + @param[in] Address The guest virtual address. + + @retval PVALIDATE_RET_SUCCESS The PVALIDATE instruction succeeded,= and + updated the RMP entry. + @retval PVALIDATE_RET_NO_RMPUPDATE The PVALIDATE instruction succeeded,= but + did not update the RMP entry. + @return Failure code from the PVALIDATE + instruction. +**/ +UINT32 +EFIAPI +AsmPvalidate ( + IN PVALIDATE_PAGE_SIZE PageSize, + IN BOOLEAN Validate, + IN PHYSICAL_ADDRESS Address + ); +#endif + =20 #if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64) /// diff --git a/MdePkg/Include/X64/Nasm.inc b/MdePkg/Include/X64/Nasm.inc index 527f71e9eb4d..528bb3385609 100644 --- a/MdePkg/Include/X64/Nasm.inc +++ b/MdePkg/Include/X64/Nasm.inc @@ -33,6 +33,14 @@ DB 0xF3, 0x48, 0x0F, 0xAE, 0xE8 %endmacro =20 +; +; Macro for the PVALIDATE instruction, defined in AMD APM volume 3. +; NASM feature request URL: https://bugzilla.nasm.us/show_bug.cgi?id=3D339= 2753 +; +%macro PVALIDATE 0 + DB 0xF2, 0x0F, 0x01, 0xFF +%endmacro + ; NASM provides built-in macros STRUC and ENDSTRUC for structure definitio= n. ; For example, to define a structure called mytype containing a longword, ; a word, a byte and a string of bytes, you might code diff --git a/MdePkg/Library/BaseLib/X64/Pvalidate.nasm b/MdePkg/Library/Bas= eLib/X64/Pvalidate.nasm new file mode 100644 index 000000000000..a7d177913405 --- /dev/null +++ b/MdePkg/Library/BaseLib/X64/Pvalidate.nasm @@ -0,0 +1,42 @@ +;-------------------------------------------------------------------------= ---- +; +; Copyright (c) 2021, AMD. All rights reserved.
+; SPDX-License-Identifier: BSD-2-Clause-Patent +; +;-------------------------------------------------------------------------= ---- + +%include "Nasm.inc" + + SECTION .text + +;-------------------------------------------------------------------------= ---- +; UINT32 +; EFIAPI +; AsmPvalidate ( +; IN UINT32 PageSize +; IN UINT32 Validate, +; IN UINT64 Address +; ) +;-------------------------------------------------------------------------= ---- +global ASM_PFX(AsmPvalidate) +ASM_PFX(AsmPvalidate): + mov rax, r8 + + PVALIDATE + + ; Save the carry flag. + setc dl + + ; The PVALIDATE instruction returns the status in rax register. + cmp rax, 0 + jne PvalidateExit + + ; Check the carry flag to determine if RMP entry was updated. + cmp dl, 0 + je PvalidateExit + + ; Return the PVALIDATE_RET_NO_RMPUPDATE. + mov rax, 255 + +PvalidateExit: + ret --=20 2.17.1 -=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 (#75395): https://edk2.groups.io/g/devel/message/75395 Mute This Topic: https://groups.io/mt/82943406/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 Sat May 18 14:10:06 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+75397+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+75397+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 162144842171679.88834229856991; Wed, 19 May 2021 11:20:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hhtoYY1788612xMFXVo8zKfj; Wed, 19 May 2021 11:20:21 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.74]) by mx.groups.io with SMTP id smtpd.web09.15906.1621448415547919253 for ; Wed, 19 May 2021 11:20:15 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HfqmhLVquM+PFVMt4gP7FPV6gxoVTCIS+v49NkZPkzgbna9nGuiTDSo+rEUMi+LZk4DGOHzFheyCssshO9Nbnz3ZjQ1Hd5DYfE7A2q5W4JMCZpzKUbMutSgowfLg1Zo4cnNo5LJFuQFVbm9ImiO/kfLiGMm3TsLc6e+l0pkS2R1mGwdykLMKI9lYK50GJvl/5FR4NSl7if9zwZZ3gkyK24VKokl6/vwsN/H1vH08VBf23LAUFRnfIEydXNbjRA0hJnXyJiN7Cr3cFpEBD9QMl9ocCkLL0hTgonVaGspMjC6idVok6NB4J97DAtxQnjtboBfQwGdlIIL8AkcvpoUMBQ== 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=1tvYEFOwi8/ZqSrzInCjgbQLT+kzDJGBR9yEjpijtsk=; b=YdXZSVnsvY5Ja4RjKfvg/STskrcTboBQ8VsHN+mHw74jqrNO0muHM6HQKrN+5fng6l7y1D1sFbd71LqdNxUQhw9o6dY2hmmnETTppKMw91ZBUijSfkOJZ071s7fwW7EdEXb39P9GafW/+K+yJta8qyVJjhehYDli7yjxmldX2G3NEW9iN7kPIXfTh6Bd3/fhGE8GqFOEhGeeNIZlfFawMwEyBOmO9CwpDKkltu1JWJYuKszPfUFUMK4+FDvAXUL88BeOfTB8vA9WZFqU9mJxF1co9mDuogc0SdomxyZClwXwFdmpapTjVWCnTHwlfkMHuZom19fqRTQBxt/uTYszqA== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2413.namprd12.prod.outlook.com (2603:10b6:802:2b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:11 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:11 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Tom Lendacky , James Bottomley , Min Xu , Jiewen Yao , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael D Kinney , Liming Gao , Zhiguang Liu , Brijesh Singh Subject: [edk2-devel] [PATCH v3 08/13] MdePkg/BaseLib: add support for RMPADJUST instruction Date: Wed, 19 May 2021 13:19:44 -0500 Message-ID: <20210519181949.6574-9-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ae180c7-6ee6-4953-a157-08d91af2bd99 X-MS-TrafficTypeDiagnostic: SN1PR12MB2413: 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: uGb2ypqj1r1SyGjiBfM7x0CSBPRUP0bTax2pfDBR+YXmMEtQ/cJEQvlnp8FeYS04BBl09clRYYgyzEL2X3UUXEWxetqF7j3j7EMcbeveSfD9ow+RBHI8AmpBVISSJsaL4gy4hLyKlr3ahcpE3mrV7BaJqc2GqYp7FU0Jji0fkRcrshSjtDq8wIKHx/q+xC8Lz6GPWqERpoCQP0QqbjqlSdoLnLO6Pmyyvz74IdZKEd+GyPAYyKeGhlg4kbCaH3FXPLPbYZ4VLnk++66KckNHegSSzbE9uXapyJ2LHsaYloSXnTkCJ2rtIuOHccPva+D9jZsf0ge4kw49FFWHscHI8zQ3GNIgBwsoztD1j224ecI9tR66kLyIxVpOgPjdRUGsTmomYc3AcphDpTC9+SdeHS1EWLJba0hG1/gmzzXXOK5zcG8dD6YvPOlObUUqazEwPMEWuXw7x2sx/+Fd2TWd/BXTZTfyeZ5cDqHnuz9nTYI1E+7BVTsDMrVZSwoWN9WpAO29A5A0Q2sbpNlvA8iruus4qrXT+Yaajpl9c2YfJDyi3KkSgyMnIx5jwgibS5NK6Da8ApFCcOEUSyJwovWfd6cZD6srOULIR0alnD+LxfBOYLDLRqwTb9yc9QXTH1zCbGkDkYyXiSb0+kWnpDJRkKLkv3QWrsnRFQ+oltHtE3vhIP4hm9tmUtA07Wx6f3l+R3on0dGLDOJ5vACb5MpRmf7fDyVIcngcf75UBgXXXW4= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?s2Qz0j/74roQ5odGQc1ZPABRcG0kD9nDntrzxCeT0QsBiJNxIBtiSkYtUK3K?= =?us-ascii?Q?xZpbb4eL11Et++56Pc3SCJOHmamrVv42V3YKjd9cx8DFC26BaAX4TvcAtTpu?= =?us-ascii?Q?tP//8EDUXT409XAETnE1Kw760hDIuk88CT3OWXlEBKSMyqHQGHjOX/EypEO2?= =?us-ascii?Q?OYpsfoyVS9DTv8z8fEsJHKslcXdzcjvAxGJHUsozBSHTYRXQi6LJ/SkmlA4b?= =?us-ascii?Q?nSJ9BMUiT5H7zYa5D1SMtta93zJxapLfjrM9hRNtk+eCpxTyx6+cy1Knrpr3?= =?us-ascii?Q?Bqymj0QOyotuWcScsiHspyHhDqcxCyH3h0h7r+lDn6/8f1M87+QhIwHEoQBN?= =?us-ascii?Q?SgM3gZGkc2pyqxgv4xIy6fFxIlelltWax92QuQOBmG8zPvi/wmbwmH+4xB4w?= =?us-ascii?Q?BP3MPK0OFEuqkVlb/ATQ+BPVbbAI2JnXzbIgNWDCOmavgT9ydFBvMBEowACz?= =?us-ascii?Q?qPQdyfHg/uro34mkZ0XmVQMe5/61iRrlqZ4jdNuF1U6rlHpgLSfD6Uws/v8/?= =?us-ascii?Q?i93ASIxY+H9wlK6QCcls0he9410sxiwGpIr8tcAoQ6PT88dtHi78n9QE6o8s?= =?us-ascii?Q?Q1J4nxx262D4RYQTSmkbY0crsGMBSEvHFv1zoVIyqdLLzKq/5RNFc1p1w5Y6?= =?us-ascii?Q?tejjc2pNo9EZkQZArgY0UemA5Rm4Zh5oV8wtOCirJPMzRApEWTn8qpOJbw0w?= =?us-ascii?Q?906EUgYIDh6H9L3BaLtt3kpErcHmLe3hyQQt/kmIMWurc7kYn6hEI1rMqWlr?= =?us-ascii?Q?kB8jEv/4AceLziD17OOwUoXKDRHyGHvB0VVgpafF/cI21KIp+7fGWML3plhq?= =?us-ascii?Q?tALpDGNQpXD6evrFgsEqGUMisRsBPuk9lZzKxslg05+GVNNkzy010kAY0Ecm?= =?us-ascii?Q?ctpzr+rk1aNtAel06+9I5wVA7Jv2EN0akI+OoM4URd15ooI4rhOPndM/T35A?= =?us-ascii?Q?XaGH1ESHPRTWowyeEMJ6fefkimpppio/JmQJ/EXwOi34J3Lh5kpnEB2S4c8G?= =?us-ascii?Q?jv76bZrOw2YG5RqmyvR0CbkHeOMt0sNTq9EuEZaqa4rTVuuNvBgiuNu3H3Gc?= =?us-ascii?Q?UOm8ynsrJvMkanq1gPmkrQIPNYl4stL8PZlblc09tLLb0CUvk0YbpHyGbwXF?= =?us-ascii?Q?9R+YK7KrPvT0+yNdAVe/d/xkxcjqPK8RwRfRVzB/zuhVEWETc6YAhNhEEFgB?= =?us-ascii?Q?8dQLNuQnFJu6+UB14FOCGgR21VYW2q8Lr5P/DPDk5q8+9LAaC6Wjihb6SUOu?= =?us-ascii?Q?QaVRslWFMPYO4iZB4WQoTh5QExhB0Dtf0DdeFW6Wr1DboMTX9+FCGDjdy4u1?= =?us-ascii?Q?LIF0n0x0vhu83VsnY/UyIRtH?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ae180c7-6ee6-4953-a157-08d91af2bd99 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:11.6005 (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: UmxuDPlSvObrMCpqoIUP+ciPVZiUikqNuVQtqbdmdRXc09u5jJuZAInl/7+GEX/Bshcb8emjIugiNLADr+6V+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2413 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,brijesh.singh@amd.com X-Gm-Message-State: gz67wWhzTuN4VSBmkQQHUtUSx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448421; bh=PY6/68+Ylo3euPoY6dweaAU/zmX+hR1Eo6AGlVpps6k=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=KqNqo1xHG50846wzC2yJbRVsoMJw34kZVb73Y+PqEg+Cp3XJrs8N2FZxX3WVktbFl4K VcFlvsgdJTF7QBsRLLZqj3DEH9Msa4L6cKMvnNnZFauL1Vz20Cn/NEEnBYuS7z2OIdiIr GWpLAxu/9XhXQI4OSBb+ByQmsTXzzNgwH0k= 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=3D3275 The RMPADJUST instruction will be used by the SEV-SNP guest to modify the RMP permissions for a guest page. See AMD APM volume 3 for further details. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh --- MdePkg/Library/BaseLib/BaseLib.inf | 1 + MdePkg/Include/Library/BaseLib.h | 35 ++++++++++++++++++++ MdePkg/Include/X64/Nasm.inc | 8 +++++ MdePkg/Library/BaseLib/X64/RmpAdjust.nasm | 40 +++++++++++++++++++++++ 4 files changed, 84 insertions(+) create mode 100644 MdePkg/Library/BaseLib/X64/RmpAdjust.nasm diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/Ba= seLib.inf index 89a52f72c08a..6ccb8997b7e8 100644 --- a/MdePkg/Library/BaseLib/BaseLib.inf +++ b/MdePkg/Library/BaseLib/BaseLib.inf @@ -319,6 +319,7 @@ [Sources.X64] X64/DisablePaging64.nasm X64/Pvalidate.nasm X64/RdRand.nasm + X64/RmpAdjust.nasm X64/XGetBv.nasm X64/XSetBv.nasm X64/VmgExit.nasm diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/Base= Lib.h index a2cd134bea9a..2452c1d92e51 100644 --- a/MdePkg/Include/Library/BaseLib.h +++ b/MdePkg/Include/Library/BaseLib.h @@ -4861,6 +4861,41 @@ AsmPvalidate ( IN BOOLEAN Validate, IN PHYSICAL_ADDRESS Address ); + +// +// RDX settings for RMPADJUST +// +#define RMPADJUST_VMPL_MAX 3 +#define RMPADJUST_VMPL_MASK 0xFF +#define RMPADJUST_VMPL_SHIFT 0 +#define RMPADJUST_PERMISSION_MASK_MASK 0xFF +#define RMPADJUST_PERMISSION_MASK_SHIFT 8 +#define RMPADJUST_VMSA_PAGE_BIT BIT16 + +/** + Adjusts the permissions of an SEV-SNP guest page. + + Executes a RMPADJUST instruction with the register state specified by Ra= x, + Rcx, and Rdx. Returns Eax. This function is only available on X64. + + The instruction is available only when CPUID Fn8000_001F_EAX[SNP]=3D1. + + @param[in] Rax The value to load into RAX before executing the RMPADJ= UST + instruction. + @param[in] Rcx The value to load into RCX before executing the RMPADJ= UST + instruction. + @param[in] Rdx The value to load into RDX before executing the RMPADJ= UST + instruction. + + @return Eax +**/ +UINT32 +EFIAPI +AsmRmpAdjust ( + IN UINT64 Rax, + IN UINT64 Rcx, + IN UINT64 Rdx + ); #endif =20 =20 diff --git a/MdePkg/Include/X64/Nasm.inc b/MdePkg/Include/X64/Nasm.inc index 528bb3385609..cfb14edc9449 100644 --- a/MdePkg/Include/X64/Nasm.inc +++ b/MdePkg/Include/X64/Nasm.inc @@ -41,6 +41,14 @@ DB 0xF2, 0x0F, 0x01, 0xFF %endmacro =20 +; +; Macro for the RMPADJUST instruction, defined in AMD APM volume 3. +; NASM feature request URL: https://bugzilla.nasm.us/show_bug.cgi?id=3D339= 2754 +; +%macro RMPADJUST 0 + DB 0xF3, 0x0F, 0x01, 0xFE +%endmacro + ; NASM provides built-in macros STRUC and ENDSTRUC for structure definitio= n. ; For example, to define a structure called mytype containing a longword, ; a word, a byte and a string of bytes, you might code diff --git a/MdePkg/Library/BaseLib/X64/RmpAdjust.nasm b/MdePkg/Library/Bas= eLib/X64/RmpAdjust.nasm new file mode 100644 index 000000000000..c307f64b518a --- /dev/null +++ b/MdePkg/Library/BaseLib/X64/RmpAdjust.nasm @@ -0,0 +1,40 @@ +;-------------------------------------------------------------------------= ---- +; +; Copyright (c) 2021, Advanced Micro Devices, Inc. All rights reserved.
+; SPDX-License-Identifier: BSD-2-Clause-Patent +; +; Module Name: +; +; RmpAdjust.Asm +; +; Abstract: +; +; AsmRmpAdjust function +; +; Notes: +; +;-------------------------------------------------------------------------= ---- + +%include "Nasm.inc" + + SECTION .text + +;-------------------------------------------------------------------------= ---- +; UINT32 +; EFIAPI +; AsmRmpAdjust ( +; IN UINT64 Rax, +; IN UINT64 Rcx, +; IN UINT64 Rdx +; ) +;-------------------------------------------------------------------------= ---- +global ASM_PFX(AsmRmpAdjust) +ASM_PFX(AsmRmpAdjust): + mov rax, rcx ; Input Rax is in RCX by calling convention + mov rcx, rdx ; Input Rcx is in RDX by calling convention + mov rdx, r8 ; Input Rdx is in R8 by calling convention + + RMPADJUST + + ; RMPADJUST returns the status in the EAX register. + ret --=20 2.17.1 -=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 (#75397): https://edk2.groups.io/g/devel/message/75397 Mute This Topic: https://groups.io/mt/82943408/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 Sat May 18 14:10:06 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+75399+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+75399+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 162144841735652.56146120018798; Wed, 19 May 2021 11:20:17 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ax6UYY1788612xArfBSBk8Hc; Wed, 19 May 2021 11:20:17 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.15906.1621448415547919253 for ; Wed, 19 May 2021 11:20:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eoFmv1t71I3NbLb3Uu47jkiP4Pm0kXEXXF19xE6hDfTTsKsXU7GJ2R+1D/+Z83POg7YE2tKnMPb36OSwnd01u6bEtqKDDrN+geDuMHf6X976u+P6vN/lCIOucG9M1zsfiJ3spqrfBynSEbE70Wm1FpKz4FUDj2rxIpsQm9sGqvjYpZ+lxL78zSYkT+6AzqP1P76NKNmZwr0NlYhYUXJRXXnJ+NojQwE+0Hv87cXlPXto+j1kjI6ztdmKK4GTkx17Rpx08xINArskeJ/mkm3ajN5NlohiBmuhk08Hx75tCrksobjuuUr9EnPQEyfcwLhne85h4t0uI4PO1tbe/go4Ng== 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=ZEZGcqArN7aJZqgUxpRSdFkwW7N58e/ychUCW5J5HSY=; b=aCiLaXBIS+UJ14Sdxqbb7volzr+VW4eT5ZFFHmLsyH4cB4ANgLa51s6kixena2poTIHpdRmFWeV5p0XpH1fguoh2/FFemj0rJ057YYqBwbMcSvF15nSDL2YtRUIKCM85OgVjqG6csbxlUHIopMyHWzuepqOx0eTinTiq4eClUSepSpJsV4p2izzm5qHMFO2w0kZqUt51IfolgKLFKIaJdVYDcsW4qCAGKgNUG4z1HCjPGsdaYbvKOhgozAmvRRjNX5by+tQ0IhsJicl5IqxB4PxW87PZ+aqz53MLMyyFz9GDNZMjNyfGrhytWrhFQAWk4ZJgtJqSXnLXmWAaffb0aw== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2413.namprd12.prod.outlook.com (2603:10b6:802:2b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:12 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:12 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas Subject: [edk2-devel] [PATCH v3 09/13] OvmfPkg/BaseMemEncryptSevLib: introduce MemEncryptSevClearMmioPageEncMask() Date: Wed, 19 May 2021 13:19:45 -0500 Message-ID: <20210519181949.6574-10-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a2cffa4-5548-4c94-8164-08d91af2bded X-MS-TrafficTypeDiagnostic: SN1PR12MB2413: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Fff4u62DJ/ilGSiTXhBorfYE8bvOZtoLxNUQ6Q2O8by1lylddj4XhoJzhXHt/osLEiiPwJPJhHp2u/sfRkcLH2qgW082ssf0waFFIUwLtv03leU1JCg93jUFZfKKrBshF1gOeWHD0dH50YbwwbDzwOOUIVfIQsshw9T95vkfOFHV/YBlvlW0p8OnH5HfkAXHP/krrCX3Zppxw0f60ySk3N4UevxDVk9HAqnfGn6KK9oJhYQQq0eFH/1Dmp6W/7eTFBVFAM4V+ej3rtFkGAPEvnpmsff7rfGUAxAL4NMDHJD84hE9pu2BusK6mBi1OtcDohgmHuqdpysuOqlUKuUo+9yme0j7uUKBiFyy6F673gPSz4yaOS2gj0nsknF7pf6/FXPty3QSmbhZKAmXeqF0PI1xggQf0I9KlywBuZy4GGRsj0FBOj9Ql47NJbNqbR+8aHtI5aAJdru86yqhGO+Am5PZzvKWmhXmGlad9oXEdb4Trpogb2PWr49E/kkI9GvbP1kRkXluVPafwKxUpHhl2/h0fabi3K1vL2ydRxP+Xp+tzt6oVr7MfFnqEMGg045WpSE0ydT90Kp40dTfbTMnIhvU523qUNlQxTirux2TtDemBrHGljZBeBaZNzex1mGRVSd7OTfaSpEIN/Y/lM/ht04Y/PEmiusvYTVxOqDGF8dER7j0ixowW2Xj1U/GJ6bP1U8agcn+HCvTt3+vABU6Qr9elXKBdq+Ko7mZ/3q7d9Yii5S11kbKNin1i8/v77swa2cnJSISWZawE7d68zIg3A== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?CBIzZG0najUjUHWeK0fyF1GWtSz6xnx1OWbP4bj77Ajt+H4VNWP8no24Uxc3?= =?us-ascii?Q?4pIWSM5bUkbgwOszPZrsn9UtmCogOjnMlU0tXD/Ust/FgExnj5ua4hcnTTNB?= =?us-ascii?Q?WNVMLyGg+xfvaBgC621EUlLnGNMKrsMKE+ZqT9ueT/0HxaQG5Q9SkQLzGDXr?= =?us-ascii?Q?4q+Y+cGv7tJq3ex9h4BKhkvCxmtRsam58ucErHEOB4UbYIaePKiH5Sy3MlSU?= =?us-ascii?Q?ainU2J3UVPdEcWz2MApVAwfKo16iF2jPWTGbTxeweFypphT1KWtP9U8Oos9/?= =?us-ascii?Q?95GQIxSCbATni3FW7SbOTrwA4B6xuIxWapowSi97FAKydONe7cJ55a14IFw5?= =?us-ascii?Q?0gwK4EUSBwDGwbZred7HXiTgHjmmuSwR6j0XXbwVuCSmY3x2e44vJCMs0Gle?= =?us-ascii?Q?7u6+Lpv13ivS/nK4dxbvPYhds/yRUVS95eVVOKZT8OI7O0wm12xX6ut8kTTm?= =?us-ascii?Q?gJT/cTINBxaUa6QeRcPKZ9np6ytpIPfbWUq+5hG35KmQUG1r6FzeQO9gIn7T?= =?us-ascii?Q?pt7S9qkOdExmmZpuBU2HE/JxSfkjjhsvzHKiV0YbwPM95oen4E5OpckyMA2B?= =?us-ascii?Q?G1OCEost9xYKcp+JW2vxyvocNRNwL8HOAT4TngBXqYGb4t9dr/tzYWC7dpCB?= =?us-ascii?Q?loNT0pI9WtP5SAJGqiqLrd09emzrOuY/VlxuucpDdMg8pKjhTf3dmiwYMSoV?= =?us-ascii?Q?PzYmM74jKv/iQF2vHIipZksVj6aFsMIsgiqFXSA3ozOMKtvgsev/OxavMhuU?= =?us-ascii?Q?owYtJU7y1M4hmMyZClHSHaoI3bUUno/dUsWzV3wq5pNlfuwit3qTs49jnh80?= =?us-ascii?Q?gtVQdyqcPtfhEp/xlcF2xhNNK0FHG/aHXDMhBDTMl1/EkDSIJcSLq/sK9ubu?= =?us-ascii?Q?W5OY+d7Dt787oBTkpRkrOQkATyv0ge2pMXKQ+7nBpuvxKUgfnyLzB9pJ8z8c?= =?us-ascii?Q?VEysranUCwkwjkhUwLmATPMwMzGITisQYCux14ddkOpQIba+ja1bL+SUgejx?= =?us-ascii?Q?CFewwGpjIpe1khJQ/zv890N/xyE43DAPj7yk20Wsr1vBj5te69oe1cHgSpKb?= =?us-ascii?Q?vIlbOA3Pi19aMjFtAYNPJjiW8KbgysGKDGB8kM2aDXV2nPWqG4fv8ldLZPWF?= =?us-ascii?Q?CBR8C/zXRfRMCW0pMP6GwIkcBl8YyxSZ3VViSnbHYzX2VtWG48/P5CMQiXnH?= =?us-ascii?Q?xtl5eM4nuAm7F5b31+QxnLian3sYJ+tQC9QoPmhrg3EA6qX/Df4tXIv0raiG?= =?us-ascii?Q?GEIyYKVMOFPQsYsejV8p9cmQq+hy6fT49GjO/QJ3+3oZ3wYpOz94Uu1oq4qh?= =?us-ascii?Q?PFZoshJyUNAEiUGeboreH/4d?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a2cffa4-5548-4c94-8164-08d91af2bded X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:12.2031 (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: Ahex9TnsuAc2xA1YCOHoFW1P5BiqThLjfNa2iVB3zmbGWNGWp2BwuRyRJh/W5yd0t29OfW0UIue+FvPwxqCD9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2413 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,brijesh.singh@amd.com X-Gm-Message-State: BgG1A4rVpGVmd5aO6BV7E4VHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448417; bh=J0sxLSyNym7L0RmcG6TOGpHpKBWZsulp8XSnZiyCrFs=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Qcmyghu7e2Cuos8k5JJyzJBtpd5jKsA/4rj1zryNe4p9DdLIRVRRnihI131zXquGwMK vnEZhW4KQY8cOAddbzf2WEL6J3z0Lmq4HBBRIuZRJTV94ZHU8kXVDqidNYJFg9kiqYaqT sfQKTloexUE4dFj6svqpAiC5z4lEvQbLstE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 The MemEncryptSevClearMmioPageEncMask() helper can be used for clearing the memory encryption mask for the Mmio region. The MemEncryptSevClearMmioPageEncMask() is a simplified version of MemEncryptSevClearPageEncMask() -- it does not flush the caches after clearing the page encryption mask. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Reviewed-by: Laszlo Ersek Signed-off-by: Brijesh Singh --- OvmfPkg/Include/Library/MemEncryptSevLib.h | 25 ++++++++++++++ .../BaseMemEncryptSevLib/X64/VirtualMemory.h | 23 +++++++++++++ .../Ia32/MemEncryptSevLib.c | 31 +++++++++++++++++ .../X64/MemEncryptSevLib.c | 33 +++++++++++++++++++ .../X64/PeiDxeVirtualMemory.c | 33 +++++++++++++++++++ .../X64/SecVirtualMemory.c | 30 +++++++++++++++++ 6 files changed, 175 insertions(+) diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h index 99f15a7d1271..b91490d5d44d 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -203,4 +203,29 @@ MemEncryptSevGetAddressRangeState ( IN UINTN Length ); =20 +/** + This function clears memory encryption bit for the MMIO region specified= by + BaseAddress and NumPages. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress The physical address that is the sta= rt + address of a MMIO region. + @param[in] NumPages The number of pages from start memory + region. + + @retval RETURN_SUCCESS The attributes were cleared for the + memory region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encryption attri= bute + is not supported +**/ +RETURN_STATUS +EFIAPI +MemEncryptSevClearMmioPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN NumPages + ); + #endif // _MEM_ENCRYPT_SEV_LIB_H_ diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h index fe2a0b2826cd..8dc39e647b90 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h @@ -126,4 +126,27 @@ InternalMemEncryptSevGetAddressRangeState ( IN UINTN Length ); =20 +/** + This function clears memory encryption bit for the MMIO region specified= by + PhysicalAddress and Length. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] PhysicalAddress The physical address that is the sta= rt + address of a MMIO region. + @param[in] Length The length of memory region + + @retval RETURN_SUCCESS The attributes were cleared for the + memory region. + @retval RETURN_INVALID_PARAMETER Length is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encyrption attri= bute + is not supported +**/ +RETURN_STATUS +EFIAPI +InternalMemEncryptSevClearMmioPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINTN Length + ); #endif diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c b= /OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c index 12a5bf495bd7..169d3118e44f 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c @@ -111,3 +111,34 @@ MemEncryptSevGetAddressRangeState ( // return MemEncryptSevAddressRangeEncrypted; } + +/** + This function clears memory encryption bit for the MMIO region specified= by + BaseAddress and NumPages. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress The physical address that is the sta= rt + address of a MMIO region. + @param[in] NumPages The number of pages from start memory + region. + + @retval RETURN_SUCCESS The attributes were cleared for the + memory region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encryption attri= bute + is not supported +**/ +RETURN_STATUS +EFIAPI +MemEncryptSevClearMmioPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN NumPages + ) +{ + // + // Memory encryption bit is not accessible in 32-bit mode + // + return RETURN_UNSUPPORTED; +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c b/= OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c index 4fea6a6be0ac..a2bf698bcde7 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c @@ -118,3 +118,36 @@ MemEncryptSevGetAddressRangeState ( Length ); } + +/** + This function clears memory encryption bit for the mmio region specified= by + BaseAddress and NumPages. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress The physical address that is the sta= rt + address of a mmio region. + @param[in] NumPages The number of pages from start memory + region. + + @retval RETURN_SUCCESS The attributes were cleared for the + memory region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encryption attri= bute + is not supported +**/ +RETURN_STATUS +EFIAPI +MemEncryptSevClearMmioPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN NumPages + ) +{ + return InternalMemEncryptSevClearMmioPageEncMask ( + Cr3BaseAddress, + BaseAddress, + EFI_PAGES_TO_SIZE (NumPages) + ); + +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c= b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c index d3455e812bd1..a18d336a8789 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c @@ -891,3 +891,36 @@ InternalMemEncryptSevSetMemoryEncrypted ( Flush ); } + +/** + This function clears memory encryption bit for the MMIO region specified= by + PhysicalAddress and Length. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] PhysicalAddress The physical address that is the sta= rt + address of a MMIO region. + @param[in] Length The length of memory region + + @retval RETURN_SUCCESS The attributes were cleared for the + memory region. + @retval RETURN_INVALID_PARAMETER Length is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encyrption attri= bute + is not supported +**/ +RETURN_STATUS +EFIAPI +InternalMemEncryptSevClearMmioPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINTN Length + ) +{ + return SetMemoryEncDec ( + Cr3BaseAddress, + PhysicalAddress, + Length, + ClearCBit, + FALSE + ); +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c b/= OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c index bca5e3febb1b..e0d3a15e8503 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c @@ -98,3 +98,33 @@ InternalMemEncryptSevSetMemoryEncrypted ( // return RETURN_UNSUPPORTED; } + +/** + This function clears memory encryption bit for the MMIO region specified= by + PhysicalAddress and Length. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] PhysicalAddress The physical address that is the sta= rt + address of a MMIO region. + @param[in] Length The length of memory region + + @retval RETURN_SUCCESS The attributes were cleared for the + memory region. + @retval RETURN_INVALID_PARAMETER Length is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encyrption attri= bute + is not supported +**/ +RETURN_STATUS +EFIAPI +InternalMemEncryptSevClearMmioPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINTN Length + ) +{ + // + // This function is not available during SEC. + // + return RETURN_UNSUPPORTED; +} --=20 2.17.1 -=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 (#75399): https://edk2.groups.io/g/devel/message/75399 Mute This Topic: https://groups.io/mt/82943410/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 Sat May 18 14:10:06 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+75401+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+75401+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 1621448418733150.52390897370185; Wed, 19 May 2021 11:20:18 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id v4ZyYY1788612xeunonKEKeF; Wed, 19 May 2021 11:20:18 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.15906.1621448415547919253 for ; Wed, 19 May 2021 11:20:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AVVZnLAZSOdVj/GGt4dgREdQnVr5sJrLIrqGkutQw0J7l/unuhcbvMu2KPXk0233FGhH8zC29h/8zCg9lunhORxucwMZdvmKT7KjWCH6dD9GDlURmC22DbMrT0prOScsm76lErhDe9pU+34FREtkFLr94/ZoQ+OyDaaf4CR22g8oeElkwiFTeQn3dtSeyrmDlzYl0yeErZasKgLPjqSV+HpBFKe1uWDvKZk/u/fV8UvDsn/SNjBJrh9imAqY3FKlEDV++WVln7tEJpVrlJnUXKWzmwGUOea0wHtM5iko6YKJ9yTUBjzgdy15sNUDbcK9eC7oF7HcJ/q3ABtmXZ02aw== 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=/okNaFz+eyRjDnmLx35Ha7Jiq/QW4TI6ieKg3CSwIAE=; b=CDLdm3+gZQzFkE/kTJxrOGmuOer4dXK3aj5OfFbyRgZk3UgxunTPHfCcn30owCSpnWJXYuOEmrjBz64xnppyCsLatH8FKJYBjrbLiIGWjwHd8odhhyABXU45Hl33o4dOA17UiLHdlOpEThSCo6xv0D/u43Ntp0YQBodYhtqmEv4B8dD0ol4QOPCb7TK/Qkz4B4KJ2Mi2ciyGDIpASAf79felbtnSvKy+6GZC7pYy6xDFsVFlC5lUDzBOMi7BkaX2XDhtOVKPrXt6gAaPrETm2LomXY5M3P4RSb3CWK8NLVcSu5lVBvsUh2mhxz8rkWvPReOGKsETJoWA0pEEGSj/sA== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2413.namprd12.prod.outlook.com (2603:10b6:802:2b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:13 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:13 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas Subject: [edk2-devel] [PATCH v3 10/13] OvmfPkg/AmdSevDxe: use MemEncryptSevClearMmioPageEncMask() to clear EncMask Date: Wed, 19 May 2021 13:19:46 -0500 Message-ID: <20210519181949.6574-11-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 31cfe44a-f6ba-49ef-3028-08d91af2be57 X-MS-TrafficTypeDiagnostic: SN1PR12MB2413: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: CFsug85nxLc/EHVj0Xi7AXt/hixlKPh1wzrIqCqdIMLlE2ufp7Y7IQ9JYGPfvKSNz5lDM3XURPeQiAWks/a9K2kFlxmfjGqqq0SliZVeHtWBeTXHZQiNN1PYJfJsiAW8tmOf6ArYUph8DZnk61f8mxYTHYYxMMD6+7s6RhaGuCnHzZYBYvfA9d4J30QHJ86104id8YgcvoqdQ8FJ9BFV4bBJ63h1TffIRgjuTG1mDyRGLd5ZyKOaou5+dGnOxjIncVw8/z2nOxrohcNZWODinEYjDS1glRU/S7BusRYhqGNeknbeAEfc5QeK82bV0lvUtkVplAPAAlEoAcjvaWPNlzDG8MDbBd5DA194PJzdrOBBFhC6zF684IiN3p1DVOnMtOjJSgAADyyxPrZyWFXv5zWmlpRIPJeXvhg9RYZx0LIxe6Q4lJGCn3jIQECL4nYu/TdH/LYSR/i3r+oYAMO0TUWa0Y1RhCMfQOCeNK3Yz/f+Cl/HTE0H9LJPfM/LeoXPgVdz3zYIBwhkGvn3VLKrWMOVyWUTGPaihNfWmUqrkNI2n9OWVzQe0j0qfQ+xmfrGQwc95EmxmO8ifGH8oQ5X7+t/TiA9N3YBKspyfBiSUCkn0iBf1vpvyYqL34JbKQXmajaZaTZFSK7oAYNg+cmaFbos/9jMpCiAwRlVpFg/35oCyjiq1pxlHmAObL3dPVcLtF+Q3zRHPwG9Y1Wp4lfYtTxnHu9oXr8K7WuXSPVIbYcxE554u9iIQOEgtPU5RMJtewXY/U9g1MwfDnDSAIATXg== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?57O3VNErxNOgqhQ1+dSGXLi8BPMo8Hca7HiCL6caI7frsAhFf9cu2m7smBl6?= =?us-ascii?Q?sEe6UiYim1VyBbIf0rT370bK1S1cEQZpUL3oG0I5MlHTgkCZ2p61XDWxaZtF?= =?us-ascii?Q?KHhV4m2U1lwPD1UJ7eyVAD30Sa/KvBO7dwTYgP445AGqwJxss6PTxeEX3Cv8?= =?us-ascii?Q?toD444rOsUZ70MzAIvjjdIkxTASbHvtP//4Ae35Nn+v4MzCCebR7Pzb1EjBa?= =?us-ascii?Q?rT0paQS4OAr10HZLYOgFdROK49TtMtFlxam2CQPAT4YN59q5qV1AN93rkCdr?= =?us-ascii?Q?iz4JXnC3f2eMWiaEg6vI9wcTO1aeVVrg+uPvu3UTpkFQTB2wbzwCUw9R/hH/?= =?us-ascii?Q?g8dGBW6la3yNqRDzyurp8gsZRXt7Lw+JQKVFixzkF6tM7ofmG4+bUKptquok?= =?us-ascii?Q?2px2+qwd2HzkaPmO+xEo894uUZS7M9DU2TMwfLPGH7g0BU81TrwhZqEASyRT?= =?us-ascii?Q?uchY3VMwdXDPSuQa3CE+XteYv8TwXmX8B6xtOTadbyXCkjd7Gcp5xpeZyRLa?= =?us-ascii?Q?ZoeelpMHPoHBaVSRDmICpEUSNz1XfA88O/sQesZ1XEVjwOoBP8Pl0fIUM2sf?= =?us-ascii?Q?NVaHwyl5KuLQVpOxj8bWrhRUfFGZ9aH5ROmS1Hi370Lb9Y/qX6hr2l7lPmYs?= =?us-ascii?Q?giWoK4iyJy/76n+Y63cftUVQfE/0MaNx92HCpSQtTZKc9MVfug91CSJB9XQq?= =?us-ascii?Q?rahWCn6AzoomxoQTfxnDXR5i9vedFj2FmRUVY973TMeSOUd/ovXuqV176kLs?= =?us-ascii?Q?+AvTAqJ7yMfgUQqNBG2rgSzZ3RwEe3o5gZ2uXcAxQewiTONYM3Q5vCq97BAu?= =?us-ascii?Q?A5YN7bwIApD/SDPe9e524ApWT1pNR05iP1i9HJtBacakATDbMu0Iwx8Z4Ekw?= =?us-ascii?Q?b2WoY/SejLLlNCZi/5AP4eGUO1JCjN1AeBLio/oWXsleOQAqY89EbtH9VQwW?= =?us-ascii?Q?2o1lWF+H1UgwlDIzGVDC2wOiRFnSIoprld7TENO2shDPVy9fgDWSe39mpdRs?= =?us-ascii?Q?jsToAPCAB8TQ5Qwl8u5DEqCnVvYeCXvL9J7lx4XbBaP7XYsnf2FpyjMVaRMR?= =?us-ascii?Q?Wn3eJ34cUL0KcJTh0T5T5oN8L4BUlHXGMmag2FVhiscZ9K1tKzXWtX0eNrIV?= =?us-ascii?Q?D8Y0rELGmZQnMsGwJvHlP4oIyxmn8T693yHxT3KARfQMKkGVZ+UI9F8Lt/IN?= =?us-ascii?Q?SLiulzN9jYhd7zGOQCTCbpbJ+VvHqZg7AHtYViCPH1xcSB2/hw5r9abameWs?= =?us-ascii?Q?RFdDvqlBxKZFCuXbmQ8F3Ube1U0GEXqSwerAbrQKYtprxrXXeOjuk/QATVif?= =?us-ascii?Q?zus3DovUrbnlfuvxf0WP5nUX?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31cfe44a-f6ba-49ef-3028-08d91af2be57 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:12.9137 (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: tV+h6rVWLAcI4xU9uSZ/ENnpDnatMdADvkfLaGkXLImmYsbhkk/wQqzgJxgyVRmg+klktg8GyUKrxOM23u8SoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2413 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,brijesh.singh@amd.com X-Gm-Message-State: SZdLJA5ESx9RpEHk4gELYkiJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448418; bh=v7Lwd2KXhzmkX2xZHPsZv/4/GHApWWEVCY6Wd0XPyOU=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=k0cAJ0nFAYtbFSoH6LiKJIIxglEZvT86lxKy7fTsN/N7LLFeeyLMGwxQ7vYy+eE9zrm 6ffLgn5fH1UwL3hjw7f1D1BrE7OJ/ibMZLutnmYwDJfrvvOLLOW1rK6XgMmyU2qgIzl1k NjnnD5oFE/UND1oNJN6MDpgKhDHqF2BLLv4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Use the MemEncryptSevClearMmioPageEncMask() to clear memory encryption mask for the Mmio and NonExistent address range. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Reviewed-by: Laszlo Ersek Signed-off-by: Brijesh Singh --- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index 689bfb376d03..80831b81facf 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -53,11 +53,10 @@ AmdSevDxeEntryPoint ( Desc =3D &AllDescMap[Index]; if (Desc->GcdMemoryType =3D=3D EfiGcdMemoryTypeMemoryMappedIo || Desc->GcdMemoryType =3D=3D EfiGcdMemoryTypeNonExistent) { - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, Desc->BaseAddress, - EFI_SIZE_TO_PAGES (Desc->Length), - FALSE + EFI_SIZE_TO_PAGES (Desc->Length) ); ASSERT_EFI_ERROR (Status); } @@ -73,11 +72,10 @@ AmdSevDxeEntryPoint ( // the range. // if (PcdGet16 (PcdOvmfHostBridgePciDevId) =3D=3D INTEL_Q35_MCH_DEVICE_ID)= { - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, FixedPcdGet64 (PcdPciExpressBaseAddress), - EFI_SIZE_TO_PAGES (SIZE_256MB), - FALSE + EFI_SIZE_TO_PAGES (SIZE_256MB) ); =20 ASSERT_EFI_ERROR (Status); --=20 2.17.1 -=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 (#75401): https://edk2.groups.io/g/devel/message/75401 Mute This Topic: https://groups.io/mt/82943412/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 Sat May 18 14:10:06 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+75398+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+75398+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 1621448416659425.7033152778713; Wed, 19 May 2021 11:20:16 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 4A8ZYY1788612xcocZUDl5OV; Wed, 19 May 2021 11:20:16 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com [40.107.95.84]) by mx.groups.io with SMTP id smtpd.web08.15798.1621448415664855986 for ; Wed, 19 May 2021 11:20:15 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KCN6thQL6GMs+ippn+3HjX3pqIqE2AYbWJd6ECyXtSrDZTTNrvFIPQoWAANlHCDaZpg4G3yfY+ItsHzDeltoLNAYeNfMPm+znTveha+8FuuYuM4aZF2mEzYVR2pz9jBMGtTPptGCDUYROyF+QA/P6JTaBjQOaKA0SoaWcdKDy6Sfdty88f0HxF/bywmMD4YiTYQBawrJok5AKDMzP1QpHlapdCqnINEOujoyHAqOuO3ukYw5UhzDNZzHD9m+O3jE0h4TanhTbYuTjsaujxLsRI9SkE5H75Z+aevpvqhF5UKfM7AYeJL04YGZUMX+kb4me2SZLa/Wqsxuqu/GGWM58A== 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=fzufsZrWgS+UNzs4KbfjAj1i6bjJ2PYGsIILu54EiEI=; b=IfJbwqPd6uCAZYbBN4A4JA0PANT6D2X6TjmDdP29Nwl4Ac8o3zr3s0cSBNDr6KPU+BLih/EyAItH1TziXYM0rD45wCZxLgJczTb08JFyQwMYvdBSNJmQ6+qRGZb/lFvczEJmp4dtVBobqwN9gyYJRmZoJx71LWZS2yVkH/3AFu3Gjnjtyy2eYkSpfUp/c4ZK3CeqsSmO3YSd9SFCtT3dpCv1+uvse2dlXMIgQ6no/5qc9UiqcrHM8gplCwGKfgIfQVtSu/x/JUjgqnokpzSbV2VvP8TGWWw2/bHlCsvgM+4kb6Q3C2WMWZkHVM6cUdJNFVgSgHJkVXOxdtGPHbZrWA== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:13 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:13 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas Subject: [edk2-devel] [PATCH v3 11/13] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: use Mmio helper to clear enc mask Date: Wed, 19 May 2021 13:19:47 -0500 Message-ID: <20210519181949.6574-12-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89145bbd-0417-4326-292c-08d91af2beba X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: 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: 3ovcvVYZ31WiAdnMvW2eIoltfRakym7ayU4PRx1yNwCWjlOVx8omVKNyEA4yYAbWwMtlXWqtXLCEtVFkkPlISMV6atrRUilPhpVGPwr/FCoAaqjy68EiXkSMFe9efMri6GmIM6hIiduRzklprazhBZ3lXy041e2ko1O2MltHJ/wJjYiYIAhkVJO41H4W1eBTfE5R51TDWQS89ADE7BKsVvks6aeVCVMFYNKLMTyWcNxLX3zTECgifev7sG64r4nPl5oC3rx2hCAy9PkkSoY+87dNG357eORUoP0zEyNoDkoW5+/HwnDXPDNNyC2hjruP9j6Q+6q4hEcvmmx60FSwxjg5SNVGaREYP7vlZ9/DpHpXr8BZ4MtLuwAsgnuAwqOSL/6byZh4WSvzga/+rXbEZuKCdZo5u2a7ypt/LhrBLlgLH6KmK6Fhfvx23pVi2sIwNQ2xKSnrTPtK5B7dvpst4ixvtDNNFBgrpqrrHnlbcCbO2r6gAO+RTqjrh4tmTyrmUphg224szNuqSmcXox8WHKY1RlOk7FJAK/JMS50fs32cKQ8AfarfpujI91oawCnbkTVophPsY83lTWsYNUTmh6aVGaIw26sKe3QZJONaULJZXQiSteL8gldQWjYcVhrjPknhDfRKinoLZPe7XpdXJ0m0xPaPA+kAaY2HRIm1n7xIDRXqOhb5jH4978nVNw85uDd9GCWrL2hGnLWvSCQGBkjd4IMMZqf0Xqbl9xSyZmbvmVSSOAcl0786KmzKd+VkjrYcVbtuckLTEHkyUsUH/g== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?7QV2HjFbvOCCoaaETIw/9herUB4f6EUKZi592n4QSPbNi4McJ8+3oxTrC1km?= =?us-ascii?Q?wqK7YCKn2kNHM9qP6KHP+4GjS+DMQ4kmCBCEb44CoPa1k2422WgPrGZ81oPO?= =?us-ascii?Q?qlqr87D1SIGo3OT6wNPjSvjkt4E3HsfdewmWIAgMZ7daR59tBIKGAMtGvtQN?= =?us-ascii?Q?Sa1mlIA3p2tQub98FNoI6j1NrV9IzeZCPnuPX6TNL6QkWXQtAgt0FZXzBzDC?= =?us-ascii?Q?87xpM0Du3Q+FAjh/pX+ZoUq/Yy3mRtsoZAi+3UC/UzW9//4s+ZR0NSVk0Iud?= =?us-ascii?Q?fWXCtA1ozB4a1o1SfapA5PCL/HTfO2yQkW652His6Hmkrahwz+tZVB4scOqH?= =?us-ascii?Q?r2aT1/XUp4iYkNJNmtU1efrcedCRh00EhVcGKOWwsC8ntRCgmmqGir80Y8fB?= =?us-ascii?Q?KfGP9QBA/zA55LTzHk2MWhBPSHO3oLq9oaAMTFw+HpN7w7aOGNimnIaVn2Sn?= =?us-ascii?Q?lArzzBA0q16Og1b8B6u6TLC/6h1VWV9Faw1M4rd0K0EmPX/e86Td9IJme9cH?= =?us-ascii?Q?9U+4CxhTlOGvPIA87fFrRq7Mphg2pwcjS2gJsGqUIJi8w/WLueeA46kKMajL?= =?us-ascii?Q?areOdXjJfhZ037N2BPxgQys4cpWhia5HTL69kcHzIQLUXQJUkR+e+iDhQl6g?= =?us-ascii?Q?/QEVIUfXdo1U+hRjSqO6qhM0EDrahfKE5wTgh1g1rs+tUHJ3WTj1P4KaKutR?= =?us-ascii?Q?tLVCccCPyK9kddjLFTqTYX9chhaFdQb2fd6WLsosagwDp5tVPTcILpcifAul?= =?us-ascii?Q?yT1E4h6HpbxIgVkVCZFQmfxXoCcaAMnX5zsklGKlF5AeU76GZAZn9ZgrzFa/?= =?us-ascii?Q?vD7k3FlwOnVExgeBDQT5u6X49lvE67Xyrq0Mb9ArWnZpKJSu0CmJgA7TDy8r?= =?us-ascii?Q?5m6F6CF+6yuSb5NV59m7hprvwj0c8kPDmztvfrCzQ1vcG5/ugNBKeB3fSUhJ?= =?us-ascii?Q?Vyv2IWkhjwZzfAxhoUC8bWZDVjlEBgcFaDT5twcTau3vdZcPjzpLVuxRXVtF?= =?us-ascii?Q?yMKBzjZrM7xXTr2Ad87RD15PB0eM1IzN8z/pQ2AqlkfIn0C+3F6PAfZs2gdj?= =?us-ascii?Q?JXI+PqnDFoZa+6Hz5hPv7CJHgKcCzZHm2Zpx3zFckdAhfAc5hC8fw627P0pn?= =?us-ascii?Q?4SCOaQP/KcGueBf7NhSl5E+x0wjJlrpGITS/rWqvw3NpGlTfGgANAK7RZlSO?= =?us-ascii?Q?qot2KaK/pGDgf+oaEOxU/P5h91M2SV21Nh64NuR359FI8cihJVhG/WN623iE?= =?us-ascii?Q?T6J1F9ad/JtNhFna4Cg5+VCqaqi0F0kFITCdBnvQyxlNiO+09mne1J8VgXD+?= =?us-ascii?Q?aQsdWWJEe7HnI6W6bukaHdIS?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89145bbd-0417-4326-292c-08d91af2beba X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:13.5593 (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: lyhrwU16jxaJPEr2f6q+m9gkOSx1dk8IWKJ5krGsrNUmY2xXg9BSUu1bAhfCAjdH6N3L8vwdesBDwKzN0c71JA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: 2AOs3l9OKNSZo33a34c91oMjx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448416; bh=2NC03Lu47dGYlnRd657AyWAdf7XKjuMqGxy+4V8z/mM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=oSmrENJBipY3NVAram4VZ4B8aYh8rurozkurrXu6VY3+334sATU87a70xKz0XIDt/A3 Ras1aC8ccaZaQMx96Lw1EOyb2+qaoZB0Fsh9sb1U6K8h+T8F3z+bm29NBBiwc52QJ62io Tezm3OgoPEGCUs5Kf47zFXjF0CMVAyIP+GE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Use the MemEncryptSevClearMmioPageEncMask() to clear memory encryption mask for the Mmio address range. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Reviewed-by: Laszlo Ersek Signed-off-by: Brijesh Singh --- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c | 5 ++--- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/O= vmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c index 1f285e008372..ab40087a8408 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c @@ -205,11 +205,10 @@ MarkIoMemoryRangeForRuntimeAccess ( // memory range. // if (MemEncryptSevIsEnabled ()) { - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, BaseAddress, - EFI_SIZE_TO_PAGES (Length), - FALSE + EFI_SIZE_TO_PAGES (Length) ); ASSERT_EFI_ERROR (Status); } diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c b/OvmfPk= g/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c index 7eb80bfeffae..ea75b489c7fd 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c @@ -38,11 +38,10 @@ QemuFlashBeforeProbe ( // C-bit on flash ranges from SMM page table. // =20 - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, BaseAddress, - EFI_SIZE_TO_PAGES (FdBlockSize * FdBlockCount), - FALSE + EFI_SIZE_TO_PAGES (FdBlockSize * FdBlockCount) ); ASSERT_EFI_ERROR (Status); } --=20 2.17.1 -=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 (#75398): https://edk2.groups.io/g/devel/message/75398 Mute This Topic: https://groups.io/mt/82943409/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 Sat May 18 14:10:06 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+75400+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+75400+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 1621448417779345.61991464929383; Wed, 19 May 2021 11:20:17 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id xV7SYY1788612xP9hsfT6tQl; Wed, 19 May 2021 11:20:17 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web08.15798.1621448415664855986 for ; Wed, 19 May 2021 11:20:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OFR0DXKQ97lyxkkHpy8E0aocznA+JUT6I53RKX122QzkkaH2mBsEpKYQ2aYKp6NXyznJ2WtjWr4C6jq3KXz0pUKBOl8Z34AQeTxXMOQSENLL5xRI09wjGDUAZhNAw2mPzk7fpc2yey0As3XscW8YqP6jPK4qrdTj/boHViDxddZgLe41SPrZJ8k6VrmBbBFSN7OoSJt307kmyV12a3wPChF1q4Bq6ZUM8d27QnKv+r+iZx9tqBGCun71ZiL+9O6FzxAXJn2gw+vVqpkfUJixk91jJfQpAEvo7AHE6k6KU1Tb4Vkgo6HjElHLPZDaQs+fPEIDwsyN4xxPKIyZr26pNQ== 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=F8Rm49ET0mDGF9wp7X4cXNbdvH36yAyJzBfsZludOwo=; b=jPay+CR5duO6dPcQzkXolH3gu7tySOGFw7h45oq4RLfwb4K3pfCWk1v4qwChEnJn6MPI1D4YsZHLu9zwxRSo/Tp9P5p9HxHTg9dxfmNjgD/n8GNdEyPvSsnb5Hn8Z7Bg2KJmIJblVXaOklk5H3pfzDXcn2yMK3xNAhgN3GZQs+SawWczhOHk9KHXzdncHUzyqfNEuio/F6PAuZ1z65yFeI44O1iw/irsTPftnrHTEJXu8+bKd0uFdunUi48yNF3U2JqwDEwkZ0sF42tsO2sWjtg0fJeUCx4UBp822fkx8fB3k9bbQUDCVOYHOBq5KaWhqiJHtAyqJOOqeJDH+zLlMg== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:14 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:14 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas Subject: [edk2-devel] [PATCH v3 12/13] OvmfPkg/TpmMmioSevDecryptPei: use MemEncryptSevClearMmioPageEncMask() Date: Wed, 19 May 2021 13:19:48 -0500 Message-ID: <20210519181949.6574-13-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5498f8d-76c3-4e50-7938-08d91af2bf19 X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: xJmJEZ/i9vKTF8sBqLUgBMC40ieZtB/tZF9x4f9oLU0/GHzWeY7uYzZyfAEq0l11un9DUwIVqcZ80J/tYGt9Go/wzecbknYi7V6WIa8y72y8FbYRsHQsgrDimDKu8hLWxN7CFT7jmVz3DfdWA7u9GqfSLc2Y+J6kxjhsszOXdRhrsm5P/D8aJeoyn3SIhBM4zGIne2yN0//gP0OR7xJd7Tgau4r8vahYixw95IkKFOur30Hw4Ef5T9ezG2uxGIJEUZegob4iThiU6Ss0TPgrH9X9Sbb/qyjv7K7HBgu2dBBCnhdjrj3hONiTmUA33pXZdHU+WFnt+Ze2reJuvV/Ni/crLlNkgGHYSyqMYYaYd2LtQocyb1YothI0WarCeeKUwH/UGP6rIZ7gyb15nbYC+MNKxUCTBsVsBgZ2hK09BOwvb56SkoHAMC85gGVbc+/HMgQSZcux4R5POwMl7zAVYp3rsf+nAPvCwpEattSr3uP7ExaCW5otL7h3R0aTUXnaviKZ3+XI5L6sKl+HMp+VXzK0oramk7amXbpC734vLl0j5reSC0ItLMc27DHH/2W+Rf27p1A/UnqRVAQ8KgPPtQGyujUIjYIRWzs45OMsLATS0eST3sZAibc6W1RgBiJgDU0Whsr/WEfX26EkrW6BVI2wyF6SFHL216zeuqL0L0YYKXGF6DHINQqeoyImpS6k7W6PD8lZfeUVKfPpJGtzn1rwf2rrg171n1KAvvTXlhHba2q5O27pgfeB2Rq7ksZgyloQprvPiybSVzJ1bcZJ6w== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?E5gXZiIILEJYhuwiO2bU6i0M928RpVeDzFGAPxcSKSy+MDZ9EFYZeNTD4GRA?= =?us-ascii?Q?91K8Az6qFCuSkZuYh0No4cuOBcoKAjwdOXiNdI2AKgbiAcEzCbWhDMCv+7wg?= =?us-ascii?Q?Ruwz2OUFQ5mcWAvP9zBYj/loJljE2iI/BPVYfWwUmUR5AXGj2zzHVwQLxWAk?= =?us-ascii?Q?zvydDwMbwa3GUyfTizeP7/KF5/9rl9JtYS4ph6xfUljnCeBkfzwP2WmBLI85?= =?us-ascii?Q?Gat9i5H/nLblkSQ51IH0qAzBjtC0r2zwWjE3a1Y3CL05eSRHskB6Zcratlyl?= =?us-ascii?Q?xY/c8c/rmOENnMKgPTDsbp8rkfYYw7T86NP8oX4ojv//iakzh5uVPiGO9O6f?= =?us-ascii?Q?E1yMQ/tlYmNFvwLX0GfCMH8YgS/w8VGMFHjmOAEnWvgrWe2WSpcvx9nvJ+dq?= =?us-ascii?Q?hbBev9g35KelfwWwbzZeOn3jXjRvSm+8Vd8RF+OpRsfDKaJf3aUFfeOUST6A?= =?us-ascii?Q?oSOHU3pyuMxmxWKd0v0/DQLxXSwQlLE5t51sKBqg6GA1SGssZm5A/hJq6ecm?= =?us-ascii?Q?+1C5MzEk/ExSqdXfLjrTUoUaaQSkZdetj7uL/odHhatRKB0BXHtNkzj/oiRe?= =?us-ascii?Q?Ewn4XqapCLB6cErtWB5BB8gRvd6NyfqV+mMw/blsPOQUIjb8tpaclXFHG0Ro?= =?us-ascii?Q?JaRe+GsEMv4Sx3nc8QAIWpkojg3couETXk5DiuTGV3RUaBkMsrUAkP+zcZqs?= =?us-ascii?Q?uosx09nroleXw1rIhXxcB/K53AQFD0zpu/i3EBQNt8YXqQ2G2H5cUJWzRk7X?= =?us-ascii?Q?UbYO68vkPrfukYBuG20PpfR53KavtQpVFdGGpDxu+5kbTyhswk8arSUkztmf?= =?us-ascii?Q?tcG7+S8FSeLluHw/PtcwTNjcfRZQcNwpQJV8Pgo5bZesBH67BEcQTbH2tG0C?= =?us-ascii?Q?Fv7XHfPmsINut0up6lJeVYQFD6oHW7WAaCAQv99uwgn2qw/HzTxiRGSmd1jn?= =?us-ascii?Q?bvFWXA+696FPjKfXHYjs+PYpPHXLpLaxN3XAQXSYiiqj8g7dYPPNJrxLUXzV?= =?us-ascii?Q?/5ad4J+7kxo5QHnW24PI4+X44zghKJ+eYtKKI5m6ymq9y8LutJNCvSdJuYGp?= =?us-ascii?Q?FcuPnbUrwAn9BGRLBve6pN7/UbLQcxxWSiRkQW5U9ePGdwJiXSjyFNwA1/7t?= =?us-ascii?Q?6EfDMMQnEg5eILpe2qO4QkM6cBYeLKyfVgnIog8GuH8ZISViwPGbHe96aXo2?= =?us-ascii?Q?jM8zSQqAVZcjPn3MZNXFG/0d+24LopUer7sgXiVcO8ftvbVtNmeDpQd4W1B4?= =?us-ascii?Q?LcAuNanMtAEGetyYz87SYYPkSi40+bIi2/f2Dz9NSn+UEUduNdGTIPf0zkH7?= =?us-ascii?Q?kmy787Gr/q602ulaPOvLzxFY?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5498f8d-76c3-4e50-7938-08d91af2bf19 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:14.1210 (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: merBWvpc37+BMax8rtJwXZ5dFzX/ekOObAMu3fjLQQesf/jeQHl+YJdhCSmKdjZdoBkdqY3Tu0ARN5prYxGzcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: 84bGDK4uJqMu7VbKdUF3qHUcx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448417; bh=x1YDuJ8hmkntndfGLRn3YhS1uF7Z0yLLWg3H8eX5deY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Z9ULr9R1B++bwnLpw2O4V1jyFdRZHnAeeqGcjM7CxbjSRLVEhsYljxpXVE7sCd+i5eF F0R3y9lA6pKvje/FuHOsdI7gPSE0kYvVlLygtbtqJn+fYk3U9NDA0BMJO1aI+2mLALkuA tt9gxAoEs7sMnHu2jfePy+C4yj1J0qp9/fY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Use the MemEncryptSevClearMmioPageEncMask() to clear memory encryption mask for the Mmio address range. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Reviewed-by: Laszlo Ersek Signed-off-by: Brijesh Singh --- OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c b/Ovm= fPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c index df2ad623308d..570c8467a673 100644 --- a/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c +++ b/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c @@ -62,11 +62,10 @@ TpmMmioSevDecryptPeimEntryPoint ( "%a: mapping TPM MMIO address range unencrypted\n", __FUNCTION__)); =20 - DecryptStatus =3D MemEncryptSevClearPageEncMask ( + DecryptStatus =3D MemEncryptSevClearMmioPageEncMask ( 0, FixedPcdGet64 (PcdTpmBaseAddress), - EFI_SIZE_TO_PAGES ((UINTN) 0x5000), - FALSE + EFI_SIZE_TO_PAGES ((UINTN) 0x5000) ); =20 if (RETURN_ERROR (DecryptStatus)) { --=20 2.17.1 -=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 (#75400): https://edk2.groups.io/g/devel/message/75400 Mute This Topic: https://groups.io/mt/82943411/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 Sat May 18 14:10:06 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+75402+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+75402+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 1621448419223611.374051153697; Wed, 19 May 2021 11:20:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1Ex9YY1788612xMcKv1xNvWB; Wed, 19 May 2021 11:20:18 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com [40.107.95.55]) by mx.groups.io with SMTP id smtpd.web10.15908.1621448417833008753 for ; Wed, 19 May 2021 11:20:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fs6RL/IDqptecxcynseNxkv8dLIJ2UjBzhCG4w2Q/QhqlTF4ezfBU4v1F5w7wbNfiPWKw0kESRc0olvSixPu+YiJtxDqe8k8dLVfDJSHmZS/2DuvfsQPy7hZFAdwxaa61xpW6YYYLWzDhCkTbgW2zrVs3gBM3bAhpzH5ZugSXqSG/mFD8C5jOSuYWkL+VJU3OwmtraNcF5m/3DazTrhB41iVtwSD9hw46svDHRS9KCNOwOv+/eqQjlMHHdnV0oxEpGns35VzCJCEElJybyS0/pf+idOTmdCXPaG420LJ/iUzEo2d1YlqkIzx90Z8J7QzRez9z3G8oPixkfIrn3R9qw== 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=ddPS7/iKvqwwOkQm6Injn2NhneCI+vMTAtaH6sO607I=; b=Os/A+aQRARK4XibfLdRElvDmEe11sdm0XlVIYKvHP8HsEU7PQOXUYZ9M7ykFLBL8wiGvIz4xHItCJm25WyRLV0dKf8t0FialjAvwwVrdq1jwGdipPqWJS0kCTCPlC8hb5eyVSpNHb671NIO9QFuQfV3yRDGr1SJwMVsVY2u2WddFAGegEusrfKtJ9TkwzTe+Q4NcYZX0IIV2elgEnrWSGGxvm2rE7d2v3Ser9YiRRY1hUfLaZmStVvROO+Ptoy2j073bP/h6x96z9Sv99lu/ewmAv1+RQNtT8a9WT+PG732Rb8z6hv0wJ1ytjN+bkJKTJ5q+9k+9ozmxa7xUKnVqfw== 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2365.namprd12.prod.outlook.com (2603:10b6:802:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:14 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:14 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas Subject: [edk2-devel] [PATCH v3 13/13] OvmfPkg/BaseMemEncryptSevLib: remove Flush parameter Date: Wed, 19 May 2021 13:19:49 -0500 Message-ID: <20210519181949.6574-14-brijesh.singh@amd.com> In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be52bb13-ce5a-4ef1-023c-08d91af2bf71 X-MS-TrafficTypeDiagnostic: SN1PR12MB2365: 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: EIaEi0xcy5pGjtda89kPKgln97YWLAZS9SkX+ZwaOSJ8aYw3ozEH+2uioP21omi3BwNnaGNubgFQbNJ0npCTYmdqaPwXvHHkN0jmm4uI1NL25Ty9ecfhmLtdKzpbBZn3YCI2KzyRlRSiMFxt0WPUEKPRPoGfC2NVFGnGJE7pTKSVbFywvWXbg7tMqrbvvT2s6/pq+wPd7pC+RrhHqTKek23+t7s6N5zcVCKer/R+ss9DlG4DOGCF1JP1r0pWy6wQPuWFoyJQomGz/ByP227CXA0W4/CyD6UUlh+oRd5tY8gWpdFfpENDsWMWpf2xbBx4MUe3XPLM3QDcNihIS5N6UU1YZY0oMVHcfnJeeS53p5jmuHd732FffniFkaimCbLOXZkwVez2Vg/+UpPxjOzcIkdiVk7xIrZISAZXgQfjJQta34mErQGD4ahGLzrYmNYBtPQOJjJwG2ovcMF1d/ck9TPoduePk5b/IJ/SswFxUp0UyBsXet4va4Kvg+PphgrY14g8Bg3lYMJg6f2N7I8ujdXAZMSacB9A5wVuPHtW45FUHbXoaTU7mvcJU7Qp8IVg40lYr4JEdfC4uXzdN40nt6zxsnm3TXNqozhW6PrUtXhwMafYPoEtMYhtDasT0oXrsDNfnksB0QCpAZ8KWbJ6SXvy7AprHouafiGojyhOscVS8gWC4cCStm/7UODJw6Efkqsdt/Gvo9E/SmjParoi0TyK+pvgT8+mr7a+MF4aich/TmTPN3LmGovaX7oyDdJ6Xo+yp2uKMShQOiWFrVjGCw== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?38r3p4tf0/rb1yVG47T6dWBmP1NpS3roDJ6aL+GxhZoMt17kXKwPs+ksgLtO?= =?us-ascii?Q?i6bKXbyB8TmLL4pOZ8zegkPoyz3tNLJUNLSmpIpmWBQ7jslWVDAyImiiS82f?= =?us-ascii?Q?58E0/vXC5biDPcAHfE+pE41dDmVS9QeTUApueV50fLfPIliwFAsDM1nCrKE6?= =?us-ascii?Q?TgnE2Tezrsdp+pK5FtBkuIbAXFEC/zgKTNMMG+6tz0TUq0cSbduwq4q7qMzI?= =?us-ascii?Q?NxfzSsN4hzDYsupCotpoYMWaCtdCw8fTeGBWhB3hwiVrQgYLnITXdlBnpvZC?= =?us-ascii?Q?3CEq1iZR31960CwSiygHXrM8fFrZbCQ7Hv58MrybLy9unpZX8h+6eC4vuSR/?= =?us-ascii?Q?hnFtElzHtjZlCFYlgFqdBgUNW5wm7GhcKMywez3CkRUWiS4CwgdhtZkcH2hK?= =?us-ascii?Q?Et3lj8pOSajPCUolh+22RbMZ0DK37Ajb4SSb2lh9+qPtj8FP0No9Ndd78j9b?= =?us-ascii?Q?xaH235KY0fi6CO8T4AzvRpw4MTrXDgvEYyYbw0CV6xfhGCMtBYKVa1Qeq+qc?= =?us-ascii?Q?h2kCiaoj14XZ1JyXHCBEVdm0qBVVvMH81rlOt2boR6cV47Sv51a0uC19nPE0?= =?us-ascii?Q?MCqA/rJucuydQuS9MafCL/aZEbw7bzoMmpdnMsANUe9WdQazpsUFMlBxlji6?= =?us-ascii?Q?kZMozO5k/Id7SZWxZCjiLgIk8NtC+G2siU0LAgNOhwA0fEPIsJp+A05mD6VG?= =?us-ascii?Q?eX1x7rS6I6IRsBSuwRxdwUN5W0IqYkutWUDhms0UL/tddsecQXhqTyGnCJeo?= =?us-ascii?Q?RZarl3xs9CQFCi7xxTIvmZRyE3X/Q/1RphbkT0Zc642xrHekNy/KKev2Q2Mk?= =?us-ascii?Q?33iyDbEmDW4QrvpJMaSNhI4ApM3qsnY8wMCd35MF03V3KZRQACd9H8gdDbUR?= =?us-ascii?Q?fGHSBGVlh9J8RUUfbzlqouMCBFqXtYAs+A0JWGNpJhcmiYjnOVlBVoGq7+Fd?= =?us-ascii?Q?OtJC0mTr1J2gMDB1pBAu4tqBOyANfEvyDIuAqbhwlTV5FOoDPNBT8aE87jrZ?= =?us-ascii?Q?Rgs7taKvrKc0JA6niSPnLXrABIe5GRRQkHg4caWQ5aONgHwZAA+tAwMUDbOX?= =?us-ascii?Q?HkQmoyEmKkvRUmgTiM8Dg6k2CKcjNxZai72Cv8Y8hdguJ/zS3YL+2eCq2P2E?= =?us-ascii?Q?XdblkuE8VCy5klp1KxkeFFrvCJB1gbtFGTrSMwjHLOHVeBuZsdZJSRk8HjJK?= =?us-ascii?Q?O17MKA3g16mkLVKVnLwRfWhkiYLMIT79TuHeF+Ft0jeFe20Ic54FKc6DpCDy?= =?us-ascii?Q?3Lbe8qunZxhpBkvhyT091Pp8BCkwmFnWy3Znu5SdfMNYqku6TuxKqthtB/pr?= =?us-ascii?Q?Y+N8aMRQhDkJQ6x2Xt1kHNAo?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: be52bb13-ce5a-4ef1-023c-08d91af2bf71 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:14.7417 (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: I8E8TiL6XBHF06CHYjkjOIcuXW3Mz7jG4JeILkAeOGqS/mlciCcvI9W1NJDCIWVsYjv7UHs6nuzI2NPSXTPj+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2365 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,brijesh.singh@amd.com X-Gm-Message-State: mmeZtP27ESkx06AC6gdoALwmx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1621448418; bh=2fhqSGGuugVO8KlfeXskSCKQumNx5We/v3MBn1Mi0F4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=TZ+PgYa+jjFLuGoay5KZ0Mn6uzPsYuJsRUqjsqC5oDyaASnNct/spAC0IFeT7Vy/zjB 8XOMLRaY+fM/DPDm7R4Vw+ODHCZuSWfUsi7llLlCsUAVInTwKqGtFI6PKdTWKBdLtVKPT C8du+yfAlXvYmZsjIbws6UUEjNpQuHI7E68= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 The Flush parameter is used to provide a hint whether the specified range is Mmio address. Now that we have a dedicated helper to clear the memory encryption mask for the Mmio address range, its safe to remove the Flush parameter from MemEncryptSev{Set,Clear}PageEncMask(). Since the address specified in the MemEncryptSev{Set,Clear}PageEncMask() points to a system RAM, thus a cache flush is required during the encryption mask update. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Reviewed-by: Laszlo Ersek Signed-off-by: Brijesh Singh --- OvmfPkg/Include/Library/MemEncryptSevLib.h | 10 ++-------- .../BaseMemEncryptSevLib/X64/VirtualMemory.h | 10 ++-------- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 3 +-- OvmfPkg/IoMmuDxe/AmdSevIoMmu.c | 6 ++---- .../BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c | 10 ++-------- .../BaseMemEncryptSevLib/X64/MemEncryptSevLib.c | 16 ++++------------ .../X64/PeiDxeVirtualMemory.c | 14 ++++---------- .../BaseMemEncryptSevLib/X64/SecVirtualMemory.c | 8 ++------ .../SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 3 +-- OvmfPkg/PlatformPei/AmdSev.c | 3 +-- 10 files changed, 21 insertions(+), 62 deletions(-) diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h index b91490d5d44d..76d06c206c8b 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -100,8 +100,6 @@ MemEncryptSevIsEnabled ( address of a memory region. @param[in] NumPages The number of pages from start memory region. - @param[in] Flush Flush the caches before clearing the= bit - (mostly TRUE except MMIO addresses) =20 @retval RETURN_SUCCESS The attributes were cleared for the memory region. @@ -114,8 +112,7 @@ EFIAPI MemEncryptSevClearPageEncMask ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS BaseAddress, - IN UINTN NumPages, - IN BOOLEAN Flush + IN UINTN NumPages ); =20 /** @@ -128,8 +125,6 @@ MemEncryptSevClearPageEncMask ( address of a memory region. @param[in] NumPages The number of pages from start memory region. - @param[in] Flush Flush the caches before setting the = bit - (mostly TRUE except MMIO addresses) =20 @retval RETURN_SUCCESS The attributes were set for the memo= ry region. @@ -142,8 +137,7 @@ EFIAPI MemEncryptSevSetPageEncMask ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS BaseAddress, - IN UINTN NumPages, - IN BOOLEAN Flush + IN UINTN NumPages ); =20 =20 diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h index 8dc39e647b90..21bbbd1c4f9c 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h @@ -58,8 +58,6 @@ InternalGetMemEncryptionAddressMask ( @param[in] PhysicalAddress The physical address that is the sta= rt address of a memory region. @param[in] Length The length of memory region - @param[in] Flush Flush the caches before applying the - encryption mask =20 @retval RETURN_SUCCESS The attributes were cleared for the memory region. @@ -72,8 +70,7 @@ EFIAPI InternalMemEncryptSevSetMemoryDecrypted ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS PhysicalAddress, - IN UINTN Length, - IN BOOLEAN Flush + IN UINTN Length ); =20 /** @@ -85,8 +82,6 @@ InternalMemEncryptSevSetMemoryDecrypted ( @param[in] PhysicalAddress The physical address that is the sta= rt address of a memory region. @param[in] Length The length of memory region - @param[in] Flush Flush the caches before applying the - encryption mask =20 @retval RETURN_SUCCESS The attributes were set for the memo= ry region. @@ -99,8 +94,7 @@ EFIAPI InternalMemEncryptSevSetMemoryEncrypted ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS PhysicalAddress, - IN UINTN Length, - IN BOOLEAN Flush + IN UINTN Length ); =20 /** diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index 80831b81facf..c66c4e9b9272 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -120,8 +120,7 @@ AmdSevDxeEntryPoint ( Status =3D MemEncryptSevClearPageEncMask ( 0, // Cr3BaseAddress -- use current CR3 MapPagesBase, // BaseAddress - MapPagesCount, // NumPages - TRUE // Flush + MapPagesCount // NumPages ); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a: MemEncryptSevClearPageEncMask(): %r\n", diff --git a/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c b/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c index 49ffa2448811..b30628078f73 100644 --- a/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c +++ b/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c @@ -252,8 +252,7 @@ IoMmuMap ( Status =3D MemEncryptSevClearPageEncMask ( 0, MapInfo->PlainTextAddress, - MapInfo->NumberOfPages, - TRUE + MapInfo->NumberOfPages ); ASSERT_EFI_ERROR (Status); if (EFI_ERROR (Status)) { @@ -407,8 +406,7 @@ IoMmuUnmapWorker ( Status =3D MemEncryptSevSetPageEncMask ( 0, MapInfo->PlainTextAddress, - MapInfo->NumberOfPages, - TRUE + MapInfo->NumberOfPages ); ASSERT_EFI_ERROR (Status); if (EFI_ERROR (Status)) { diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c b= /OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c index 169d3118e44f..be260e0d1014 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c @@ -25,8 +25,6 @@ address of a memory region. @param[in] NumPages The number of pages from start memory region. - @param[in] Flush Flush the caches before clearing the= bit - (mostly TRUE except MMIO addresses) =20 @retval RETURN_SUCCESS The attributes were cleared for the memory region. @@ -39,8 +37,7 @@ EFIAPI MemEncryptSevClearPageEncMask ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS BaseAddress, - IN UINTN NumPages, - IN BOOLEAN Flush + IN UINTN NumPages ) { // @@ -59,8 +56,6 @@ MemEncryptSevClearPageEncMask ( address of a memory region. @param[in] NumPages The number of pages from start memory region. - @param[in] Flush Flush the caches before setting the = bit - (mostly TRUE except MMIO addresses) =20 @retval RETURN_SUCCESS The attributes were set for the memo= ry region. @@ -73,8 +68,7 @@ EFIAPI MemEncryptSevSetPageEncMask ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS BaseAddress, - IN UINTN NumPages, - IN BOOLEAN Flush + IN UINTN NumPages ) { // diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c b/= OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c index a2bf698bcde7..a57e8fd37fa7 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c @@ -27,8 +27,6 @@ address of a memory region. @param[in] NumPages The number of pages from start memory region. - @param[in] Flush Flush the caches before clearing the= bit - (mostly TRUE except MMIO addresses) =20 @retval RETURN_SUCCESS The attributes were cleared for the memory region. @@ -41,15 +39,13 @@ EFIAPI MemEncryptSevClearPageEncMask ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS BaseAddress, - IN UINTN NumPages, - IN BOOLEAN Flush + IN UINTN NumPages ) { return InternalMemEncryptSevSetMemoryDecrypted ( Cr3BaseAddress, BaseAddress, - EFI_PAGES_TO_SIZE (NumPages), - Flush + EFI_PAGES_TO_SIZE (NumPages) ); } =20 @@ -63,8 +59,6 @@ MemEncryptSevClearPageEncMask ( address of a memory region. @param[in] NumPages The number of pages from start memory region. - @param[in] Flush Flush the caches before setting the = bit - (mostly TRUE except MMIO addresses) =20 @retval RETURN_SUCCESS The attributes were set for the memo= ry region. @@ -77,15 +71,13 @@ EFIAPI MemEncryptSevSetPageEncMask ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS BaseAddress, - IN UINTN NumPages, - IN BOOLEAN Flush + IN UINTN NumPages ) { return InternalMemEncryptSevSetMemoryEncrypted ( Cr3BaseAddress, BaseAddress, - EFI_PAGES_TO_SIZE (NumPages), - Flush + EFI_PAGES_TO_SIZE (NumPages) ); } =20 diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c= b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c index a18d336a8789..c696745f9d26 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c @@ -828,8 +828,6 @@ SetMemoryEncDec ( @param[in] PhysicalAddress The physical address that is the sta= rt address of a memory region. @param[in] Length The length of memory region - @param[in] Flush Flush the caches before applying the - encryption mask =20 @retval RETURN_SUCCESS The attributes were cleared for the memory region. @@ -842,8 +840,7 @@ EFIAPI InternalMemEncryptSevSetMemoryDecrypted ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS PhysicalAddress, - IN UINTN Length, - IN BOOLEAN Flush + IN UINTN Length ) { =20 @@ -852,7 +849,7 @@ InternalMemEncryptSevSetMemoryDecrypted ( PhysicalAddress, Length, ClearCBit, - Flush + TRUE ); } =20 @@ -865,8 +862,6 @@ InternalMemEncryptSevSetMemoryDecrypted ( @param[in] PhysicalAddress The physical address that is the sta= rt address of a memory region. @param[in] Length The length of memory region - @param[in] Flush Flush the caches before applying the - encryption mask =20 @retval RETURN_SUCCESS The attributes were set for the memo= ry region. @@ -879,8 +874,7 @@ EFIAPI InternalMemEncryptSevSetMemoryEncrypted ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS PhysicalAddress, - IN UINTN Length, - IN BOOLEAN Flush + IN UINTN Length ) { return SetMemoryEncDec ( @@ -888,7 +882,7 @@ InternalMemEncryptSevSetMemoryEncrypted ( PhysicalAddress, Length, SetCBit, - Flush + TRUE ); } =20 diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c b/= OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c index e0d3a15e8503..a155c8729bfb 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c @@ -42,8 +42,6 @@ InternalGetMemEncryptionAddressMask ( @param[in] PhysicalAddress The physical address that is the sta= rt address of a memory region. @param[in] Length The length of memory region - @param[in] Flush Flush the caches before applying the - encryption mask =20 @retval RETURN_SUCCESS The attributes were cleared for the memory region. @@ -56,8 +54,7 @@ EFIAPI InternalMemEncryptSevSetMemoryDecrypted ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS PhysicalAddress, - IN UINTN Length, - IN BOOLEAN Flush + IN UINTN Length ) { // @@ -89,8 +86,7 @@ EFIAPI InternalMemEncryptSevSetMemoryEncrypted ( IN PHYSICAL_ADDRESS Cr3BaseAddress, IN PHYSICAL_ADDRESS PhysicalAddress, - IN UINTN Length, - IN BOOLEAN Flush + IN UINTN Length ) { // diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPk= g/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index fdf2380974fa..c7cc5b0389c8 100644 --- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -283,8 +283,7 @@ SmmCpuFeaturesSmmRelocationComplete ( Status =3D MemEncryptSevSetPageEncMask ( 0, // Cr3BaseAddress -- use current CR3 MapPagesBase, // BaseAddress - MapPagesCount, // NumPages - TRUE // Flush + MapPagesCount // NumPages ); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a: MemEncryptSevSetPageEncMask(): %r\n", diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index dddffdebda4b..a8bf610022ba 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -72,8 +72,7 @@ AmdSevEsInitialize ( DecryptStatus =3D MemEncryptSevClearPageEncMask ( 0, GhcbBasePa + EFI_PAGES_TO_SIZE (PageCount), - 1, - TRUE + 1 ); ASSERT_RETURN_ERROR (DecryptStatus); } --=20 2.17.1 -=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 (#75402): https://edk2.groups.io/g/devel/message/75402 Mute This Topic: https://groups.io/mt/82943413/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-