From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by mx.groups.io with SMTP id smtpd.web11.9375.1664379220889820316 for ; Wed, 28 Sep 2022 08:33:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@google.com header.s=20210112 header.b=oD1NS+8k; spf=pass (domain: flex--dionnaglaze.bounces.google.com, ip: 209.85.214.201, mailfrom: 3vgk0ywskbrk27dccz5azo35dd5a3.1db23k3a329r.5gdjeh.7d@flex--dionnaglaze.bounces.google.com) Received: by mail-pl1-f201.google.com with SMTP id k2-20020a170902c40200b001782bd6c416so8530684plk.20 for ; Wed, 28 Sep 2022 08:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=lFlz2erMkAnQH1b1s6nEEXYMtVF8KG/KO8S2s5VEyVo=; b=oD1NS+8kDdiYNsJJNSAorluJVMsYNzow1LMT1Tu0oxpQ7oh10t3cwSfpA6uDuEEtuF pf74fFcYmqcuxQ72auarFs9UCtPkdvjZumyCGHtKYxsFUZcaiCHubz1k+Ho3atzIkBnq TY1QjlUZwSTvnX+zzS4kNMe9h4dyxIyuwNA8W5kPIk+QLjLrqOPc8W2nBJtEdXEwiE/0 HvFBkBEs6GYRjdbpnCLt2B9Tc3UVkwtIaJ/cdPn7CFsRL9dgJ8j3vW7bUZNw/2NlcsOM gLv9XaLbUToICT6FRH8yZk8ao84CYe86Dp9Yoh3uofCo55n32H++btFuH5CWf4ag/IQY sUaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=lFlz2erMkAnQH1b1s6nEEXYMtVF8KG/KO8S2s5VEyVo=; b=I3zLrg+NHclGC29XAo996We6YHsrclZbdgBu/5k2Yk2TLCq24Kip3Dg73jmzoPzAg0 WLvotBIsYZ6N93Y9np+fCv8CwjwCloxYptPAww9QIoU+RaVlXtPagAEOfZ2V542O61Vg Gfle16Ah1pDjxq3V1R23+IquqOECiKPnjWrDwtamKdx23X4bEI01xvGay76q/Pe3B/CA ajdZutNYfY4ruWlCskdgMN3A4VdUw+Sl1qgOgt08SusUGDcJFiq45MsLejK327ZmyLdx frWiKYZfW2R5FEDSC68lMRPT27y10ZofvlwX8l/vFSuwl+C/wiNgPLdWXvG2Byd7wK51 rAFw== X-Gm-Message-State: ACrzQf1rWO+IOfVUEnRtdvbFryZ8FpY8DRlwrA8zVf/h5YwubZXYNX8a 6zA8Afu5kdvw9wHtN6B+sIIXdblBKuPz6Z00nV/ckdwmlea0+FYqAeC5Nt2UAVHElNwjvBPQSjv AKr7RPFZ3DwPT21LlTNw3sph/IiG60j/rpNhYg/xVZ1xUlCzpisF/Q+z/5dGq3O6K6H36p7SV X-Google-Smtp-Source: AMsMyM7o/eTFxCy/sVQb+GPXDcMylEI1OfXi5utIZuSwitehsn11VqKAZu/xqRsOhTyOORerOx3/ht/cxHELZOnciw== X-Received: from dionnaglaze.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2ee6]) (user=dionnaglaze job=sendgmr) by 2002:a17:90b:4fc8:b0:202:a340:3594 with SMTP id qa8-20020a17090b4fc800b00202a3403594mr11438462pjb.149.1664379220199; Wed, 28 Sep 2022 08:33:40 -0700 (PDT) Date: Wed, 28 Sep 2022 15:33:18 +0000 In-Reply-To: <20220928153323.2583389-1-dionnaglaze@google.com> Mime-Version: 1.0 References: <20220928153323.2583389-1-dionnaglaze@google.com> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog Message-ID: <20220928153323.2583389-2-dionnaglaze@google.com> Subject: [PATCH v4 1/6] OvmfPkg: Realize EfiMemoryAcceptProtocol in AmdSevDxe From: "Dionna Glaze" To: devel@edk2.groups.io Cc: Dionna Glaze , Gerd Hoffmann , James Bottomley , Jiewen Yao , Tom Lendacky , Sophia Wolf Content-Type: text/plain; charset="UTF-8" From: Sophia Wolf When a guest OS does not support unaccepted memory, the unaccepted memory must be accepted before returning a memory map to the caller. EfiMemoryAcceptProtocol is defined in MdePkg and is implemented / Installed in AmdSevDxe for AMD SEV-SNP memory acceptance. Cc: Gerd Hoffmann Cc: James Bottomley Cc: Jiewen Yao Cc: Tom Lendacky Signed-off-by: Sophia Wolf --- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 34 ++++++++++++++++++++ OvmfPkg/AmdSevDxe/AmdSevDxe.inf | 3 ++ OvmfPkg/Library/BaseMemEncryptSevLib/X64/DxeSnpSystemRamValidate.c | 24 +++++++++++--- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index 662d3c4ccb..09aa15165d 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -20,6 +20,7 @@ #include #include #include +#include STATIC CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION mSnpBootDxeTable = { SIGNATURE_32 ('A', 'M', 'D', 'E'), @@ -31,6 +32,29 @@ STATIC CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION mSnpBootDxeTable = { FixedPcdGet32 (PcdOvmfCpuidSize), }; +STATIC EFI_HANDLE mAmdSevDxeHandle = NULL; + +STATIC +EFI_STATUS +EFIAPI +AmdSevMemoryAccept ( + IN EFI_MEMORY_ACCEPT_PROTOCOL *This, + IN EFI_PHYSICAL_ADDRESS StartAddress, + IN UINTN Size +) +{ + MemEncryptSevSnpPreValidateSystemRam ( + StartAddress, + EFI_SIZE_TO_PAGES (Size) + ); + + return EFI_SUCCESS; +} + +STATIC EFI_MEMORY_ACCEPT_PROTOCOL mMemoryAcceptProtocol = { + AmdSevMemoryAccept +}; + EFI_STATUS EFIAPI AmdSevDxeEntryPoint ( @@ -147,6 +171,16 @@ AmdSevDxeEntryPoint ( } } + Status = gBS->InstallProtocolInterface ( + &mAmdSevDxeHandle, + &gEfiMemoryAcceptProtocolGuid, + EFI_NATIVE_INTERFACE, + &mMemoryAcceptProtocol + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Install EfiMemoryAcceptProtocol failed.\n")); + } + // // If its SEV-SNP active guest then install the CONFIDENTIAL_COMPUTING_SEV_SNP_BLOB. // It contains the location for both the Secrets and CPUID page. diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf index 9acf860cf2..5ddddabc32 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf @@ -47,6 +47,9 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsSize +[Protocols] + gEfiMemoryAcceptProtocolGuid + [Guids] gConfidentialComputingSevSnpBlobGuid diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/DxeSnpSystemRamValidate.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/DxeSnpSystemRamValidate.c index d3a95e4913..ee3710f7b3 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/DxeSnpSystemRamValidate.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/DxeSnpSystemRamValidate.c @@ -14,6 +14,7 @@ #include #include "SnpPageStateChange.h" +#include "VirtualMemory.h" /** Pre-validate the system RAM when SEV-SNP is enabled in the guest VM. @@ -29,12 +30,27 @@ MemEncryptSevSnpPreValidateSystemRam ( IN UINTN NumPages ) { + EFI_STATUS Status; + if (!MemEncryptSevSnpIsEnabled ()) { return; } - // - // All the pre-validation must be completed in the PEI phase. - // - ASSERT (FALSE); + // DXE pre-validation may happen with the memory accept protocol. + // The protocol should only be called outside the prevalidated ranges + // that the PEI stage code explicitly skips. Specifically, only memory + // ranges that are classified as unaccepted. + if (BaseAddress >= SIZE_4GB) { + Status = InternalMemEncryptSevCreateIdentityMap1G ( + 0, + BaseAddress, + EFI_PAGES_TO_SIZE (NumPages) + ); + if (EFI_ERROR (Status)) { + ASSERT (FALSE); + CpuDeadLoop (); + } + } + + InternalSetPageState (BaseAddress, NumPages, SevSnpPagePrivate, TRUE); } -- 2.37.3.998.g577e59143f-goog