From: "Dionna Glaze" <dionnaglaze@google.com>
To: devel@edk2.groups.io
Cc: Dionna Glaze <dionnaglaze@google.com>,
Gerd Hoffmann <kraxel@redhat.com>,
James Bottomley <jejb@linux.ibm.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Ard Biesheuvel <ardb@kernel.org>,
"Min M. Xu" <min.m.xu@intel.com>, Andrew Fish <afish@apple.com>,
"Michael D. Kinney" <michael.d.kinney@intel.com>
Subject: [PATCH v9 3/4] OvmfPkg: Implement AcceptAllUnacceptedMemory in CocoDxe
Date: Fri, 13 Jan 2023 00:14:18 +0000 [thread overview]
Message-ID: <20230113001419.2519031-4-dionnaglaze@google.com> (raw)
In-Reply-To: <20230113001419.2519031-1-dionnaglaze@google.com>
This protocol implementation disables the accept-all-memory behavior
of the BeforeExitBootServices event this driver adds.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: "Min M. Xu" <min.m.xu@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: "Michael D. Kinney" <michael.d.kinney@intel.com>
Signed-off-by: Dionna Glaze <dionnaglaze@google.com>
---
OvmfPkg/CocoDxe/CocoDxe.c | 28 ++++++++++++++++++++++++++++
OvmfPkg/CocoDxe/CocoDxe.inf | 1 +
2 files changed, 29 insertions(+)
diff --git a/OvmfPkg/CocoDxe/CocoDxe.c b/OvmfPkg/CocoDxe/CocoDxe.c
index da16af32a3..57169b0481 100644
--- a/OvmfPkg/CocoDxe/CocoDxe.c
+++ b/OvmfPkg/CocoDxe/CocoDxe.c
@@ -18,11 +18,14 @@
#include <Library/MemEncryptTdxLib.h>
#include <Pi/PrePiDxeCis.h>
#include <Protocol/MemoryAccept.h>
+#include <Protocol/MemoryAcceptance.h>
STATIC BOOLEAN mAcceptAllMemoryAtEBS = TRUE;
STATIC EFI_EVENT mAcceptAllMemoryEvent = NULL;
+STATIC EFI_HANDLE mCocoDxeHandle = NULL;
+
STATIC
EFI_STATUS
AcceptAllMemory (
@@ -111,6 +114,21 @@ ResolveUnacceptedMemory (
ASSERT_EFI_ERROR (Status);
}
+STATIC
+EFI_STATUS
+EFIAPI
+AllowUnacceptedMemory (
+ IN BZ3987_MEMORY_ACCEPTANCE_PROTOCOL *This
+ )
+{
+ mAcceptAllMemoryAtEBS = FALSE;
+ return EFI_SUCCESS;
+}
+
+STATIC
+BZ3987_MEMORY_ACCEPTANCE_PROTOCOL
+ mMemoryAcceptanceProtocol = { AllowUnacceptedMemory };
+
EFI_STATUS
EFIAPI
CocoDxeEntryPoint (
@@ -143,5 +161,15 @@ CocoDxeEntryPoint (
DEBUG ((DEBUG_ERROR, "AllowUnacceptedMemory event creation for EventBeforeExitBootServices failed.\n"));
}
+ Status = gBS->InstallProtocolInterface (
+ &mCocoDxeHandle,
+ &gBz3987MemoryAcceptanceProtocolGuid,
+ EFI_NATIVE_INTERFACE,
+ &mMemoryAcceptanceProtocol
+ );
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "Install Bz3987MemoryAcceptanceProtocol failed.\n"));
+ }
+
return EFI_SUCCESS;
}
diff --git a/OvmfPkg/CocoDxe/CocoDxe.inf b/OvmfPkg/CocoDxe/CocoDxe.inf
index 8d4452e94d..05c2651a89 100644
--- a/OvmfPkg/CocoDxe/CocoDxe.inf
+++ b/OvmfPkg/CocoDxe/CocoDxe.inf
@@ -42,4 +42,5 @@
gEfiEventBeforeExitBootServicesGuid
[Protocols]
+ gBz3987MemoryAcceptanceProtocolGuid
gEdkiiMemoryAcceptProtocolGuid
--
2.39.0.314.g84b9a713c41-goog
next prev parent reply other threads:[~2023-01-13 0:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 0:14 [PATCH v9 0/4] Add safe unaccepted memory behavior Dionna Glaze
2023-01-13 0:14 ` [PATCH v9 1/4] OvmfPkg: Introduce CocoDxe driver Dionna Glaze
2023-01-13 0:14 ` [PATCH v9 2/4] MdePkg: Introduce the MemoryAcceptance protocol Dionna Glaze
2023-01-13 0:14 ` Dionna Glaze [this message]
2023-01-13 0:14 ` [PATCH v9 4/4] OvmfPkg/PlatformPei: SEV-SNP make >=4GB unaccepted Dionna Glaze
2023-01-13 3:46 ` [PATCH v9 0/4] Add safe unaccepted memory behavior Yao, Jiewen
2023-01-13 7:18 ` [edk2-devel] " Gerd Hoffmann
2023-01-13 7:32 ` Yao, Jiewen
2023-01-13 9:32 ` Ard Biesheuvel
2023-01-13 11:11 ` Yao, Jiewen
2023-01-13 11:24 ` Ard Biesheuvel
2023-01-13 11:44 ` Yao, Jiewen
2023-01-13 12:00 ` Ard Biesheuvel
2023-01-13 16:00 ` dave.hansen
2023-01-13 17:06 ` Dionna Glaze
2023-01-13 17:57 ` Dave Hansen
2023-01-13 18:23 ` Dionna Glaze
2023-01-13 18:34 ` Dave Hansen
2023-01-16 10:28 ` Gerd Hoffmann
2023-01-24 22:42 ` Lendacky, Thomas
2023-01-24 22:46 ` Dave Hansen
2023-01-25 9:01 ` Ard Biesheuvel
2023-01-25 9:18 ` Gerd Hoffmann
2023-01-25 11:44 ` Ard Biesheuvel
2023-01-25 12:10 ` Gerd Hoffmann
2023-01-25 14:52 ` Ard Biesheuvel
2023-01-25 16:56 ` Yao, Jiewen
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=20230113001419.2519031-4-dionnaglaze@google.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