From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web10.1343.1585071673819169845 for ; Tue, 24 Mar 2020 10:41:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=mdIGYbcN; spf=none, err=SPF record not found (domain: amd.com, ip: , mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XriWDArrEdzwJnhITs5hdo1K+OIE5ul6JS5xruJ/EsRKbn/AP71vjusMwdNP2vCnef8mmOmPygt1XlB6mV72GoYMvWLFryULtE1TcYAhX7fn3uVaLwT67TH4tZzFZ8xmVdGSXuFSTMn7hAwgTtCkAibJsi/zlK5UPp8hkIX7ZXRJsC4QT7QFRZle9cnjBA+MynuWnJqtCBeFkjs3+ht9A6VNSiAFNBm4Ot1HNQclvg513D2g4nqVfwr404B6Ze0RDWTux0SS7fVLQe5QWWas6wOi3LS8717j19K8ACp/o6j/fxiHKWXkTV7fh98/yq+/3Lhd0mnkCJZNl6nc60+xgQ== 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=WmRkwnbXUnYEZQe8rJku7Wn9NMokR6jjTRiTC79ZFgo=; b=MpimDzTbVFZJSuF709mSMvL8rR5UwLKO7lZdVMebcji4coJ7EmUb4cxSWd8wgUY7BnZx1M5/QtxrA2Ef0hLm2VbIW/QbRsCe+DZWp0QygPzcQ+Z9XTVwpdUVi4PE+D3P3e3jKdj1q/nw2pdcL0PoMDGoEqplMKkfNyxD+OpjJLQOG+is5wXWHfVh9dVhVxEZrNWx6fF2VRsviFbrlYDl/zPipVczbyTxbJLQDWK1OK/5U23CEYowXCewIuUXxA8/M2fMOBseHxpLEkBgdhQcWuLjy7ns4aI9SZ33z/ubHMtfkPOeMK6KfDt8J4zcUd+5HVIgzH3FzpyH02G2AO38EQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WmRkwnbXUnYEZQe8rJku7Wn9NMokR6jjTRiTC79ZFgo=; b=mdIGYbcNXvAfBSd+kkLzLwdoKtW0k+lG/sK2zUOK6Mf2D5TI5MmByxSZB+jZC374tzBYdlvHw91g72FzdAJ0Z0m1Y//M8xq8IavvDEywT/tYP1KSwuEIjeguGQv59MzrkXRzYN2TkczMf/fb8mrtTPl0awNTpnxSyy16014n1o4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) by DM6PR12MB4027.namprd12.prod.outlook.com (2603:10b6:5:148::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.20; Tue, 24 Mar 2020 17:41:10 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733%7]) with mapi id 15.20.2835.023; Tue, 24 Mar 2020 17:41:10 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Michael D Kinney , Liming Gao , Eric Dong , Ray Ni , Brijesh Singh , Benjamin You , Dandan Bi , Guo Dong , Hao A Wu , Jian J Wang , Maurice Ma Subject: [PATCH v6 00/42] SEV-ES guest support Date: Tue, 24 Mar 2020 12:40:14 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: DM5PR06CA0025.namprd06.prod.outlook.com (2603:10b6:3:5d::11) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by DM5PR06CA0025.namprd06.prod.outlook.com (2603:10b6:3:5d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.19 via Frontend Transport; Tue, 24 Mar 2020 17:41:09 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: abebe3f9-82d2-41b1-b339-08d7d01a8a0e X-MS-TrafficTypeDiagnostic: DM6PR12MB4027:|DM6PR12MB4027: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-Forefront-PRVS: 03524FBD26 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(366004)(376002)(396003)(346002)(136003)(39860400002)(2906002)(956004)(6666004)(2616005)(7416002)(5660300002)(8676002)(19627235002)(6916009)(8936002)(30864003)(966005)(81156014)(478600001)(81166006)(316002)(36756003)(86362001)(54906003)(52116002)(186003)(6486002)(16526019)(66556008)(66946007)(4326008)(26005)(66476007)(7696005)(136400200001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB4027;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2ua8fB8Qjyq62UyVQPPfOcygd8lC7E+gAwRXQMWKTQKuyR8BQMR/z779KZWnxOZ0Hkp1xXVocNNXjE1K9KT2R/K35X+k1HNX/ATVOyQAvYNrpMGRw7HiMREsBVtYX65tvPfYzwuj4CWa5FuXlX85mW4gg1Zo6vb8TyEX7cnzxva5IfEk32GJHnHYvBPEcM3Yqv/Nvn41fY/109uZFmsMGYZYgnTUQ1DmaYQo6zwn308GkA/hNzq5SaYNBqTSaUcu4F6j2GWzM+LWk+69jyutPkz9olsY4HaeQEdKFFhh1zKF93k/BBFszaseByVv4CQ2bTlSI32nVO4Fge5jHqMLsFbJDl45LOOx4/LbX+zU+IJtYoKhgoGSSutPyeg4vl7x+F+4+8FVDcHCM1dMlvpiBJdWfpZepmd6U1/cRQU/w9E9FatYEhpqf02sBj4XlBGU5tcDBTwQjGi+lcI69ZfYJOahdDGe7ItJ3gdBRkyR/ZSbyVMxdyYkYduOZtXehIt3xvu/f/DHLawr+75ROkyZ1KzjYtLDdTEedXom+2TmykfkPhGmkVjKLOaR7cL4liO3nrL1qTXeoQoEs7CRBmQIww== X-MS-Exchange-AntiSpam-MessageData: 38dxp07uVC5v4rrc7ZKmHJ/NiiIqLSk5OXkN2PEYW1I85mCm0Hh9BD67/EGBYN+QJYQEIwN3QaCqasLnsW/zGAeG0/0sLI9ixYZu6vgkOPZ2yT/vHaWpDJCNDIWV1MA6Ev8GoSN1jWYMdt3iGMoZ3A== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: abebe3f9-82d2-41b1-b339-08d7d01a8a0e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2020 17:41:10.2129 (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: VUHVMhkfLunOgTF00Q78dBaky8WFOiGSGrLhjxynCRt0dHh5L8ThoYnc/rEcztTNiQHH3/5QoulcBKmL1AISGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4027 Content-Type: text/plain This patch series provides support for running EDK2/OVMF under SEV-ES. Secure Encrypted Virtualization - Encrypted State (SEV-ES) expands on the SEV support to protect the guest register state from the hypervisor. See "AMD64 Architecture Programmer's Manual Volume 2: System Programming", section "15.35 Encrypted State (SEV-ES)" [1]. In order to allow a hypervisor to perform functions on behalf of a guest, there is architectural support for notifying a guest's operating system when certain types of VMEXITs are about to occur. This allows the guest to selectively share information with the hypervisor to satisfy the requested function. The notification is performed using a new exception, the VMM Communication exception (#VC). The information is shared through the Guest-Hypervisor Communication Block (GHCB) using the VMGEXIT instruction. The GHCB format and the protocol for using it is documented in "SEV-ES Guest-Hypervisor Communication Block Standardization" [2]. The main areas of the EDK2 code that are updated to support SEV-ES are around the exception handling support and the AP boot support. Exception support is required starting in Sec, continuing through Pei and into Dxe in order to handle #VC exceptions that are generated. Each AP requires it's own GHCB page as well as a page to hold values specific to that AP. AP booting poses some interesting challenges. The INIT-SIPI-SIPI sequence is typically used to boot the APs. However, the hypervisor is not allowed to update the guest registers. The GHCB document [2] talks about how SMP booting under SEV-ES is performed. Since the GHCB page must be a shared (unencrypted) page, the processor must be running in long mode in order for the guest and hypervisor to communicate with each other. As a result, SEV-ES is only supported under the X64 architecture. [1] https://www.amd.com/system/files/TechDocs/24593.pdf [2] https://developer.amd.com/wp-content/resources/56421.pdf --- These patches are based on commit: 2f524a745e23 ("BaseTools:Fix build tools print traceback info issue") Proper execution of SEV-ES relies on Bugzilla 2340 being fixed. A version of the tree (with an extra patch to workaround Bugzilla 2340) can be found at: https://github.com/AMDESE/ovmf/tree/sev-es-v13 Cc: Ard Biesheuvel Cc: Benjamin You Cc: Dandan Bi Cc: Eric Dong Cc: Guo Dong Cc: Hao A Wu Cc: Jian J Wang Cc: Jordan Justen Cc: Laszlo Ersek Cc: Liming Gao Cc: Maurice Ma Cc: Michael D Kinney Cc: Ray Ni Changes since v5: - Remove extraneous VmgExitLib usage - Miscellaneous changes to address feedback (coding style, etc.) Changes since v4: - Move the SEV-ES protocol negotiation out of the SEC exception handler and into the SecMain.c file. As a result: - Move the SecGhcb related PCDs out of UefiCpuPkg and into OvmfPkg - Combine SecAMDSevVcHandler.c and PeiDxeAMDSevVcHandler.c into a single AMDSevVcHandler.c - Consolidate VmgExitLib usage into common LibraryClasses sections - Add documentation comments to the VmgExitLib functions Changes since v3: - Remove the need for the MP library finalization routine. The AP jump table address will be held by the hypervisor rather than communicated via the GHCB MSR. This removes some fragility around the UEFI to OS transition. - Rename the SEV-ES RIP reset area to SEV-ES workarea and use it to communicate the SEV-ES status, so that SEC CPU exception handling is only established for an SEV-ES guest. - Fix SMM build breakageAdd around QemuFlashPtrWrite(). - Fix SMM build breakage by adding VC exception support the SMM CPU exception handling. - Add memory fencing around the invocation of AsmVmgExit(). - Clarify comments around the SEV-ES AP reset RIP values and usage. - Move some PCD definitions from MdeModulePkg to UefiCpuPkg. - Remove the 16-bit code selector definition from MdeModulePkg Changes since v2: - Added a way to locate the SEV-ES fixed AP RIP address for starting AP's to avoid updating the actual flash image (build time location that is identified with a GUID value). - Create a VmgExit library to replace static inline functions. - Move some PCDs to the appropriate packages - Add support for writing to QEMU flash under SEV-ES - Add additional MMIO opcode support - Cleaned up the GHCB MSR CPUID protocol support Changes since v1: - Patches reworked to be more specific to the component/area being updated and order of definition/usage - Created a library for VMGEXIT-related functions to replace use of inline functions - Allocation method for GDT changed from AllocatePool to AllocatePages - Early caching only enabled for SEV-ES guests - Ensure AP loop mode set to halt loop mode for SEV-ES guests - Reserved SEC GHCB-related memory areas when S3 is enabled Tom Lendacky (42): MdePkg: Create PCDs to be used in support of SEV-ES MdePkg: Add the MSR definition for the GHCB register MdePkg: Add a structure definition for the GHCB MdeModulePkg/DxeIplPeim: Support GHCB pages when creating page tables MdePkg/BaseLib: Add support for the XGETBV instruction MdePkg/BaseLib: Add support for the VMGEXIT instruction UefiCpuPkg: Implement library support for VMGEXIT OvmfPkg: Prepare OvmfPkg to use the VmgExitLib library UefiPayloadPkg: Prepare UefiPayloadPkg to use the VmgExitLib library UefiCpuPkg/CpuExceptionHandler: Add base support for the #VC exception UefiCpuPkg/CpuExceptionHandler: Add support for IOIO_PROT NAE events UefiCpuPkg/CpuExceptionHandler: Support string IO for IOIO_PROT NAE events UefiCpuPkg/CpuExceptionHandler: Add support for CPUID NAE events UefiCpuPkg/CpuExceptionHandler: Add support for MSR_PROT NAE events UefiCpuPkg/CpuExceptionHandler: Add support for NPF NAE events (MMIO) UefiCpuPkg/CpuExceptionHandler: Add support for WBINVD NAE events UefiCpuPkg/CpuExceptionHandler: Add support for RDTSC NAE events UefiCpuPkg/CpuExceptionHandler: Add support for RDPMC NAE events UefiCpuPkg/CpuExceptionHandler: Add support for INVD NAE events UefiCpuPkg/CpuExceptionHandler: Add support for VMMCALL NAE events UefiCpuPkg/CpuExceptionHandler: Add support for RDTSCP NAE events UefiCpuPkg/CpuExceptionHandler: Add support for MONITOR/MONITORX NAE events UefiCpuPkg/CpuExceptionHandler: Add support for MWAIT/MWAITX NAE events UefiCpuPkg/CpuExceptionHandler: Add support for DR7 Read/Write NAE events OvmfPkg/MemEncryptSevLib: Add an SEV-ES guest indicator function OvmfPkg: Add support to perform SEV-ES initialization OvmfPkg: Create a GHCB page for use during Sec phase OvmfPkg/PlatformPei: Reserve GHCB-related areas if S3 is supported OvmfPkg: Create GHCB pages for use during Pei and Dxe phase OvmfPkg/PlatformPei: Move early GDT into ram when SEV-ES is enabled UefiCpuPkg: Create an SEV-ES workarea PCD OvmfPkg: Reserve a page in memory for the SEV-ES usage OvmfPkg/ResetVector: Add support for a 32-bit SEV check OvmfPkg/Sec: Add #VC exception handling for Sec phase OvmfPkg/Sec: Enable cache early to speed up booting OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Bypass flash detection with SEV-ES is enabled UefiCpuPkg: Add a 16-bit protected mode code segment descriptor UefiCpuPkg/MpInitLib: Add CPU MP data flag to indicate if SEV-ES is enabled UefiCpuPkg: Allow AP booting under SEV-ES OvmfPkg: Use the SEV-ES work area for the SEV-ES AP reset vector OvmfPkg: Move the GHCB allocations into reserved memory UefiCpuPkg/MpInitLib: Prepare SEV-ES guest APs for OS use MdeModulePkg/MdeModulePkg.dec | 9 + OvmfPkg/OvmfPkg.dec | 9 + UefiCpuPkg/UefiCpuPkg.dec | 17 + OvmfPkg/OvmfPkgIa32.dsc | 6 + OvmfPkg/OvmfPkgIa32X64.dsc | 6 + OvmfPkg/OvmfPkgX64.dsc | 6 + OvmfPkg/OvmfXen.dsc | 1 + UefiCpuPkg/UefiCpuPkg.dsc | 2 + UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 2 + UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 2 + OvmfPkg/OvmfPkgX64.fdf | 9 + MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 2 + MdePkg/Library/BaseLib/BaseLib.inf | 4 + OvmfPkg/PlatformPei/PlatformPei.inf | 7 + .../FvbServicesRuntimeDxe.inf | 2 + OvmfPkg/ResetVector/ResetVector.inf | 8 + OvmfPkg/Sec/SecMain.inf | 4 + .../DxeCpuExceptionHandlerLib.inf | 5 + .../PeiCpuExceptionHandlerLib.inf | 5 + .../SecPeiCpuExceptionHandlerLib.inf | 5 + .../SmmCpuExceptionHandlerLib.inf | 5 + UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf | 4 + UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf | 4 + UefiCpuPkg/Library/VmgExitLib/VmgExitLib.inf | 33 + .../Core/DxeIplPeim/X64/VirtualMemory.h | 12 +- MdePkg/Include/Library/BaseLib.h | 31 + MdePkg/Include/Register/Amd/Fam17Msr.h | 42 + MdePkg/Include/Register/Amd/Ghcb.h | 136 ++ OvmfPkg/Include/Library/MemEncryptSevLib.h | 12 + .../QemuFlash.h | 6 + UefiCpuPkg/CpuDxe/CpuGdt.h | 4 +- UefiCpuPkg/Include/Library/VmgExitLib.h | 111 ++ .../CpuExceptionHandlerLib/AMDSevVcCommon.h | 26 + .../CpuExceptionCommon.h | 2 + UefiCpuPkg/Library/MpInitLib/MpLib.h | 68 +- .../Core/DxeIplPeim/Ia32/DxeLoadFunc.c | 4 +- .../Core/DxeIplPeim/X64/DxeLoadFunc.c | 11 +- .../Core/DxeIplPeim/X64/VirtualMemory.c | 49 +- MdePkg/Library/BaseLib/Ia32/GccInline.c | 45 + MdePkg/Library/BaseLib/X64/GccInline.c | 47 + .../MemEncryptSevLibInternal.c | 75 +- OvmfPkg/PlatformPei/AmdSev.c | 82 ++ OvmfPkg/PlatformPei/MemDetect.c | 23 + .../QemuFlash.c | 23 +- .../QemuFlashDxe.c | 15 + .../QemuFlashSmm.c | 9 + OvmfPkg/Sec/SecMain.c | 160 ++- UefiCpuPkg/CpuDxe/CpuGdt.c | 8 +- .../CpuExceptionHandlerLib/AMDSevVcHandler.c | 29 + .../CpuExceptionCommon.c | 2 +- .../Ia32/ArchAMDSevVcHandler.c | 24 + .../PeiDxeSmmCpuException.c | 16 + .../SecPeiCpuException.c | 16 + .../X64/ArchAMDSevVcHandler.c | 1237 +++++++++++++++++ UefiCpuPkg/Library/MpInitLib/DxeMpLib.c | 114 +- UefiCpuPkg/Library/MpInitLib/MpLib.c | 257 +++- UefiCpuPkg/Library/MpInitLib/PeiMpLib.c | 19 + UefiCpuPkg/Library/VmgExitLib/VmgExitLib.c | 249 ++++ UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c | 2 +- MdePkg/Library/BaseLib/Ia32/VmgExit.nasm | 37 + MdePkg/Library/BaseLib/Ia32/XGetBv.nasm | 31 + MdePkg/Library/BaseLib/X64/VmgExit.nasm | 32 + MdePkg/Library/BaseLib/X64/XGetBv.nasm | 34 + OvmfPkg/ResetVector/Ia16/ResetVectorVtf0.asm | 100 ++ OvmfPkg/ResetVector/Ia32/PageTables64.asm | 351 ++++- OvmfPkg/ResetVector/ResetVector.nasmb | 20 + .../X64/ExceptionHandlerAsm.nasm | 17 + UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc | 2 +- .../Library/MpInitLib/Ia32/MpFuncs.nasm | 15 + UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc | 4 +- UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm | 370 ++++- UefiCpuPkg/Library/VmgExitLib/VmgExitLib.uni | 15 + .../ResetVector/Vtf0/Ia16/Real16ToFlat32.asm | 9 + 73 files changed, 4061 insertions(+), 99 deletions(-) create mode 100644 UefiCpuPkg/Library/VmgExitLib/VmgExitLib.inf create mode 100644 MdePkg/Include/Register/Amd/Ghcb.h create mode 100644 UefiCpuPkg/Include/Library/VmgExitLib.h create mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/AMDSevVcCommon.h create mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/AMDSevVcHandler.c create mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ArchAMDSevVcHandler.c create mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c create mode 100644 UefiCpuPkg/Library/VmgExitLib/VmgExitLib.c create mode 100644 MdePkg/Library/BaseLib/Ia32/VmgExit.nasm create mode 100644 MdePkg/Library/BaseLib/Ia32/XGetBv.nasm create mode 100644 MdePkg/Library/BaseLib/X64/VmgExit.nasm create mode 100644 MdePkg/Library/BaseLib/X64/XGetBv.nasm create mode 100644 OvmfPkg/ResetVector/Ia16/ResetVectorVtf0.asm create mode 100644 UefiCpuPkg/Library/VmgExitLib/VmgExitLib.uni -- 2.17.1