* Fri Sep 13 2024 Miroslav Rezanina <mrezanin@redhat.com> - 20240524-6

- edk2-OvmfPkg-CpuHotplugSmm-delay-SMM-exit.patch [RHEL-56154]
- Resolves: RHEL-56154
  (qemu-kvm: warning: Blocked re-entrant IO on MemoryRegion: acpi-cpu-hotplug at addr: 0x0 [rhel-10])

edk2-OvmfPkg-CpuHotplugSmm-delay-SMM-exit.patch

@@ -0,0 +1,46 @@
+From b2e458faf8603547bcdf578f465fdf777df44500 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Thu, 29 Aug 2024 09:20:29 +0200
+Subject: [PATCH] OvmfPkg/CpuHotplugSmm: delay SMM exit
+
+RH-Author: Gerd Hoffmann <None>
+RH-MergeRequest: 75: OvmfPkg/CpuHotplugSmm: delay SMM exit
+RH-Jira: RHEL-56154
+RH-Acked-by: Oliver Steffen <osteffen@redhat.com>
+RH-Commit: [1/1] 591189c9b119804cab4c48e9c27e428751993169 (kraxel.rh/centos-src-edk2)
+
+Let APs wait until the BSP has completed the register updates to remove
+the CPU.  This makes sure all APs stay in SMM mode until the CPU
+hot-unplug operation is complete, which in turn makes sure the ACPI lock
+is released only after the CPU hot-unplug operation is complete.
+
+Some background:  The CPU hotplug SMI is triggered from an ACPI function
+which is protected by an ACPI lock.  The ACPI function is in the ACPI
+tables generated by qemu.
+
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+
+upstream: submitted (https://github.com/tianocore/edk2/pull/6138)
+---
+ OvmfPkg/CpuHotplugSmm/CpuHotplug.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c
+index d504163026..5af78211d3 100644
+--- a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c
++++ b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c
+@@ -355,6 +355,11 @@ EjectCpu (
+   //
+   QemuSelector = mCpuHotEjectData->QemuSelectorMap[ProcessorNum];
+   if (QemuSelector == CPU_EJECT_QEMU_SELECTOR_INVALID) {
++    /* wait until BSP is done */
++    while (mCpuHotEjectData->Handler != NULL) {
++      CpuPause ();
++    }
++
+     return;
+   }
+ 
+-- 
+2.39.3
+

edk2.spec

@@ -21,7 +21,7 @@ ExclusiveArch: x86_64 aarch64
 
 Name:       edk2
 Version:    %{GITDATE}
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    UEFI firmware for 64-bit virtual machines
 License:    BSD-2-Clause-Patent and Apache-2.0 and MIT
 URL:        http://www.tianocore.org
@@ -99,6 +99,8 @@ Patch41: edk2-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch
 Patch42: edk2-AmdSevDxe-Fix-the-shim-fallback-reboot-workaround-fo.patch
 # For RHEL-50185 - [RHEL10] Hit soft lockup when hotplug vcpu
 Patch43: edk2-UefiCpuPkg-PiSmmCpuDxeSmm-skip-PatchInstructionX86-c.patch
+# For RHEL-56154 - qemu-kvm: warning: Blocked re-entrant IO on MemoryRegion: acpi-cpu-hotplug at addr: 0x0 [rhel-10]
+Patch44: edk2-OvmfPkg-CpuHotplugSmm-delay-SMM-exit.patch
 
 # python3-devel and libuuid-devel are required for building tools.
 # python3-devel is also needed for varstore template generation and
@@ -433,6 +435,11 @@ install -m 0644 \
 
 
 %changelog
+* Fri Sep 13 2024 Miroslav Rezanina <mrezanin@redhat.com> - 20240524-6
+- edk2-OvmfPkg-CpuHotplugSmm-delay-SMM-exit.patch [RHEL-56154]
+- Resolves: RHEL-56154
+  (qemu-kvm: warning: Blocked re-entrant IO on MemoryRegion: acpi-cpu-hotplug at addr: 0x0 [rhel-10])
+
 * Mon Sep 09 2024 Miroslav Rezanina <mrezanin@redhat.com> - 20240524-5
 - edk2-UefiCpuPkg-PiSmmCpuDxeSmm-skip-PatchInstructionX86-c.patch [RHEL-50185]
 - Resolves: RHEL-50185