public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Brijesh Singh" <brijesh.singh@amd.com>
To: devel@edk2.groups.io
Cc: James Bottomley <jejb@linux.ibm.com>, Min Xu <min.m.xu@intel.com>,
	Jiewen Yao <jiewen.yao@intel.com>,
	Tom Lendacky <thomas.lendacky@amd.com>,
	Jordan Justen <jordan.l.justen@intel.com>,
	Ard Biesheuvel <ardb+tianocore@kernel.org>,
	Erdem Aktas <erdemaktas@google.com>,
	Michael Roth <Michael.Roth@amd.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Brijesh Singh <brijesh.singh@amd.com>,
	Michael Roth <michael.roth@amd.com>
Subject: [PATCH v7 06/31] OvmfPkg/ResetVector: pre-validate the data pages used in SEC phase
Date: Mon, 13 Sep 2021 13:19:16 -0500	[thread overview]
Message-ID: <20210913181941.23405-7-brijesh.singh@amd.com> (raw)
In-Reply-To: <20210913181941.23405-1-brijesh.singh@amd.com>

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3275

An SEV-SNP guest requires that private memory (aka pages mapped encrypted)
must be validated before being accessed.

The validation process consist of the following sequence:

1) Set the memory encryption attribute in the page table (aka C-bit).
   Note: If the processor is in non-PAE mode, then all the memory accesses
   are considered private.
2) Add the memory range as private in the RMP table. This can be performed
   using the Page State Change VMGEXIT defined in the GHCB specification.
3) Use the PVALIDATE instruction to set the Validated Bit in the RMP table.

During the guest creation time, the VMM encrypts the OVMF_CODE.fd using
the SEV-SNP firmware provided LAUNCH_UPDATE_DATA command. In addition to
encrypting the content, the command also validates the memory region.
This allows us to execute the code without going through the validation
sequence.

During execution, the reset vector need to access some data pages
(such as page tables, SevESWorkarea, Sec stack). The data pages are
accessed as private memory. The data pages are not part of the
OVMF_CODE.fd, so they were not validated during the guest creation.

There are two approaches we can take to validate the data pages before
the access:

a) Enhance the OVMF reset vector code to validate the pages as described
   above (go through step 2 - 3).
OR
b) Validate the pages during the guest creation time. The SEV firmware
   provides a command which can be used by the VMM to validate the pages
   without affecting the measurement of the launch.

Approach #b seems much simpler; it does not require any changes to the
OVMF reset vector code.

Update the OVMF metadata with the list of regions that must be
pre-validated by the VMM before the boot.

Cc: Michael Roth <michael.roth@amd.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Min Xu <min.m.xu@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
---
 OvmfPkg/ResetVector/ResetVector.inf      |  7 ++++
 OvmfPkg/ResetVector/ResetVector.nasmb    | 29 ++++++++++++++
 OvmfPkg/ResetVector/X64/OvmfMetadata.asm | 48 ++++++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/OvmfPkg/ResetVector/ResetVector.inf b/OvmfPkg/ResetVector/ResetVector.inf
index 4cb81a3233f0..af3cf610a2cd 100644
--- a/OvmfPkg/ResetVector/ResetVector.inf
+++ b/OvmfPkg/ResetVector/ResetVector.inf
@@ -37,6 +37,8 @@ [Pcd]
   gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBase
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbSize
+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupBase
+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbPageTableBase
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbPageTableSize
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase
@@ -44,6 +46,11 @@ [Pcd]
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase
+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize
+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase
+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize
+  gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress
+  gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize
 
 [FixedPcd]
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidBase
diff --git a/OvmfPkg/ResetVector/ResetVector.nasmb b/OvmfPkg/ResetVector/ResetVector.nasmb
index 84cb5ae81b66..e05e202def1e 100644
--- a/OvmfPkg/ResetVector/ResetVector.nasmb
+++ b/OvmfPkg/ResetVector/ResetVector.nasmb
@@ -70,6 +70,7 @@
   %define PT_ADDR(Offset) (FixedPcdGet32 (PcdOvmfSecPageTablesBase) + (Offset))
 
   %define GHCB_PT_ADDR (FixedPcdGet32 (PcdOvmfSecGhcbPageTableBase))
+  %define GHCB_PT_SIZE (FixedPcdGet32 (PcdOvmfSecGhcbPageTableSize))
   %define GHCB_BASE (FixedPcdGet32 (PcdOvmfSecGhcbBase))
   %define GHCB_SIZE (FixedPcdGet32 (PcdOvmfSecGhcbSize))
   %define WORK_AREA_GUEST_TYPE (FixedPcdGet32 (PcdOvmfWorkAreaBase))
@@ -81,6 +82,34 @@
   %define SEV_SNP_SECRETS_SIZE  (FixedPcdGet32 (PcdOvmfSnpSecretsSize))
   %define CPUID_BASE  (FixedPcdGet32 (PcdOvmfCpuidBase))
   %define CPUID_SIZE  (FixedPcdGet32 (PcdOvmfCpuidSize))
