[edk2-devel] [PATCH v5 6/9] OvmfPkg/SmmCpuFeaturesLib: init CPU ejection state

[Ankur Arora]

Init CPU_HOT_EJECT_DATA, which will be used to share CPU ejection state
between SmmCpuFeaturesLib (via PiSmmCpuDxeSmm) and CpuHotPlugSmm.
CpuHotplugSmm also sets up the CPU ejection mechanism via
CPU_HOT_EJECT_DATA->Handler.

Additionally, expose CPU_HOT_EJECT_DATA via PcdCpuHotEjectDataAddress.

Cc: Laszlo Ersek <lersek at redhat.com>
Cc: Jordan Justen <jordan.l.justen at intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel at arm.com>
Cc: Igor Mammedov <imammedo at redhat.com>
Cc: Boris Ostrovsky <boris.ostrovsky at oracle.com>
Cc: Aaron Young <aaron.young at oracle.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3132
Signed-off-by: Ankur Arora <ankur.a.arora at oracle.com>
---
 .../SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf        |  3 +
 .../Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c  | 68 ++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
index 97a10afb6e27..32c63722ee62 100644
--- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
+++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
@@ -35,4 +35,7 @@ [LibraryClasses]
   UefiBootServicesTableLib

 

 [Pcd]

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber

+  gUefiOvmfPkgTokenSpaceGuid.PcdCpuHotEjectDataAddress

   gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase

diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
index 7ef7ed98342e..5c9cdc6710e4 100644
--- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
+++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
@@ -14,7 +14,9 @@
 #include <Library/PcdLib.h>

 #include <Library/SmmCpuFeaturesLib.h>

 #include <Library/SmmServicesTableLib.h>

+#include <Library/MemoryAllocationLib.h>                 // AllocatePool()

 #include <Library/UefiBootServicesTableLib.h>

+#include <Library/CpuHotEjectData.h>

 #include <PiSmm.h>

 #include <Register/Intel/SmramSaveStateMap.h>

 #include <Register/QemuSmramSaveStateMap.h>

@@ -171,6 +173,60 @@ SmmCpuFeaturesHookReturnFromSmm (
   return OriginalInstructionPointer;

 }

 

+GLOBAL_REMOVE_IF_UNREFERENCED

+CPU_HOT_EJECT_DATA *mCpuHotEjectData = NULL;

+

+/**

+  This function initializes CpuHotEjectData if PcdCpuHotPlugSupport is

+  enabled and if more than 1 CPU is configured.

+

+  Also sets up the corresponding PcdCpuHotEjectDataAddress.

+**/

+STATIC

+VOID

+EFIAPI

+SmmCpuFeaturesSmmInitHotEject(

+  VOID

+  )

+{

+  UINT32 mMaxNumberOfCpus;

+  EFI_STATUS Status;

+

+  if (!FeaturePcdGet (PcdCpuHotPlugSupport)) {

+    return;

+  }

+

+  // PcdCpuHotPlugSupport => PcdCpuMaxLogicalProcessorNumber

+  mMaxNumberOfCpus = PcdGet32 (PcdCpuMaxLogicalProcessorNumber);

+

+  // No spare CPUs to eject

+  if (mMaxNumberOfCpus == 1) {

+    return;

+  }

+

+  mCpuHotEjectData =

+    (CPU_HOT_EJECT_DATA *)AllocatePool (sizeof (*mCpuHotEjectData));

+  ASSERT (mCpuHotEjectData != NULL);

+

+  //

+  // Allocate buffer for pointers to array in CPU_HOT_EJECT_DATA.

+  //

+  mCpuHotEjectData->Revision = CPU_HOT_EJECT_DATA_REVISION_1;   // Revision

+  mCpuHotEjectData->ArrayLength = mMaxNumberOfCpus;             // Array Length of APIC ID

+  mCpuHotEjectData->ApicIdMap =                                 // CpuIndex -> APIC ID map

+    (UINT64 *)AllocatePool (sizeof (UINT64) * mCpuHotEjectData->ArrayLength);

+  mCpuHotEjectData->Handler = NULL;                             // Hot Eject handler

+  mCpuHotEjectData->Handler = 0;                                // Reserved

+

+  ASSERT (mCpuHotEjectData->ApicIdMap != NULL);

+

+  //

+  // Expose address of CPU Hot eject Data structure

+  //

+  Status = PcdSet64S (PcdCpuHotEjectDataAddress, (UINT64)(VOID *)mCpuHotEjectData);

+  ASSERT_EFI_ERROR (Status);

+}

+

 /**

   Hook point in normal execution mode that allows the one CPU that was elected

   as monarch during System Management Mode initialization to perform additional

@@ -188,6 +244,9 @@ SmmCpuFeaturesSmmRelocationComplete (
   UINTN      MapPagesBase;

   UINTN      MapPagesCount;

 

+

+  SmmCpuFeaturesSmmInitHotEject();

+

   if (!MemEncryptSevIsEnabled ()) {

     return;

   }

@@ -375,6 +434,15 @@ SmmCpuFeaturesRendezvousExit (
   IN UINTN  CpuIndex

   )

 {

+  //

+  // CPU Hot eject not enabled.

+  //

+  if (mCpuHotEjectData == NULL ||

+      mCpuHotEjectData->Handler == NULL) {

+    return;

+  }

+

+  mCpuHotEjectData->Handler(CpuIndex);

 }

 

 /**

-- 
2.9.3



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#70765): https://edk2.groups.io/g/devel/message/70765
Mute This Topic: https://groups.io/mt/80125313/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-