From nobody Thu May 2 16:57:25 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+68294+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+68294+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 1607039802702813.0510497019355; Thu, 3 Dec 2020 15:56:42 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id aXJUYY1788612xsivROC8IkV; Thu, 03 Dec 2020 15:56:42 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.56]) by mx.groups.io with SMTP id smtpd.web08.5157.1607034421925214229 for ; Thu, 03 Dec 2020 14:27:02 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nWzV2PFhNGvVur2a0tss6H6UKQfQWmbOkoSP6cHrN279M/6duJS2RtOVVafjWFl0IQWSgrLujrjc9eUXI4RJV9R0q1iZ5omxJoBWfk3BgSU2icZVSbIQfBQ8WHBAnrc2oDhK6yzoE/P3XTk/UowfRmd8XQxhDNnxcHdwllxVCs+RBfAnnonzNC0G/xipoAm+j9sXH94e6NnuoII6PxwL/FPT8eCZ/TumfgJR1xwDdmhdVNjeUe2DY1AEX6qdH/8XgoWvzKD9pPUqaO5t+bzPdvCoOnmk5/MRqYV82R2raU+dLytDCRvpcO6tDWRIeo+KK6sM3HRPvIFCq3y3laBW2w== 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=1t6oC4lZ57xjNaS6GKs/9SY1UpL5VsqK5gUKYx1x8Y8=; b=c2pOhgerUicdrWN2nugxB6jQkrfIJJ1is3oRfhIjPCnjlEKTmbUl+8HxEcRXbypKMtrCe2ogh21A6wo9CPFZq5RiRSiXKc+Gr3HHjP2lf6znkgmFi6r9QjrAJyYgpzAW7/ezeCBVI2JrYyCUb4VvqQvTY4mf9wfKsBI/bex9ezMNqcpgeXJuAInpU0modwRvqyHHVhbZIsMFo1xmfPSFLJC2q+rG/LAiR6TxVzjf3JWoqt7Ih3kNzNulgL2LOphrXRDU8Lc5tKM7fRHgi7KwtNXeqISSMDw2qz8NkDcv38MiW2iP6jHBGGGwh8zh/cabYTI7XltRN6JHX173UuTOdQ== 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 SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN1PR12MB2446.namprd12.prod.outlook.com (2603:10b6:802:26::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.20; Thu, 3 Dec 2020 22:27:00 +0000 X-Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::d8f2:fde4:5e1d:afec]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::d8f2:fde4:5e1d:afec%3]) with mapi id 15.20.3611.025; Thu, 3 Dec 2020 22:27:00 +0000 From: "Ashish Kalra" To: devel@edk2.groups.io Cc: dovmurik@linux.vnet.ibm.com, brijesh.singh@amd.com, tobin@ibm.com, Jon.Grimm@amd.com, Thomas.Lendacky@amd.com, jejb@linux.ibm.com, frankeh@us.ibm.com, dgilbert@redhat.com, lersek@redhat.com, jordan.l.justen@intel.com, ard.biesheuvel@arm.com Subject: [edk2-devel] [PATCH v2 1/3] OvmfPkg/MemEncryptHypercallLib: add library to support SEV hypercalls. Date: Thu, 3 Dec 2020 22:26:49 +0000 Message-Id: <5d84e29cb02eada513738fb4f0c54a6dfe35f416.1607032888.git.ashish.kalra@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR03CA0075.namprd03.prod.outlook.com (2603:10b6:5:333::8) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by DM6PR03CA0075.namprd03.prod.outlook.com (2603:10b6:5:333::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Thu, 3 Dec 2020 22:26:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6f130e55-dd89-4726-9d88-08d897da8d2f X-MS-TrafficTypeDiagnostic: SN1PR12MB2446: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: cJI8AW2+ZLVWhuhaAlN1AArHEAesdfqb7XhizmwAxuFzPIlBRcubPi2dhrFzDZnE/Sgjp6O6ITL+d4HLc+0akZ6Z1L43CbW9KiEOw9srW5Fn0nyk8BCAl0Ygd6nNvkGDFbY/UUGSIsfKaGE0FE5o5KInFoHx2GwbvWS9HOXeLT7WcobCX7I2KCGSTZWmknEnvhvKDT8SE5mE70lPZPx+BFFPNDebRrimfrZytqrTPXOsVLqBpNrYLCDs0WiXDqYZVND1G29++9Ztkm7EutiOicOaun7uRV55Q2gDzZW2xDEx6ftG1CzC/GigRGtIr2Ksy8Q0seZWvJsix+eDZ0k6xQ== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?84Vlq3Od+Nkm/cgXHXwqZvNPzTR+EQnno+rrL89V3tu0XCg8e6+eIm/vgz0w?= =?us-ascii?Q?JKf9IY6Zqr2UgoDcX4D2U9CBBJwhmtzZ/ydhKrGt9Q1MYMaz07ofVuqwmLYF?= =?us-ascii?Q?lYg7eG9CvDCCJZEBSClrqNIXtjgGrEEtuHah7UlTQwmWhTV1/VUEi8kJftFo?= =?us-ascii?Q?yi60aA7CL2XzexOkcEbSJIoIkjGlul53S6kWO4AiomD7CiePQ9u9ueM/4eCX?= =?us-ascii?Q?xozmrL7v1+JwdgoPV0xEzW+FhJxroKVHIqMITdB8vSKka/a891LjKh7V6bDI?= =?us-ascii?Q?Tb7MIQPLkjDIk0XR3cGC6e09+dXH/THD0/YPrveTn9MUU0jLZF94pTkq2cw9?= =?us-ascii?Q?6VGWkdKqGrtwbjllPnAuhMWQn+Jhne2CJpXsVnmX9kDX7ICGIJSgxRNjxVH/?= =?us-ascii?Q?vWpcCrqLfL5IGMEiTYDkPCqMlFBDRCShQ+IbI5Y2X9gQQJw4HkMOP+TtxHBC?= =?us-ascii?Q?GVaD47beb5W7h0D5R78QX8LnbbGAOtcAMc0M32kC7JWYDTTOKaw/41IAik7d?= =?us-ascii?Q?ta+N+gS72wAvTbW9iDdF9mj1eA0yaNXJCZUGRS2W/KwU0brB/qM/xCLuUUwD?= =?us-ascii?Q?g9j09eS4zDqjElA1N+/1qVZWpk4MRcJ2smAa04vp9mQg8hDTc1uaGVjpSd2n?= =?us-ascii?Q?yXGQgYRPq50eNwd0HwY1h+5q11+lXOOE57gHVTOKA0lXWVUoLEW5JBwQS6fU?= =?us-ascii?Q?1+kdUkfKDGCbU30efWm6mR9+rg9gYFl7x3m/4ATLgG/38UAmCYdWndyxCmez?= =?us-ascii?Q?5HdiqGin39Ws+4MQUPBG/7yqhBYEA+H2OoE6VN9Dj7RVHc8ZLBWtPCCI/i3n?= =?us-ascii?Q?FbcBEhEmLJ17m6AinfGskD79XBTUeUowjYq3F3dE+MGUPWx2wq1cRPQA62Rx?= =?us-ascii?Q?5FQqwoiTI0yi4sGasI7pWlnD+8rYJzozQRhUAzLeaLlgRhE2nMKobXdB10ui?= =?us-ascii?Q?1nLpRZzeE4euUxypmSU416YcMF13pra2OsxpPDkFAZ1LUA/cYNPuomM6KS35?= =?us-ascii?Q?fAbz?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f130e55-dd89-4726-9d88-08d897da8d2f X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2020 22:27:00.2866 (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: niTinYtfCsq3sPiwv7kh92W06HNLKdxQl7ZobC8nHLZ0q7Jv1QoeddUEEvRKl6cwzlDc7z2JWJzqV10Sk5nM2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2446 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashish.kalra@amd.com X-Gm-Message-State: TwduDpqHOo92Mgl8V96zGkk2x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1607039802; bh=REYzxfudQX8tim1rpkDOOnX9PbINY8MFlvDpgXez31E=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Uo2nT89uY9rdJrnv5CcQpU77Y5jfLiGZxvaeezJ0MOJuphGgBOjLDjUdUPoClDmNa8v E0LEGk2afFqUnKwAUfyZC7jFRWX6y4IEdb7qkOV7MITIgsR6XlKpLik+JjXfISkE/yl8H /2Zsrc3aOenjKHiTSubjcBO8kzmK1fEq0yk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ashish Kalra Add SEV and SEV-ES hypercall abstraction library to support SEV Page encryption/deceryption status hypercalls for SEV and SEV-ES guests. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Ashish Kalra --- OvmfPkg/Include/Library/MemEncryptHypercallLib.h | 37 ++= +++++ OvmfPkg/Library/MemEncryptHypercallLib/MemEncryptHypercallLib.c | 105 ++= ++++++++++++++++++ OvmfPkg/Library/MemEncryptHypercallLib/MemEncryptHypercallLib.inf | 39 ++= ++++++ OvmfPkg/Library/MemEncryptHypercallLib/X64/AsmHelperStub.nasm | 39 ++= ++++++ OvmfPkg/OvmfPkgX64.dsc | 1 + 5 files changed, 221 insertions(+) diff --git a/OvmfPkg/Include/Library/MemEncryptHypercallLib.h b/OvmfPkg/Inc= lude/Library/MemEncryptHypercallLib.h new file mode 100644 index 0000000000..cd46a7f2b3 --- /dev/null +++ b/OvmfPkg/Include/Library/MemEncryptHypercallLib.h @@ -0,0 +1,37 @@ +/** @file + + Define Secure Encrypted Virtualization (SEV) hypercall library. + + Copyright (c) 2020, AMD Incorporated. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef _MEM_ENCRYPT_HYPERCALL_LIB_H_ +#define _MEM_ENCRYPT_HYPERCALL_LIB_H_ + +#include + +#define SEV_PAGE_ENC_HYPERCALL 12 + +/** + This hyercall is used to notify hypervisor when a page is marked as + 'decrypted' (i.e C-bit removed). + + @param[in] PhysicalAddress The physical address that is the start= address + of a memory region. + @param[in] Length The length of memory region + @param[in] Mode SetCBit or ClearCBit + +**/ + +VOID +EFIAPI +SetMemoryEncDecHypercall3 ( + IN UINTN PhysicalAddress, + IN UINTN Length, + IN UINTN Mode + ); + +#endif diff --git a/OvmfPkg/Library/MemEncryptHypercallLib/MemEncryptHypercallLib.= c b/OvmfPkg/Library/MemEncryptHypercallLib/MemEncryptHypercallLib.c new file mode 100644 index 0000000000..f1136b7d36 --- /dev/null +++ b/OvmfPkg/Library/MemEncryptHypercallLib/MemEncryptHypercallLib.c @@ -0,0 +1,105 @@ +/** @file + + Secure Encrypted Virtualization (SEV) hypercall helper library + + Copyright (c) 2020, AMD Incorporated. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// +// Interface exposed by the ASM implementation of the core hypercall +// +// + +VOID +EFIAPI +SetMemoryEncDecHypercall3AsmStub ( + IN UINTN HypercallNum, + IN UINTN PhysicalAddress, + IN UINTN Length, + IN UINTN Mode + ); + +/** + This function returns the current CPU privilege level, implemented + in ASM helper stub. + +**/ + +UINT8 +EFIAPI +GetCurrentCpuPrivilegeLevel ( + VOID + ); + +STATIC +VOID +GhcbSetRegValid ( + IN OUT GHCB *Ghcb, + IN GHCB_REGISTER Reg + ) +{ + UINT32 RegIndex; + UINT32 RegBit; + + RegIndex =3D Reg / 8; + RegBit =3D Reg & 0x07; + + Ghcb->SaveArea.ValidBitmap[RegIndex] |=3D (1 << RegBit); +} + +VOID +EFIAPI +SetMemoryEncDecHypercall3 ( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINTN Pages, + IN UINTN Mode + ) +{ + if (MemEncryptSevEsIsEnabled ()) { + MSR_SEV_ES_GHCB_REGISTER Msr; + GHCB *Ghcb; + BOOLEAN InterruptState; + UINT64 Status; + + Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); + Ghcb =3D Msr.Ghcb; + + VmgInit (Ghcb, &InterruptState); + + Ghcb->SaveArea.Rax =3D SEV_PAGE_ENC_HYPERCALL; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Rbx =3D PhysicalAddress; + GhcbSetRegValid (Ghcb, GhcbRbx); + Ghcb->SaveArea.Rcx =3D Pages; + GhcbSetRegValid (Ghcb, GhcbRcx); + Ghcb->SaveArea.Rdx =3D Mode; + GhcbSetRegValid (Ghcb, GhcbRdx); + Ghcb->SaveArea.Cpl =3D GetCurrentCpuPrivilegeLevel(); + GhcbSetRegValid (Ghcb, GhcbCpl); + + Status =3D VmgExit (Ghcb, SVM_EXIT_VMMCALL, 0, 0); + if (Status) { + DEBUG ((DEBUG_ERROR, "SVM_EXIT_VMMCALL failed %lx\n", Status)); + } + VmgDone (Ghcb, InterruptState); + } else { + SetMemoryEncDecHypercall3AsmStub ( + SEV_PAGE_ENC_HYPERCALL, + PhysicalAddress, + Pages, + Mode); + } +} diff --git a/OvmfPkg/Library/MemEncryptHypercallLib/MemEncryptHypercallLib.= inf b/OvmfPkg/Library/MemEncryptHypercallLib/MemEncryptHypercallLib.inf new file mode 100644 index 0000000000..1936fe5b37 --- /dev/null +++ b/OvmfPkg/Library/MemEncryptHypercallLib/MemEncryptHypercallLib.inf @@ -0,0 +1,39 @@ +## @file +# Library provides the hypervisor helper functions for SEV guest +# +# Copyright (c) 2020 Advanced Micro Devices. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# +## + +[Defines] + INF_VERSION =3D 1.25 + BASE_NAME =3D MemEncryptHypercallLib + FILE_GUID =3D 86f2501e-f128-45f3-91c4-3cff31656ca8 + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D MemEncryptHypercallLib|SEC PEI_CORE P= EIM DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_DRIVER + +# +# The following information is for reference only and not required by the = build +# tools. +# +# VALID_ARCHITECTURES =3D IA32 X64 +# + +[Packages] + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + UefiCpuPkg/UefiCpuPkg.dec + OvmfPkg/OvmfPkg.dec + +[Sources.X64] + MemEncryptHypercallLib.c + X64/AsmHelperStub.nasm + +[LibraryClasses] + BaseLib + DebugLib + VmgExitLib diff --git a/OvmfPkg/Library/MemEncryptHypercallLib/X64/AsmHelperStub.nasm = b/OvmfPkg/Library/MemEncryptHypercallLib/X64/AsmHelperStub.nasm new file mode 100644 index 0000000000..5d8a7aa85a --- /dev/null +++ b/OvmfPkg/Library/MemEncryptHypercallLib/X64/AsmHelperStub.nasm @@ -0,0 +1,39 @@ +DEFAULT REL +SECTION .text + +; VOID +; EFIAPI +; SetMemoryEncDecHypercall3AsmStub ( +; IN UINT HypercallNum, +; IN INTN Arg1, +; IN INTN Arg2, +; IN INTN Arg3 +; ); +global ASM_PFX(SetMemoryEncDecHypercall3AsmStub) +ASM_PFX(SetMemoryEncDecHypercall3AsmStub): + ; UEFI calling conventions require RBX to + ; be nonvolatile/callee-saved. + push rbx + ; Copy HypercallNumber to rax + mov rax, rcx + ; Copy Arg1 to the register expected by KVM + mov rbx, rdx + ; Copy Arg2 to register expected by KVM + mov rcx, r8 + ; Copy Arg2 to register expected by KVM + mov rdx, r9 + ; Call VMMCALL + vmmcall + pop rbx + ret + +; UINT8 +; EFIAPI +; GetCurrentCpuPrivilegeLevel ( +; VOID +; ); +global ASM_PFX(GetCurrentCpuPrivilegeLevel) +ASM_PFX(GetCurrentCpuPrivilegeLevel): + mov ax, cs + and al, 0x3 + ret diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index e59ae05b73..97c31c7586 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -174,6 +174,7 @@ VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf + MemEncryptHypercallLib|OvmfPkg/Library/MemEncryptHypercallLib/MemEncrypt= HypercallLib.inf !if $(SMM_REQUIRE) =3D=3D FALSE LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf !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 (#68294): https://edk2.groups.io/g/devel/message/68294 Mute This Topic: https://groups.io/mt/78698660/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 Thu May 2 16:57:25 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+68295+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+68295+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 1607039797678221.21736647754346; Thu, 3 Dec 2020 15:56:37 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id s8y4YY1788612xgIlUJHmly3; Thu, 03 Dec 2020 15:56:37 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.63]) by mx.groups.io with SMTP id smtpd.web12.5236.1607034439424739402 for ; Thu, 03 Dec 2020 14:27:19 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c58EGtbtiMvEIxxr5gHs/GI9W5dj/lPW6qOJzxhcZoFNUOekjVmkxUscSPD/Sd5z6kMTqEAoEldcEjuRyJQxAbycsx6ZRuJiklZu4Gn1mQEpbRbxw0qO3+ovQ56A4JWNwiSWyM2RIUup4qHynqVmalcaGJviE+R/YwHlbn2QWlTzQZ/E5Fsa2sEk7Tjm8IJ5UUdAFOyhG5yoTcPRinlYJZ4Z82uZgDPC3G8HXfyqxS3LUQ6HxiZ0NieKt/o6KZfCACoE9wRPxsbGojfkFv2SZO1TFLonLqe9olTgEFwZebTmHIpaREZE7bPfVCclR5k4YYYEvbGNewNb8ivUPTXzEg== 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=p3E/A7M3DwEfsOb1I+VpU+KO/a7vwmEBAoBN+RmnkOU=; b=AxkrvoeA6g6BZr3blkQMWG+ec+9wiOxZH0+O51jEq2wQOh3DhI+zBlBsPwdGJk02U9NGm5qgv5w6hO2QVaWr5oedw5GLwUkTGijYnAHOvjIELzLTuRFPKKfqWQgMOxoh34khG0BV4b3W0QwAvBP/AJK8ZgLBg9n0O4b7B5Bcu3pSUu2riKnR8wUlrm2gm7ml64QsH+zL2c4nPabZSI7wgBL45GoQ54pwJwuCWB0UwuW4caFudL1gF13IHgzm3IoEhysHqNQPTPWHPt7A83jVUnUNnTCYSPBhC9vTskXx0kt3pV4tshtL4pOrND+j7eWk3RQcg8NmwTRP8i6SQ3iuiQ== 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 SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN1PR12MB2446.namprd12.prod.outlook.com (2603:10b6:802:26::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.20; Thu, 3 Dec 2020 22:27:16 +0000 X-Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::d8f2:fde4:5e1d:afec]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::d8f2:fde4:5e1d:afec%3]) with mapi id 15.20.3611.025; Thu, 3 Dec 2020 22:27:16 +0000 From: "Ashish Kalra" To: devel@edk2.groups.io Cc: dovmurik@linux.vnet.ibm.com, brijesh.singh@amd.com, tobin@ibm.com, Jon.Grimm@amd.com, Thomas.Lendacky@amd.com, jejb@linux.ibm.com, frankeh@us.ibm.com, dgilbert@redhat.com, lersek@redhat.com, jordan.l.justen@intel.com, ard.biesheuvel@arm.com Subject: [edk2-devel] [PATCH v2 2/3] OvmfPkg/BaseMemEncryptLib: Support to issue unencrypted hypercall Date: Thu, 3 Dec 2020 22:27:05 +0000 Message-Id: <2ebeb0332fa0a077e10fa93a50f9de7ef3029249.1607032888.git.ashish.kalra@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR22CA0016.namprd22.prod.outlook.com (2603:10b6:3:101::26) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by DM5PR22CA0016.namprd22.prod.outlook.com (2603:10b6:3:101::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.18 via Frontend Transport; Thu, 3 Dec 2020 22:27:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: dc51016b-ee65-418d-bcb3-08d897da96fc X-MS-TrafficTypeDiagnostic: SN1PR12MB2446: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 1LwqeoG8wYMg29AtzCq17opaHAjquc4thIT1sVn3u8HVy8YETrda4DBayQTNXqdbWuzRgDLxHqfbhZSy8ZqBNDXN/WrHt+nxktUy41xQNyFbyZ6sn1bAIQusfMARKhtjWZvke863c3tiyghfniczQh0s2/onCHL6+hi05lvmZD6wrmUXZe6dQJfYjEeaDi6Gd+cy3Hchq8yvjRElu3kAu6bEAARZbReBV6EiOXrGhTOvP///uTlx8Gj+CF0bHyVO3vcw6/BEG4lwEZs4Qvwv1OFCl1SBbkx7PNXCRbkBX62/h35nl+e1BiHOgWtp5guWtV55fug1v38r+SCGEIPmAw== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?NgvLerNb6qRsVPUKk7hSrctvnTTK2M42c7OdCRZfHy0RmGA04gO2O3GGxqd6?= =?us-ascii?Q?ukmad5bJR2KJbrBQPTCh8n8nI/D0ycwPbysTyg1oTzn89cQK/gEE8bA6C5zb?= =?us-ascii?Q?xvakSeVOm+BfaFppbjap6SeCq6Qn4Sl4lbl5051xtjKnA7FBxUpE9V0pKN6/?= =?us-ascii?Q?cS+oqkh84EuYlqceIyhdgEkvQwEvfLla8Ba22Evdy/gI76ET0CCaVqLHKZqw?= =?us-ascii?Q?sNQtiO6DBljmkEwvBRqW+1vv3KW9kJi2w02+dvW5DbYGGRp5dbBTXLiS/0TB?= =?us-ascii?Q?xjUNhWstCAw4xsxkgs2vXNlsoc+5uR1d5b2APVB3FL2geUFTZBnCWBannhmF?= =?us-ascii?Q?dhtaCdtbam4+PAXi64XAw1UnMH1jERdQyqYQaUmkytKTQ/dXaNKhCvRBYsk+?= =?us-ascii?Q?3wkpoMdVcuXtZE7yui18AfWRk2jxbAat99uu+QajJHeajYj1KBRNG/3Kh5IW?= =?us-ascii?Q?SmSL/7nQbfLYMx2rehgpnjjuQ5ck29hlFIAvCXlSmxgQ5tL6uA2QMKKrrw8s?= =?us-ascii?Q?s7MHnphGbdDfu93Fu1Y7hf49ogYsKuYZQQMS0bACe8+vwKRrsiqLUSslCQCx?= =?us-ascii?Q?nfMfl8KgQMAF/Dv1ywE9x/8N9Dmqs+mAu5l9AyCmDIt5IceH0rg8yGwuKROr?= =?us-ascii?Q?/OFaaZH2GBpCwl0tXVSdxbXYHC10jlYQzTcqq2iLoa8rSIww0+nKitfyoCvr?= =?us-ascii?Q?QQTnxuBzqah60l8uMqUkbyw+bi8QXnafif4AbyAyBdAedOiX6tr9mb1DHMy6?= =?us-ascii?Q?VVY+8kwTpduXTsEZmI7wj0bhKKbptoaC0/XOsnbn+wV8rHHdNSU0YQZuvZ+t?= =?us-ascii?Q?XL0cq0k4JwWbHpRSjbyEmWQb7t6Kax7HN8rfzawgIkXGGdxE/vCKRykD85wo?= =?us-ascii?Q?Hu490HAwmDCS6Lg0kaW1skK+l7njtg+VyjkGaxcHnYa60+/DM6m/TFhIileS?= =?us-ascii?Q?iTAENovDKQ4vd3bSk8RdznV+kJ6HB+kC8uMvSaARdO8=3D?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc51016b-ee65-418d-bcb3-08d897da96fc X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2020 22:27:16.6224 (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: gYojb35bdg6JyTYxN9t6EpZ+ZPZp4fJzn1vT0wB4Vznbp53Bg5Qgs3mvu1bbY+OGIFdYQcUTcmZzG/DAL6V3BA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2446 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashish.kalra@amd.com X-Gm-Message-State: 5bG8JY9DVneQENPtPl41MRrEx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1607039797; bh=J4hE+5rfkWTVKDwfDZ+1oKiQbGPw+5dtmyJp7ZUozVY=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=EgQOr01bMHx7o41s2/KTnZT1amnIHxLvN5RxB9fNNxMnsvG4Va8EhWJcAS5FCvfgyJ3 CtbesfK14nV/DTIuIsTj4Qu0YangkoXBCiAp9bTfovF3S+yelcOaMpbinrtCNckt4sJV1 NgoaTUqZnjIbtJafMNPZ40RcY0m6fFbBhig= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Brijesh Singh By default all the SEV guest memory regions are considered encrypted, if a guest changes the encryption attribute of the page (e.g mark a page as decrypted) then notify hypervisor. Hypervisor will need to track the unencrypted pages. The information will be used during guest live migration, guest page migration and guest debugging. Invoke hypercall via the new hypercall library. This hypercall is used to notify hypervisor when a page is marked as 'decrypted' (i.e C-bit removed). Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra --- OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf | 1 + OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c | 18 +++++++= +++++++++++ 2 files changed, 19 insertions(+) diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf = b/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf index 7c44d09528..95ee707918 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf @@ -46,6 +46,7 @@ DebugLib MemoryAllocationLib PcdLib + MemEncryptHypercallLib =20 [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c index 5e110c84ff..1e670b6200 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c @@ -14,6 +14,7 @@ #include #include #include +#include =20 #include "VirtualMemory.h" =20 @@ -589,6 +590,9 @@ SetMemoryEncDec ( UINT64 AddressEncMask; BOOLEAN IsWpEnabled; RETURN_STATUS Status; + UINTN Size; + BOOLEAN CBitChanged; + PHYSICAL_ADDRESS OrigPhysicalAddress; =20 // // Set PageMapLevel4Entry to suppress incorrect compiler/analyzer warnin= gs. @@ -640,6 +644,10 @@ SetMemoryEncDec ( =20 Status =3D EFI_SUCCESS; =20 + Size =3D Length; + CBitChanged =3D FALSE; + OrigPhysicalAddress =3D PhysicalAddress; + while (Length) { // @@ -699,6 +707,7 @@ SetMemoryEncDec ( )); PhysicalAddress +=3D BIT30; Length -=3D BIT30; + CBitChanged =3D TRUE; } else { // // We must split the page @@ -753,6 +762,7 @@ SetMemoryEncDec ( SetOrClearCBit (&PageDirectory2MEntry->Uint64, Mode); PhysicalAddress +=3D BIT21; Length -=3D BIT21; + CBitChanged =3D TRUE; } else { // // We must split up this page into 4K pages @@ -795,6 +805,7 @@ SetMemoryEncDec ( SetOrClearCBit (&PageTableEntry->Uint64, Mode); PhysicalAddress +=3D EFI_PAGE_SIZE; Length -=3D EFI_PAGE_SIZE; + CBitChanged =3D TRUE; } } } @@ -812,6 +823,13 @@ SetMemoryEncDec ( // CpuFlushTlb(); =20 + // + // Notify Hypervisor on C-bit status + // + if (CBitChanged) { + SetMemoryEncDecHypercall3 (OrigPhysicalAddress, EFI_SIZE_TO_PAGES(Size= ), !Mode); + } + Done: // // Restore page table write protection, if any. --=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 (#68295): https://edk2.groups.io/g/devel/message/68295 Mute This Topic: https://groups.io/mt/78698661/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 Thu May 2 16:57:25 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+68296+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+68296+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 1607039799020170.8334032905019; Thu, 3 Dec 2020 15:56:39 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id zQdSYY1788612xGU0zTkjrKS; Thu, 03 Dec 2020 15:56:38 -0800 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.75]) by mx.groups.io with SMTP id smtpd.web10.5272.1607034473172569596 for ; Thu, 03 Dec 2020 14:27:53 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZI7HHmvHYUDbfsLdgeRPlcqnTyh5k7s32/uq+OjqquhOkXSQd7NUDCM5i83l6swbq4uWrzkdnYT2/d5Pdv6CeG74u0Od+M5JPxFfzixOKsyR9tgVdopb4+cmCdr/ax/MVfBrO41ozrqOgzNmnDRCbf5+lYDzM/w3DYYNcV8yN17j/SHJzEMmnNEp346pfrl6nrBdOYpkTKUG6HjDYxJdsRhqkbx1R3JXHdLovI/AlgIW21tjTg7PHlDmrDd70h5RxOOAVEJCbxQahkVmjjqjZHvVh+/KN647oPSE/L9Fklq1xVZo8BS/ks5rO9JXkZV9QP81aZ9de4AnKBLdLiwxqQ== 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=Uql70QEMwu+QY9FYK9SG7yfzU5s34xpo0pFKnE31WYo=; b=dWmDpxGLleYkjTT0/1aQAoKWMN8BhCvzh9RMjJhJGqZThPCO0kY2XhOtG7D2+nXPQO3TuWZ2U4l+qF23CdxGQc5qhMGB8OGHbe80qpX+8lQqIefEkRpAh163R6bLmNYNWSTSn0dAvnTkUR7vs3BpKN8wUCqdy69NvmeJL8e5XpQj4N35IIRfyGkhO7KHUDvz/zA0xyZ6Rs5gZQgGGXgy3nKcc8adWa+WzjBQf9naLl8LnLSmCrSFieFxymRI3eQbmifZjL/bGzXn9VW8ooGVbPwXroaqvUX5T1w/dBdUggUYyoK77Kr3h6BYTbuSiBVYAQkz0C/x82Y5Aa21BF1Fog== 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 SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.25; Thu, 3 Dec 2020 22:27:51 +0000 X-Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::d8f2:fde4:5e1d:afec]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::d8f2:fde4:5e1d:afec%3]) with mapi id 15.20.3611.025; Thu, 3 Dec 2020 22:27:51 +0000 From: "Ashish Kalra" To: devel@edk2.groups.io Cc: dovmurik@linux.vnet.ibm.com, brijesh.singh@amd.com, tobin@ibm.com, Jon.Grimm@amd.com, Thomas.Lendacky@amd.com, jejb@linux.ibm.com, frankeh@us.ibm.com, dgilbert@redhat.com, lersek@redhat.com, jordan.l.justen@intel.com, ard.biesheuvel@arm.com Subject: [edk2-devel] [PATCH v2 3/3] OvmfPkg/PlatformPei: Mark SEC GHCB page in the page encryption bitmap. Date: Thu, 3 Dec 2020 22:27:39 +0000 Message-Id: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR11CA0018.namprd11.prod.outlook.com (2603:10b6:806:d3::23) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SA0PR11CA0018.namprd11.prod.outlook.com (2603:10b6:806:d3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Thu, 3 Dec 2020 22:27:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 451fb5dd-742c-4c47-93b9-08d897daab8d X-MS-TrafficTypeDiagnostic: SN6PR12MB2767: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: U8NtQa46Q6dJogk9pi3nMX77REzDODq0LRSpb06LOsYzCZiRtuja4sOLj/dVrPeBXrJRcYpfPDa/MkJDbSvd/zxJLPChq3uiWbXyiOYALJNVH3rtKul/etgl0brm6BsxowLHtbFuCsNk0143eNWzx8FAOmfwGJzRHznn8MdWHAZjws5At2oXaZRrWQY0HsdmsEPEusSczHB9Xp6WYJVbsd4/nOJIkb3CyNHeSIIwZM5HFy/d4DDNi71ipSDwh4iw2iVlcyBoRP3N3Zu7I6X9VY+l5xlpPgtoALXFLMAv9/qKJzT2iiJV2UoDn8SD2axDo/A9iTrOo++XtX+QyDg+Vg== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?5Pw+++oOf7iGNzjugJ0RMeNf8ymW7mfY4hWLCy+s+i3xtAsa/xTabry3n9Mz?= =?us-ascii?Q?uHlpShSgMtSSVPo5j9Z/aOrsayWRGH+4xCIqANjLY5CSFmON3dUcoj6BtXdK?= =?us-ascii?Q?D+hG69fKeQCBXnodv+5PiY9U13mE7CYH7OTfCEVO+VKI8C0u63uUfYE6eeFE?= =?us-ascii?Q?242712zXwmLtzWFEjb+WA0dHX8Y5ZhUoJBNO8qddY+MI4FeQJoWwhh9eJXgX?= =?us-ascii?Q?PvsIbIJ0GubxZ+s29Nt/EMr2obGpzPn62OFcMAMCpkMNp6TFL+XUaX4UdgZ4?= =?us-ascii?Q?p5wMctczFJLy4gaOpzu26PGOm6+wZcTMyr3RlxQ88nnbEJrwwnbuJz0miH2B?= =?us-ascii?Q?4tm5LNxvE2pPZLFCeiX7r20GgYNbBVcz6CDCJHhuhCuh+qcN5L3GMllDRKO7?= =?us-ascii?Q?8go00vh9cAp6C5h0ijkPP5ZH66wXGFvkRBF9YEOJTd0XAzbl7HJqpQ2gRNir?= =?us-ascii?Q?horHmYVrIRObCJnzuCatb7NfZv4Oxp3TrAIYYROPrnsy0XXh9gIKuMqwLq1L?= =?us-ascii?Q?AgigmQS3RhXaF2Co/luZZaJCMfD6cvf/0oSom5ANOiWCLK4qUhS4IaMBWXAN?= =?us-ascii?Q?NOeh8xypOjry0dDlFRPwzjixudKzuGfSkV55wg2M1ULai6ARa7cer8eD/XqK?= =?us-ascii?Q?CjECL97Xe3QAbOc5YiXjULSTrA/YO2cnZoffuqBqpDZ+wvMD+HfmMMb4dEki?= =?us-ascii?Q?sRdQYBpPDcviJXeLUkbx3YDW/gcJ+0Mufr19BDUbDVM41Gy/02BODDJdeewu?= =?us-ascii?Q?9uZ1rGrLv5qq/doSdV6UtJhDF29hBJyzHR/SmQrgfIofTNTamNWFTPEwEYnh?= =?us-ascii?Q?tyIkYIChjBlzqkLarZnadzXoeHz9H/goFPrJer0pFTf9fkvcN2uYye9ofpj3?= =?us-ascii?Q?/YBY36M9+Y8xQcJfoF2RZZRHDh13V1GqnKYwMzCgryl1E0WdybjtLPp8YQvZ?= =?us-ascii?Q?mV3a4pJVQ8q/lc9m+hQ2JUrrFys6BQEAURe0oyYwzaE=3D?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 451fb5dd-742c-4c47-93b9-08d897daab8d X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2020 22:27:51.1950 (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: vWWV6ZT8KW9evUCA3TV7nA1gIU1pvAtgk6SxQzQgUV5WBla/tGhNFi9PNx1URPF+QXRIbqa54qDkS4ZsJWqDXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2767 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashish.kalra@amd.com X-Gm-Message-State: 9M2nNtFRbvRwSsvKW1X57TK4x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1607039798; bh=hqcrXEKkIcU3j7yH76uVwIZ2MIS0/R6Jn0Uz1/Y68XE=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=iqaCCci2yTkazH05SV6+iR2UWGwzLTsYccYxOGyklJUWnUuHhHqiiXu4VdQmpqXzElj M+qEE9VbFWuLtXM5H74/JFC+RlzdIU0/PWHl2k9oFAqnr38ow5pGZiGNXLgZJcEyxGpPG aDlS69G9Z9GobfEa5/dVkUZmsfKF+FvjN6Q= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ashish Kalra Mark the SEC GHCB page that is mapped as unencrypted in ResetVector code in the hypervisor page encryption bitmap. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Ashish Kalra --- OvmfPkg/PlatformPei/AmdSev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index 4a515a4847..456d32be84 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -77,6 +78,15 @@ AmdSevEsInitialize ( =20 ZeroMem (GhcbBase, EFI_PAGES_TO_SIZE (GhcbPageCount)); =20 + // + // GHCB_BASE setup during reset-vector needs to be marked as + // decrypted in the hypervisor page encryption bitmap. + // + SetMemoryEncDecHypercall3 (FixedPcdGet32 (PcdOvmfSecGhcbBase), + EFI_SIZE_TO_PAGES(FixedPcdGet32 (PcdOvmfSecGhcbSize)), + FALSE + ); + PcdStatus =3D PcdSet64S (PcdGhcbBase, GhcbBasePa); ASSERT_RETURN_ERROR (PcdStatus); PcdStatus =3D PcdSet64S (PcdGhcbSize, EFI_PAGES_TO_SIZE (GhcbPageCount)); --=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 (#68296): https://edk2.groups.io/g/devel/message/68296 Mute This Topic: https://groups.io/mt/78698662/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-