+  %define SEC_PAGE_TABLE_BASE   (FixedPcdGet32 (PcdOvmfSecPageTablesBase))
+  %define SEC_PAGE_TABLE_SIZE   (FixedPcdGet32 (PcdOvmfSecPageTablesSize))
+  %define LOCK_BOX_STORAGE_BASE (FixedPcdGet32 (PcdOvmfLockBoxStorageBase))
+  %define LOCK_BOX_STORAGE_SIZE (FixedPcdGet32 (PcdOvmfLockBoxStorageSize))
+  ;
+  ; The PcdGuidedExtractHandlerTableAddress is a 64-bit PCD. The FixedPcdGet64() returns
+  ; a number suffix with 'ULL' (e.g 0x1111ULL). NASM does not like the constant ending
+  ; with anything other than 'h'. So, instead of using the FixedPcdGet64(), calculate
+  ; the base address of GuidedExtractHandlerTableBase
+  ;
+  %define GUID_EXTRACT_HANDLER_TABLE_BASE (LOCK_BOX_STORAGE_BASE + LOCK_BOX_STORAGE_SIZE)
+  %define GUID_EXTRACT_HANDLER_TABLE_SIZE (FixedPcdGet32 (PcdGuidedExtractHandlerTableSize))
+  %define WORK_AREA_BASE (FixedPcdGet32 (PcdOvmfWorkAreaBase))
+  %define WORK_AREA_SIZE (FixedPcdGet32 (PcdOvmfWorkAreaSize))
+  %define SEC_PEI_TEMP_RAM_BASE (FixedPcdGet32 (PcdOvmfSecPeiTempRamBase))
+  %define SEC_PEI_TEMP_RAM_SIZE (FixedPcdGet32 (PcdOvmfSecPeiTempRamSize))
+
+  ;
+  ; The PcdOvmfSecGhcbBase reserves two GHCB pages. The first page is used
+  ; as GHCB shared page and second is used for booking to support the
+  ; nested GHCB in SEC phase. The booking page is mapped private. The VMM
+  ; does not need to validate the shared page but it need to validate the
+  ; booking page
+  ;
+  %define GHCB_SEC_BACKUP_BASE (FixedPcdGet32 (PcdOvmfSecGhcbBackupBase))
+  %define GHCB_SEC_BACKUP_SIZE (FixedPcdGet32 (PcdOvmfSecGhcbBackupSize))
+  %define GHCB_BOOKKEEPING_BASE (GHCB_BASE + 0x1000)
+  %define GHCB_BOOKKEEPING_SIZE (GHCB_SIZE - 0x1000)
 
 %include "Ia32/Flat32ToFlat64.asm"
 %include "Ia32/AmdSev.asm"
diff --git a/OvmfPkg/ResetVector/X64/OvmfMetadata.asm b/OvmfPkg/ResetVector/X64/OvmfMetadata.asm
index 95bac86a3b95..657d6c298d4e 100644
--- a/OvmfPkg/ResetVector/X64/OvmfMetadata.asm
+++ b/OvmfPkg/ResetVector/X64/OvmfMetadata.asm
@@ -49,6 +49,48 @@ _Descriptor:
   DD OVMF_METADATA_VERSION                            ; Version
   DD (OvmfGuidedStructureEnd - _Descriptor - 16) / 12 ; Number of sections
 
+; Page table used during SEC
+SecPageTable:
+  DD  SEC_PAGE_TABLE_BASE
+  DD  SEC_PAGE_TABLE_SIZE
+  DD  OVMF_SECTION_TYPE_SEC_MEM
+
+; Lockbox storage
+LockBoxStorage:
+  DD  LOCK_BOX_STORAGE_BASE
+  DD  LOCK_BOX_STORAGE_SIZE
+  DD  OVMF_SECTION_TYPE_SEC_MEM
+
+; Guided Extract Handler Table
+ExtractHandlerTable:
+  DD  GUID_EXTRACT_HANDLER_TABLE_BASE
+  DD  GUID_EXTRACT_HANDLER_TABLE_SIZE
+  DD  OVMF_SECTION_TYPE_SEC_MEM
+
+; GHCB page table
+GhcbPageTable:
+  DD  GHCB_PT_ADDR
+  DD  GHCB_PT_SIZE
+  DD  OVMF_SECTION_TYPE_SEC_MEM
+
+; GHCB bookkeeping page used in SEC phase
+GhcbBookkeeping:
+  DD  GHCB_BOOKKEEPING_BASE
+  DD  GHCB_BOOKKEEPING_SIZE
+  DD  OVMF_SECTION_TYPE_SEC_MEM
+
+; Confidential computing work area
+WorkArea:
+  DD  WORK_AREA_BASE
+  DD  WORK_AREA_SIZE
+  DD  OVMF_SECTION_TYPE_SEC_MEM
+
+; GHCB backup page used in SEC
+GhcbBackup:
+  DD  GHCB_SEC_BACKUP_BASE
+  DD  GHCB_SEC_BACKUP_SIZE
+  DD  OVMF_SECTION_TYPE_SEC_MEM
+
 ; SEV-SNP Secrets page
 SevSnpSecrets:
   DD  SEV_SNP_SECRETS_BASE
