From nobody Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68901+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+68901+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 1608065498267988.7085746693474; Tue, 15 Dec 2020 12:51:38 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id M9jVYY1788612xEERMsAvQah; Tue, 15 Dec 2020 12:51:37 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.57]) by mx.groups.io with SMTP id smtpd.web09.2820.1608065497290686853 for ; Tue, 15 Dec 2020 12:51:37 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e/STQVZmP6oURvPHK+xw7skF+8PAhfaMoCpWJ68c0yP3jmKUnIVILiLWaLbVVP1nrSiPG2oQF9LthQRCwXcsW8N1hXgurqX1M1hBgYmjNuzbSSYrQRT+rOg/0+/hjXDiakfET0qO5o6JCm6UdadOu79lm1Wmzrmj4uqpq4Kiyzb9sI0JVRC9aV8iC/WSd9f5LOXmGGeC4UfItklpgvU+OfQS3Hyn0KflKJ4tilgSWh/Hiz9rLZycBO9B2dWGJrDwcuXKQwjOG+wZhLn0UjWAG7QJTMiSOPBwYx2A/FrDjWaYygK/qfntWanWz1ApPaxhlezXfCmv7M5PiQNuNYqzAw== 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=0oXVB4duNhaS871RW2TBNEW+znVp4ol8hYZpdhroXcg=; b=D0WpT0Mp5PhxJK6L2/kAC5wKKAcsbYiYgz4rEzXA5d5lF7ddCvaEf5TzEF06TQiQsLbkIim21B49Wi3xZudNn4267N+IsRc/aO3EMG2pNwagNfzuH25Bi9bUUPyc/dUJNn2c9z32txh0f553ZDcsyW6D15nNBSbRf7Uy0orlFXbMKT8r5D5g+aiPFlma1Mb+Y0nyQjgiHII71lFh8jd6Hg1GCfmkt9uYaz5+evpBtfPdMFUqOJBrquvUlmP9SxRNFJ/i6ydYBRHoF7+g5uNMNMIBQY5TGScgmjZH0iYXOAvVNsR+B8vsl5EszNDhkmD7sc36EJiAZ22qJaLCS+rmUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:51:34 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:51:34 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 01/12] Ovmf/ResetVector: Simplify and consolidate the SEV features checks Date: Tue, 15 Dec 2020 14:51:00 -0600 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR10CA0004.namprd10.prod.outlook.com (2603:10b6:610:4c::14) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR10CA0004.namprd10.prod.outlook.com (2603:10b6:610:4c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:51:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: fa518678-8606-49f4-29a2-08d8a13b3584 X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: 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: Vh/czc0Hv0jQBv61zU/rYD3ZM2jaribxf7OHlV44s1tKgzHGQ1dxEriMZ+8H7cE/KpWEptKjuBHPE2ptcO+2l8FxNuXfdyOFVa9Gj2rqp+S5vkZpLO1bpFKt1Fqsbrfcyps1pVMZOBkU/i0+TNtRWebomVwHWC0sCQUF8/SEjjGSstCThIJ7C66n/gPQ0kabtE3Pk1OC8oLoDBJRA+d9S45WEf4pVWBi6oIQpZyoDsl9IE8zhHzYCiK5CV0Z/bAEFLc1sIjZCqqPWp2QskFlfT6n2tju42VLq9UfkJOGhmluRW0x0fs7NtamaUKhuz1hJDZeVoWMr7byz5xZKy5V27xNv56UQ1hDyM2KfT2bKCPv+0wZWCJaB1UIl8hx2nIVF5eZtf6aXMA5xdEwoccGGM9I0U8ppUG6DsCcvHx9GhpXaW7A9j+y74nhJJRCaon/dX+UIIfPNBITejQ1N0me8A== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?p6QrKuMj2esKVJz08PUl9tvLWSpQBZgtEOz/HrrEss0IgJDy7gA3OqC7aQDj?= =?us-ascii?Q?DhkrKznWDhTlmD5XxlkDPBsNQ1PfEm0u6op4ocmfTY2wAJXFnlrDnBKRdSJ0?= =?us-ascii?Q?V1aFn7312bbib87/QGvmNkXbCqSs9KwrC/lz8OV1T8O8tbmkpBvyIJfVzXPx?= =?us-ascii?Q?JWNWGG1rwTJmgo7uo8x6iJCfMgVVPwbRmjXyPW+1sUfSaFY6gSxid4TzZUlz?= =?us-ascii?Q?JDn50zonS2arLBO2/7rbvLITd481D1U0xiYH/4ADK/jF0jK8bO/Sbxtv5deK?= =?us-ascii?Q?vlLzm/N4sMK4XeBLOL4tlVM/AB8IbEcSZQ+Z1f5reUc5gJhylCj9XDzyatQm?= =?us-ascii?Q?EwtKtwAqYZYZyh91LTRU4IrbS2mA6nkcqJQXvJDAlg5oaF+dkCwwcXG5ID0q?= =?us-ascii?Q?QbUNnkUke61kV7vFWXihoKyyBMRC0kH4dW7AkX6gw+5EXCIm1PC5IyJLs2g0?= =?us-ascii?Q?DZu1btQPWV7Z1PFIwacxsmOSIq1ZUIGXiQtBiyMpAD4f9DW0sQDsFfe8eyNB?= =?us-ascii?Q?Gn+BMDCwA49FLYyvQ19jQWwKFeEysyBqODB55x1p0Kt5VUfzWhvAQo0yX3pR?= =?us-ascii?Q?8dE/t25Wo6pT3kmj8gPQVD/uxmKTaKfMyHBpH33ZrOqjKYemqifxOuvQbQgl?= =?us-ascii?Q?SYgfLFggKIjcEV6IDrGMo6JSSc9mmhyq14ZoXeWizb/bXtfJxcOE2K96y7wQ?= =?us-ascii?Q?4B2/ro1QykMSSgs2BrXcZcWP+B+oYMBxCY57gaUNrtw2AU51jKAcU25aFlTV?= =?us-ascii?Q?rlgeBT/gcSYjYsD6jainm1QcUyG7rDlf801pgKVe+4uHqI8nalJuLd35dPMd?= =?us-ascii?Q?O2dl/UztyuI3cnvSvYPwh6P6/M4aQWudOrF4TIq6pFmKLtVtbFJwtaSwwrIY?= =?us-ascii?Q?1mcQ9xlDy/M2e3LsHPpSkQXUgSZ5I8KxHU/WotYFUYOqG6FjdcZZO6chM6CF?= =?us-ascii?Q?CpXhJLJsulEe8TdOSkjLowTv4wtV+WYP8ajkaN5Fj4854mqR4RS1IJ66NgjK?= =?us-ascii?Q?Wu7U?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:51:34.4512 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: fa518678-8606-49f4-29a2-08d8a13b3584 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VHYusUEVjRGh/CqxJyez5+F5jlqNHmbmxYv7y/Q2qkhoJZHR6wovQSR2XF17QIuJ20uc6pX4OCqBbpgsM8xTpA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: y9V9mglEMPZtYeikKa6oEYvCx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065497; bh=S6IwR1vj7QgmB8R+ydSIXELS/gLGRXDEtD0BF2hAQxo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=BGiSAV9blSzCjk0QeVTsSzOc1Q42vtpjkiB59Rufq3riby6K220qWUZT9gqaQg+RR8M ggzArtdFmCMv2ZP/kCytaJwy6beABn2NVXbYj1fbwQFQcqrNFw56ManKmirLGTFsZ1rTu vEHzQax2kOBFRHwPRIPuzAo0ZUAFwvTRwKc= 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=3D3108 Simplify and consolidate the SEV and SEV-ES checks into a single routine. This new routine will use CPUID to check for the appropriate CPUID leaves and the required values, as well as read the non-interceptable SEV status MSR (0xc0010131) to check SEV and SEV-ES enablement. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky Reviewed-by: Laszlo Ersek --- OvmfPkg/ResetVector/Ia32/PageTables64.asm | 75 ++++++++++++++--------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/ResetVecto= r/Ia32/PageTables64.asm index 7c72128a84d6..4032719c3075 100644 --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm +++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm @@ -3,6 +3,7 @@ ; Sets the CR3 register for 64-bit paging ; ; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.
+; Copyright (c) 2017 - 2020, Advanced Micro Devices, Inc. All rights reser= ved.
; SPDX-License-Identifier: BSD-2-Clause-Patent ; ;-------------------------------------------------------------------------= ----- @@ -62,18 +63,22 @@ BITS 32 %define CPUID_INSN_LEN 2 =20 =20 -; Check if Secure Encrypted Virtualization (SEV) feature is enabled +; Check if Secure Encrypted Virtualization (SEV) features are enabled. +; +; Register usage is tight in this routine, so multiple calls for the +; same CPUID and MSR data are performed to keep things simple. ; ; Modified: EAX, EBX, ECX, EDX, ESP ; ; If SEV is enabled then EAX will be at least 32. ; If SEV is disabled then EAX will be zero. ; -CheckSevFeature: +CheckSevFeatures: ; Set the first byte of the workarea to zero to communicate to the SEC ; phase that SEV-ES is not enabled. If SEV-ES is enabled, the CPUID ; instruction will trigger a #VC exception where the first byte of the - ; workarea will be set to one. + ; workarea will be set to one or, if CPUID is not being intercepted, + ; the MSR check below will set the first byte of the workarea to one. mov byte[SEV_ES_WORK_AREA], 0 =20 ; @@ -97,21 +102,41 @@ CheckSevFeature: cmp eax, 0x8000001f jl NoSev =20 - ; Check for memory encryption feature: + ; Check for SEV memory encryption feature: ; CPUID Fn8000_001F[EAX] - Bit 1 ; CPUID raises a #VC exception if running as an SEV-ES guest - mov eax, 0x8000001f + mov eax, 0x8000001f cpuid bt eax, 1 jnc NoSev =20 - ; Check if memory encryption is enabled + ; Check if SEV memory encryption is enabled ; MSR_0xC0010131 - Bit 0 (SEV enabled) mov ecx, 0xc0010131 rdmsr bt eax, 0 jnc NoSev =20 + ; Check for SEV-ES memory encryption feature: + ; CPUID Fn8000_001F[EAX] - Bit 3 + ; CPUID raises a #VC exception if running as an SEV-ES guest + mov eax, 0x8000001f + cpuid + bt eax, 3 + jnc GetSevEncBit + + ; Check if SEV-ES is enabled + ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) + mov ecx, 0xc0010131 + rdmsr + bt eax, 1 + jnc GetSevEncBit + + ; Set the first byte of the workarea to one to communicate to the SEC + ; phase that SEV-ES is enabled. + mov byte[SEV_ES_WORK_AREA], 1 + +GetSevEncBit: ; Get pte bit position to enable memory encryption ; CPUID Fn8000_001F[EBX] - Bits 5:0 ; @@ -132,45 +157,35 @@ SevExit: pop eax mov esp, 0 =20 - OneTimeCallRet CheckSevFeature + OneTimeCallRet CheckSevFeatures =20 ; Check if Secure Encrypted Virtualization - Encrypted State (SEV-ES) feat= ure ; is enabled. ; -; Modified: EAX, EBX, ECX +; Modified: EAX ; ; If SEV-ES is enabled then EAX will be non-zero. ; If SEV-ES is disabled then EAX will be zero. ; -CheckSevEsFeature: +IsSevEsEnabled: xor eax, eax =20 - ; SEV-ES can't be enabled if SEV isn't, so first check the encryption - ; mask. - test edx, edx - jz NoSevEs + ; During CheckSevFeatures, the SEV_ES_WORK_AREA was set to 1 if + ; SEV-ES is enabled. + cmp byte[SEV_ES_WORK_AREA], 1 + jne SevEsDisabled =20 - ; Save current value of encryption mask - mov ebx, edx + mov eax, 1 =20 - ; Check if SEV-ES is enabled - ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) - mov ecx, 0xc0010131 - rdmsr - and eax, 2 - - ; Restore encryption mask - mov edx, ebx - -NoSevEs: - OneTimeCallRet CheckSevEsFeature +SevEsDisabled: + OneTimeCallRet IsSevEsEnabled =20 ; ; Modified: EAX, EBX, ECX, EDX ; SetCr3ForPageTables64: =20 - OneTimeCall CheckSevFeature + OneTimeCall CheckSevFeatures xor edx, edx test eax, eax jz SevNotActive @@ -229,7 +244,7 @@ pageTableEntriesLoop: mov [(ecx * 8 + PT_ADDR (0x2000 - 8)) + 4], edx loop pageTableEntriesLoop =20 - OneTimeCall CheckSevEsFeature + OneTimeCall IsSevEsEnabled test eax, eax jz SetCr3 =20 @@ -336,8 +351,8 @@ SevEsIdtVmmComm: ; If we're here, then we are an SEV-ES guest and this ; was triggered by a CPUID instruction ; - ; Set the first byte of the workarea to one to communicate to the SEC - ; phase that SEV-ES is enabled. + ; Set the first byte of the workarea to one to communicate that + ; a #VC was taken. mov byte[SEV_ES_WORK_AREA], 1 =20 pop ecx ; Error code --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68901): https://edk2.groups.io/g/devel/message/68901 Mute This Topic: https://groups.io/mt/78986135/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68902+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+68902+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 1608065511011599.1733952674863; Tue, 15 Dec 2020 12:51:51 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 9mV1YY1788612x4oyPc5RAaQ; Tue, 15 Dec 2020 12:51:50 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.54]) by mx.groups.io with SMTP id smtpd.web12.2788.1608065505100001666 for ; Tue, 15 Dec 2020 12:51:45 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U+T6CNjxr+6e5SJ7J5jf4FOxaX3cLmNTCuhSEFiIBIZDRDb4NkS9aq1LlLajKHYO4i1U+1Tm94lZRzkH2JIjJ2nD6DeiIqAbgxtuVkuueGqGCvWZ+GpqQwvqMDWwYmTdRbFosSy00aEvJNEoqMX1zKb69JyVh4Ev4yxD0bn8lAIlYGzllQaZiBBp30tlImMdBzKj1/kv/x/Ah+bKEgILtT3V6IGOCqW6r2dpwSvhddSyGOD1VbjhRkZOrcdQs9+CJNZ+gmCOCek1FLcjSF5JH0OlXBRmOgh5HMHPfiVZUzh/c/cDDH63Q59svPBYEc94+Ba7nk3jbI43W9BfXRWXZw== 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=DcpBXNGiPRcrpvYVcooYfi6LgsRHex4vK40Y8s11Xsw=; b=ktrtMFWqkOeDQ+K0/38qk5ux2VowV6R7YuBNhjGY6ur4bX00Ry7YggVMgCiM3hCTkK7wb8RtdsaBDek8CT/Ir7p6sJsADAJhXuglvqdhV10WIBtRRmD0pwAFnpXkctmEfDOO/a6dlyNqo405TH4KruSYwx8eolwO47QMYp9mHiF+qFpyqGQCMnqVb9AZTNh3ZK0Kfi7TBwz4iBdNKRTfCfITHL6q/p3s/2fLOM/6PyGWgIsBAgDxHk7YvCXJbr+EWa+WgAv+uvo7ndeUtd/ZLMam6/XJFsQoKgGXKqQQrs9vgR5ylsO64FwASlW4vQ6AWfh/ubcWyojANTlKt/6xcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:51:42 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:51:42 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 02/12] OvmfPkg/Sec: Move SEV-ES SEC workarea definition to common header file Date: Tue, 15 Dec 2020 14:51:01 -0600 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR10CA0024.namprd10.prod.outlook.com (2603:10b6:610:4c::34) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR10CA0024.namprd10.prod.outlook.com (2603:10b6:610:4c::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:51:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ee96ea67-8fe4-4bc6-da83-08d8a13b3a40 X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: 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: nCQcnoL1Bhkcp8Kv7L0db+EFfKGzKfvD8f72XA7LCMedvHk/jhUhpWLjtC2N6kTnDNUgo2zD7WqV+lozNwGuk0FsjYrjK2abIByXaeOcai/N/9vUAiI9w4Rw3zPoJDK85Oe3HXwf6V01cgMRKDJ8KDwFmtnG1gb6IPgr6b6r7nVj6DwHg6BU5XSi8we4dyrr1Xknu143jlv1TKpaacqQEvlwNBb2+BpdpfKDy5U9b1CTY/Nvl0dHUa9RvkV6SCPsDuCUO5aAsTtj34vBzeXgPIkdJm6rmYKWg9ka8G8x//+ZhIAR009lk/BwsaNuIrWri6PxntVAqC2ywLPpAcjKMquBEogc9z13UpisF7vGIjg5F/6uSs++8c6RTwpN0Sw7yYbwLpqTJxwfZG4BcRpBdrG5OyJg2G9hN8d81iNHQsF1L+twk1g88ygiRH3i0d0Oq3bw4cxTVBTpacSU4z1grg== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?v1yu7B41exwaWFkRr0PSGfoi+VvL2LMgKW4R79fPZRC4s+d7iTwWaF9G3cv0?= =?us-ascii?Q?61KK6GZP/icSH3+1wevHokieMEwTj7cGZeFYommpjiYgFK1xjis/kfZQnqnH?= =?us-ascii?Q?V1EylPmIRvXH+/Ksg3Yt4eAzfyEKcAPQ4a7krRm/1Pu7Qnx2bRX2ctn/4GOF?= =?us-ascii?Q?HJ6HhPd99LuB1Hz6DW4VMcV4/gwtO7Xqs3O2M+oEvcNLyzipm2YZBn2aPelZ?= =?us-ascii?Q?MS36o/fBrbv4LcI1pcwk7+130LOFfdm3hzy76jM6bO7QJXdDP935UmKTQyDA?= =?us-ascii?Q?zJ4zoWyIE9aCxUHrccUQHLJGrVEMz2IpPyUEZjwDX7yWok7nrZcNNo7iPR/J?= =?us-ascii?Q?w3taqyLCkVCU88x6dYSTFC6ekqpuqYCF291KK7TQQQDdDFF0u018vXmlfHEy?= =?us-ascii?Q?GmSjNf6tzTo6hsDEqe2EMr+56Qq2m3mAZqUFlvzJR/6xB6dNRo56xJYCIM/g?= =?us-ascii?Q?NA/rStd2Flg1mvT4y1lnKyosARhqjZeH9i4DKrbVFrqe23xDZzIfYPWO5v8f?= =?us-ascii?Q?0963Qvl7Ldhw4dKdDVo9AkJm10qN4E6Yr2lfUfdWtp5nzt3z0GKpHkH/mZQS?= =?us-ascii?Q?9T2yezuYtEXgPJjWUe+1VNERmPN3ljh2RldOcyMiq42uFdbXTCkDsgRaLQhy?= =?us-ascii?Q?7hEMFbgfbJ8VrJ2Cz7FMJEx5FzBVkckHSriqdSqYUo55B/hyKK0pyis/p2iI?= =?us-ascii?Q?q4zEzPr4mNUlCY/EFRWf3YQqPKDfGlkH9eh1ZAgaXeTAwxOUP+Je/hSNiEZ1?= =?us-ascii?Q?J9eZ5AhpBbLoVpPyC4qraq1Xby09CGAkDOdYgBUFvH17HQopTEXPY1QnckNT?= =?us-ascii?Q?HR4EtHEF9zSUGZzdZFyYlup40t++Fo4LeopQ8g1gsT5rfDcWWFjUtsMfiVD3?= =?us-ascii?Q?bL7EpweO8dMj+M4O8giYowyb/qfMxpFyy4OsG3t8+ReJZoSL0xjojKYDiHfU?= =?us-ascii?Q?8clmpsYx7gho/F8mGPYzEyvHdL3kG8qJG9rXpSQLha+nJ+LY11/fV+xpDGAK?= =?us-ascii?Q?/Ore?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:51:42.4416 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: ee96ea67-8fe4-4bc6-da83-08d8a13b3a40 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: n185/ESYeK5ubKwgk4luNCrS82wJe5RyBfYAxGYOsZEx7h9At+TFmvVA1YH7UFUn6xggXxdJQPUH1ae3xGZSDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: cPu9Hx0ls84iqAeIF41Q5HE3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065510; bh=aDBj1SGFPvXkwfirOAsDShN9tplqhhhVepwkYR5fIYs=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=fAawX/JBdb37dOxcucDaFv0ZZ19MlasJ+xOEDLu8pB+i/UXPDsomS7jHm6p7I0mtE2N VZNbVW3TOcf4tlwpYwb+H7Zw9Xr5yQeyA6cGIbM97mppkJ4MA16K00jaJjcltaGfOw3yH QuPMz2YFlgjHhRqFMbVH4mUYuCBG6nIojjI= 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=3D3108 In order to allow for the SEV-ES workarea to be used for other purposes and by other files, move the definition into the BaseMemEncryptSevLib header file, MemEncryptSevLib.h. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky Reviewed-by: Laszlo Ersek --- OvmfPkg/Include/Library/MemEncryptSevLib.h | 16 +++++++++++++++- OvmfPkg/Sec/SecMain.c | 6 ++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h index fc70b0114354..a6d82dac7fac 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -2,7 +2,7 @@ =20 Define Secure Encrypted Virtualization (SEV) base library helper function =20 - Copyright (c) 2017, AMD Incorporated. All rights reserved.
+ Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -13,6 +13,20 @@ =20 #include =20 +// +// Internal structure for holding SEV-ES information needed during SEC pha= se +// and valid only during SEC phase and early PEI during platform +// initialization. +// +// This structure is also used by assembler files: +// OvmfPkg/ResetVector/ResetVector.nasmb +// OvmfPkg/ResetVector/Ia32/PageTables64.asm +// any changes must stay in sync with its usage. +// +typedef struct _SEC_SEV_ES_WORK_AREA { + UINT8 SevEsEnabled; +} SEC_SEV_ES_WORK_AREA; + /** Returns a boolean to indicate whether SEV-ES is enabled. =20 diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c index 63aca7020727..9db67e17b2aa 100644 --- a/OvmfPkg/Sec/SecMain.c +++ b/OvmfPkg/Sec/SecMain.c @@ -3,6 +3,7 @@ =20 Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
+ Copyright (c) 2020, Advanced Micro Devices, Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -25,6 +26,7 @@ #include #include #include +#include #include #include =20 @@ -37,10 +39,6 @@ typedef struct _SEC_IDT_TABLE { IA32_IDT_GATE_DESCRIPTOR IdtTable[SEC_IDT_ENTRY_COUNT]; } SEC_IDT_TABLE; =20 -typedef struct _SEC_SEV_ES_WORK_AREA { - UINT8 SevEsEnabled; -} SEC_SEV_ES_WORK_AREA; - VOID EFIAPI SecStartupPhase2 ( --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68902): https://edk2.groups.io/g/devel/message/68902 Mute This Topic: https://groups.io/mt/78986139/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68903+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+68903+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 1608065514473686.4354219656434; Tue, 15 Dec 2020 12:51:54 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 3xipYY1788612xZRWFzxKoMQ; Tue, 15 Dec 2020 12:51:54 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.62]) by mx.groups.io with SMTP id smtpd.web09.2837.1608065513514007703 for ; Tue, 15 Dec 2020 12:51:53 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jgUOecZYBOpWXwyJ+LE5iuGThGVdZV0nkLw6SW+T+f5vDB4FYcgh48OXdrW3OXg0mi7cS+Nb7aIo6fXl2kiH524mk1srmr1F6w2ijYy24/VHpj9MLMDLI9n3iKopr1TDVH4cRt2KosMZXlBNhm4WPTzvnrtskqXFS+i3otrWUBnMRuk/FOip4ezetypJHgEaq0oMuc/8qrX17tIyBBzq1Fld5mO33dowNgcIuDCP8v/z57qx/XCm1yIa1n3hFxKYJO3oYnhrJM4IYLm/veYa7LIHahz7E9SlJ84ZevBp7p3HvFagbcCoZy6LZHcOcKFeB7dzL3KtqvYqJNrYzpsBuw== 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=E8a69Lp4y8lgnmbwkniG8e/aE7qeGeCBhOZA2+sobDM=; b=YUFshBxqHt+RAypdAvAMBcctVJ3rzR3gF/aXwHF9F+VcjYWVTXIDSA+BEo3mTJZhXJ0Uu4YDKE1NPmduC/yP8NbSz903rdiIIjKp0ELLWuw3pYOa8CxaAy1NMF5VO0n1FtCHQEiRztNwS7sdG+1bgHxnq30/SW8ubrt+0E3/kcZel67XtnH1w/weHHPGfue/Hrv3R1hSRv7XMInHrxi8XoO38fg1z0+YdVpidr7RNL3/feoJN0W8tLwmEKYVHW4/emj7aoKdZJKqG/r1BwXsj5u3dC15n9Xmje1+d8ahnkls5QpTt4xYuAzAAJKVN2iBKI3NX0hQyu10ZFrUP/wXLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:51:50 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:51:50 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 03/12] OvmfPkg/ResetVector: Validate the encryption bit position for SEV/SEV-ES Date: Tue, 15 Dec 2020 14:51:02 -0600 Message-ID: <3ffe88b74cf89f79a49441ac844b273e857d013f.1608065471.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR10CA0020.namprd10.prod.outlook.com (2603:10b6:610:4c::30) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR10CA0020.namprd10.prod.outlook.com (2603:10b6:610:4c::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:51:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4d428b0f-0539-477e-a4e0-08d8a13b3f0c X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: 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: RYlajsDgw0WL74lNAHj212CTh0Jpy2r8/yzoQgoX8T9vgtTj3fm3O7+BJjN7EpWjEdigSuCQqDwkH/qDmndXNA1q9RWVAI1QDTkvKZhOwCGU4n2XJ1hu4W064Px9Bqve6UEmItdya+pFl9RZrJk0K4rJhEcNCBaB7TeW0toRdVfz6aO2JKYasio29tgx6BWkKqlgqJoDm40h5EYHe87EQYG6D5K+2iz90vENunCukcFWbXoUTzJt7jqtEc2acDWliGoXncrsAYOh6RaJ7sI7p7eDFPK3TYzW5bhwkB2JVaizDitR1E+B+37MAIVfLNHW0cX+ouTegkkgmgAK29jLUUIo+wwJmYj0D+wj+mRNpXxHT7QNkNOEkkQhmhHr7fzvz3vZJbD4SMNIAD+QnFGq7S5CIKvJrGfaYT/mE+0tN+95m21PwDftYh4zNipbMD6iDi4/1mfaS958c7S5Xtk7Lg== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?oMyrBRYllTtCEzwtDDrdj0idyxBcdmx5PKBF1Eg9a44gwoleqpqYyi2D/ty9?= =?us-ascii?Q?zUJ0B53f8XoqdP26IB7podIfAmEQZtaCOzLBnsS3b8jXWpuZ3k3c9D2Ui1a2?= =?us-ascii?Q?2qE+OySMM/rQ3PqPR/EoZh2oGukrbG7NVEfE0yX1r3EcWgvvzRlgi2N30kH+?= =?us-ascii?Q?ngxtTuo2SOv6DfTuTMZVDrP/+4AL7usKGkuuO0F2eIGGUGlGOMyzWtZ5dkzJ?= =?us-ascii?Q?izl8w011800iFqF2GD11w1oBZ6Yp6ohyTELXQ7f2syxs2jXFj5EZbydRlWHa?= =?us-ascii?Q?O/vediqWRPVtd5czy7khHryEFYvreqTpA1Y0NqNdZCf0aL6reYCwd0pQlZEd?= =?us-ascii?Q?9WsCGiZFa9yo/eC/889Y9MJGFBWCRpA6MBfL+s3wwGVeGvNylWggh51nnhEG?= =?us-ascii?Q?yB9RirDN8FC6fEGYSWMl8AaDzSiGDx+rrlyZv20jfm53L0QukcvNp3tpZr6J?= =?us-ascii?Q?yER8PCwbs70laF+suVg35VkGnnFIAuMYcJhElrkEHnj8DRyfXEGMC139rzLZ?= =?us-ascii?Q?t/rm8k+S9A/jwbow+6yLl2vmH5piR3Pu8cB19ykEE54NlrazQaQezZA9Xxn2?= =?us-ascii?Q?EleE6uAwaRcm2GJz/WoTRm7OL/p4bU+FHLq1LIBgueUSlCUjOBeJ4gq75uZN?= =?us-ascii?Q?UATd15k5fOJOchaaHAN/6eY8hmVaKUdn9iWlnbSsZuDPZ3X92HkoKC7BOmSz?= =?us-ascii?Q?ezqJy5wXdm86CUv6P3iGBdR75DLxBYaNAp4ZPtKBhPSGpkVSy4AoRLEndzLD?= =?us-ascii?Q?SrOxE8tLe6vg/ttPKootGRqbS1BYKJdLwdu4v8nTMJoKwQE3hvORd0ZZemdG?= =?us-ascii?Q?xFnsBG2gBlVM6jZmdXBXC+pNOcUMeL7rYsy6QS5sh/hITJHVm0J4GuTswUEY?= =?us-ascii?Q?BxRJWJZTdB2VP/EJhhyGqP6y3/xVZvoT2E3Ar7QsZVdKR1r8L51HlD6mu41k?= =?us-ascii?Q?BhlUxFFQ7PWA3gbAaU/78LUtgyCKYWzb0lgTAbDxTzNTDhyzoQOp8d7EaYTa?= =?us-ascii?Q?c67l?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:51:50.4551 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 4d428b0f-0539-477e-a4e0-08d8a13b3f0c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: r2xMNPuSzb48heEXLLyVySaq1D621+6Kj88lTQqudxDpPlpeUGsoaLxHQodJ/oSXAAz4X3VZWgV+XEwzTqInLA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: VfMfLIVxC8CcZsO93YZLtkH8x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065514; bh=NHYTjg1hOhn6hX46Utv6TId8nNe+MkKaGaxZifCtWWU=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Sy/iar05C2dlxdITX2FIMgIAZhENJcZKhwKlejfOqNiHxRcPDMz9J1hlnjoj06Q2TZV lhB75pVqyPVhOHDXTp8oG6lExh6dfm4/7EqINBDR5IThaaDjmreUiUFCn7WvJUxDHN+6I BgYS7bMNb50RgYTCXWWDw8EP7z2obFaAIl8= 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=3D3108 To help mitigate against ROP attacks, add some checks to validate the encryption bit position that is reported by the hypervisor. The first check is to ensure that the hypervisor reports a bit position above bit 31. After extracting the encryption bit position from the CPUID information, the code checks that the value is above 31. If the value is not above 31, then the bit position is not valid, so the code enters a HLT loop. The second check is specific to SEV-ES guests and is a two step process. The first step will obtain random data using RDRAND and store that data to memory before paging is enabled. When paging is not enabled, all writes to memory are encrypted. The random data is maintained in registers, which are protected. After enabling paging, the random data in memory is compared to the register contents. If they don't match, then the reported bit position is not valid, so the code enters a HLT loop. The third check is after switching to 64-bit long mode. Use the fact that instruction fetches are automatically decrypted, while a memory fetch is decrypted only if the encryption bit is set in the page table. By comparing the bytes of an instruction fetch against a memory read of that same instruction, the encryption bit position can be validated. If the compare is not equal, then SEV/SEV-ES is active but the reported bit position is not valid, so the code enters a HLT loop. The encryption mask is saved in the SEV-ES work area so that it can be used later in the boot process. To keep the changes local to the OvmfPkg, an OvmfPkg version of the Flat32ToFlat64.asm file has been created based on the UefiCpuPkg file UefiCpuPkg/ResetVector/Vtf0/Ia32/Flat32ToFlat64.asm. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky --- OvmfPkg/Include/Library/MemEncryptSevLib.h | 4 + OvmfPkg/ResetVector/Ia32/Flat32ToFlat64.asm | 116 ++++++++++++++++++++ OvmfPkg/ResetVector/Ia32/PageTables64.asm | 12 +- OvmfPkg/ResetVector/ResetVector.nasmb | 4 +- 4 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 OvmfPkg/ResetVector/Ia32/Flat32ToFlat64.asm diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h index a6d82dac7fac..dc09c61e58bb 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -21,10 +21,14 @@ // This structure is also used by assembler files: // OvmfPkg/ResetVector/ResetVector.nasmb // OvmfPkg/ResetVector/Ia32/PageTables64.asm +// OvmfPkg/ResetVector/Ia32/Flat32ToFlat64.asm // any changes must stay in sync with its usage. // typedef struct _SEC_SEV_ES_WORK_AREA { UINT8 SevEsEnabled; + UINT8 Reserved1[7]; + + UINT64 RandomData; } SEC_SEV_ES_WORK_AREA; =20 /** diff --git a/OvmfPkg/ResetVector/Ia32/Flat32ToFlat64.asm b/OvmfPkg/ResetVec= tor/Ia32/Flat32ToFlat64.asm new file mode 100644 index 000000000000..8fe0d0eed945 --- /dev/null +++ b/OvmfPkg/ResetVector/Ia32/Flat32ToFlat64.asm @@ -0,0 +1,116 @@ +;-------------------------------------------------------------------------= ----- +; @file +; Transition from 32 bit flat protected mode into 64 bit flat protected mo= de +; +; Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
+; Copyright (c) 2020, Advanced Micro Devices, Inc. All rights reserved.
+; SPDX-License-Identifier: BSD-2-Clause-Patent +; +;-------------------------------------------------------------------------= ----- + +BITS 32 + +; +; Modified: EAX, ECX, EDX +; +Transition32FlatTo64Flat: + + OneTimeCall SetCr3ForPageTables64 + + mov eax, cr4 + bts eax, 5 ; enable PAE + mov cr4, eax + + mov ecx, 0xc0000080 + rdmsr + bts eax, 8 ; set LME + wrmsr + + ; + ; SEV-ES mitigation check support + ; + xor ebx, ebx + + cmp byte[SEV_ES_WORK_AREA], 0 + jz EnablePaging + + ; + ; SEV-ES is active, perform a quick sanity check against the reported + ; encryption bit position. This is to help mitigate against attacks wh= ere + ; the hypervisor reports an incorrect encryption bit position. + ; + ; This is the first step in a two step process. Before paging is enabl= ed + ; writes to memory are encrypted. Using the RDRAND instruction (availa= ble + ; on all SEV capable processors), write 64-bits of random data to the + ; SEV_ES_WORK_AREA and maintain the random data in registers (register + ; state is protected under SEV-ES). This will be used in the second st= ep. + ; +RdRand1: + rdrand ecx + jnc RdRand1 + mov dword[SEV_ES_WORK_AREA_RDRAND], ecx +RdRand2: + rdrand edx + jnc RdRand2 + mov dword[SEV_ES_WORK_AREA_RDRAND + 4], edx + + ; + ; Use EBX instead of the SEV_ES_WORK_AREA memory to determine whether = to + ; perform the second step. + ; + mov ebx, 1 + +EnablePaging: + mov eax, cr0 + bts eax, 31 ; set PG + mov cr0, eax ; enable paging + + jmp LINEAR_CODE64_SEL:ADDR_OF(jumpTo64BitAndLandHere) +BITS 64 +jumpTo64BitAndLandHere: + + ; + ; Check if the second step of the SEV-ES + test ebx, ebx + jz InsnCompare + + ; + ; SEV-ES is active, perform the second step of the encryption bit post= ion + ; mitigation check. The ECX and EDX register contain data from RDRAND = that + ; was stored to memory in encrypted form. If the encryption bit positi= on is + ; valid, the contents of ECX and EDX will match the memory location. + ; + cmp dword[SEV_ES_WORK_AREA_RDRAND], ecx + jne SevEncBitHlt + cmp dword[SEV_ES_WORK_AREA_RDRAND + 4], edx + jne SevEncBitHlt + + ; + ; If SEV or SEV-ES is active, perform a quick sanity check against + ; the reported encryption bit position. This is to help mitigate + ; against attacks where the hypervisor reports an incorrect encryption + ; bit position. If SEV is not active, this check will always succeed. + ; + ; The cmp instruction compares the first four bytes of the cmp instruc= tion + ; itself (which will be read decrypted if SEV or SEV-ES is active and = the + ; encryption bit position is valid) against the immediate within the + ; instruction (an instruction fetch is always decrypted correctly by + ; hardware) based on RIP relative addressing. + ; +InsnCompare: + cmp dword[rel InsnCompare], 0xFFF63D81 + je GoodCompare + + ; + ; The hypervisor provided an incorrect encryption bit position, do not + ; proceed. + ; +SevEncBitHlt: + hlt + jmp SevEncBitHlt + +GoodCompare: + debugShowPostCode POSTCODE_64BIT_MODE + + OneTimeCallRet Transition32FlatTo64Flat + diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/ResetVecto= r/Ia32/PageTables64.asm index 4032719c3075..3cd909df4f09 100644 --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm +++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm @@ -140,9 +140,17 @@ GetSevEncBit: ; Get pte bit position to enable memory encryption ; CPUID Fn8000_001F[EBX] - Bits 5:0 ; + and ebx, 0x3f mov eax, ebx - and eax, 0x3f - jmp SevExit + + ; The encryption bit position is always above 31 + sub ebx, 32 + jns SevExit + + ; Encryption bit was reported as 31 or below, enter a HLT loop +SevEncBitLowHlt: + hlt + jmp SevEncBitLowHlt =20 NoSev: xor eax, eax diff --git a/OvmfPkg/ResetVector/ResetVector.nasmb b/OvmfPkg/ResetVector/Re= setVector.nasmb index c5e0fe93abf4..d3aa87982959 100644 --- a/OvmfPkg/ResetVector/ResetVector.nasmb +++ b/OvmfPkg/ResetVector/ResetVector.nasmb @@ -3,6 +3,7 @@ ; This file includes all other code files to assemble the reset vector code ; ; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.
+; Copyright (c) 2020, Advanced Micro Devices, Inc. All rights reserved.
; SPDX-License-Identifier: BSD-2-Clause-Patent ; ;-------------------------------------------------------------------------= ----- @@ -67,13 +68,14 @@ %endif =20 %define PT_ADDR(Offset) (FixedPcdGet32 (PcdOvmfSecPageTablesBase) + (Off= set)) -%include "Ia32/Flat32ToFlat64.asm" =20 %define GHCB_PT_ADDR (FixedPcdGet32 (PcdOvmfSecGhcbPageTableBase)) %define GHCB_BASE (FixedPcdGet32 (PcdOvmfSecGhcbBase)) %define GHCB_SIZE (FixedPcdGet32 (PcdOvmfSecGhcbSize)) %define SEV_ES_WORK_AREA (FixedPcdGet32 (PcdSevEsWorkAreaBase)) + %define SEV_ES_WORK_AREA_RDRAND (FixedPcdGet32 (PcdSevEsWorkAreaBase) + = 8) %define SEV_ES_VC_TOP_OF_STACK (FixedPcdGet32 (PcdOvmfSecPeiTempRamBase)= + FixedPcdGet32 (PcdOvmfSecPeiTempRamSize)) +%include "Ia32/Flat32ToFlat64.asm" %include "Ia32/PageTables64.asm" %endif =20 --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68903): https://edk2.groups.io/g/devel/message/68903 Mute This Topic: https://groups.io/mt/78986151/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68904+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+68904+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 1608065521939238.78704215981736; Tue, 15 Dec 2020 12:52:01 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id wWjwYY1788612xqp2dfpneA5; Tue, 15 Dec 2020 12:52:01 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.42]) by mx.groups.io with SMTP id smtpd.web12.2796.1608065520926844182 for ; Tue, 15 Dec 2020 12:52:01 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dmiXNQaFCL5zpXbtQVrwTNKQcxT5mRJwCagr703Mam1qywAP3VFcPASf/9uS2cwCcVQbpQengVz8OO7WYf4tUqKKMLDz68lJBDrmgytEyHFF3dUA0kfND4fn4pFvH05d1jy/Oy5qkKX4pjjNs2h24P5cA5okBRkMv/5/fxRecaO4TOCIXoUHNxarSwiboUCQg/1SqJqqey8uM6T19LIAqh3mbXEH534b+IJhOi5r0TDi28uLArebYiyDucBsPk2tsGyLC67ThfPt1sTKtZd3fd+Q0Kvz4/MjQXj8qnu6SJfPpEUecQswkrCo4LOpG6UrfKhsE8kHRTJKShfX3W7imA== 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=zxc3ee4j5NCQp+pKg0CXiUVIU6inGfZcFt7dDGR7YK0=; b=K0lULFwwGcAVaXGrJe8BEyj6XNUvYJZdDDneUa1xzcR2XD5oV4R5Q1lsWEDY2y/Kk5TrQEQegVZFJ6zpNUdddDG6g/BJWgvxjdUXhQVk1zK2SQgR+Qw0zAjlBiODpRfMIOfi3LvHA3XP9oCMyMYVhRNW3pYXbKuRqLXrOBY+17NIzGQLbaaDqLBcUU7f3uYw0v0k9UF1Ebp7mbSagZ4PKAR0JyLTcd9Wfovkz4hDPgJR3doN/ur1nQvGIYjH65m8iGRP62TED7nzlyG+k40HH/0bCIlz+NoEqMd9mpC/WTCPDvSu8aY/8FRpbO44Ig4KV0wmimkz7mX+0ak0iPr3bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:51:58 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:51:58 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 04/12] OvmfPkg/ResetVector: Perform a simple SEV-ES sanity check Date: Tue, 15 Dec 2020 14:51:03 -0600 Message-ID: <17a60d57656bd9351f318d325b9bd6ef64026769.1608065471.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR10CA0001.namprd10.prod.outlook.com (2603:10b6:610:4c::11) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR10CA0001.namprd10.prod.outlook.com (2603:10b6:610:4c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:51:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8720a076-b49c-47e8-ad54-08d8a13b43b3 X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1247; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 7CCQMJADPICP0YgzfkHk20lVUKGmbuOkWqBBbk8X6WzqJE8nmbJogfRThQgvorT7+p7nO8naNlFnFo+x9wgNoTRXN05mhZdnsYxxEJdUHh99uuxJG49rdrZIOkw2RoIpjgUn5PlvHEvm84YIgMlGg071AkCq6zI1FTzKesUvnQR1W7W4YC/26FvOl8NljsJQfi/m1f+mZid5lKZwEMRf4KhPaYttMRRo3V0BTasUnNCJWkYQqmUFHIgjoBm40vfdpr775KcQEYwU3oU1wxKWDBvBOP0IPmPmWzL6RYIoP+h+Gn331mko+rTc0t0FFoXNH1bJ2gDxkGB7PuN3kn+S6m6F4hPmPcEWHLPM7pLVb77R8RVBKeEuG8epZ99F4J3gb4i5f18LiXUUR+TTtLhck2BUHzKQjxEgHpENkEWsDbefq5dI3w8LHpI5juaGbifEaeiWhjbW2ILvQYGZcWYF3g== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?LoampayT3SxJw4of3PkBmfrJh7piqkNbDBsacsg92S2VBWWKp+92jCAMHRDj?= =?us-ascii?Q?Pe+CSRNwJQsUJyhOV2BIui/URCusQbkEYF0tO1blUK6SX+MClbU6zQgpc3pD?= =?us-ascii?Q?aoG0cSaQm8pznpLRkmm/A9P4ou5oJskmdMFcmFKjtGfw/azRhZN+udacNdQS?= =?us-ascii?Q?Bj8xjfaOKfad4Fj3vP8ik3/2U7tI/z8DhV4Wp64M8uBrSScjT0yzMzeJ/ndx?= =?us-ascii?Q?Su9UlU6IpowM/bHCbYm1ZWeJ93Nji2U9hCjUdOt0h/BiYwqe0Psk0al2wBcV?= =?us-ascii?Q?rS6LUyWpXm4iwQuc87112IlHw1pibZDoaY+IO76znNi0kKPi6rQCkHvB7y/h?= =?us-ascii?Q?RvXjtvOV4q1mYb60fNm4bMj6OfxxJzc19RJCg8XZVESS50LbeIejtqodkv0J?= =?us-ascii?Q?L5ZDNen5q5aqyXRindmzg9qe0LXpaX2LXP9V9gzRCO3U3QUrXHSlLuUkTt49?= =?us-ascii?Q?na73FLp9NyqibgKR52B+y7xriwWiJfEVj/MvTqeQYAWfgWrbcJ3xo7+Dq8Da?= =?us-ascii?Q?BAHdTLBUGKTOrd/untlgXC73dSpixKtZWDC4Woy2c2VpTMwcMd7lRDTX01EW?= =?us-ascii?Q?aYvDxOKoMFNusilOe95Ni+4t0E2SUxBRZ+AbakP7omIsc4PCYs+ruP4s1V1s?= =?us-ascii?Q?ZU3p+8xJ0WBx71AhQSzQUVoGDafHaAx/Y5VEHkM/PXeMGJmMSmKSNtd4PA4n?= =?us-ascii?Q?Fq2Rdx6D55rm8Nr6ScXTKCjKLu/SegCildBnHLc/OqainmJt9kHSTQMrHVZN?= =?us-ascii?Q?TO10auDK/CddJTEDIyAukedCjjxEbGXjO8XtIOiR5FmFCux+/pRbpUANYZ2L?= =?us-ascii?Q?6p1wTlwx/U4tOUWKD8QNBZPtNdH7l4Qqfsf84viZMUgjrEso5CILAD6RMCLt?= =?us-ascii?Q?yIzcauRFdg1cxGOeNCo2ShdhLC+y8Ol1YrjoyCNAJRYtWpJ+XF6g/d1AtIO1?= =?us-ascii?Q?ZRkfnKR6bQKdSTaxVjyiiOb4QJukDsduhoWttgqdhHCS7jkRmtJwJlmeKtyS?= =?us-ascii?Q?uaoj?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:51:58.3066 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 8720a076-b49c-47e8-ad54-08d8a13b43b3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qaEr+KXTIORu5klpneHFVflqUZSz+ChG89fO2h1yaSEUV34j3jZ7mlniWTTJdJbA9PsT5MS2wDlkE26ldo2raw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: IuKojtvkh0ONwjuBXddOiBYzx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065521; bh=qHaUJHZP3uGVIxvQLVJKQfP/dZHm7MazyTWMglDNxp4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Iqw59k66iGw+kNydlflypo9MM2Vo2h6D9xjRRZ4eliaHMciCPjGOaEjeKLGQ4hjyGqb HIT/mobarSPQHTvprboNJQpM+EwJS214QROrqmtpFFUZoJRHA/+YpLVramvevngBgolDy JzUH/S33eXYVIEZLNhyupTFmJfZH8p8oK1I= 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=3D3108 If a hypervisor incorrectly reports through CPUID that SEV-ES is not active, ensure that a #VC exception was not taken. If it is found that a #VC was taken, then the code enters a HLT loop. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky Reviewed-by: Laszlo Ersek --- OvmfPkg/ResetVector/Ia32/PageTables64.asm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/ResetVecto= r/Ia32/PageTables64.asm index 3cd909df4f09..b08f31157cbf 100644 --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm +++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm @@ -153,6 +153,21 @@ SevEncBitLowHlt: jmp SevEncBitLowHlt =20 NoSev: + ; + ; Perform an SEV-ES sanity check by seeing if a #VC exception occurred. + ; + cmp byte[SEV_ES_WORK_AREA], 0 + jz NoSevPass + + ; + ; A #VC was received, yet CPUID indicates no SEV-ES support, something + ; isn't right. + ; +NoSevEsVcHlt: + hlt + jmp NoSevEsVcHlt + +NoSevPass: xor eax, eax =20 SevExit: --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68904): https://edk2.groups.io/g/devel/message/68904 Mute This Topic: https://groups.io/mt/78986154/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68905+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+68905+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 1608065531632464.2939490905769; Tue, 15 Dec 2020 12:52:11 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id z7jlYY1788612xG9GQdcfNTO; Tue, 15 Dec 2020 12:52:11 -0800 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.55]) by mx.groups.io with SMTP id smtpd.web12.2803.1608065530452844492 for ; Tue, 15 Dec 2020 12:52:10 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zi7ZYI5HS4TxIKo05oAkjA4lkUR5JjGqDJMS5HNMFHbu0Tkz0EZZMisLyM9ptBKzSAD/AFA/iXmLxT57Z0eBk6xXDLBlukp+GtCIxxH4gc0zsqsqzSXODLzzDaURV6Im7rPmkchZrvW6RqVeOIWq6M2UcQEanRFZRRNK9AWaDg9JXWHdWT4IoRTHZ5Nke0hcC0PJbSTe+lEJdXUPwERUus0Kh7P2CjGZBdrvhTxlfLCByaeXDAkUZZ+dwnPSA9T/K3RfRfF156xHb/S67IVEyAcTAabPP4URNVPHFg5lBDX/bzrwWjQJjoeWOh2YJVQThT97eHhZZiL4jyGrV1hYcw== 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=7Pqvf+InDRjjJXAKthrhzJRl4H2D/8lUxDfxhodEX60=; b=JF0TOVUK2TnuhlJ0s1i3ZqB+YnHwUMY8itkjHh/1zpyY3lRUyoe2UejENw4bK/8AbS1Tmq3AjBjBPcf3Qtv1nYKGpaOJ6XCS3XCFwdDAd8iVxqJH/BHGHTS1923STADwAhiUZ4ABJivT5tu61MvWc3bvkM9c3Do2qKdUjlVtZpA0zYRFTte5S9O3mUOmwCXVGtuMMA3qn/PcBG9nha3p7cmpQrD940+gnt5OIF6+7YDjdll3gZdXQ8orycd8xrQLddQfBZ8t/D9mF3TU/YsOx/n1PH7gwkbFqRqOZ+oOO3LRvRINdigzA8kh5PRpFkaSiEVe5Nrozk1+7x5zU9v+TQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:52:06 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:52:06 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Rebecca Cran , Peter Grehan , Anthony Perard , Julien Grall Subject: [edk2-devel] [PATCH 05/12] OvmfPkg/MemEncryptSevLib: Add an interface to retrieve the encryption mask Date: Tue, 15 Dec 2020 14:51:04 -0600 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR10CA0014.namprd10.prod.outlook.com (2603:10b6:610:4c::24) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR10CA0014.namprd10.prod.outlook.com (2603:10b6:610:4c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:52:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 308a5d3d-979a-431c-4ea8-08d8a13b48b5 X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: 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: UxFOvBmjzLeLkPPyRurUfewdLfL4gAYS6iLpv3uOV8TaPHfVfFQEj+g9XAHiD23Olviqcn7qpQUgMp7Zb/rm6pJz1bHcl0ZVCeAPDRyvhZJeZtRrRnDQzYo6e1olQECGzBV/9f8Y8KnNfo9KtRQLVZQREONjJ2UwyErl5MRiusYluw5VovPcCkvkPAyj1U3EybylnQqh6IQJMmpHdHzw11oGu1/IRdEYiwldVyI4rvvPjJZZyzWjqfESEmYIOpkpxX7rSpM8ofjUQqN4MHo2srjZ3G4zJyq0Pv/vqOlizkJfwj33Qwc3swjF+6xIgATIKFUkWlrEQVwzeM4vukX7n3BUYxDJ8QH6aErzpE6C0J61i23703WLJJpT7QfdS3o0eBw5UKXwRIcTr8u+PbaTjwZZL6NnSh05dd7WYMIx/9UYqFxsvyFM/AyLkc4inSgJ7Gc4IYBubwVfLAnYHKLT1g== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?FvjAFkk6o90MrK1NTE38btIWTLYAsd+sKF0n5jjVSNOYw+QnV6GxuvKt5cMO?= =?us-ascii?Q?E+lZLT+7zL8xXzLp6yWdRWG6qbBs1ecHZ7pQZWfiWyPiyU5AiUaDvCUkHuHG?= =?us-ascii?Q?UAKEzHauN9vkUOSax2kxHfbbq+py5guPJvd7cEz8vTSbzoKa00llEBAJAZgC?= =?us-ascii?Q?MUQfPsF5WdugjICIfHk52MRLNPGooB+415uF2vQdNH6UkGPRr+QOTTWMaBUU?= =?us-ascii?Q?ZNYMZPn3DiIug4kXADKhV782ECBqRYVUsnXGfDqMgCgPNb7SSvqhJHmQ1BZ5?= =?us-ascii?Q?0ezCm1qqbHYhNffTK48H8byE5Dy9FxMgwi/jInBWD40/Kl3T+FU7gf4jP+PM?= =?us-ascii?Q?cM/c46U8b9C1nIn5luyCPlu8+et+tEBj1XHUJUr/jSTXYOeA1O09nNlgUqag?= =?us-ascii?Q?7qdvKUr8lcdf+9EcbxWWsga4pWP64WvABM5QeXznO+ldv1GCbFKVvR1aOCsE?= =?us-ascii?Q?xG3ddwG1UqJSf1bSJY7fZYxKCshMi4dkWHnurspUG3AwnY/avIObX87oeSEk?= =?us-ascii?Q?9JMr6ym/j9DjSCG3wz4ZEXY+XP9guAB1E+8uTtclPZETX+MekGZIS/lbfHqW?= =?us-ascii?Q?294N6KtRWM4tCP/cLMc7KO0vUc0yfLld/1C9ULcA0Edei8FQCDE5jGvclo0C?= =?us-ascii?Q?GyDdgzw3DLzKJCYwLt23AaEl44R5I06bxdPdBn5hnnwP2Me19LzQA13IpnGy?= =?us-ascii?Q?1mQnEDCabLQUluhRnCs7gBVltZYSTkxdfKHoBSXTUoz4ucFXfcBkWuYYKxtM?= =?us-ascii?Q?45nHZrew12owNFd6t3OV0Btyzzqz/FnVJmEdtmvdKcbooegxDOcmV9qneR0d?= =?us-ascii?Q?Um2H7Dt4sZaqgbaNf2uP9kUAEAi4UnY69XbH0llIoK9CitiR9bonnEheQywq?= =?us-ascii?Q?lo5q7nDMR24dsioP3t1iCWbDicf9Hp87GTaBWeWQ6zSOFnoAFeHSErNqEWZO?= =?us-ascii?Q?Key07Rew8Zf9Q21VGEQDDXjT5QMLZNu/cL/00Y00ZJASsQ7mkYPZN+Kv+dTX?= =?us-ascii?Q?YavR?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:52:06.5510 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 308a5d3d-979a-431c-4ea8-08d8a13b48b5 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: f1zP629/TiZvHK4gWgMOyICcYMYaXQ1cF5Z7A9fBjCbANJY/AaaLQm3GeomLW/qVvyzUbI1WxC5Mrdcy/tgJ6Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: PN5HN8m76A9KUS63xtBht3NBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065531; bh=LCuhaMB0JKnhBfTZ3Qh7BO3DMBJUD8QHTEKUYvR1yTw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=TBPPhP16x5pb56hIfKaPDDRkXoiuZH6vJWycVx0/Uqsax2cLWeCkYhglTo9vhHPGp7j m+TnS4xLHEEAVEUr3WShtgk19UHuwrK8sFlZ8bJbry9tHPENVf2aK2SXyuH9qvWGp59ih ZRcEYn7NlE54SIeILg8n0KC1nWDFmmKYHjQ= 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=3D3108 The early assembler code performs validation for some of the SEV-related information, specifically the encryption bit position. To avoid having to re-validate the encryption bit position as the system proceeds through its boot phases, use the saved information from the SEV-ES work area during PEI and PcdPteMemoryEncryptionAddressOrMask (set during PEI) during DXE. To ensure that we always use a validated encryption mask for an SEV-ES guest, create a new interface in the MemEncryptSevLib library to return the encryption mask. This avoids the multiple locations where CPUID is used to retrieve the value and allows the validated mask to be returned. Update all locations that use CPUID to calculate the encryption mask to use the new interface. Also, clean up some call areas where extra masking was being performed and where a function call was being used instead of the local variable that was just set using the function. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Rebecca Cran Cc: Peter Grehan Cc: Anthony Perard Cc: Julien Grall Cc: Brijesh Singh Signed-off-by: Tom Lendacky --- OvmfPkg/AmdSev/AmdSevX64.dsc | 4 +- OvmfPkg/Bhyve/BhyveX64.dsc | 4 +- OvmfPkg/OvmfPkgIa32.dsc | 4 +- OvmfPkg/OvmfPkgIa32X64.dsc | 4 +- OvmfPkg/OvmfPkgX64.dsc | 4 +- OvmfPkg/OvmfXen.dsc | 3 +- ...SevLib.inf =3D> DxeBaseMemEncryptSevLib.inf} | 13 +- .../PeiBaseMemEncryptSevLib.inf | 56 ++++++ OvmfPkg/Include/Library/MemEncryptSevLib.h | 14 ++ OvmfPkg/Bhyve/PlatformPei/AmdSev.c | 12 +- .../DxeMemEncryptSevLibInternal.c | 145 ++++++++++++++++ .../MemEncryptSevLibInternal.c | 91 +--------- .../PeiMemEncryptSevLibInternal.c | 159 ++++++++++++++++++ .../BaseMemEncryptSevLib/X64/VirtualMemory.c | 15 +- OvmfPkg/PlatformPei/AmdSev.c | 12 +- OvmfPkg/XenPlatformPei/AmdSev.c | 12 +- OvmfPkg/ResetVector/Ia32/PageTables64.asm | 10 +- OvmfPkg/ResetVector/ResetVector.nasmb | 1 + 18 files changed, 422 insertions(+), 141 deletions(-) rename OvmfPkg/Library/BaseMemEncryptSevLib/{BaseMemEncryptSevLib.inf =3D>= DxeBaseMemEncryptSevLib.inf} (67%) create mode 100644 OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptS= evLib.inf create mode 100644 OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLi= bInternal.c create mode 100644 OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLi= bInternal.c diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index bb7697eb324b..c742ec54cb57 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -164,7 +164,7 @@ [LibraryClasses] QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFw= CfgSimpleParserLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptS= evLib.inf LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf @@ -285,6 +285,8 @@ [LibraryClasses.common.PEIM] Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf !endif =20 + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptS= evLib.inf + [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index b93fe30ae4e0..27973bc940d5 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -163,7 +163,7 @@ [LibraryClasses] QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf BhyveFwCtlLib|OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptS= evLib.inf LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf =20 CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf @@ -292,6 +292,8 @@ [LibraryClasses.common.PEIM] Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf !endif =20 + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptS= evLib.inf + [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 8eede796a8bd..e433e17dc807 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -169,7 +169,7 @@ [LibraryClasses] QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFw= CfgSimpleParserLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptS= evLib.inf !if $(SMM_REQUIRE) =3D=3D FALSE LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf !endif @@ -309,6 +309,8 @@ [LibraryClasses.common.PEIM] Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf !endif =20 + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptS= evLib.inf + [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index f9f82a48f4b9..2e2eefbe33f0 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -173,7 +173,7 @@ [LibraryClasses] QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFw= CfgSimpleParserLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptS= evLib.inf !if $(SMM_REQUIRE) =3D=3D FALSE LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf !endif @@ -313,6 +313,8 @@ [LibraryClasses.common.PEIM] Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf !endif =20 + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptS= evLib.inf + [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index e59ae05b73aa..3e008855fbc1 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -173,7 +173,7 @@ [LibraryClasses] QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFw= CfgSimpleParserLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptS= evLib.inf !if $(SMM_REQUIRE) =3D=3D FALSE LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf !endif @@ -313,6 +313,8 @@ [LibraryClasses.common.PEIM] Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf !endif =20 + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptS= evLib.inf + [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 12b7a87ee877..44fae364b423 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -161,7 +161,7 @@ [LibraryClasses] SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVar= iablesLib.inf QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoad= ImageLib.inf - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptS= evLib.inf LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf @@ -273,6 +273,7 @@ [LibraryClasses.common.PEIM] QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptS= evLib.inf =20 [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf = b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf similarity index 67% rename from OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf rename to OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf index 7c44d0952815..2be6ca1fa737 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf @@ -1,7 +1,7 @@ ## @file # Library provides the helper functions for SEV guest # -# Copyright (c) 2017 Advanced Micro Devices. All rights reserved.
+# Copyright (c) 2017 - 2020, Advanced Micro Devices. All rights reserved.<= BR> # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -10,11 +10,11 @@ =20 [Defines] INF_VERSION =3D 1.25 - BASE_NAME =3D MemEncryptSevLib + BASE_NAME =3D DxeMemEncryptSevLib FILE_GUID =3D c1594631-3888-4be4-949f-9c630dbc842b MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D MemEncryptSevLib|PEIM DXE_DRIVER DXE_= RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_DRIVER + LIBRARY_CLASS =3D MemEncryptSevLib|DXE_DRIVER DXE_RUNTI= ME_DRIVER DXE_SMM_DRIVER UEFI_DRIVER =20 # # The following information is for reference only and not required by the = build @@ -30,14 +30,16 @@ [Packages] UefiCpuPkg/UefiCpuPkg.dec =20 [Sources.X64] + DxeMemEncryptSevLibInternal.c MemEncryptSevLibInternal.c X64/MemEncryptSevLib.c X64/VirtualMemory.c X64/VirtualMemory.h =20 [Sources.IA32] + DxeMemEncryptSevLibInternal.c + MemEncryptSevLibInternal.c Ia32/MemEncryptSevLib.c - MemEncryptSevLibInternal.c =20 [LibraryClasses] BaseLib @@ -49,3 +51,6 @@ [LibraryClasses] =20 [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire + +[Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.i= nf b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.inf new file mode 100644 index 000000000000..7bdf8cb5210d --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.inf @@ -0,0 +1,56 @@ +## @file +# Library provides the 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 PeiMemEncryptSevLib + FILE_GUID =3D 15d9a694-3d2a-4184-9672-ba55c3070e07 + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D MemEncryptSevLib|PEIM + +# +# 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 + OvmfPkg/OvmfPkg.dec + UefiCpuPkg/UefiCpuPkg.dec + +[Sources.X64] + PeiMemEncryptSevLibInternal.c + MemEncryptSevLibInternal.c + X64/MemEncryptSevLib.c + X64/VirtualMemory.c + X64/VirtualMemory.h + +[Sources.IA32] + PeiMemEncryptSevLibInternal.c + MemEncryptSevLibInternal.c + Ia32/MemEncryptSevLib.c + +[LibraryClasses] + BaseLib + CacheMaintenanceLib + CpuLib + DebugLib + MemoryAllocationLib + PcdLib + +[FeaturePcd] + gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire + +[FixedPcd] + gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h index dc09c61e58bb..394065f15bc1 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -29,6 +29,8 @@ typedef struct _SEC_SEV_ES_WORK_AREA { UINT8 Reserved1[7]; =20 UINT64 RandomData; + + UINT64 EncryptionMask; } SEC_SEV_ES_WORK_AREA; =20 /** @@ -133,4 +135,16 @@ MemEncryptSevLocateInitialSmramSaveStateMapPages ( OUT UINTN *BaseAddress, OUT UINTN *NumberOfPages ); + +/** + Returns the SEV encryption mask. + + @return The SEV pagtable encryption mask +**/ +UINT64 +EFIAPI +MemEncryptSevGetEncryptionMask ( + VOID + ); + #endif // _MEM_ENCRYPT_SEV_LIB_H_ diff --git a/OvmfPkg/Bhyve/PlatformPei/AmdSev.c b/OvmfPkg/Bhyve/PlatformPei= /AmdSev.c index e484f4b311fe..e3ed78581c1b 100644 --- a/OvmfPkg/Bhyve/PlatformPei/AmdSev.c +++ b/OvmfPkg/Bhyve/PlatformPei/AmdSev.c @@ -1,7 +1,7 @@ /**@file Initialize Secure Encrypted Virtualization (SEV) support =20 - Copyright (c) 2017, Advanced Micro Devices. All rights reserved.
+ Copyright (c) 2017 - 2020, Advanced Micro Devices. All rights reserved.<= BR> =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -15,8 +15,6 @@ #include #include #include -#include -#include #include =20 #include "Platform.h" @@ -32,7 +30,6 @@ AmdSevInitialize ( VOID ) { - CPUID_MEMORY_ENCRYPTION_INFO_EBX Ebx; UINT64 EncryptionMask; RETURN_STATUS PcdStatus; =20 @@ -43,15 +40,10 @@ AmdSevInitialize ( return; } =20 - // - // CPUID Fn8000_001F[EBX] Bit 0:5 (memory encryption bit position) - // - AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, NULL, &Ebx.Uint32, NULL, NULL); - EncryptionMask =3D LShiftU64 (1, Ebx.Bits.PtePosBits); - // // Set Memory Encryption Mask PCD // + EncryptionMask =3D MemEncryptSevGetEncryptionMask (); PcdStatus =3D PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, Encryption= Mask); ASSERT_RETURN_ERROR (PcdStatus); =20 diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLibIntern= al.c b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLibInternal.c new file mode 100644 index 000000000000..2816f859a0c4 --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLibInternal.c @@ -0,0 +1,145 @@ +/** @file + + Secure Encrypted Virtualization (SEV) library helper function + + Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include +#include +#include +#include +#include +#include + +STATIC BOOLEAN mSevStatus =3D FALSE; +STATIC BOOLEAN mSevEsStatus =3D FALSE; +STATIC BOOLEAN mSevStatusChecked =3D FALSE; + +STATIC UINT64 mSevEncryptionMask =3D 0; +STATIC BOOLEAN mSevEncryptionMaskSaved =3D FALSE; + +/** + Reads and sets the status of SEV features. + + **/ +STATIC +VOID +EFIAPI +InternalMemEncryptSevStatus ( + VOID + ) +{ + UINT32 RegEax; + MSR_SEV_STATUS_REGISTER Msr; + CPUID_MEMORY_ENCRYPTION_INFO_EAX Eax; + BOOLEAN ReadSevMsr; + UINT64 EncryptionMask; + + ReadSevMsr =3D FALSE; + + EncryptionMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask); + if (EncryptionMask !=3D 0) { + // + // The MSR has been read before, so it is safe to read it again and av= oid + // having to validate the CPUID information. + // + ReadSevMsr =3D TRUE; + } else { + // + // Check if memory encryption leaf exist + // + AsmCpuid (CPUID_EXTENDED_FUNCTION, &RegEax, NULL, NULL, NULL); + if (RegEax >=3D CPUID_MEMORY_ENCRYPTION_INFO) { + // + // CPUID Fn8000_001F[EAX] Bit 1 (Sev supported) + // + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, &Eax.Uint32, NULL, NULL, NUL= L); + + if (Eax.Bits.SevBit) { + ReadSevMsr =3D TRUE; + } + } + } + + if (ReadSevMsr) { + // + // Check MSR_0xC0010131 Bit 0 (Sev Enabled) + // + Msr.Uint32 =3D AsmReadMsr32 (MSR_SEV_STATUS); + if (Msr.Bits.SevBit) { + mSevStatus =3D TRUE; + } + + // + // Check MSR_0xC0010131 Bit 1 (Sev-Es Enabled) + // + if (Msr.Bits.SevEsBit) { + mSevEsStatus =3D TRUE; + } + } + + mSevStatusChecked =3D TRUE; +} + +/** + Returns a boolean to indicate whether SEV-ES is enabled. + + @retval TRUE SEV-ES is enabled + @retval FALSE SEV-ES is not enabled +**/ +BOOLEAN +EFIAPI +MemEncryptSevEsIsEnabled ( + VOID + ) +{ + if (!mSevStatusChecked) { + InternalMemEncryptSevStatus (); + } + + return mSevEsStatus; +} + +/** + Returns a boolean to indicate whether SEV is enabled. + + @retval TRUE SEV is enabled + @retval FALSE SEV is not enabled +**/ +BOOLEAN +EFIAPI +MemEncryptSevIsEnabled ( + VOID + ) +{ + if (!mSevStatusChecked) { + InternalMemEncryptSevStatus (); + } + + return mSevStatus; +} + +/** + Returns the SEV encryption mask. + + @return The SEV pagtable encryption mask +**/ +UINT64 +EFIAPI +MemEncryptSevGetEncryptionMask ( + VOID + ) +{ + if (!mSevEncryptionMaskSaved) { + mSevEncryptionMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask); + mSevEncryptionMaskSaved =3D TRUE; + } + + return mSevEncryptionMask; +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.= c b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c index 02b8eb225d81..ec6d02eaefd0 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c @@ -2,7 +2,7 @@ =20 Secure Encrypted Virtualization (SEV) library helper function =20 - Copyright (c) 2017, AMD Incorporated. All rights reserved.
+ Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -19,95 +19,6 @@ #include #include =20 -STATIC BOOLEAN mSevStatus =3D FALSE; -STATIC BOOLEAN mSevEsStatus =3D FALSE; -STATIC BOOLEAN mSevStatusChecked =3D FALSE; - -/** - Reads and sets the status of SEV features. - - **/ -STATIC -VOID -EFIAPI -InternalMemEncryptSevStatus ( - VOID - ) -{ - UINT32 RegEax; - MSR_SEV_STATUS_REGISTER Msr; - CPUID_MEMORY_ENCRYPTION_INFO_EAX Eax; - - // - // Check if memory encryption leaf exist - // - AsmCpuid (CPUID_EXTENDED_FUNCTION, &RegEax, NULL, NULL, NULL); - if (RegEax >=3D CPUID_MEMORY_ENCRYPTION_INFO) { - // - // CPUID Fn8000_001F[EAX] Bit 1 (Sev supported) - // - AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, &Eax.Uint32, NULL, NULL, NULL); - - if (Eax.Bits.SevBit) { - // - // Check MSR_0xC0010131 Bit 0 (Sev Enabled) - // - Msr.Uint32 =3D AsmReadMsr32 (MSR_SEV_STATUS); - if (Msr.Bits.SevBit) { - mSevStatus =3D TRUE; - } - - // - // Check MSR_0xC0010131 Bit 1 (Sev-Es Enabled) - // - if (Msr.Bits.SevEsBit) { - mSevEsStatus =3D TRUE; - } - } - } - - mSevStatusChecked =3D TRUE; -} - -/** - Returns a boolean to indicate whether SEV-ES is enabled. - - @retval TRUE SEV-ES is enabled - @retval FALSE SEV-ES is not enabled -**/ -BOOLEAN -EFIAPI -MemEncryptSevEsIsEnabled ( - VOID - ) -{ - if (!mSevStatusChecked) { - InternalMemEncryptSevStatus (); - } - - return mSevEsStatus; -} - -/** - Returns a boolean to indicate whether SEV is enabled. - - @retval TRUE SEV is enabled - @retval FALSE SEV is not enabled -**/ -BOOLEAN -EFIAPI -MemEncryptSevIsEnabled ( - VOID - ) -{ - if (!mSevStatusChecked) { - InternalMemEncryptSevStatus (); - } - - return mSevStatus; -} - - /** Locate the page range that covers the initial (pre-SMBASE-relocation) SM= RAM Save State Map. diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibIntern= al.c b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c new file mode 100644 index 000000000000..e2fd109d120f --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c @@ -0,0 +1,159 @@ +/** @file + + Secure Encrypted Virtualization (SEV) library helper function + + Copyright (c) 2020, AMD Incorporated. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include +#include +#include +#include +#include +#include + +STATIC BOOLEAN mSevStatus =3D FALSE; +STATIC BOOLEAN mSevEsStatus =3D FALSE; +STATIC BOOLEAN mSevStatusChecked =3D FALSE; + +STATIC UINT64 mSevEncryptionMask =3D 0; +STATIC BOOLEAN mSevEncryptionMaskSaved =3D FALSE; + +/** + Reads and sets the status of SEV features. + + **/ +STATIC +VOID +EFIAPI +InternalMemEncryptSevStatus ( + VOID + ) +{ + UINT32 RegEax; + MSR_SEV_STATUS_REGISTER Msr; + CPUID_MEMORY_ENCRYPTION_INFO_EAX Eax; + BOOLEAN ReadSevMsr; + SEC_SEV_ES_WORK_AREA *SevEsWorkArea; + + ReadSevMsr =3D FALSE; + + SevEsWorkArea =3D (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAr= eaBase); + if (SevEsWorkArea !=3D NULL && SevEsWorkArea->EncryptionMask !=3D 0) { + // + // The MSR has been read before, so it is safe to read it again and av= oid + // having to validate the CPUID information. + // + ReadSevMsr =3D TRUE; + } else { + // + // Check if memory encryption leaf exist + // + AsmCpuid (CPUID_EXTENDED_FUNCTION, &RegEax, NULL, NULL, NULL); + if (RegEax >=3D CPUID_MEMORY_ENCRYPTION_INFO) { + // + // CPUID Fn8000_001F[EAX] Bit 1 (Sev supported) + // + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, &Eax.Uint32, NULL, NULL, NUL= L); + + if (Eax.Bits.SevBit) { + ReadSevMsr =3D TRUE; + } + } + } + + if (ReadSevMsr) { + // + // Check MSR_0xC0010131 Bit 0 (Sev Enabled) + // + Msr.Uint32 =3D AsmReadMsr32 (MSR_SEV_STATUS); + if (Msr.Bits.SevBit) { + mSevStatus =3D TRUE; + } + + // + // Check MSR_0xC0010131 Bit 1 (Sev-Es Enabled) + // + if (Msr.Bits.SevEsBit) { + mSevEsStatus =3D TRUE; + } + } + + mSevStatusChecked =3D TRUE; +} + +/** + Returns a boolean to indicate whether SEV-ES is enabled. + + @retval TRUE SEV-ES is enabled + @retval FALSE SEV-ES is not enabled +**/ +BOOLEAN +EFIAPI +MemEncryptSevEsIsEnabled ( + VOID + ) +{ + if (!mSevStatusChecked) { + InternalMemEncryptSevStatus (); + } + + return mSevEsStatus; +} + +/** + Returns a boolean to indicate whether SEV is enabled. + + @retval TRUE SEV is enabled + @retval FALSE SEV is not enabled +**/ +BOOLEAN +EFIAPI +MemEncryptSevIsEnabled ( + VOID + ) +{ + if (!mSevStatusChecked) { + InternalMemEncryptSevStatus (); + } + + return mSevStatus; +} + +/** + Returns the SEV encryption mask. + + @return The SEV pagtable encryption mask +**/ +UINT64 +EFIAPI +MemEncryptSevGetEncryptionMask ( + VOID + ) +{ + if (!mSevEncryptionMaskSaved) { + SEC_SEV_ES_WORK_AREA *SevEsWorkArea; + + SevEsWorkArea =3D (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWork= AreaBase); + if (SevEsWorkArea !=3D NULL) { + mSevEncryptionMask =3D SevEsWorkArea->EncryptionMask; + } else { + CPUID_MEMORY_ENCRYPTION_INFO_EBX Ebx; + + // + // CPUID Fn8000_001F[EBX] Bit 0:5 (memory encryption bit position) + // + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, NULL, &Ebx.Uint32, NULL, NUL= L); + mSevEncryptionMask =3D LShiftU64 (1, Ebx.Bits.PtePosBits); + } + + mSevEncryptionMaskSaved =3D TRUE; + } + + return mSevEncryptionMask; +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c index 5e110c84ff81..6422bc53bd5d 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c @@ -3,7 +3,7 @@ Virtual Memory Management Services to set or clear the memory encryption= bit =20 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
- Copyright (c) 2017, AMD Incorporated. All rights reserved.
+ Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -12,6 +12,7 @@ **/ =20 #include +#include #include #include =20 @@ -39,17 +40,12 @@ GetMemEncryptionAddressMask ( ) { UINT64 EncryptionMask; - CPUID_MEMORY_ENCRYPTION_INFO_EBX Ebx; =20 if (mAddressEncMaskChecked) { return mAddressEncMask; } =20 - // - // CPUID Fn8000_001F[EBX] Bit 0:5 (memory encryption bit position) - // - AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, NULL, &Ebx.Uint32, NULL, NULL); - EncryptionMask =3D LShiftU64 (1, Ebx.Bits.PtePosBits); + EncryptionMask =3D MemEncryptSevGetEncryptionMask (); =20 mAddressEncMask =3D EncryptionMask & PAGING_1G_ADDRESS_MASK_64; mAddressEncMaskChecked =3D TRUE; @@ -289,8 +285,7 @@ SetPageTablePoolReadOnly ( LevelSize[3] =3D SIZE_1GB; LevelSize[4] =3D SIZE_512GB; =20 - AddressEncMask =3D GetMemEncryptionAddressMask() & - PAGING_1G_ADDRESS_MASK_64; + AddressEncMask =3D GetMemEncryptionAddressMask(); PageTable =3D (UINT64 *)(UINTN)PageTableBase; PoolUnitSize =3D PAGE_TABLE_POOL_UNIT_SIZE; =20 @@ -437,7 +432,7 @@ Split1GPageTo2M ( =20 AddressEncMask =3D GetMemEncryptionAddressMask (); ASSERT (PageDirectoryEntry !=3D NULL); - ASSERT (*PageEntry1G & GetMemEncryptionAddressMask ()); + ASSERT (*PageEntry1G & AddressEncMask); // // Fill in 1G page entry. // diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index 4a515a484720..954d53eba4e8 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -1,7 +1,7 @@ /**@file Initialize Secure Encrypted Virtualization (SEV) support =20 - Copyright (c) 2017, Advanced Micro Devices. All rights reserved.
+ Copyright (c) 2017 - 2020, Advanced Micro Devices. All rights reserved.<= BR> =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -17,9 +17,7 @@ #include #include #include -#include #include -#include #include =20 #include "Platform.h" @@ -116,7 +114,6 @@ AmdSevInitialize ( VOID ) { - CPUID_MEMORY_ENCRYPTION_INFO_EBX Ebx; UINT64 EncryptionMask; RETURN_STATUS PcdStatus; =20 @@ -127,15 +124,10 @@ AmdSevInitialize ( return; } =20 - // - // CPUID Fn8000_001F[EBX] Bit 0:5 (memory encryption bit position) - // - AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, NULL, &Ebx.Uint32, NULL, NULL); - EncryptionMask =3D LShiftU64 (1, Ebx.Bits.PtePosBits); - // // Set Memory Encryption Mask PCD // + EncryptionMask =3D MemEncryptSevGetEncryptionMask (); PcdStatus =3D PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, Encryption= Mask); ASSERT_RETURN_ERROR (PcdStatus); =20 diff --git a/OvmfPkg/XenPlatformPei/AmdSev.c b/OvmfPkg/XenPlatformPei/AmdSe= v.c index 7ebbb5cc1fd2..4ed448632ae2 100644 --- a/OvmfPkg/XenPlatformPei/AmdSev.c +++ b/OvmfPkg/XenPlatformPei/AmdSev.c @@ -1,7 +1,7 @@ /**@file Initialize Secure Encrypted Virtualization (SEV) support =20 - Copyright (c) 2017, Advanced Micro Devices. All rights reserved.
+ Copyright (c) 2017 - 2020, Advanced Micro Devices. All rights reserved.<= BR> Copyright (c) 2019, Citrix Systems, Inc. =20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -14,8 +14,6 @@ #include #include #include -#include -#include =20 #include "Platform.h" =20 @@ -30,7 +28,6 @@ AmdSevInitialize ( VOID ) { - CPUID_MEMORY_ENCRYPTION_INFO_EBX Ebx; UINT64 EncryptionMask; RETURN_STATUS PcdStatus; =20 @@ -41,15 +38,10 @@ AmdSevInitialize ( return; } =20 - // - // CPUID Fn8000_001F[EBX] Bit 0:5 (memory encryption bit position) - // - AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, NULL, &Ebx.Uint32, NULL, NULL); - EncryptionMask =3D LShiftU64 (1, Ebx.Bits.PtePosBits); - // // Set Memory Encryption Mask PCD // + EncryptionMask =3D MemEncryptSevGetEncryptionMask (); PcdStatus =3D PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, Encryption= Mask); ASSERT_RETURN_ERROR (PcdStatus); =20 diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/ResetVecto= r/Ia32/PageTables64.asm index b08f31157cbf..8c0d432050df 100644 --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm +++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm @@ -145,13 +145,21 @@ GetSevEncBit: =20 ; The encryption bit position is always above 31 sub ebx, 32 - jns SevExit + jns SevSaveMask =20 ; Encryption bit was reported as 31 or below, enter a HLT loop SevEncBitLowHlt: hlt jmp SevEncBitLowHlt =20 +SevSaveMask: + xor edx, edx + bts edx, ebx + + mov dword[SEV_ES_WORK_AREA_ENC_MASK], 0 + mov dword[SEV_ES_WORK_AREA_ENC_MASK + 4], edx + jmp SevExit + NoSev: ; ; Perform an SEV-ES sanity check by seeing if a #VC exception occurred. diff --git a/OvmfPkg/ResetVector/ResetVector.nasmb b/OvmfPkg/ResetVector/Re= setVector.nasmb index d3aa87982959..5fbacaed5f9d 100644 --- a/OvmfPkg/ResetVector/ResetVector.nasmb +++ b/OvmfPkg/ResetVector/ResetVector.nasmb @@ -74,6 +74,7 @@ %define GHCB_SIZE (FixedPcdGet32 (PcdOvmfSecGhcbSize)) %define SEV_ES_WORK_AREA (FixedPcdGet32 (PcdSevEsWorkAreaBase)) %define SEV_ES_WORK_AREA_RDRAND (FixedPcdGet32 (PcdSevEsWorkAreaBase) + = 8) + %define SEV_ES_WORK_AREA_ENC_MASK (FixedPcdGet32 (PcdSevEsWorkAreaBase) = + 16) %define SEV_ES_VC_TOP_OF_STACK (FixedPcdGet32 (PcdOvmfSecPeiTempRamBase)= + FixedPcdGet32 (PcdOvmfSecPeiTempRamSize)) %include "Ia32/Flat32ToFlat64.asm" %include "Ia32/PageTables64.asm" --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68905): https://edk2.groups.io/g/devel/message/68905 Mute This Topic: https://groups.io/mt/78986159/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68906+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+68906+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 1608065538485195.26214269995887; Tue, 15 Dec 2020 12:52:18 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1o94YY1788612xpdDFtnxGod; Tue, 15 Dec 2020 12:52:18 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.87]) by mx.groups.io with SMTP id smtpd.web08.2914.1608065537595584516 for ; Tue, 15 Dec 2020 12:52:17 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=df7/tTdIYz2bvyO8HpabYNZ9Bzv8wVc+JiIdsjWRhhI1C+0+XoBPFBDzEVxgzrffzadqrGkdHVya8Fp/uBFpKSg9OEKkvLgbyR6FRbTRdIIcA0blqrREQRc9Zrk7T8m4vafXPguBMatgxeFvZMrCqvLY3dFBWpZTN130k6Qt2kGFEhxt7LzznPj3bn7DfrXLrq2OvlU1JmpW/KYcM/d3bkipyhHw6X7Xkl3H1hqjDf+45MFWmn4RpAuaC+hIA0G6zY9qBWprmu6+lN+OsIg538Zz1Y8xmGEU9hTXQUMKR+XmYx2jI3KY3Bn70tlu/o/GS5IgEyJe4MCOo/0+lHi1eA== 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=IhQVMSYEr0MpqAPq9kN9zc/1u7MuiFh5ltXwi1U/TdE=; b=EpZLNyvtzMyW6Wz8pMXPqPe9Lpgqv5x0vVxduqs90hVsFd9hRa5E8bUqznGCLFsn2nOOQPPf3bz+rPv553MUiuxSnmtCT2uwkWpnuC8N7fxBSdmeiHD9Shusnrb8pF42dph05NpG8q6q3Nfd2Ly6lQVNxYaPfHk49ktLKyDOesrbUxOXdnjkZ3gJ7GrBsUfm+QhJe7cIL1GcGWOK0PHCjVbtkVz9pCSoBqpbUsl4ZNYKr4eGF2SpNAU5psJusCgW4bCuBVc6mmr3BEgg3fFUMH/3ImjGdCan6qduOZFZzrn0Fkia41OzSlIevYmz1/N08jv9eILOES/lW3BB29Kg8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:52:14 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:52:14 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 06/12] OvmfPkg/AmdSevDxe: Clear encryption bit on PCIe MMCONFIG range Date: Tue, 15 Dec 2020 14:51:05 -0600 Message-ID: <90152d0505354d270cc3af9e5838010e4dcbe114.1608065471.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR03CA0001.namprd03.prod.outlook.com (2603:10b6:610:59::11) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR03CA0001.namprd03.prod.outlook.com (2603:10b6:610:59::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:52:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6e3b922a-7da9-4337-7c8d-08d8a13b4d89 X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: 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: 3cG5LXxPnvEf5s93D8ct00Lk1Ijbz4lx8l7jsj4vvdktXvGywsSbGmBsUQzVF5JFmYVfF5QAZeB2BauexCr4AEjC+R2FGSdx9bqPKxEy9ur21xWU3ZuBPRpvscvM6fzNHrrC5wszxoiiWvaOC8oPcrlpxg2up9trvrnG6azQ2Vsev6B7Hm5wz0M9IP7vIHY03J6yjO3iN8soYDfCfI/90k/hSMGA8j3xNEC8IrfYvrsYAkPzaAf6mbMcMQwVLNEyBmn2a9LKEKYBQnGkLprQMD7EizN1uINaTeiK8UEf5s5HxAVZBeROj7xBi/dpzB2bHJYl7+VLsXm56lY2GkKEACe4fnX5HlhzuUETmfK51cY11AMTVAI0/ov97PhKaZz9TdMNuHyGvQj9Rws2QbHZnAcR31Ii/nrqlx0LxFVQGvs2fHocFL/Q8SBXrzls3dCTXhePeZB1akCcgPHT2zYeng== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?tziqT6d0U737UY4wmSEzCUh1vwp2xziHliPWykb9TXF3z5+tarZoVP3vkFkD?= =?us-ascii?Q?eoNPVyusRIG/mt4flpG6+250qtV51GwjfBvUW166SVtKvT6tN5hbWaWQw4bk?= =?us-ascii?Q?kjzjS+wmzDzyex2Q7vstvTeAMr2LtlHjKv8R2Lm8AGhvgfg8kBz3SH7WR2Hp?= =?us-ascii?Q?sBJX3+fBQjKm/rH4+G/xNsrXx1geGP52Tgahz2hGgmOw0piWrpZ9LceBD+ka?= =?us-ascii?Q?gnREBTYYIZbAijRuKfs9mdTJrauYnnBJdsxEKQPgZbz9kETlzXRtly84w0nE?= =?us-ascii?Q?3V5R+o8gpf3YHUlaoJ0fD5o9WD55/AvF4+MvdjXs3YCJ5ngKvRSbFQYGfxd6?= =?us-ascii?Q?FMjeKVRQ1/17xUhSitTFt5TaKAXfDhHhO2BrxtZLcO8Qjog6uxEi+3pTnn4G?= =?us-ascii?Q?N//lZGt55NhztjBS0+KMDNuaH5JeGmaa9dAFW/MvC6z7WvHCtV0/pdmrBJ5Z?= =?us-ascii?Q?ovktBCYtsnBn3VLB7S8gCQEm7JUmH1+ViCwhgOv1paF/ORJD2uoSDFcgb/QG?= =?us-ascii?Q?itZ9hAGRVJjTKbqnkQNVRUMuRtqpqdf12H4YiirH/ODfdLUSjDaBf20eXtFn?= =?us-ascii?Q?XSVlm7VO50Apo6FY8Vky7vjeVmQxN1WDonMNmThf+VhdwGfxi4+bjFrGAPU0?= =?us-ascii?Q?JRWFKOndicEtdlQsNGJL1jRosDJk2MNhxFr+lc4Fu4Q3VEVWKkOQsJJLmOUS?= =?us-ascii?Q?VxNh4P1n6QBSM6wZQFoFbFLGQur/FBISWR1X4rTqHwRITzEwlwFdRk5nxfba?= =?us-ascii?Q?2Nj4KdtUosIyAkYh12bhpHCt45NVXPO2pCnljFySH9TL2KzBoBNV+3XFchCQ?= =?us-ascii?Q?eEIfIdw4Auo841N1zNKLq1bWxsHCweIK4XFjoM1xGm8d0+fTxPGeVLyRWE4J?= =?us-ascii?Q?jCEejXaJItGNjuvx1anDbB0EsvrPRnRPELKQER2gXrA/GS4VqaJUlzSZtyzD?= =?us-ascii?Q?dtQAdbgzYsawjYvZvxGu9ZmmPtT3liLmN5IPBHhjLQ+BY5hkgSOap6mT/rVD?= =?us-ascii?Q?HIQR?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:52:14.7714 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 6e3b922a-7da9-4337-7c8d-08d8a13b4d89 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xGPbbtaBS2IZU+b2C30Xwa1ej4jpouzv6Pc7w1y8IFQS2/2ttQJ7rxw0ID56DDu6O48EAzOp0vSXB0LQDZfxBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: Y4i1Kg8aclwuIDdnlp49qeXJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065538; bh=UkKpH+AP9YSLdUO4/p1/ti1zUgmD9IB/BoTHr99cyFc=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ZYUb0ITtTJrRzW/zy/D1Hu8wbWZJ/0fY8oioFgyEaFQ0N5A/uaZf+de86biU8Y5IT2Y 8kmnkPPz0bFCQZKkMO5vHINaYU+aokSF4aqK9zZZZZIRmldMEQKSl8WCzSTRiS18lULax 8kyFuQJY8x5YC96mk41KDQ3G/SZQy0OJPRw= 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=3D3108 The PCIe MMCONFIG range should be treated as an MMIO range. However, there is a comment in the code explaining why AddIoMemoryBaseSizeHob() is not called. The AmdSevDxe walks the GCD map looking for MemoryMappedIo or NonExistent type memory and will clear the encryption bit for these ranges. Since the MMCONFIG range does not have one of these types, the encryption bit is not cleared for this range. Add support to detect the presence of the MMCONFIG range and clear the encryption bit. This will be needed for follow-on support that will validate MMIO under SEV-ES. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky Reviewed-by: Laszlo Ersek --- OvmfPkg/AmdSevDxe/AmdSevDxe.inf | 8 +++++++- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf b/OvmfPkg/AmdSevDxe/AmdSevDxe.= inf index dd9ecc789a20..0676fcc5b6a4 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf @@ -2,7 +2,7 @@ # # Driver clears the encryption attribute from MMIO regions when SEV is en= abled # -# Copyright (c) 2017, AMD Inc. All rights reserved.
+# Copyright (c) 2017 - 2020, AMD Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -39,3 +39,9 @@ [Depex] =20 [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire + +[FixedPcd] + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress + +[Pcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index 595586617882..ed516fcdf956 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -4,7 +4,7 @@ in APRIORI. It clears C-bit from MMIO and NonExistent Memory space when = SEV is enabled. =20 - Copyright (c) 2017, AMD Inc. All rights reserved.
+ Copyright (c) 2017 - 2020, AMD Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -17,6 +17,7 @@ #include #include #include +#include =20 EFI_STATUS EFIAPI @@ -65,6 +66,23 @@ AmdSevDxeEntryPoint ( FreePool (AllDescMap); } =20 + // + // If PCI Express is enabled, the MMCONFIG area has been reserved, rather + // than marked as MMIO, and so the C-bit won't be cleared by the above w= alk + // through the GCD map. Check for the MMCONFIG area and clear the C-bit = for + // the range. + // + if (PcdGet16 (PcdOvmfHostBridgePciDevId) =3D=3D INTEL_Q35_MCH_DEVICE_ID)= { + Status =3D MemEncryptSevClearPageEncMask ( + 0, + FixedPcdGet64 (PcdPciExpressBaseAddress), + EFI_SIZE_TO_PAGES (SIZE_256MB), + FALSE + ); + + ASSERT_EFI_ERROR (Status); + } + // // When SMM is enabled, clear the C-bit from SMM Saved State Area // --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68906): https://edk2.groups.io/g/devel/message/68906 Mute This Topic: https://groups.io/mt/78986163/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68907+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+68907+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 1608065546488188.19991583534295; Tue, 15 Dec 2020 12:52:26 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id SrpIYY1788612x1qqBVDDB0C; Tue, 15 Dec 2020 12:52:26 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.45]) by mx.groups.io with SMTP id smtpd.web11.2912.1608065545569225455 for ; Tue, 15 Dec 2020 12:52:25 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MeUNGspQBrID7act+C1w5mJBfpioND5Pev1QqBeQeCnMopRKRaeluMCyda4LiAN7ijT39GjpO1/hsNzuDEoQYEUvbKDRRMrk3FVc/UciEIUVtB+d139fnSnKYJSlLQwcW8cHkDO3Ka6n0Fb0PNEyLhriZNMRGmNRUhC9aBN0kysw2iLlbr0v2FvnB3d9Giu/8r5pFEP77Rf1FsAkW6vEf0aoIKNS8fimZ+i8nFGfaHKGJw+eBP0VSrYoZNxH8G2cZLTBN1EWZaMI9mgL6Yk0bENBIZK/DQkIG6oZYjZTHo37iYj1u0bzQ5cmTZ5zT6zcZG3y7LnDSaQZGz51DIi6tg== 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=fwLaKo04rC62Q/hRfjO8x9MU763zHqc18Fo0iL+767E=; b=VfGAp6svSdNcSDonZ7jParow0tOWUfPs7Khi73e8Ub6r+a3FuJ1XsQ0JdFBHnkJ378vqe8lcTl3U4k4x3uiZNngFbQyG46DkaGdMeSWpIyWANA34gU5zwlrEVPrhBOoSREsczB/DjO9K/CuA0eOdaH2ek2YnIYjqmoYv/TfNfPCdNNL4BhYjyjRGTyAxH4stlOkX6ElSNlnhUcYFnVs/SQVcwRFvWV6ihkKY+5t3G4/UsAG3fhcZAq3GffPh4Ugof/AXJGyK76DK62cqE4dLoqmlyI11DSYgFKj88/2WZRf0HagR7/cV09AEJzz3/Ur1qViZPbiSJWJPtl90SfCFQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:52:22 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:52:22 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 07/12] OvmfPkg/VmgExitLib: Check for an explicit DR7 cached value Date: Tue, 15 Dec 2020 14:51:06 -0600 Message-ID: <69448e7f1e1ad25b2ff4890dd64e96ae14bb54e5.1608065471.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR03CA0018.namprd03.prod.outlook.com (2603:10b6:610:59::28) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR03CA0018.namprd03.prod.outlook.com (2603:10b6:610:59::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:52:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a6c068ac-93d0-4d83-f8d0-08d8a13b5254 X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: 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: QXhcuivT/W0HPq7ilAQ7zw8JetqlaQ2a6Ersy9i4U2enVNIxLgHZgbkepEujXxa1w0t7wKdpKc8XCtzILDO0vxACuoYbLiDqpeQleV8m+rKx9+ttKOzm9Hfp55XKwPRkJtijz2pRac+SPEgDKF0x58mg79HDkNOs5xsoQwBGapmwO4ZyySYTogO+l9tXAzWVZLtjlI0hzpCqPa1zTH8ICKySfiXXyvxxlFUHmDGmeboS6cFPZlBCkhNrqAIGcAQDaqVYvR+hKt/mSk8/IPPZlJRNF1bbXVeGOfOAJCV2uakZdplVTLYWyy8I2hi1rOvl64HJ5RNhYkdxO0kJIzeh5haUORgUQNI46hUg/Zdp0+gkedLseSRXbgcUkZunDeqPb2NMePXuM9bDQYQ92jN1cDjYpZZcNbnbv8Daf6TjsR/KI02j80ddxaJgaPClDIdduyG5rqxhutFMVftvmqJP3w== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?C3Uz8p8HLfOa6pNKF5CL99zUWEiWIWcR2MB9swAahYoystDrEBUzZfs9N/1T?= =?us-ascii?Q?XkMavVD1Jvvx7ACzBz+J6tIU/63Kc0cgaL+mpJTHP+3UgzYdnd3yvf2sobfb?= =?us-ascii?Q?7IrN1pbCUQEQaiaHTtCQbkgob58R2ok+PzQ4AvXiPyOMw7jLSD4DtQJfh3zf?= =?us-ascii?Q?vXvTZKCeoS4qkXF2MDkyj2zulfTfHsdjD/dJNJeuX5ZwI3FlK/IYN2Rd2cdW?= =?us-ascii?Q?BerL2uLi3TwliDCTiaFkRtJwWFAARiMBcDIQesO+NweT2RrKdEV0U6RxyhpV?= =?us-ascii?Q?vKEC1odzWFylhAyzCc0ASlkpkn+K+gHLWCiHPbnT8h2hD7deAEGKoA6YnJiV?= =?us-ascii?Q?iXsd80VeQu0iA/PmTwkw8RFtLrtyY4jydZ1C9vZ3Fkrd6IN/e94Qz5gDltOB?= =?us-ascii?Q?Bve3ktOwQWvbJ6tNCdpZH90UeAotswxEZ9aE3mo1MKGNGqzKa9b9QQx3soLh?= =?us-ascii?Q?I4AUqcCdpnz6Rkj85SFJvn/l7gnks7iK4ZoXusG4QyOXPs1Zx2SlfocpDrjJ?= =?us-ascii?Q?pyD1t2l3FliF3j2AL/PjER0xHvLb3n1EC/FibAaZGwKiA+6RNEND1E8vZh1N?= =?us-ascii?Q?R/XWSOdw0i1f4lcKmPLDjb2/hj71nzS1Cp1VE9aGbyHAmxUvIH7IaTaroV2S?= =?us-ascii?Q?17Nar5WWKSW08DLf5upo5gDxSNBalKTi1cwNJzjAQPFQsTOMqkhnuqerJlYI?= =?us-ascii?Q?R3BMiI4ZdRd4pTJ+ztotD50qo6pFvZoRWOh4XFz/dRCDXvfZeF5qOGmxvKcc?= =?us-ascii?Q?GfVl49iSAFkaqZDX14Vz8XYeO61eWkEVErvCUfeov8OLJM3QTMVNc6U3Rgsv?= =?us-ascii?Q?wb7zroG+BoUQwQcLbcfLqnU5pKuE9rvEVpXawPdIfZxgZ3Fvr1tHmg9FXIn9?= =?us-ascii?Q?xmNppn4evskDe3QgkD0M62vEioRw121Y+UEyqmfPEv13B6JvEgGhre5GfxGG?= =?us-ascii?Q?Vgbc2TVtMTvtV527dJAqjn1J1WhsfRmFoCVipCUWCIcBiheZtnYn5qk4feuc?= =?us-ascii?Q?UntI?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:52:22.8008 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: a6c068ac-93d0-4d83-f8d0-08d8a13b5254 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: K20eIosix2ecs4MgeiZrBk7Ns/ONAPjw9KSLgsJf0iLhM0A7R2bkv55N+x2tLKsHZqJGbe9511xgidAv0ggzZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: JfJ7Yxw4eprYM40VOo2L1JvHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065546; bh=HzhbTiKspJBQC0CFWoMt2KxCja0ssN0iC9XRW2+sgno=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ht2m3aMWIMpht8QsbgXuC5PLaDYnRSbQCPVjJkEXxnr6dz428RWDdk8gshhHeVsV2ui EiKd4YS+6l4bBIe5qmNGdcqaCa96fmbCoPCuedRCiEftZk9r7wPijhLo/bYvXafLhP8BY DHODvblxL8iEoJfIfSW77Sr5ZfMXQi9XpBk= 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=3D3108 Check the DR7 cached indicator against a specific value. This makes it harder for a hypervisor to just write random data into that field in an attempt to use an invalid DR7 value. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky Reviewed-by: Laszlo Ersek --- OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index 1671db3a01b1..5149ab2bc989 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -128,10 +128,13 @@ UINT64 =20 // // Per-CPU data mapping structure +// Use UINT32 for cached indicators and compare to a specific value +// so that the hypervisor can't indicate a value is cached by just +// writing random data to that area. // typedef struct { - BOOLEAN Dr7Cached; - UINT64 Dr7; + UINT32 Dr7Cached; + UINT64 Dr7; } SEV_ES_PER_CPU_DATA; =20 =20 @@ -1489,7 +1492,7 @@ Dr7WriteExit ( } =20 SevEsData->Dr7 =3D *Register; - SevEsData->Dr7Cached =3D TRUE; + SevEsData->Dr7Cached =3D 1; =20 return 0; } @@ -1533,7 +1536,7 @@ Dr7ReadExit ( // If there is a cached valued for DR7, return that. Otherwise return the // DR7 standard reset value of 0x400 (no debug breakpoints set). // - *Register =3D (SevEsData->Dr7Cached) ? SevEsData->Dr7 : 0x400; + *Register =3D (SevEsData->Dr7Cached =3D=3D 1) ? SevEsData->Dr7 : 0x400; =20 return 0; } --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68907): https://edk2.groups.io/g/devel/message/68907 Mute This Topic: https://groups.io/mt/78986167/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68908+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+68908+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 1608065554534331.1982570345151; Tue, 15 Dec 2020 12:52:34 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id cDllYY1788612xePDsvQomMp; Tue, 15 Dec 2020 12:52:34 -0800 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.85]) by mx.groups.io with SMTP id smtpd.web10.2819.1608065553325342555 for ; Tue, 15 Dec 2020 12:52:33 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RgjeS9Qhba7yXKvgI2g7hBXABcLrwRfWJ3yU1UMEAlm3vilsUjQRYHVV7LCWsCFIpt0ccyHXA+puGPiMnS0hXI5Mt6HdXhnUI1cYth9RzdtZuT4G2BnxgAi+sk3kq7LwsDn/P9OHTavyjRpe5ybKRT8nZlf1IEz6RvJPfDrv/2WTZ0weABp9/Uot5A6F6QTlG6TKAlTDaH8qAKg0BggiqmokSo0F/F8+JWyvwAeLMF8JO48UFUzr/jP1u/l3QzNOdS399ZeIoCbq/Sfys7m4TKScediQUhCW5APy9vVEUKnORbUqVzJcmTvebSZHIGu2vQ+qKIK1njE7aucOMET3og== 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=fs5vg0Dzj+E6kqDtTd74gz4qJXbn1XPKSNWq6ts4b6k=; b=aEZ4rkqS/3h3lKase/1ToK1VUTD8P4eDuEG0AXe4E7z0uL3Pj6wANqo5vycCS4Ti0jY6BPNa7xaIZbK/Ax6o3I+WcMHMFHU/zoCY7nqLqdkehkE65GlA5YkPhsTEaZvAYXxXgruZXFl/vhQZNBkVRJFXA3ctQS4rfeTziVqr9ulQ12xmPrjnvX0eRjrocuNABqUhdl3peK+lbdG9w048ADKxUOoKzZxeGgHYd+xzz43Ft2VYmfEzDo/fFKwodxupRC5+AC3kdbp2ItiIho5eiAaKEwTKk3z1uCjrBhb61XK4/ZiraB80j1CEHaOcJ8my6CQ6Cy5pNEd8iV2xaql7tw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:52:30 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:52:30 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 08/12] OvmfPkg/MemEncryptSevLib: Make the MemEncryptSevLib available for SEC Date: Tue, 15 Dec 2020 14:51:07 -0600 Message-ID: <6b14be9c75dd31656e986c8e7611b739c2b22a9e.1608065471.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR03CA0001.namprd03.prod.outlook.com (2603:10b6:610:59::11) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR03CA0001.namprd03.prod.outlook.com (2603:10b6:610:59::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:52:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4729cff1-26c6-42fa-5c40-08d8a13b56ff X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 0tEHwOjqrZT0fqwacvsyI487IHh818B3BKXtTp0ntT+65j311T7DBPfHdX+o5nWEE3KxTy9K9TL32k/64Oa625wk0tIYgckMH7d8lX3jyVIk56NQNC2BA3Bivx80Kbiklv2Nmj0Z+JNLGOeFkLM6GyvV3R38rgqKIAD5Q0Gy3C8eWM4/3UxOC/EqNE7dWvcAPPbs2md4Ga70Mvk/3xYOg9F9VeFKFedYKM7A+UJDxssYhYIGVWqQHzThjh409sz7XrOkmMbp0nrJWtWcWzWdFcpgy+5a6l6YTsRKdmUmLAQ2QWXpatdpfK5Lb8yuWKfO4fQ0AbpDKpQHCQ4D1grpo9l1KarI1n4hfHvU7IHyFdzPIdrjxE7E0kPx2jLx+rFiX9cJBya+ZrZQUco9WA7waPPPcZJVRdayMqZkpzPzvjTp31QZTJgrmlwM59PX9Vt0uTE3TZraLtvBKgeZKV8TwA== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?knpfY2sx4sPHW4CPsxz4+3ZydgfztGfw+0/ynIKT4291rtU2PLC9yzOxByeI?= =?us-ascii?Q?subCQHu2Um2o0fd6S7YIR3U1J7ME6H8j2HLpxv/PacdSMLzuDVvMOc6eOUIX?= =?us-ascii?Q?WqjUK5xln/1I9a4/VSMXwvoJ5D9Zr36Qg7YxhQ2fiMgJxAPDzBNhOJSl+1RY?= =?us-ascii?Q?YlCgUirCBwG4/Eivsfj7xR6i/xUJHdpwS18M1N+RbbOkmKLt5MsAQSLi1TDE?= =?us-ascii?Q?OO4X+EDwGg7qiiL04snQDfhj/TVZeoQkh4k6QAmA+QJ401Odif9JBui6LOQY?= =?us-ascii?Q?3SEtv8qg+pIndcoANaBW6nUhU30gzpAAW4E3c61oxYtvwchKgmoiCKjd9ebu?= =?us-ascii?Q?MluH9SyOS1GzXf63gnWYXwxp6U7Y+E00+Be1D7nuB+mx7HI+yxfbPtv4kmD/?= =?us-ascii?Q?0GLv11rb7ihEEbMQn4HMgka4mJDqmmmDTiloz3IX6CgMEVWpPSzIGrb5kXHh?= =?us-ascii?Q?/A3VMFLaW7WHK9C9C90LXVIkM4ObULBjbTiJgQs3/tP4YBhKp3HvRKUllRUA?= =?us-ascii?Q?9jLVtQ1/e9oWGZF2+tmCByDlIMca6p5WQGdBhhBuRtWj2wSnvr5oC5N2z0Tj?= =?us-ascii?Q?bbTJg5duNya+oBZRYVCu2K+tln68GG7vyoOw8ATLSHvURteDr4kZH7mfRMMg?= =?us-ascii?Q?j1fXfgaXX+J9M/Nd62InA1+DF0bEqCXbHp9/WxFdPJLT10oMzUmEWVZbYk2B?= =?us-ascii?Q?2vLn8PpueKXUPp/6Oe8kXEFuK41GQcQThzv5cO/l88RVuFPkXu++2Vz0g+w5?= =?us-ascii?Q?FoqtX47i9N9DzHwy3MbFCyJqB7HAPmXklPd+IXCtdLN9jGwZ6i79GGBvHUhs?= =?us-ascii?Q?4NtFH5L3FthZ1ShgqeTMa2837P7JxPKgmryIXlDnalt/W6vCV/AWoxG8atyc?= =?us-ascii?Q?jR3L3qmGKPfvFgWqju5VCFj+69riBWukYM91oE0KTYQ8sGCWjF3kNfcxLfJP?= =?us-ascii?Q?9S0AEYz1ST3mxGMk+PxxCh/TmA8wQm6sauFDP7wtmAvVngsRxU6lLa7e89Ms?= =?us-ascii?Q?zuQi?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:52:30.5914 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 4729cff1-26c6-42fa-5c40-08d8a13b56ff X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: F4a4IjxVZWJgTkC4qORvr4Aop4ez0pbZ10C1oh5HHEndv8ZJppcE8ExcT3prC4w6lpW+UIeBGGBb3LfhD4fRuA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: g0LIs68koeHE28sfLNvsThFpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065554; bh=NgXvPLlOTiDd7zmBMdv4xri8/8t56V/nBEVHY/aJqeU=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=tjLmlAvCxn6lFVYJ7gU7jQreqx4S9+hevwOsOyv0iw1d1CQJ3nt4ebrVxBDxdrXCW8S fwR3+z+ROp/56uJYQvJng3Bf++LzX+tIPLvufIQybnz7j+GHOq47N+f/ZGzHAuEBAGA5a UF7jBIrXvcfsaf/Q3vy2pzPFWK9ygEtmzAc= 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=3D3108 In preparation for a new interface to be added to the MemEncryptSevLib library that will be used in SEC, create an SEC version of the library. This requires the creation of SEC specific files. Some of the current MemEncryptSevLib functions perform memory allocations which cannot be performed in SEC, so these interfaces will return an error during SEC. Also, the current MemEncryptSevLib library uses some static variables to optimize access to variables, which cannot be used in SEC. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky --- .../DxeBaseMemEncryptSevLib.inf | 2 +- .../PeiBaseMemEncryptSevLib.inf | 2 +- .../SecBaseMemEncryptSevLib.inf | 54 ++++++++ .../SecMemEncryptSevLibInternal.c | 130 ++++++++++++++++++ ...{VirtualMemory.c =3D> PeiDxeVirtualMemory.c} | 12 +- .../X64/SecVirtualMemory.c | 80 +++++++++++ 6 files changed, 272 insertions(+), 8 deletions(-) create mode 100644 OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptS= evLib.inf create mode 100644 OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLi= bInternal.c rename OvmfPkg/Library/BaseMemEncryptSevLib/X64/{VirtualMemory.c =3D> PeiD= xeVirtualMemory.c} (95%) create mode 100644 OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemo= ry.c diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.i= nf b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf index 2be6ca1fa737..390f2d60677f 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf @@ -33,7 +33,7 @@ [Sources.X64] DxeMemEncryptSevLibInternal.c MemEncryptSevLibInternal.c X64/MemEncryptSevLib.c - X64/VirtualMemory.c + X64/PeiDxeVirtualMemory.c X64/VirtualMemory.h =20 [Sources.IA32] diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.i= nf b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.inf index 7bdf8cb5210d..cb973fdeb868 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.inf @@ -33,7 +33,7 @@ [Sources.X64] PeiMemEncryptSevLibInternal.c MemEncryptSevLibInternal.c X64/MemEncryptSevLib.c - X64/VirtualMemory.c + X64/PeiDxeVirtualMemory.c X64/VirtualMemory.h =20 [Sources.IA32] diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptSevLib.i= nf b/OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptSevLib.inf new file mode 100644 index 000000000000..b26f739d69fd --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptSevLib.inf @@ -0,0 +1,54 @@ +## @file +# Library provides the 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 SecMemEncryptSevLib + FILE_GUID =3D 046388b4-430e-4e61-88f6-51ea21db2632 + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D MemEncryptSevLib|SEC + +# +# 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 + OvmfPkg/OvmfPkg.dec + UefiCpuPkg/UefiCpuPkg.dec + +[Sources.X64] + SecMemEncryptSevLibInternal.c + MemEncryptSevLibInternal.c + X64/MemEncryptSevLib.c + X64/SecVirtualMemory.c + X64/VirtualMemory.h + +[Sources.IA32] + SecMemEncryptSevLibInternal.c + MemEncryptSevLibInternal.c + Ia32/MemEncryptSevLib.c + +[LibraryClasses] + BaseLib + CpuLib + DebugLib + PcdLib + +[FeaturePcd] + gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire + +[FixedPcd] + gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibIntern= al.c b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c new file mode 100644 index 000000000000..30d2ebe1d6e9 --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c @@ -0,0 +1,130 @@ +/** @file + + Secure Encrypted Virtualization (SEV) library helper function + + Copyright (c) 2020, Advanced Micro Devices, Inc. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include +#include +#include +#include +#include +#include + +/** + Reads and sets the status of SEV features. + + **/ +STATIC +UINT32 +EFIAPI +InternalMemEncryptSevStatus ( + VOID + ) +{ + UINT32 RegEax; + CPUID_MEMORY_ENCRYPTION_INFO_EAX Eax; + BOOLEAN ReadSevMsr; + SEC_SEV_ES_WORK_AREA *SevEsWorkArea; + + ReadSevMsr =3D FALSE; + + SevEsWorkArea =3D (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAr= eaBase); + if (SevEsWorkArea !=3D NULL && SevEsWorkArea->EncryptionMask !=3D 0) { + // + // The MSR has been read before, so it is safe to read it again and av= oid + // having to validate the CPUID information. + // + ReadSevMsr =3D TRUE; + } else { + // + // Check if memory encryption leaf exist + // + AsmCpuid (CPUID_EXTENDED_FUNCTION, &RegEax, NULL, NULL, NULL); + if (RegEax >=3D CPUID_MEMORY_ENCRYPTION_INFO) { + // + // CPUID Fn8000_001F[EAX] Bit 1 (Sev supported) + // + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, &Eax.Uint32, NULL, NULL, NUL= L); + + if (Eax.Bits.SevBit) { + ReadSevMsr =3D TRUE; + } + } + } + + return ReadSevMsr ? AsmReadMsr32 (MSR_SEV_STATUS) : 0; +} + +/** + Returns a boolean to indicate whether SEV-ES is enabled. + + @retval TRUE SEV-ES is enabled + @retval FALSE SEV-ES is not enabled +**/ +BOOLEAN +EFIAPI +MemEncryptSevEsIsEnabled ( + VOID + ) +{ + MSR_SEV_STATUS_REGISTER Msr; + + Msr.Uint32 =3D InternalMemEncryptSevStatus (); + + return Msr.Bits.SevEsBit ? TRUE : FALSE; +} + +/** + Returns a boolean to indicate whether SEV is enabled. + + @retval TRUE SEV is enabled + @retval FALSE SEV is not enabled +**/ +BOOLEAN +EFIAPI +MemEncryptSevIsEnabled ( + VOID + ) +{ + MSR_SEV_STATUS_REGISTER Msr; + + Msr.Uint32 =3D InternalMemEncryptSevStatus (); + + return Msr.Bits.SevBit ? TRUE : FALSE; +} + +/** + Returns the SEV encryption mask. + + @return The SEV pagtable encryption mask +**/ +UINT64 +EFIAPI +MemEncryptSevGetEncryptionMask ( + VOID + ) +{ + CPUID_MEMORY_ENCRYPTION_INFO_EBX Ebx; + SEC_SEV_ES_WORK_AREA *SevEsWorkArea; + UINT64 EncryptionMask; + + SevEsWorkArea =3D (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAr= eaBase); + if (SevEsWorkArea !=3D NULL) { + EncryptionMask =3D SevEsWorkArea->EncryptionMask; + } else { + // + // CPUID Fn8000_001F[EBX] Bit 0:5 (memory encryption bit position) + // + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, NULL, &Ebx.Uint32, NULL, NULL); + EncryptionMask =3D LShiftU64 (1, Ebx.Bits.PtePosBits); + } + + return EncryptionMask; +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c similarity index 95% rename from OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c rename to OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c index 6422bc53bd5d..3a5bab657bd7 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c @@ -192,7 +192,8 @@ Split2MPageTo4K ( { PHYSICAL_ADDRESS PhysicalAddress4K; UINTN IndexOfPageTableEntries; - PAGE_TABLE_4K_ENTRY *PageTableEntry, *PageTableEntry1; + PAGE_TABLE_4K_ENTRY *PageTableEntry; + PAGE_TABLE_4K_ENTRY *PageTableEntry1; UINT64 AddressEncMask; =20 PageTableEntry =3D AllocatePageTableMemory(1); @@ -472,7 +473,7 @@ Split1GPageTo2M ( /** Set or Clear the memory encryption bit =20 - @param[in] PagetablePoint Page table entry pointer (PTE). + @param[in, out] PageTablePointer Page table entry pointer (PTE). @param[in] Mode Set or Clear encryption bit =20 **/ @@ -562,7 +563,6 @@ EnableReadOnlyPageWriteProtect ( @retval RETURN_UNSUPPORTED Setting the memory encyrption attrib= ute is not supported **/ - STATIC RETURN_STATUS EFIAPI @@ -635,7 +635,7 @@ SetMemoryEncDec ( =20 Status =3D EFI_SUCCESS; =20 - while (Length) + while (Length !=3D 0) { // // If Cr3BaseAddress is not specified then read the current CR3 @@ -683,7 +683,7 @@ SetMemoryEncDec ( // Valid 1GB page // If we have at least 1GB to go, we can just update this entry // - if (!(PhysicalAddress & (BIT30 - 1)) && Length >=3D BIT30) { + if ((PhysicalAddress & (BIT30 - 1)) =3D=3D 0 && Length >=3D BIT30) { SetOrClearCBit(&PageDirectory1GEntry->Uint64, Mode); DEBUG (( DEBUG_VERBOSE, @@ -744,7 +744,7 @@ SetMemoryEncDec ( // Valid 2MB page // If we have at least 2MB left to go, we can just update this ent= ry // - if (!(PhysicalAddress & (BIT21-1)) && Length >=3D BIT21) { + if ((PhysicalAddress & (BIT21-1)) =3D=3D 0 && Length >=3D BIT21) { SetOrClearCBit (&PageDirectory2MEntry->Uint64, Mode); PhysicalAddress +=3D BIT21; Length -=3D BIT21; diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c b/= OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c new file mode 100644 index 000000000000..5c337ea0b820 --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c @@ -0,0 +1,80 @@ +/** @file + + Virtual Memory Management Services to set or clear the memory encryption= bit + + Copyright (c) 2020, AMD Incorporated. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include + +#include "VirtualMemory.h" + +/** + This function clears memory encryption bit for the memory region specifi= ed by + PhysicalAddress and Length from the current page table context. + + @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 memory region. + @param[in] Length The length of memory region + @param[in] Flush Flush the caches before applying the + encryption mask + + @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 encyrption attri= bute + is not supported +**/ +RETURN_STATUS +EFIAPI +InternalMemEncryptSevSetMemoryDecrypted ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINTN Length, + IN BOOLEAN Flush + ) +{ + // + // This function is not available during SEC. + // + return RETURN_UNSUPPORTED; +} + +/** + This function sets memory encryption bit for the memory region specified= by + PhysicalAddress and Length from the current page table context. + + @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 memory region. + @param[in] Length The length of memory region + @param[in] Flush Flush the caches before applying the + encryption mask + + @retval RETURN_SUCCESS The attributes were set for the memo= ry + region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Setting the memory encyrption attrib= ute + is not supported +**/ +RETURN_STATUS +EFIAPI +InternalMemEncryptSevSetMemoryEncrypted ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINTN Length, + IN BOOLEAN Flush + ) +{ + // + // This function is not available during SEC. + // + return RETURN_UNSUPPORTED; +} --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68908): https://edk2.groups.io/g/devel/message/68908 Mute This Topic: https://groups.io/mt/78986172/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68909+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+68909+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 1608065562609556.9633496032792; Tue, 15 Dec 2020 12:52:42 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id kNuOYY1788612xQ9ylG20X4t; Tue, 15 Dec 2020 12:52:42 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.54]) by mx.groups.io with SMTP id smtpd.web11.2918.1608065561661812247 for ; Tue, 15 Dec 2020 12:52:41 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aSyzIzOwmqFiOSxkHpzUWtBkANBugw2/5qnwpjmSG2ikacqQhYyWyAfj1vN3qI/VFboTlOfFTnUqO2TtE2kZiTuG9EOogdXqIs/EH/dNBgn8nv1jFnZ4ebvuuBG4BvXS9wtEYHQsbB/q/bOhFAXVZVpUah5M7ZS49+yLeolo7T5o1tGqziWazNozsEMILyqNlrrPWDdcJMqnYbPMUc1tJoJHiRjBgzl5OCiL399LMKoZbR1X9hygaz9DSAhDVMSNfKRgPg/tfEVUwnBjGmUcnie3XaJt6WtRDWRr16tEsCrtpfLra/K1GlRAk3w5tJv+ax3DyCSqHUiPH+M/voB0Qg== 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=FG1h2Hw03TDiWayBN6sbKxtBLL/zBNJv5liu5U3JvEA=; b=GLvGnN/N+eWPwInRj1hybEQHQZ6tXkJ0lANTa0GQ6zlBsv1ixaE3UjrAhnWZdQvG3tYALh2Syuk6D3D7bZDrblVcMOEVsJxSMD6b2pSBazRufG9UWY3JWbhLKFJC0+qH1/ZvIaxZnMA58JoCQQ7Om1vCqKILru7nNGd+IEX8HbmsvQFFi/YmyRMvkStr0LQKgr7vQ4abzXC8KQ4himZNEY2Ae/RydUfNx3Cc9XwE+en9jdybJFpyaPATNbvBRQz3PK4k3H08dt+nj9BupkCUYbD7zv3hY0aXtRNsV3Gj60KE+Yk7FUFiZIv9QzPfyc692ogSGImaX+5OswpQYZl/QQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:52:38 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:52:38 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 09/12] OvmfPkg/MemEncryptSevLib: Address range encryption state interface Date: Tue, 15 Dec 2020 14:51:08 -0600 Message-ID: <6877ca800856e85692d7ab99357895fa318f36c7.1608065471.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR03CA0026.namprd03.prod.outlook.com (2603:10b6:610:59::36) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR03CA0026.namprd03.prod.outlook.com (2603:10b6:610:59::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:52:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1d9f9f75-7427-4535-9340-08d8a13b5bc6 X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: 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: cJIPLHG07ez3eg3Zl1R/sweXJ7T2CM7wCBqAT4hhUo7hHQaUSf55X3S0ggHwgv338PxL4u8/uB4quQfZ7neAdQ7KX/a1kTixFoE/ORLWBOWmphbvFEacVg+mZn7NShBHUVawxLNXPv9d+9fZPV3zVbtnsSdSTlTBwOOZ/JKQk+VkNA+fO416kaahKNDEDQ5w8Wmw8eLfBhO1Kry7tmZTbEqs91U2Qo8JGDolF+74R4ELT3UT8XFXHrt88n13OCUwAKSxFRhnBumECVpCGSY0b2q/3ppCNu/r62AnUsMsimh6GJ6cXsaDIVm56uxsyDsXB8LQkdf2uUncRlKyUJOUSncFFGPZp35a87Ta7TK50MUmf6jXLrBS+cMO8zeG9/JkhvR08gh3MG2P5u0xl5KPvtZio+TXt86au1/qkhKuBIXhO/YmAncGS9OnVEc3DhDqMjk65lyYaxtVgTM1kt3/mw== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Ru1R0KLVqIgJqSTmOo18qipDZHMIJiXlrjMSM9hYJQBSyh2qo8oeNr+56VL7?= =?us-ascii?Q?9mlwvX4QGITXsRUDAn4nGddUFUYL4HBAE53SCSV3F0WvePdpa7otHSlnUfct?= =?us-ascii?Q?qdvCA0m/exBDl3xrCpK65/0JCJpXdcBz2qQ8OzjDNvB4CJomFaPfjU140ZJj?= =?us-ascii?Q?XiMh+mOSiJEwhxXwNqyYOIxn50vR1WyGaq7d6crnHgda5fgGRJOjABWEgCxf?= =?us-ascii?Q?hqZp/4ru/1XO9YUVBDYC7dXtTUyzTg6xF0FbM2myZ+tboMGgLBBbFfkFOO6c?= =?us-ascii?Q?0ZBpv8ryVZtNopRnfITxLzsmDJrDlRJljCkQfF+rjmbDRGShDBaVbIEI/nEM?= =?us-ascii?Q?XaEShM0Hj6wAw8LqNlu//ojQix7bu8jpzvrnyGX2F/7O7gm89iZZkuvLCEZ8?= =?us-ascii?Q?bRrRF2iMKwQ3ywFmMpPPbsvxVAEOGkm3n0XbD9HYXaOMBZI3DfQK6dtCkZWv?= =?us-ascii?Q?KZE0jtoyplk4I0Ouwm3Sb2Gc3vdvWUmeubjsQ107THtysmuk6y4WDzwKbBRf?= =?us-ascii?Q?0W4EqeU09kCdrcf7nFXgdp3LWBf9lsyfBge7aTq9RHOXsYawYkSvRBAF0Wos?= =?us-ascii?Q?RVqalOnk0VakLASj7mYym5Yg5RkaboDvv1A/+YgWryqNjR0iULUMaoMRIZKw?= =?us-ascii?Q?8dXrPeQr7eoSHjIGBDeouPBz6xjpo1LbYo5iCuWDdNCplrvbqqMcZ0NKMYk4?= =?us-ascii?Q?rHH6Wljq6P5VehSkCTsQNogePO48Egu70lGsDDXhUJceEkiLCslWlj028mrz?= =?us-ascii?Q?hxP55zIzAqMoFTqO5cVm2m275ZwF0IQtCRiIsOLkAXakbRd1gQ5Zs2Zd9jYH?= =?us-ascii?Q?TbO/iZvI58HWPSCHgh4hNZxhvKRI5Mh0x7DyFQp3YTKHkwbe8YpdkezCTE2P?= =?us-ascii?Q?hUKInekeMm5Xe9IeS48gbDXzDUBlk59HLVGcpQzeLKEc2toFBfFYrirMIODP?= =?us-ascii?Q?ttdS52XUA6jpa5Uem7YUPERrDq5NOu2D6tP/YpUAEzj+OBlylCQILWRcEjUk?= =?us-ascii?Q?Fvlb?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:52:38.6708 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 1d9f9f75-7427-4535-9340-08d8a13b5bc6 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VNUzWsVIBhKPl54f2U21448rEPnhu1wDBv6y/tuFjb8mhCgRYZTNXNLPklTvtWqv0gGl8HYyRiaSEcYpVmSwPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: JBZpM3lWtCq8IQ81TCHALKOsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065562; bh=6ZUwELcx9BOYnK6mIv8ga+WrzpHBdMqtR2oqmf1zBKE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=L4W4UDikjWJm5xE+neW0Fz2s3Xv8c9eE9Mf/ouKtMSeVhOToadqi2Dd3x/Ft6iQB8Gb 8dh3k5SYUeTqEXZNvsSUNEvhlfrYpivZ/7I/bAOmziJkV0l4P+by2BBt/UAxQULqmPsdG IspTPPWEM8HwdETtvddzqUhSNacMywEzqh4= 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=3D3108 Update the MemEncryptSevLib library to include an interface that can report the encryption state on a range of memory. The values will represent the range as being unencrypted, encrypted, a mix of unencrypted and encrypted, and error (e.g. ranges that aren't mapped). Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky Acked-by: Laszlo Ersek --- .../DxeBaseMemEncryptSevLib.inf | 1 + .../PeiBaseMemEncryptSevLib.inf | 1 + .../SecBaseMemEncryptSevLib.inf | 1 + OvmfPkg/Include/Library/MemEncryptSevLib.h | 33 +++ .../BaseMemEncryptSevLib/X64/VirtualMemory.h | 35 ++- .../Ia32/MemEncryptSevLib.c | 31 ++- .../X64/MemEncryptSevLib.c | 32 ++- .../X64/PeiDxeVirtualMemory.c | 19 +- .../X64/SecVirtualMemory.c | 20 ++ .../BaseMemEncryptSevLib/X64/VirtualMemory.c | 207 ++++++++++++++++++ 10 files changed, 368 insertions(+), 12 deletions(-) create mode 100644 OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.i= nf b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf index 390f2d60677f..04728a5dd256 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf @@ -34,6 +34,7 @@ [Sources.X64] MemEncryptSevLibInternal.c X64/MemEncryptSevLib.c X64/PeiDxeVirtualMemory.c + X64/VirtualMemory.c X64/VirtualMemory.h =20 [Sources.IA32] diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.i= nf b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.inf index cb973fdeb868..4e4f59c0b0b6 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiBaseMemEncryptSevLib.inf @@ -34,6 +34,7 @@ [Sources.X64] MemEncryptSevLibInternal.c X64/MemEncryptSevLib.c X64/PeiDxeVirtualMemory.c + X64/VirtualMemory.c X64/VirtualMemory.h =20 [Sources.IA32] diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptSevLib.i= nf b/OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptSevLib.inf index b26f739d69fd..79389298a3b3 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptSevLib.inf @@ -34,6 +34,7 @@ [Sources.X64] MemEncryptSevLibInternal.c X64/MemEncryptSevLib.c X64/SecVirtualMemory.c + X64/VirtualMemory.c X64/VirtualMemory.h =20 [Sources.IA32] diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h index 394065f15bc1..421b2e2c2c1e 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -33,6 +33,16 @@ typedef struct _SEC_SEV_ES_WORK_AREA { UINT64 EncryptionMask; } SEC_SEV_ES_WORK_AREA; =20 +// +// Memory encryption address range states. +// +typedef enum { + MemEncryptSevAddressRangeUnencrypted, + MemEncryptSevAddressRangeEncrypted, + MemEncryptSevAddressRangeMixed, + MemEncryptSevAddressRangeError, +} MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE; + /** Returns a boolean to indicate whether SEV-ES is enabled. =20 @@ -147,4 +157,27 @@ MemEncryptSevGetEncryptionMask ( VOID ); =20 +/** + Returns the encryption state of the specified virtual address range. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress Base address to check + @param[in] Length Length of virtual address range + + @retval MemEncryptSevAddressRangeUnencrypted Address range is mapped + unencrypted + @retval MemEncryptSevAddressRangeEncrypted Address range is mapped + encrypted + @retval MemEncryptSevAddressRangeMixed Address range is mapped mi= xed + @retval MemEncryptSevAddressRangeError Address range is not mapped +**/ +MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE +EFIAPI +MemEncryptSevGetAddressRangeState ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN Length + ); + #endif // _MEM_ENCRYPT_SEV_LIB_H_ diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h index 26d26cd922a4..996f94f07ebb 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h @@ -3,7 +3,7 @@ Virtual Memory Management Services to set or clear the memory encryption= bit =20 Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
- Copyright (c) 2017, AMD Incorporated. All rights reserved.
+ Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -178,7 +178,17 @@ typedef struct { UINTN FreePages; } PAGE_TABLE_POOL; =20 +/** + Return the pagetable memory encryption mask. =20 + @return The pagetable memory encryption mask. + +**/ +UINT64 +EFIAPI +InternalGetMemEncryptionAddressMask ( + VOID + ); =20 /** This function clears memory encryption bit for the memory region specifi= ed by @@ -234,4 +244,27 @@ InternalMemEncryptSevSetMemoryEncrypted ( IN BOOLEAN Flush ); =20 +/** + Returns the encryption state of the specified virtual address range. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress Base address to check + @param[in] Length Length of virtual address range + + @retval MemEncryptSevAddressRangeUnencrypted Address range is mapped + unencrypted + @retval MemEncryptSevAddressRangeEncrypted Address range is mapped + encrypted + @retval MemEncryptSevAddressRangeMixed Address range is mapped mi= xed + @retval MemEncryptSevAddressRangeError Address range is not mapped +**/ +MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE +EFIAPI +InternalMemEncryptSevGetAddressRangeState ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN Length + ); + #endif diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c b= /OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c index b4f6e5738e6e..12a5bf495bd7 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c @@ -2,7 +2,7 @@ =20 Secure Encrypted Virtualization (SEV) library helper function =20 - Copyright (c) 2017, AMD Incorporated. All rights reserved.
+ Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -82,3 +82,32 @@ MemEncryptSevSetPageEncMask ( // return RETURN_UNSUPPORTED; } + +/** + Returns the encryption state of the specified virtual address range. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress Base address to check + @param[in] Length Length of virtual address range + + @retval MemEncryptSevAddressRangeUnencrypted Address range is mapped + unencrypted + @retval MemEncryptSevAddressRangeEncrypted Address range is mapped + encrypted + @retval MemEncryptSevAddressRangeMixed Address range is mapped mi= xed + @retval MemEncryptSevAddressRangeError Address range is not mapped +**/ +MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE +EFIAPI +MemEncryptSevGetAddressRangeState ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN Length + ) +{ + // + // Memory is always encrypted in 32-bit mode + // + return MemEncryptSevAddressRangeEncrypted; +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c b/= OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c index cf0921e21464..4fea6a6be0ac 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c @@ -2,7 +2,7 @@ =20 Secure Encrypted Virtualization (SEV) library helper function =20 - Copyright (c) 2017, AMD Incorporated. All rights reserved.
+ Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -88,3 +88,33 @@ MemEncryptSevSetPageEncMask ( Flush ); } + +/** + Returns the encryption state of the specified virtual address range. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress Base address to check + @param[in] Length Length of virtual address range + + @retval MemEncryptSevAddressRangeUnencrypted Address range is mapped + unencrypted + @retval MemEncryptSevAddressRangeEncrypted Address range is mapped + encrypted + @retval MemEncryptSevAddressRangeMixed Address range is mapped mi= xed + @retval MemEncryptSevAddressRangeError Address range is not mapped +**/ +MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE +EFIAPI +MemEncryptSevGetAddressRangeState ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN Length + ) +{ + return InternalMemEncryptSevGetAddressRangeState ( + Cr3BaseAddress, + BaseAddress, + Length + ); +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c= b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c index 3a5bab657bd7..d3455e812bd1 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c @@ -28,14 +28,14 @@ typedef enum { } MAP_RANGE_MODE; =20 /** - Get the memory encryption mask + Return the pagetable memory encryption mask. =20 - @param[out] EncryptionMask contains the pte mask. + @return The pagetable memory encryption mask. =20 **/ -STATIC UINT64 -GetMemEncryptionAddressMask ( +EFIAPI +InternalGetMemEncryptionAddressMask ( VOID ) { @@ -200,7 +200,7 @@ Split2MPageTo4K ( =20 PageTableEntry1 =3D PageTableEntry; =20 - AddressEncMask =3D GetMemEncryptionAddressMask (); + AddressEncMask =3D InternalGetMemEncryptionAddressMask (); =20 ASSERT (PageTableEntry !=3D NULL); ASSERT (*PageEntry2M & AddressEncMask); @@ -286,7 +286,7 @@ SetPageTablePoolReadOnly ( LevelSize[3] =3D SIZE_1GB; LevelSize[4] =3D SIZE_512GB; =20 - AddressEncMask =3D GetMemEncryptionAddressMask(); + AddressEncMask =3D InternalGetMemEncryptionAddressMask(); PageTable =3D (UINT64 *)(UINTN)PageTableBase; PoolUnitSize =3D PAGE_TABLE_POOL_UNIT_SIZE; =20 @@ -431,7 +431,7 @@ Split1GPageTo2M ( =20 PageDirectoryEntry =3D AllocatePageTableMemory(1); =20 - AddressEncMask =3D GetMemEncryptionAddressMask (); + AddressEncMask =3D InternalGetMemEncryptionAddressMask (); ASSERT (PageDirectoryEntry !=3D NULL); ASSERT (*PageEntry1G & AddressEncMask); // @@ -485,7 +485,7 @@ SetOrClearCBit( { UINT64 AddressEncMask; =20 - AddressEncMask =3D GetMemEncryptionAddressMask (); + AddressEncMask =3D InternalGetMemEncryptionAddressMask (); =20 if (Mode =3D=3D SetCBit) { *PageTablePointer |=3D AddressEncMask; @@ -527,6 +527,7 @@ DisableReadOnlyPageWriteProtect ( /** Enable Write Protect on pages marked as read-only. **/ +STATIC VOID EnableReadOnlyPageWriteProtect ( VOID @@ -605,7 +606,7 @@ SetMemoryEncDec ( // // Check if we have a valid memory encryption mask // - AddressEncMask =3D GetMemEncryptionAddressMask (); + AddressEncMask =3D InternalGetMemEncryptionAddressMask (); if (!AddressEncMask) { return RETURN_ACCESS_DENIED; } diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c b/= OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c index 5c337ea0b820..bca5e3febb1b 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c @@ -13,6 +13,26 @@ =20 #include "VirtualMemory.h" =20 +/** + Return the pagetable memory encryption mask. + + @return The pagetable memory encryption mask. + +**/ +UINT64 +EFIAPI +InternalGetMemEncryptionAddressMask ( + VOID + ) +{ + UINT64 EncryptionMask; + + EncryptionMask =3D MemEncryptSevGetEncryptionMask (); + EncryptionMask &=3D PAGING_1G_ADDRESS_MASK_64; + + return EncryptionMask; +} + /** This function clears memory encryption bit for the memory region specifi= ed by PhysicalAddress and Length from the current page table context. diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c new file mode 100644 index 000000000000..36aabcf556a7 --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c @@ -0,0 +1,207 @@ +/** @file + + Virtual Memory Management Services to test an address range encryption s= tate + + Copyright (c) 2020, AMD Incorporated. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include + +#include "VirtualMemory.h" + +/** + Returns the (updated) address range state based upon the page table + entry. + + @param[in] CurrentState The current address range state + @param[in] PageDirectoryEntry The page table entry to check + @param[in] AddressEncMask The encryption mask + + @retval MemEncryptSevAddressRangeUnencrypted Address range is mapped + unencrypted + @retval MemEncryptSevAddressRangeEncrypted Address range is mapped + encrypted + @retval MemEncryptSevAddressRangeMixed Address range is mapped mi= xed +**/ +STATIC +MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE +UpdateAddressState ( + IN MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE CurrentState, + IN UINT64 PageDirectoryEntry, + IN UINT64 AddressEncMask + ) +{ + if (CurrentState =3D=3D MemEncryptSevAddressRangeEncrypted) { + if ((PageDirectoryEntry & AddressEncMask) =3D=3D 0) { + CurrentState =3D MemEncryptSevAddressRangeMixed; + } + } else if (CurrentState =3D=3D MemEncryptSevAddressRangeUnencrypted) { + if ((PageDirectoryEntry & AddressEncMask) !=3D 0) { + CurrentState =3D MemEncryptSevAddressRangeMixed; + } + } else if (CurrentState =3D=3D MemEncryptSevAddressRangeError) { + // + // First address check, set initial state + // + if ((PageDirectoryEntry & AddressEncMask) =3D=3D 0) { + CurrentState =3D MemEncryptSevAddressRangeUnencrypted; + } else { + CurrentState =3D MemEncryptSevAddressRangeEncrypted; + } + } + + return CurrentState; +} + +/** + Returns the encryption state of the specified virtual address range. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use + current CR3) + @param[in] BaseAddress Base address to check + @param[in] Length Length of virtual address range + + @retval MemEncryptSevAddressRangeUnencrypted Address range is mapped + unencrypted + @retval MemEncryptSevAddressRangeEncrypted Address range is mapped + encrypted + @retval MemEncryptSevAddressRangeMixed Address range is mapped mi= xed + @retval MemEncryptSevAddressRangeError Address range is not mapped +**/ +MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE +EFIAPI +InternalMemEncryptSevGetAddressRangeState ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN Length + ) +{ + PAGE_MAP_AND_DIRECTORY_POINTER *PageMapLevel4Entry; + PAGE_MAP_AND_DIRECTORY_POINTER *PageUpperDirectoryPointerEntry; + PAGE_MAP_AND_DIRECTORY_POINTER *PageDirectoryPointerEntry; + PAGE_TABLE_1G_ENTRY *PageDirectory1GEntry; + PAGE_TABLE_ENTRY *PageDirectory2MEntry; + PAGE_TABLE_4K_ENTRY *PageTableEntry; + UINT64 AddressEncMask; + UINT64 PgTableMask; + PHYSICAL_ADDRESS Address; + PHYSICAL_ADDRESS AddressEnd; + MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE State; + + // + // If Cr3BaseAddress is not specified then read the current CR3 + // + if (Cr3BaseAddress =3D=3D 0) { + Cr3BaseAddress =3D AsmReadCr3(); + } + + AddressEncMask =3D MemEncryptSevGetEncryptionMask (); + AddressEncMask &=3D PAGING_1G_ADDRESS_MASK_64; + + PgTableMask =3D AddressEncMask | EFI_PAGE_MASK; + + State =3D MemEncryptSevAddressRangeError; + + // + // Encryption is on a page basis, so start at the beginning of the + // virtual address page boundary and walk page-by-page. + // + Address =3D (PHYSICAL_ADDRESS) (UINTN) BaseAddress & ~EFI_PAGE_MASK; + AddressEnd =3D (PHYSICAL_ADDRESS) + (UINTN) (BaseAddress + Length); + + while (Address < AddressEnd) { + PageMapLevel4Entry =3D (VOID*) (Cr3BaseAddress & ~PgTableMask); + PageMapLevel4Entry +=3D PML4_OFFSET (Address); + if (!PageMapLevel4Entry->Bits.Present) { + return MemEncryptSevAddressRangeError; + } + + PageDirectory1GEntry =3D (VOID *) ( + (PageMapLevel4Entry->Bits.PageTableBaseAddres= s << + 12) & ~PgTableMask + ); + PageDirectory1GEntry +=3D PDP_OFFSET (Address); + if (!PageDirectory1GEntry->Bits.Present) { + return MemEncryptSevAddressRangeError; + } + + // + // If the MustBe1 bit is not 1, it's not actually a 1GB entry + // + if (PageDirectory1GEntry->Bits.MustBe1) { + // + // Valid 1GB page + // + State =3D UpdateAddressState ( + State, + PageDirectory1GEntry->Uint64, + AddressEncMask + ); + + Address +=3D BIT30; + continue; + } + + // + // Actually a PDP + // + PageUpperDirectoryPointerEntry =3D + (PAGE_MAP_AND_DIRECTORY_POINTER *) PageDirectory1GEntry; + PageDirectory2MEntry =3D + (VOID *) ( + (PageUpperDirectoryPointerEntry->Bits.PageTableBaseAddress << + 12) & ~PgTableMask + ); + PageDirectory2MEntry +=3D PDE_OFFSET (Address); + if (!PageDirectory2MEntry->Bits.Present) { + return MemEncryptSevAddressRangeError; + } + + // + // If the MustBe1 bit is not a 1, it's not a 2MB entry + // + if (PageDirectory2MEntry->Bits.MustBe1) { + // + // Valid 2MB page + // + State =3D UpdateAddressState ( + State, + PageDirectory2MEntry->Uint64, + AddressEncMask + ); + + Address +=3D BIT21; + continue; + } + + // + // Actually a PMD + // + PageDirectoryPointerEntry =3D + (PAGE_MAP_AND_DIRECTORY_POINTER *)PageDirectory2MEntry; + PageTableEntry =3D + (VOID *)( + (PageDirectoryPointerEntry->Bits.PageTableBaseAddress << + 12) & ~PgTableMask + ); + PageTableEntry +=3D PTE_OFFSET (Address); + if (!PageTableEntry->Bits.Present) { + return MemEncryptSevAddressRangeError; + } + + State =3D UpdateAddressState ( + State, + PageTableEntry->Uint64, + AddressEncMask + ); + + Address +=3D EFI_PAGE_SIZE; + } + + return State; +} --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68909): https://edk2.groups.io/g/devel/message/68909 Mute This Topic: https://groups.io/mt/78986176/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68910+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+68910+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 1608065575690117.70617805157497; Tue, 15 Dec 2020 12:52:55 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id a5jNYY1788612x2QJQ4Yidjc; Tue, 15 Dec 2020 12:52:55 -0800 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.76]) by mx.groups.io with SMTP id smtpd.web11.2921.1608065569831172631 for ; Tue, 15 Dec 2020 12:52:50 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mSUCVEsggoXlDTtMAKMRUZlln3Xhehtj10jCVy1bHBSel/kns7RkQz/ylKinIK6GmUhWc7eHg+Fp7TBb2Lw2NgyjTgMtJjBd8SxdLisodH1fMH1M7TEJYXW0XP3+QiAG7l1RI3JtVix0SdBUODQoB2SKQcvNiroiLRNN4wnOPmBZUhFa61UQKY5y9fR/pjGXKFS23+yenRNWDjgGlNDeGU94k1Pqtikj6bJKyyibjD5I+EBXrMKFbo/iFJjFm5FiS569FoXHK1kJAZmyjS2MzHZ4G95mCACN8tY6qLzh4WTy6IVU3nnZmb7Ay451qV+P9aF9tYPVzmoG5aKeYPvbVg== 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=ucf0PrV9wVTDTI6RbUlRhSXT/2DUBfX6QoNkxvQWEtI=; b=jwppT9twx4rkMr3bNx+4ZGgxr3PiCWVs8QDMM4TzxdmjdDBHJayOaUhn0xpUlqNxp4qnKAqQ3OSoJWulqdYHKrHQAoeld1FLsTvjtbHk5oQsdGXOccMDdcrkfDsI5qpNfeEGfaG9ordjj+doWvwcNpKYIH8vojpfy5AYhrIuiqlrlYoXeFKIR8X6ueHgBZ0Ti7uGmX57oom+0GLTcL1sw45nsmm4jGVenA0RhHUXWj5+Kalp/t1kyDy0Qs3t3uWAsQ08CFbDKj0YmWwUyCv3x0yaDt73lmwZd5+asn2bl7lAe3Sn0kSsiJcAp1bpVaJyd119l9rb4gjfih/ER8l8dg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:52:47 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:52:47 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 10/12] OvmfPkg/VmgExitLib: Support nested #VCs Date: Tue, 15 Dec 2020 14:51:09 -0600 Message-ID: <8d981134522af3a1efa222b12f36d5e831f88f2e.1608065471.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:610:59::16) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR03CA0006.namprd03.prod.outlook.com (2603:10b6:610:59::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:52:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 89756895-dad9-4a50-53ce-08d8a13b60b1 X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: kRDLfARKeRCVVVovlEUWSoYIBeOS2yxoqMMlC7zheZkA4S7LGBLVXulCk4+JxrhV+P+v/FmYOGJPsfHmVleFwWrmcimeyWSNW/s4IIaoNBi4LMI5RTkMac9FtN+alhdKE8X/Hu3w2dOtxHhVGsxE2CRw/gn6jvvRnxPMwOOzJ/cSFNqiLGmkrg+Uke5y/yTXCkrFZrONu8xryo4EnvgZTlLxwEGJzZbUDNVmqE/xs1T5Ky/bJjOE9tAJ7iXt4/LhP2hhD3jYDLwJn9mhk4xX5SXhSAylhv6I3WackWhSUJeQVnbivu79z3jHmF8Or08vxJE656ysLoaO2RgcjJSHXi/W9hj4/K8fPe6kzKgxxoYf19Rf16kqNhPNJcdf1TuBeQEifRPq5BdEvtXJ85EQ7GkpSCUrn2m83z4SNmLOe2PN8y9d/jBwnHjT/Y3fAmQ2r567tuYXyY2lhTE9SFTvKw== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?NCZCxGgOyc1osjcNoV/7VlUNAODDBFVnW3gIdy1oIsIKsmVHAX3XBsUNfoA5?= =?us-ascii?Q?oeSMWCn2+YiYew4jmYt86pXuUZCFuShlQptfKCjADANS9LWsP1fEqjLcr2jt?= =?us-ascii?Q?YPuW6nshBYiHT0cElH65JuN9ZQfhO19qQ9Qk7HiP3KGPgwmuhFMCCiD2/5pR?= =?us-ascii?Q?rtuVam8qvEgAsS957pbAPsR4xtV/hRTHXDUf8UL0cGoPKQXMF89G49cCLG3a?= =?us-ascii?Q?ixR3SzrA5IZpsZhb+EW7C1FMLoLpMpUUtUCq0Ri2clOt+WZyMEurGNBa4Qer?= =?us-ascii?Q?Ol/bKSCZJpHOPlmUvQeWPB1Fe1an+knlIY6ZJujTsVbQP32bjCOIWJnmcRax?= =?us-ascii?Q?5SzYRQM2dNmTVl8T0Uv0wZz3Qmewy5tyuczLtfa/sf8X5x5woZQ5o8MxO82B?= =?us-ascii?Q?WpLaeIoL8xGC6zXkrqTd1edPEdv/35351GUDBvJR0ziU320LctZVpeQt8ZWD?= =?us-ascii?Q?60WKhm/o/9Ng4xiSYwkNbrQ37hYjzMEAcatlq5d7y6c/at861MVPbqXdKSiu?= =?us-ascii?Q?VMtOrqZkmMX5fZ5OEOrgT6dCWw+PosJdlDZ6A3Wu0NPwWMbR3h9f4OxNrCrz?= =?us-ascii?Q?NUJjnm//Tujz6vs/YsxA+tZPEakPq+FXJPav27om1Bt7/7q7y9O7BgXRuwl3?= =?us-ascii?Q?z61rAZRgQC1YP908arDJMyNEHlH2oHvvxyplw1kjRavBhVhk19BijPAsf4e8?= =?us-ascii?Q?ZHNa2MyLY4jC5VjA0+ZwjcwnprSLYpix/Jg/2HZ0tOPPa9GjpStxEtTjXdH+?= =?us-ascii?Q?F8tQG0s08qMNpW45zycacmQUdlYPxU/piWJiptbKe6BkM9yFc3hR1bi0/9HE?= =?us-ascii?Q?3j4gEs+Pmsv070tzwThZnhVr7LoR9gxozDK896smNlvCoN8kOba7T3pS9web?= =?us-ascii?Q?wr3qdGs+EX1A4HPXCVUeXPDW3E14jmyXtNKDnx85ciYkoeEMREuJ5Mqul9vf?= =?us-ascii?Q?bvwypzfAKgtWMbiqcWaiNt7KIyZHjoJCWEB36HZ3iGFqPMDHo6R4E9+5Pxwr?= =?us-ascii?Q?IU8D?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:52:46.9282 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 89756895-dad9-4a50-53ce-08d8a13b60b1 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: s+OUR+0lDitOXaxvFPABG9vXw+lOjgc8Yf9uWqi8L2D0YZZYbbAYHZuL5eVmzVVNZyB0Ef80xz+BXAA4qCTRBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: KNCTP5EfckJE2Uwpr3MIW5tGx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065575; bh=03wZ8+UEt1vbQpetEdHxHF+3YMm+2LJZEeQs5NAGhN0=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=XPEOjVdFY4ucwVmHtjH7hLqJiPshWJudrr6Km1/kT5eOSiZwysxDFS2Kkjy/R1sdunC IymJ3o3znFas+3cLWowcSjch8JouENF8HHGnPHuNWj6uUkXqy2RT7W+w61/SVlYZxbi4v ol5rDrZqzfuH2X846ZzjqdYwxvrrtXFpDrg= 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=3D3108 In order to be able to issue messages or make interface calls that cause another #VC (e.g. GetLocalApicBaseAddress () issues RDMSR), add support for nested #VCs. In order to support nested #VCs, GHCB backup pages are required. If a #VC is received while currently processing a #VC, a backup of the current GHCB content is made. This allows the #VC handler to continue processing the new #VC. Upon completion of the new #VC, the GHCB is restored from the backup page. The #VC recursion level is tracked in the per-vCPU variable area. Support is added to handle up to one nested #VC (or two #VCs total). If a second nested #VC is encountered, an ASSERT will be issued and the vCPU will enter CpuDeadLoop (). For SEC, the GHCB backup pages are reserved in the OvmfPkgX64.fdf memory layout, with two new fixed PCDs to provide the address and size of the backup area. For PEI/DXE, the GHCB backup pages are allocated as boot services pages using the memory allocation library. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky Acked-by: Laszlo Ersek --- OvmfPkg/OvmfPkg.dec | 2 + OvmfPkg/AmdSev/AmdSevX64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + OvmfPkg/AmdSev/AmdSevX64.fdf | 3 + OvmfPkg/OvmfPkgX64.fdf | 3 + OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf | 43 +++++++ OvmfPkg/Library/VmgExitLib/VmgExitLib.inf | 4 +- OvmfPkg/Include/Library/MemEncryptSevLib.h | 23 ++++ OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.h | 53 +++++++++ .../VmgExitLib/PeiDxeVmgExitVcHandler.c | 103 +++++++++++++++++ .../Library/VmgExitLib/SecVmgExitVcHandler.c | 109 ++++++++++++++++++ OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 48 ++++---- OvmfPkg/PlatformPei/AmdSev.c | 38 +++++- 13 files changed, 404 insertions(+), 27 deletions(-) create mode 100644 OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf create mode 100644 OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.h create mode 100644 OvmfPkg/Library/VmgExitLib/PeiDxeVmgExitVcHandler.c create mode 100644 OvmfPkg/Library/VmgExitLib/SecVmgExitVcHandler.c diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 8a294116efaa..9731f09381a9 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -304,6 +304,8 @@ [PcdsFixedAtBuild] ## The base address of the SEC GHCB page used by SEV-ES. gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBase|0|UINT32|0x40 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbSize|0|UINT32|0x41 + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupBase|0|UINT32|0x44 + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize|0|UINT32|0x45 =20 ## The base address and size of the SEV Launch Secret Area provisioned # after remote attestation. If this is set in the .fdf, the platform diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index c742ec54cb57..3e5a3f648ad5 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -236,6 +236,7 @@ [LibraryClasses.common.SEC] !else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf !endif + VmgExitLib|OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf =20 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 3e008855fbc1..226b576545a9 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -264,6 +264,7 @@ [LibraryClasses.common.SEC] !else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf !endif + VmgExitLib|OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf =20 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index e8fd4b8c7b89..c0098502aa90 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -62,6 +62,9 @@ [FD.MEMFD] 0x00C000|0x001000 gUefiOvmfPkgTokenSpaceGuid.PcdSevLaunchSecretBase|gUefiOvmfPkgTokenSpaceGu= id.PcdSevLaunchSecretSize =20 +0x00D000|0x001000 +gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecGhcbBackupSize + 0x010000|0x010000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecPeiTempRamSize =20 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 17ba9e177ac3..31fe58566bb5 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -85,6 +85,9 @@ [FD.MEMFD] 0x00B000|0x001000 gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase|gUefiCpuPkgTokenSpaceGuid.P= cdSevEsWorkAreaSize =20 +0x00C000|0x001000 +gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecGhcbBackupSize + 0x010000|0x010000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecPeiTempRamSize =20 diff --git a/OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf b/OvmfPkg/Library= /VmgExitLib/SecVmgExitLib.inf new file mode 100644 index 000000000000..df14de3c21bc --- /dev/null +++ b/OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf @@ -0,0 +1,43 @@ +## @file +# VMGEXIT Support Library. +# +# Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved. +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION =3D 0x00010005 + BASE_NAME =3D SecVmgExitLib + FILE_GUID =3D dafff819-f86c-4cff-a70e-83161e5bcf9a + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D VmgExitLib|SEC + +# +# The following information is for reference only and not required by the = build tools. +# +# VALID_ARCHITECTURES =3D X64 +# + +[Sources.common] + VmgExitLib.c + VmgExitVcHandler.c + VmgExitVcHandler.h + SecVmgExitVcHandler.c + +[Packages] + MdePkg/MdePkg.dec + OvmfPkg/OvmfPkg.dec + UefiCpuPkg/UefiCpuPkg.dec + +[LibraryClasses] + BaseLib + BaseMemoryLib + DebugLib + PcdLib + +[FixedPcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize + diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitLib.inf b/OvmfPkg/Library/Vm= gExitLib/VmgExitLib.inf index d003ac63173e..b3c3e56ecff8 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitLib.inf +++ b/OvmfPkg/Library/VmgExitLib/VmgExitLib.inf @@ -12,7 +12,7 @@ [Defines] FILE_GUID =3D 0e923c25-13cd-430b-8714-ffe85652a97b MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D VmgExitLib + LIBRARY_CLASS =3D VmgExitLib|PEIM DXE_CORE DXE_DRIVER D= XE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_DRIVER =20 # # The following information is for reference only and not required by the = build tools. @@ -23,6 +23,8 @@ [Defines] [Sources.common] VmgExitLib.c VmgExitVcHandler.c + VmgExitVcHandler.h + PeiDxeVmgExitVcHandler.c =20 [Packages] MdePkg/MdePkg.dec diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h index 421b2e2c2c1e..eb400387e8e2 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -13,6 +13,29 @@ =20 #include =20 +// +// Define the maximum number of #VCs allowed (e.g. the level of nesting +// that is allowed =3D> 2 allows for 1 nested #VCs). I this value is chang= ed, +// be sure to increase the size of +// gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize +// in any FDF file using this PCD. +// +#define VMGEXIT_MAXIMUM_VC_COUNT 2 + +// +// Per-CPU data mapping structure +// Use UINT32 for cached indicators and compare to a specific value +// so that the hypervisor can't indicate a value is cached by just +// writing random data to that area. +// +typedef struct { + UINT32 Dr7Cached; + UINT64 Dr7; + + UINTN VcCount; + VOID *GhcbBackupPages; +} SEV_ES_PER_CPU_DATA; + // // Internal structure for holding SEV-ES information needed during SEC pha= se // and valid only during SEC phase and early PEI during platform diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.h b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.h new file mode 100644 index 000000000000..3a37cb04f616 --- /dev/null +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.h @@ -0,0 +1,53 @@ +/** @file + X64 #VC Exception Handler functon header file. + + Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef __VMG_EXIT_VC_HANDLER_H__ +#define __VMG_EXIT_VC_HANDLER_H__ + +#include +#include +#include + +/** + Handle a #VC exception. + + Performs the necessary processing to handle a #VC exception. + + @param[in, out] Ghcb Pointer to the GHCB + @param[in, out] ExceptionType Pointer to an EFI_EXCEPTION_TYPE to be s= et + as value to use on error. + @param[in, out] SystemContext Pointer to EFI_SYSTEM_CONTEXT + + @retval EFI_SUCCESS Exception handled + @retval EFI_UNSUPPORTED #VC not supported, (new) exception value= to + propagate provided + @retval EFI_PROTOCOL_ERROR #VC handling failed, (new) exception val= ue to + propagate provided + +**/ +EFI_STATUS +EFIAPI +InternalVmgExitHandleVc ( + IN OUT GHCB *Ghcb, + IN OUT EFI_EXCEPTION_TYPE *ExceptionType, + IN OUT EFI_SYSTEM_CONTEXT SystemContext + ); + +/** + Routine to allow ASSERT from within #VC. + + @param[in, out] SevEsData Pointer to the per-CPU data + +**/ +VOID +EFIAPI +VmgExitIssueAssert ( + IN OUT SEV_ES_PER_CPU_DATA *SevEsData + ); + +#endif diff --git a/OvmfPkg/Library/VmgExitLib/PeiDxeVmgExitVcHandler.c b/OvmfPkg/= Library/VmgExitLib/PeiDxeVmgExitVcHandler.c new file mode 100644 index 000000000000..fb4942df37ca --- /dev/null +++ b/OvmfPkg/Library/VmgExitLib/PeiDxeVmgExitVcHandler.c @@ -0,0 +1,103 @@ +/** @file + X64 #VC Exception Handler functon. + + Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include +#include +#include +#include + +#include "VmgExitVcHandler.h" + +/** + Handle a #VC exception. + + Performs the necessary processing to handle a #VC exception. + + @param[in, out] ExceptionType Pointer to an EFI_EXCEPTION_TYPE to be s= et + as value to use on error. + @param[in, out] SystemContext Pointer to EFI_SYSTEM_CONTEXT + + @retval EFI_SUCCESS Exception handled + @retval EFI_UNSUPPORTED #VC not supported, (new) exception value= to + propagate provided + @retval EFI_PROTOCOL_ERROR #VC handling failed, (new) exception val= ue to + propagate provided + +**/ +EFI_STATUS +EFIAPI +VmgExitHandleVc ( + IN OUT EFI_EXCEPTION_TYPE *ExceptionType, + IN OUT EFI_SYSTEM_CONTEXT SystemContext + ) +{ + MSR_SEV_ES_GHCB_REGISTER Msr; + GHCB *Ghcb; + GHCB *GhcbBackup; + EFI_STATUS VcRet; + BOOLEAN InterruptState; + SEV_ES_PER_CPU_DATA *SevEsData; + + InterruptState =3D GetInterruptState (); + if (InterruptState) { + DisableInterrupts (); + } + + Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); + ASSERT (Msr.GhcbInfo.Function =3D=3D 0); + ASSERT (Msr.Ghcb !=3D 0); + + Ghcb =3D Msr.Ghcb; + GhcbBackup =3D NULL; + + SevEsData =3D (SEV_ES_PER_CPU_DATA *) (Ghcb + 1); + SevEsData->VcCount++; + + // + // Check for maximum PEI/DXE #VC nesting. + // + if (SevEsData->VcCount > VMGEXIT_MAXIMUM_VC_COUNT) { + VmgExitIssueAssert (SevEsData); + } else if (SevEsData->VcCount > 1) { + // + // Nested #VC + // + if (SevEsData->GhcbBackupPages =3D=3D NULL) { + VmgExitIssueAssert (SevEsData); + } + + // + // Save the active GHCB to a backup page. + // To access the correct backup page, increment the backup page poin= ter + // based on the current VcCount. + // + GhcbBackup =3D (GHCB *) SevEsData->GhcbBackupPages; + GhcbBackup +=3D (SevEsData->VcCount - 2); + + CopyMem (GhcbBackup, Ghcb, sizeof (*Ghcb)); + } + + VcRet =3D InternalVmgExitHandleVc (Ghcb, ExceptionType, SystemContext); + + if (GhcbBackup !=3D NULL) { + // + // Restore the active GHCB from the backup page. + // + CopyMem (Ghcb, GhcbBackup, sizeof (*Ghcb)); + } + + SevEsData->VcCount--; + + if (InterruptState) { + EnableInterrupts (); + } + + return VcRet; +} diff --git a/OvmfPkg/Library/VmgExitLib/SecVmgExitVcHandler.c b/OvmfPkg/Lib= rary/VmgExitLib/SecVmgExitVcHandler.c new file mode 100644 index 000000000000..85853d334b35 --- /dev/null +++ b/OvmfPkg/Library/VmgExitLib/SecVmgExitVcHandler.c @@ -0,0 +1,109 @@ +/** @file + X64 #VC Exception Handler functon. + + Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include +#include +#include +#include + +#include "VmgExitVcHandler.h" + +/** + Handle a #VC exception. + + Performs the necessary processing to handle a #VC exception. + + @param[in, out] ExceptionType Pointer to an EFI_EXCEPTION_TYPE to be s= et + as value to use on error. + @param[in, out] SystemContext Pointer to EFI_SYSTEM_CONTEXT + + @retval EFI_SUCCESS Exception handled + @retval EFI_UNSUPPORTED #VC not supported, (new) exception value= to + propagate provided + @retval EFI_PROTOCOL_ERROR #VC handling failed, (new) exception val= ue to + propagate provided + +**/ +EFI_STATUS +EFIAPI +VmgExitHandleVc ( + IN OUT EFI_EXCEPTION_TYPE *ExceptionType, + IN OUT EFI_SYSTEM_CONTEXT SystemContext + ) +{ + MSR_SEV_ES_GHCB_REGISTER Msr; + GHCB *Ghcb; + GHCB *GhcbBackup; + EFI_STATUS VcRet; + BOOLEAN InterruptState; + SEV_ES_PER_CPU_DATA *SevEsData; + + InterruptState =3D GetInterruptState (); + if (InterruptState) { + DisableInterrupts (); + } + + Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); + ASSERT (Msr.GhcbInfo.Function =3D=3D 0); + ASSERT (Msr.Ghcb !=3D 0); + + Ghcb =3D Msr.Ghcb; + GhcbBackup =3D NULL; + + SevEsData =3D (SEV_ES_PER_CPU_DATA *) (Ghcb + 1); + SevEsData->VcCount++; + + // + // Check for maximum SEC #VC nesting. + // + if (SevEsData->VcCount > VMGEXIT_MAXIMUM_VC_COUNT) { + VmgExitIssueAssert (SevEsData); + } else if (SevEsData->VcCount > 1) { + UINTN GhcbBackupSize; + + // + // Be sure that the proper amount of pages are allocated + // + GhcbBackupSize =3D (VMGEXIT_MAXIMUM_VC_COUNT - 1) * sizeof (*Ghcb); + if (GhcbBackupSize > FixedPcdGet32 (PcdOvmfSecGhcbBackupSize)) { + // + // Not enough SEC backup pages allocated. + // + VmgExitIssueAssert (SevEsData); + } + + // + // Save the active GHCB to a backup page. + // To access the correct backup page, increment the backup page poin= ter + // based on the current VcCount. + // + GhcbBackup =3D (GHCB *) FixedPcdGet32 (PcdOvmfSecGhcbBackupBase); + GhcbBackup +=3D (SevEsData->VcCount - 2); + + CopyMem (GhcbBackup, Ghcb, sizeof (*Ghcb)); + } + + VcRet =3D InternalVmgExitHandleVc (Ghcb, ExceptionType, SystemContext); + + if (GhcbBackup !=3D NULL) { + // + // Restore the active GHCB from the backup page. + // + CopyMem (Ghcb, GhcbBackup, sizeof (*Ghcb)); + } + + SevEsData->VcCount--; + + if (InterruptState) { + EnableInterrupts (); + } + + return VcRet; +} diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index 5149ab2bc989..ce577e4677eb 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -9,11 +9,14 @@ #include #include #include +#include #include #include #include #include =20 +#include "VmgExitVcHandler.h" + // // Instruction execution mode definition // @@ -126,18 +129,6 @@ UINT64 SEV_ES_INSTRUCTION_DATA *InstructionData ); =20 -// -// Per-CPU data mapping structure -// Use UINT32 for cached indicators and compare to a specific value -// so that the hypervisor can't indicate a value is cached by just -// writing random data to that area. -// -typedef struct { - UINT32 Dr7Cached; - UINT64 Dr7; -} SEV_ES_PER_CPU_DATA; - - /** Return a pointer to the contents of the specified register. =20 @@ -1546,6 +1537,7 @@ Dr7ReadExit ( =20 Performs the necessary processing to handle a #VC exception. =20 + @param[in, out] Ghcb Pointer to the GHCB @param[in, out] ExceptionType Pointer to an EFI_EXCEPTION_TYPE to be s= et as value to use on error. @param[in, out] SystemContext Pointer to EFI_SYSTEM_CONTEXT @@ -1559,14 +1551,13 @@ Dr7ReadExit ( **/ EFI_STATUS EFIAPI -VmgExitHandleVc ( +InternalVmgExitHandleVc ( + IN OUT GHCB *Ghcb, IN OUT EFI_EXCEPTION_TYPE *ExceptionType, IN OUT EFI_SYSTEM_CONTEXT SystemContext ) { - MSR_SEV_ES_GHCB_REGISTER Msr; EFI_SYSTEM_CONTEXT_X64 *Regs; - GHCB *Ghcb; NAE_EXIT NaeExit; SEV_ES_INSTRUCTION_DATA InstructionData; UINT64 ExitCode, Status; @@ -1575,12 +1566,7 @@ VmgExitHandleVc ( =20 VcRet =3D EFI_SUCCESS; =20 - Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); - ASSERT (Msr.GhcbInfo.Function =3D=3D 0); - ASSERT (Msr.Ghcb !=3D 0); - Regs =3D SystemContext.SystemContextX64; - Ghcb =3D Msr.Ghcb; =20 VmgInit (Ghcb, &InterruptState); =20 @@ -1670,3 +1656,25 @@ VmgExitHandleVc ( =20 return VcRet; } + +/** + Routine to allow ASSERT from within #VC. + + @param[in, out] SevEsData Pointer to the per-CPU data + +**/ +VOID +EFIAPI +VmgExitIssueAssert ( + IN OUT SEV_ES_PER_CPU_DATA *SevEsData + ) +{ + // + // Progress will be halted, so set VcCount to allow for ASSERT output + // to be seen. + // + SevEsData->VcCount =3D 0; + + ASSERT (FALSE); + CpuDeadLoop (); +} diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index 954d53eba4e8..dddffdebda4b 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -33,12 +33,17 @@ AmdSevEsInitialize ( VOID ) { - VOID *GhcbBase; - PHYSICAL_ADDRESS GhcbBasePa; - UINTN GhcbPageCount, PageCount; - RETURN_STATUS PcdStatus, DecryptStatus; - IA32_DESCRIPTOR Gdtr; - VOID *Gdt; + UINT8 *GhcbBase; + PHYSICAL_ADDRESS GhcbBasePa; + UINTN GhcbPageCount; + UINT8 *GhcbBackupBase; + UINT8 *GhcbBackupPages; + UINTN GhcbBackupPageCount; + SEV_ES_PER_CPU_DATA *SevEsData; + UINTN PageCount; + RETURN_STATUS PcdStatus, DecryptStatus; + IA32_DESCRIPTOR Gdtr; + VOID *Gdt; =20 if (!MemEncryptSevEsIsEnabled ()) { return; @@ -84,6 +89,27 @@ AmdSevEsInitialize ( "SEV-ES is enabled, %lu GHCB pages allocated starting at 0x%p\n", (UINT64)GhcbPageCount, GhcbBase)); =20 + // + // Allocate #VC recursion backup pages. The number of backup pages neede= d is + // one less than the maximum VC count. + // + GhcbBackupPageCount =3D mMaxCpuCount * (VMGEXIT_MAXIMUM_VC_COUNT - 1); + GhcbBackupBase =3D AllocatePages (GhcbBackupPageCount); + ASSERT (GhcbBackupBase !=3D NULL); + + GhcbBackupPages =3D GhcbBackupBase; + for (PageCount =3D 1; PageCount < GhcbPageCount; PageCount +=3D 2) { + SevEsData =3D + (SEV_ES_PER_CPU_DATA *)(GhcbBase + EFI_PAGES_TO_SIZE (PageCount)); + SevEsData->GhcbBackupPages =3D GhcbBackupPages; + + GhcbBackupPages +=3D EFI_PAGE_SIZE * (VMGEXIT_MAXIMUM_VC_COUNT - 1); + } + + DEBUG ((DEBUG_INFO, + "SEV-ES is enabled, %lu GHCB backup pages allocated starting at 0x%p\n= ", + (UINT64)GhcbBackupPageCount, GhcbBackupBase)); + AsmWriteMsr64 (MSR_SEV_ES_GHCB, GhcbBasePa); =20 // --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68910): https://edk2.groups.io/g/devel/message/68910 Mute This Topic: https://groups.io/mt/78986180/1787277 Mute #vcs:https://edk2.groups.io/g/devel/mutehashtag/vcs 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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68911+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+68911+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 1608065578326611.5928589310417; Tue, 15 Dec 2020 12:52:58 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id si3vYY1788612xA3IY4xmQPA; Tue, 15 Dec 2020 12:52:57 -0800 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.83]) by mx.groups.io with SMTP id smtpd.web11.2925.1608065577587608720 for ; Tue, 15 Dec 2020 12:52:57 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=muokHvDl7y5XwMOT4ZTq4ixTYWeEmOFVouaYIgBrBW6B8hwGKces6nm2It7YV8nVF4grSA/WAVJf3+vkN/WceBqXLLAMkfVM7R0q90pZKA0z+VcCI+VdVwCqbzyJSDWJg52tBzCjsAm7xxwIw/kAmp+xDwYkaovPB/MJlXG/qywn01pQ15fus+8xqaPWBUI9jzUn5RgJ0l7caTY0o5O9VkUbJ+spTFg2Vf4ZlupRoh7MbYwD5nNU98xXgiG+L+CZ3wrx7xwuyImUWWXLe0X8y818HDQkRHQq3Xnxp6r0s0HdLv9Fpx9gP7SyckumQ3oIy+H4tj4/Gdb5aukpzGh4jQ== 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=yQEgagDEeKwAQVEjA6tJNseRNmPXZb5+++558chndg0=; b=TEgeA5dHkXVJySMAMb7ff2x0PMxe9kz6ocuvAdgmd9ZV+YEOKFMKgnK03gxq+5cKqVc0NQlRi4ePDIQX1UrobVOfxol9WL5TcSb6n6LPYfeVZFaDlWRP1ly57GcCM+UmTW8v3Ua5Gz/3W41+NTYVtreJemnZG5SQ0vlww0/ewWRJ8S9RsfIBGZlb6De+BgvrdkhwRtnAUdNaTHPGSwz6oxQaNSa8ukDqpf9v/kJF/iwS6qLDgdd1CguT01PWfQh405k+TPWvecManDmwVcWb/kXugj6khD3J25QB12bYFuVU33MXqF9Qgdtc9PtkyJAwQCFYdKQJRMl2kDt1pzU80w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:52:55 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:52:55 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Anthony Perard , Julien Grall Subject: [edk2-devel] [PATCH 11/12] OvmfPkg/PlatformPei: Reserve GHCB backup pages if S3 is supported Date: Tue, 15 Dec 2020 14:51:10 -0600 Message-ID: In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR03CA0025.namprd03.prod.outlook.com (2603:10b6:610:59::35) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR03CA0025.namprd03.prod.outlook.com (2603:10b6:610:59::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:52:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a82a7ac7-118e-4e93-8f3e-08d8a13b6576 X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: 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: qrkWPiNZnR4QcEQhlrBzYsJZQ/wRHbfEO4jfyLeA904m9mNwsI5ZNLQF003P5p25d8jGtT9zlBfeio6bOM1KIbI6x2y2d2060lZp2xoCE2Xt88w7Vl+v3GMVdUZNU+q7cG4UcyyjidWmtL5jFkTs5vDuVgyE6g6R7e2KoIo+EYkd9N8CtHolB937ke4Vhm3E+0f9cSmPCjJHmkJ7BMQ7+/+CfoQrvz/62DKptaQwU2hnQnNyaTe1/nXFs3O5IWndZsGJyoUI7KEFZuBBvmjW2sOFXOkTovGx1uytx5R+KyKpGKpaDcQomB8GQIJjvFXo6ZvQ0wfMymBKya0ziu4feq49aYEgPHQ5v/kE7eVOSRy3fqTLcRIlE7Y5DNc4jDGY/z6+nuiDw5ZWuoIXihb8KDyAoCGgPXwRNPNkSvdwb8t4bQ1Co+szH7Tat7PaqdWlxpIQmhaz5bEE9knu87cgJw== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?wBy5xyGNAH5kd1kGq+7+brxooOnn0/HSE08EpGJf6HA3zvwOKmNpSBiqGHM5?= =?us-ascii?Q?X+2wj4aMHZuaggaz9z9tcNPI2aVJ4zimz1QCwoG9GGUFmr8V3U0wNDSolisU?= =?us-ascii?Q?1DB9TWeuNUKDzYjtEDzU1DpTAsXtim0bkIbqrZcHkX/k29Eftcz5J6dqR/iZ?= =?us-ascii?Q?ls8mmvHJLMVFWxl8XdxvwC58ZmXBn+SIKuZ5D+dIYDw7xc9Q0H1bfrC+FFIB?= =?us-ascii?Q?786JfPhsDvCdvi6QPcjNE+438wyHc+eefN8rDXGy8HYhiSZaQGTMIdKLc77E?= =?us-ascii?Q?Zu9hK3Z5L9wNzK8szAmbXWjxDoDRsPXRbWqWSgHSJL0eYfLLTtDffMVLtJ8L?= =?us-ascii?Q?Px28rw0Niht3JYyY0l8z9olR/A2Ecf7dZp3DqPJoW8xdefw3YAjoaL1TDLa4?= =?us-ascii?Q?EPhVeZ0TkTeDqZcdX5gcycVVEbd3fOuyKAe3FFCJRMCWj6ceRK5xK9gygNKW?= =?us-ascii?Q?dyAxlXu+meYS77IxzdyIBcfst7tFKj8Rt+vongVPobiK82BSDVC2XtLbwinN?= =?us-ascii?Q?6L09O+/YZhyAhIbEJ3n1GYT/x5cE1XqUm0R3P7VTHRWy5jas6kZc15OQkp7/?= =?us-ascii?Q?SsAvR9++1bj9jVGfiXLvmt1iqtN0pwkx6+PABgWpXqvPCfx6h8h2LHEMgUL3?= =?us-ascii?Q?SQOAe6BHwb6RRuNXWe7QEsLReylJz52jmlBHfZK8kfDzyTuIEg+YBn2zoX8w?= =?us-ascii?Q?/HqeOOCybh5Dxe1T3Pl80iBMWqEd6ILhH7z34M1eR5TmuGv7+1juyDtFZ9Hx?= =?us-ascii?Q?xiKzAXzDmjNl4cktdEqdlGGXnB/DaloWB1Cae7hLFf7/PV9wQKycCXIChvzG?= =?us-ascii?Q?NHxzPV9zo+G5wK0XVyR0El6Ri25j/+mDsQA+kwGyEnokVs+wcU6LfT28hLkg?= =?us-ascii?Q?E+4eus7BHSHSxhuKovT3EZIGED3z1K33Uhlo84c91yd0vqFRBlK1IktbdS+2?= =?us-ascii?Q?eQue+VKvKAQGuS8sKqXgwGlMLdeKaObqAHU0pfEu/rX6+oCVCXlV9u0UydS8?= =?us-ascii?Q?wzBn?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:52:54.8497 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: a82a7ac7-118e-4e93-8f3e-08d8a13b6576 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Yf7lxWiZyRk75OmqV1MUpZ7xOAG4j2kI0F1rtQ+mOeeELy1u+jCASpKwclconMqmGNFho/xn1Oc7+i1ltfnxHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: Mc6r4oB2TdNqXLy3wKWHOcOGx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065577; bh=O/kpckJvrssKlBXd1qFmXo0ZdTItDeyLK6W2q+g0Zik=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=q/q5hUQQemVvDn7GpTezoW8urTL6y+9slXZHIglCi/+yOVdtkYqNie7QF9TzNGDft6f m/vm0w0hqS7jf+amsl7dtlkprvcb4hyuCueCV4NNHSYDvI/l5TLqn+S9o6j/Pyi+3FQrl +WSaVnVVV4As/SKsy+tszx8CIFW9XFXi4dg= 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=3D3108 Protect the GHCB backup pages used by an SEV-ES guest when S3 is supported. Regarding the lifecycle of the GHCB backup pages: PcdOvmfSecGhcbBackupBase (a) when and how it is initialized after first boot of the VM If SEV-ES is enabled, the GHCB backup pages when a nested #VC is received during the SEC phase [OvmfPkg/Library/VmgExitLib/SecVmgExitVcHandler.c]. (b) how it is protected from memory allocations during DXE If S3 and SEV-ES are enabled, then InitializeRamRegions() [OvmfPkg/PlatformPei/MemDetect.c] protects the ranges with an AcpiNVS memory allocation HOB, in PEI. If S3 is disabled, then these ranges are not protected. PEI switches to the GHCB backup pages in permanent PEI memory and DXE will use these PEI GHCB backup pages, so we don't have to preserve PcdOvmfSecGhcbBackupBase. (c) how it is protected from the OS If S3 is enabled, then (b) reserves it from the OS too. If S3 is disabled, then the range needs no protection. (d) how it is accessed on the S3 resume path It is rewritten same as in (a), which is fine because (b) reserved it. (e) how it is accessed on the warm reset path It is rewritten same as in (a). Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Cc: Brijesh Singh Signed-off-by: Tom Lendacky Reviewed-by: Laszlo Ersek --- OvmfPkg/PlatformPei/PlatformPei.inf | 2 ++ OvmfPkg/PlatformPei/MemDetect.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index c53be2f4925c..6ef77ba7bb21 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -118,6 +118,8 @@ [FixedPcd] gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaSize =20 diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index ffbbef891a11..c08aa2e45a53 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -888,6 +888,11 @@ InitializeRamRegions ( (UINT64)(UINTN) PcdGet32 (PcdOvmfSecGhcbSize), EfiACPIMemoryNVS ); + BuildMemoryAllocationHob ( + (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecGhcbBackupBase), + (UINT64)(UINTN) PcdGet32 (PcdOvmfSecGhcbBackupSize), + EfiACPIMemoryNVS + ); } #endif } --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68911): https://edk2.groups.io/g/devel/message/68911 Mute This Topic: https://groups.io/mt/78986183/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 Sun Feb 8 00:16:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68912+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+68912+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 1608065586711148.04274712513768; Tue, 15 Dec 2020 12:53:06 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id eRXgYY1788612xaN0SxUbwEm; Tue, 15 Dec 2020 12:53:06 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.78]) by mx.groups.io with SMTP id smtpd.web10.2838.1608065585659062568 for ; Tue, 15 Dec 2020 12:53:05 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TLm/XLZ9wLDfO638/bc4bvmVnBTyacOQ4vzg0tB4C+12IAQV54DKpFzuG0G0eX6DFFl+ib4HLGX+3VgswwFEqDcueTZZ64xK0sDUnCu2uNj+5a7sNu3jECRUkAd7wrE2EF24iBOuj5A9EBOHJ8rM0Ycwam5T0lZWaiFV1czU009w04sQHxBrftaXdhe1bioFyVT6fBPG1t99iT6958o5yTopv7SGa7OIGC1g3vfM4eQnHjSav8HFnvgFuhXjN9bdTdch5XWVxTJWX6B9AGQr1x8FzOOCqc2IeKB1se2eGst2UkkkaRS9pMGRO9w90x5ZTujNC50axnnPKxrclwm4aA== 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=IU0tN8kqIwF0BhCWAHrQOnqr1P+svXJXB18DtHcIfSE=; b=UfVX2U1kQQulVW2XcwMvOrhVdxILkbtfO48YbEm9KwG0ISItKtthreiTya9kT9gbm4VEgmBzCE2fNpQE+k7Kt9a8frlzjRYDwX9PZW+PRh53Z553i8pb4QAGKjIVhAsCc2hRQgOO4RgihLTWH+uzp8EQTyBeILU9y7LWid1nyB9h9zTD6qIoFK/s9isy+4QGUmE9/3/gSWO+980t4BnXTNDUMobEex01gwVo6Wsx1qRsNJ0nqKp5ztkHlIMpxtJJ0G4l/7UmMYQ5Zu7F+DQUildHcZXbsyD9S8ligM8YmHK6jg/7ZQqEfG1zChrHqOapMvZZANf2yOVl7cIyd7qemA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (10.168.234.7) by DM6PR12MB4155.namprd12.prod.outlook.com (10.141.8.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.15; Tue, 15 Dec 2020 20:53:03 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 20:53:03 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 12/12] OvfmPkg/VmgExitLib: Validate #VC MMIO is to un-encrypted memory Date: Tue, 15 Dec 2020 14:51:11 -0600 Message-ID: <36dee4fe5bcc0d982b25a429fd37269bce72346e.1608065471.git.thomas.lendacky@amd.com> In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CH2PR03CA0020.namprd03.prod.outlook.com (2603:10b6:610:59::30) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by CH2PR03CA0020.namprd03.prod.outlook.com (2603:10b6:610:59::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 20:53:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 90562975-9653-4e6e-960d-08d8a13b6a4a X-MS-TrafficTypeDiagnostic: DM6PR12MB4155: 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: tk58LTj6PDmeEE3ZeR3NPbqarD0GJ9rKB/7Hxn/ZGAWWLqcM9eZSs+TbIyIoWT1H2DNSnNib8OlcAXvpjNa+QKNbK0Sb61pO75PNzoIbm3SJqyEwv6zOj+9/JyfDjdLalfnNjFgi1k8vMq84WCGcPabOlMQxw4PFkjSisDfI2G0xWlsCYMrj35lD/YVFeQmKW+N94g9znPD0ntakkMWQdt0SywVAzl+v/w/LDTAs+ojGzEa1HlFwQjSZSvID9hr6Gw16IBYEGNUF7CXzIVrNPc1bX+asf7lR+qJgrxW5+3T9ki/8fqOvl+nx/rNsAqRKtflpk3qCQQgYvEFoD21u9xwbL1SOggdjK5obEEBqzSM4oUwgIyNzIU6IZl3ixuim7ShfGTeefXEekWITBxSALLmulVNgjvlal8k4/9fRmYvO1BrxJMg8sXm+NuNA3iBXnW56fwwJ8M0vPAqPVGzHgw== X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?gbEIhvl436RWpRqmJYybcwcwqwT6wZWttrc/ccvtRXUXGPkxgyLLjP5NDyUs?= =?us-ascii?Q?6NgVPJSh3+TYHdU/o5neP3skj5l3A70h+/4qJhmS49U5KwmbaJrolCgHf1Fx?= =?us-ascii?Q?HNUzokKSqacA1prEQ1KbL1fvxYzVK1Zv95+tmieyHaXe/P3nxTVTOQUmAKuI?= =?us-ascii?Q?ty81fz8lZFfUTYPw5PqYaisPuLLJcWmyqfEMMvBtMU+7adCTsKfJfMoBHTuQ?= =?us-ascii?Q?bMM+glc+rB5sVKmdnUhMTcWAL7E/JYg4b3rgmQNDgeKm13ckl71XdppgWIcJ?= =?us-ascii?Q?cLFL86ND8H6Eg2pgd/Yi2GRXoy/huVsaWtuCFna+G9mqm9EEbuIbdMe17WGy?= =?us-ascii?Q?rCK7J+VlBgQTxfkSlkPx4GHszAdhntN86zcvfiHPbERz7TPAekgvjCFFBpXO?= =?us-ascii?Q?1Q4rcWAjw4rnT17gnYX3TMIPA2IiwZMWraMStzMtksThUVhq0fj4PO9utPbu?= =?us-ascii?Q?6Y9Ov3XUL211VzBXFxeWm6Z460TCOuEL24CdOYczeIbPb73hM9WhhlutMimB?= =?us-ascii?Q?D2g/pGOmzoiHwe2+2GEMLXjZat8WCc2UYyQ2iBmO6m4Tgc62W0v87ImqC1l8?= =?us-ascii?Q?GPr72lp1ydmYtihkgU51hfKCytRHwkBbln8/IQ1KVGc4zluXgql5lHW+RKst?= =?us-ascii?Q?D9j7cEwR2dGW/9RqZDHRNSGri+mUcFsuLDaw2yIRKV8ZumIH+97Qiq4vWqVw?= =?us-ascii?Q?Nx9PPfuoKujkT3H8AbvBgK7L/yr1ZtM086Mi83nCQAWlJIjWfXIhjVMW+Bg6?= =?us-ascii?Q?Um2TjKwUZ4z2TaSBo5UcM68bXGmrcGSGM7udXpgjOA/fcwxW4I8RuwOtotfi?= =?us-ascii?Q?5WorD8x0V4CIadZ76hnDwV9x4tYKLNrq8HEgTbijh/sIjNwVsTWctrAXi5Gz?= =?us-ascii?Q?UrxBeBxciwShtm0JmgfzG73yqIhLU0uLR5u1/UKza0JXpACdWAqWW05zuUGF?= =?us-ascii?Q?Kg309WUqA5FAL/mriH+UFzhttW+mlltMVFy5TG3kP2n/Su5k0DQCf7sye/OY?= =?us-ascii?Q?33qg?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 20:53:02.9641 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 90562975-9653-4e6e-960d-08d8a13b6a4a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dg1JqJ2MrMAJMsjowGi5x/XeW4t/rvXSfoWjPkH8yWixO7CgeGvFtl/YSQpLNRFPvxFTRBaE9M831EEKTPd98w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4155 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,thomas.lendacky@amd.com X-Gm-Message-State: PZojQC1BgUE3bocgJu5AlpDix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608065586; bh=EyR41t2/QJbtceRLFzvMV7HdbqmfpFYEMAIPctLxWeU=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=BD6JJSAzWJe0SV7IfiCEeXGD/0u3j8qbycHVD/eDc1I8+zAf5Q7nvjAazSa1i3sVwfW MnEUpudwio64+0GbuYQ56Eu7cPSG2A7Z5P3L2hY21fy9leLv3KaV+A9Dt/qLfp+9vjXPp WRvO4mPwQW239xClaoWm85/fKRuzzWEhjFc= 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=3D3108 When SEV-ES is active, and MMIO operation will trigger a #VC and the VmgExitLib exception handler will process this MMIO operation. A malicious hypervisor could try to extract information from encrypted memory by setting a reserved bit in the guests nested page tables for a non-MMIO area. This can result in the encrypted data being copied into the GHCB shared buffer area and accessed by the hypervisor. Prevent this by ensuring that the MMIO source/destination is un-encrypted memory. For the APIC register space, access is allowed in general. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Signed-off-by: Tom Lendacky Acked-by: Laszlo Ersek --- OvmfPkg/AmdSev/AmdSevX64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + .../DxeBaseMemEncryptSevLib.inf | 2 +- OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf | 1 + OvmfPkg/Library/VmgExitLib/VmgExitLib.inf | 2 + OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 81 +++++++++++++++++++ 6 files changed, 87 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 3e5a3f648ad5..d0e9d28fc492 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -237,6 +237,7 @@ [LibraryClasses.common.SEC] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf !endif VmgExitLib|OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptS= evLib.inf =20 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 226b576545a9..2a230888c636 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -265,6 +265,7 @@ [LibraryClasses.common.SEC] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf !endif VmgExitLib|OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecBaseMemEncryptS= evLib.inf =20 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.i= nf b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf index 04728a5dd256..10f794759207 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/DxeBaseMemEncryptSevLib.inf @@ -14,7 +14,7 @@ [Defines] FILE_GUID =3D c1594631-3888-4be4-949f-9c630dbc842b MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D MemEncryptSevLib|DXE_DRIVER DXE_RUNTI= ME_DRIVER DXE_SMM_DRIVER UEFI_DRIVER + LIBRARY_CLASS =3D MemEncryptSevLib|DXE_CORE DXE_DRIVER = DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_DRIVER =20 # # The following information is for reference only and not required by the = build diff --git a/OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf b/OvmfPkg/Library= /VmgExitLib/SecVmgExitLib.inf index df14de3c21bc..9c8de326f3d1 100644 --- a/OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf +++ b/OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf @@ -35,6 +35,7 @@ [LibraryClasses] BaseLib BaseMemoryLib DebugLib + MemEncryptSevLib PcdLib =20 [FixedPcd] diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitLib.inf b/OvmfPkg/Library/Vm= gExitLib/VmgExitLib.inf index b3c3e56ecff8..c66c68726cdb 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitLib.inf +++ b/OvmfPkg/Library/VmgExitLib/VmgExitLib.inf @@ -35,4 +35,6 @@ [LibraryClasses] BaseLib BaseMemoryLib DebugLib + LocalApicLib + MemEncryptSevLib =20 diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Librar= y/VmgExitLib/VmgExitVcHandler.c index ce577e4677eb..24259060fd65 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -595,6 +596,61 @@ UnsupportedExit ( return Status; } =20 +/** + Validate that the MMIO memory access is not to encrypted memory. + + Examine the pagetable entry for the memory specified. MMIO should not be + performed against encrypted memory. MMIO to the APIC page is always allo= wed. + + @param[in] Ghcb Pointer to the Guest-Hypervisor Communication = Block + @param[in] MemoryAddress Memory address to validate + @param[in] MemoryLength Memory length to validate + + @retval 0 Memory is not encrypted + @return New exception value to propogate + +**/ +STATIC +UINT64 +ValidateMmioMemory ( + IN GHCB *Ghcb, + IN UINTN MemoryAddress, + IN UINTN MemoryLength + ) +{ + MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE State; + GHCB_EVENT_INJECTION GpEvent; + UINTN Address; + + // + // Allow APIC accesses (which will have the encryption bit set during + // SEC and PEI phases). + // + Address =3D MemoryAddress & ~(SIZE_4KB - 1); + if (Address =3D=3D GetLocalApicBaseAddress ()) { + return 0; + } + + State =3D MemEncryptSevGetAddressRangeState ( + 0, + MemoryAddress, + MemoryLength + ); + if (State =3D=3D MemEncryptSevAddressRangeUnencrypted) { + return 0; + } + + // + // Any state other than unencrypted is an error, issue a #GP. + // + GpEvent.Uint64 =3D 0; + GpEvent.Elements.Vector =3D GP_EXCEPTION; + GpEvent.Elements.Type =3D GHCB_EVENT_INJECTION_TYPE_EXCEPTION; + GpEvent.Elements.Valid =3D 1; + + return GpEvent.Uint64; +} + /** Handle an MMIO event. =20 @@ -653,6 +709,11 @@ MmioExit ( return UnsupportedExit (Ghcb, Regs, InstructionData); } =20 + Status =3D ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Byte= s); + if (Status !=3D 0) { + return Status; + } + ExitInfo1 =3D InstructionData->Ext.RmData; ExitInfo2 =3D Bytes; CopyMem (Ghcb->SharedBuffer, &InstructionData->Ext.RegData, Bytes); @@ -683,6 +744,11 @@ MmioExit ( InstructionData->ImmediateSize =3D Bytes; InstructionData->End +=3D Bytes; =20 + Status =3D ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Byte= s); + if (Status !=3D 0) { + return Status; + } + ExitInfo1 =3D InstructionData->Ext.RmData; ExitInfo2 =3D Bytes; CopyMem (Ghcb->SharedBuffer, InstructionData->Immediate, Bytes); @@ -717,6 +783,11 @@ MmioExit ( return UnsupportedExit (Ghcb, Regs, InstructionData); } =20 + Status =3D ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Byte= s); + if (Status !=3D 0) { + return Status; + } + ExitInfo1 =3D InstructionData->Ext.RmData; ExitInfo2 =3D Bytes; =20 @@ -748,6 +819,11 @@ MmioExit ( case 0xB7: Bytes =3D (Bytes !=3D 0) ? Bytes : 2; =20 + Status =3D ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Byte= s); + if (Status !=3D 0) { + return Status; + } + ExitInfo1 =3D InstructionData->Ext.RmData; ExitInfo2 =3D Bytes; =20 @@ -774,6 +850,11 @@ MmioExit ( case 0xBF: Bytes =3D (Bytes !=3D 0) ? Bytes : 2; =20 + Status =3D ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Byte= s); + if (Status !=3D 0) { + return Status; + } + ExitInfo1 =3D InstructionData->Ext.RmData; ExitInfo2 =3D Bytes; =20 --=20 2.28.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68912): https://edk2.groups.io/g/devel/message/68912 Mute This Topic: https://groups.io/mt/78986184/1787277 Mute #vc:https://edk2.groups.io/g/devel/mutehashtag/vc 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-