@@ -61,5 +103,11 @@ CpuidSec:
   DD  CPUID_SIZE
   DD  OVMF_SECTION_TYPE_CPUID
 
+; Temporary RAM used in SEC phase
+SecPeiTempRam:
+  DD  SEC_PEI_TEMP_RAM_BASE
+  DD  SEC_PEI_TEMP_RAM_SIZE
+  DD  OVMF_SECTION_TYPE_SEC_MEM
+
 OvmfGuidedStructureEnd:
   ALIGN   16
-- 
2.17.1


  parent reply	other threads:[~2021-09-13 18:20 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-13 18:19 [PATCH v7 00/31] Add AMD Secure Nested Paging (SEV-SNP) support Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 01/31] OvmfPkg/SecMain: move SEV specific routines in AmdSev.c Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 02/31] OvmfPkg/ResetVector: move clearing GHCB in SecMain Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 03/31] OvmfPkg/ResetVector: introduce metadata descriptor for VMM use Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 04/31] OvmfPkg: reserve SNP secrets page Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 05/31] OvmfPkg: reserve CPUID page Brijesh Singh
2021-09-16  8:07   ` Gerd Hoffmann
2021-09-16 10:46     ` Brijesh Singh
2021-09-13 18:19 ` Brijesh Singh [this message]
2021-09-16  8:26   ` [PATCH v7 06/31] OvmfPkg/ResetVector: pre-validate the data pages used in SEC phase Gerd Hoffmann
2021-09-16 10:49     ` [edk2-devel] " Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 07/31] OvmfPkg/ResetVector: use SEV-SNP-validated CPUID values Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 08/31] OvmfPkg/MemEncryptSevLib: add MemEncryptSevSnpEnabled() Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 09/31] OvmfPkg/SecMain: register GHCB gpa for the SEV-SNP guest Brijesh Singh
2021-09-15 17:08   ` Erdem Aktas
2021-09-15 18:50     ` Brijesh Singh
2021-09-16  8:30       ` Gerd Hoffmann
2021-09-16 10:49         ` Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 10/31] OvmfPkg/VmgExitLib: use SEV-SNP-validated CPUID values Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 11/31] OvmfPkg/PlatformPei: register GHCB gpa for the SEV-SNP guest Brijesh Singh
2021-09-16  8:33   ` Gerd Hoffmann
2021-09-16 10:59     ` Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 12/31] OvmfPkg/AmdSevDxe: do not use extended PCI config space Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 13/31] OvmfPkg/MemEncryptSevLib: add support to validate system RAM Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 14/31] OvmfPkg/MemEncryptSevLib: add function to check the VMPL0 Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 15/31] OvmfPkg/BaseMemEncryptSevLib: skip the pre-validated system RAM Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 16/31] OvmfPkg/MemEncryptSevLib: add support to validate > 4GB memory in PEI phase Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 17/31] OvmfPkg/SecMain: pre-validate the memory used for decompressing Fv Brijesh Singh
2021-09-16  8:58   ` Gerd Hoffmann
2021-09-16 11:11     ` Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 18/31] OvmfPkg/PlatformPei: validate the system RAM when SNP is active Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 19/31] UefiCpuPkg: Define ConfidentialComputingGuestAttr Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 20/31] OvmfPkg/PlatformPei: set PcdConfidentialComputingAttr when SEV is active Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 21/31] UefiCpuPkg/MpInitLib: use PcdConfidentialComputingAttr to check SEV status Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 22/31] UefiCpuPkg: add PcdGhcbHypervisorFeatures Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 23/31] OvmfPkg/PlatformPei: set the Hypervisor Features PCD Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 24/31] MdePkg/GHCB: increase the GHCB protocol max version Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 25/31] UefiCpuPkg/MpLib: add support to register GHCB GPA when SEV-SNP is enabled Brijesh Singh
2021-09-14  2:23   ` Ni, Ray
2021-09-14  2:25     ` Ni, Ray
2021-09-14 14:21       ` [edk2-devel] " Brijesh Singh
2021-09-16  9:15         ` Gerd Hoffmann
2021-09-16  9:18           ` Ni, Ray
2021-09-13 18:19 ` [PATCH v7 26/31] UefiCpuPkg/MpInitLib: use BSP to do extended topology check Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 27/31] OvmfPkg/MemEncryptSevLib: change the page state in the RMP table Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 28/31] OvmfPkg/MemEncryptSevLib: skip page state change for Mmio address Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 29/31] OvmfPkg/PlatformPei: mark cpuid and secrets memory reserved in EFI map Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 30/31] OvmfPkg/AmdSev: expose the SNP reserved pages through configuration table Brijesh Singh
2021-09-13 18:19 ` [PATCH v7 31/31] UefiCpuPkg/MpInitLib: Use SEV-SNP AP Creation NAE event to launch APs Brijesh Singh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210913181941.23405-7-brijesh.singh@amd.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox