From: "Laszlo Ersek" <lersek@redhat.com>
To: lersek@redhat.com, devel@edk2.groups.io
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>,
Brijesh Singh <brijesh.singh@amd.com>,
Erdem Aktas <erdemaktas@google.com>,
Gerd Hoffmann <kraxel@redhat.com>,
James Bottomley <jejb@linux.ibm.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Jordan Justen <jordan.l.justen@intel.com>,
Michael Brown <mcb30@ipxe.org>, Min Xu <min.m.xu@intel.com>,
Oliver Steffen <osteffen@redhat.com>,
Sebastien Boeuf <sebastien.boeuf@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>
Subject: [PATCH v3 1/2] OvmfPkg/PlatformInitLib: factor out PlatformCpuCountBugCheck()
Date: Thu, 19 Jan 2023 12:01:30 +0100 [thread overview]
Message-ID: <20230119110131.91923-2-lersek@redhat.com> (raw)
In-Reply-To: <20230119110131.91923-1-lersek@redhat.com>
Move the QEMU v2.7 reset bug check/workaround to a separate function, as
we'll need to detect further issues.
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Michael Brown <mcb30@ipxe.org>
Cc: Min Xu <min.m.xu@intel.com>
Cc: Oliver Steffen <osteffen@redhat.com>
Cc: Sebastien Boeuf <sebastien.boeuf@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=4250
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
Notes:
v3:
- new patch
OvmfPkg/Library/PlatformInitLib/Platform.c | 81 ++++++++++++++------
1 file changed, 58 insertions(+), 23 deletions(-)
diff --git a/OvmfPkg/Library/PlatformInitLib/Platform.c b/OvmfPkg/Library/PlatformInitLib/Platform.c
index 9ab0342fd8c0..d1be5c2d7970 100644
--- a/OvmfPkg/Library/PlatformInitLib/Platform.c
+++ b/OvmfPkg/Library/PlatformInitLib/Platform.c
@@ -404,6 +404,61 @@ PlatformMiscInitialization (
}
}
+/**
+ Check for various QEMU bugs concerning CPU numbers.
+
+ Compensate for those bugs if various conditions are satisfied, by updating a
+ suitable subset of the input-output parameters. The function may not return
+ (it may hang deliberately), even in RELEASE builds, if the QEMU bug is
+ impossible to cover up.
+
+ @param[in,out] BootCpuCount On input, the boot CPU count reported by QEMU via
+ fw_cfg (QemuFwCfgItemSmpCpuCount). The caller is
+ responsible for ensuring (BootCpuCount > 0); that
+ is, if QEMU does not provide the boot CPU count
+ via fw_cfg *at all*, then this function must not
+ be called.
+
+ @param[in,out] Present On input, the number of present-at-boot CPUs, as
+ reported by QEMU through the modern CPU hotplug
+ register block.
+
+ @param[in,out] Possible On input, the number of possible CPUs, as
+ reported by QEMU through the modern CPU hotplug
+ register block.
+**/
+STATIC
+VOID
+PlatformCpuCountBugCheck (
+ IN OUT UINT16 *BootCpuCount,
+ IN OUT UINT32 *Present,
+ IN OUT UINT32 *Possible
+ )
+{
+ ASSERT (*BootCpuCount > 0);
+
+ //
+ // Sanity check: fw_cfg and the modern CPU hotplug interface should expose the
+ // same boot CPU count.
+ //
+ if (*BootCpuCount != *Present) {
+ DEBUG ((
+ DEBUG_WARN,
+ "%a: QEMU v2.7 reset bug: BootCpuCount=%d Present=%u\n",
+ __FUNCTION__,
+ *BootCpuCount,
+ *Present
+ ));
+ //
+ // The handling of QemuFwCfgItemSmpCpuCount, across CPU hotplug plus
+ // platform reset (including S3), was corrected in QEMU commit e3cadac073a9
+ // ("pc: fix FW_CFG_NB_CPUS to account for -device added CPUs", 2016-11-16),
+ // part of release v2.8.0.
+ //
+ *BootCpuCount = (UINT16)*Present;
+ }
+}
+
/**
Fetch the boot CPU count and the possible CPU count from QEMU, and expose
them to UefiCpuPkg modules.
@@ -518,8 +573,8 @@ PlatformMaxCpuCountInitialization (
UINT8 CpuStatus;
//
- // Read the status of the currently selected CPU. This will help with a
- // sanity check against "BootCpuCount".
+ // Read the status of the currently selected CPU. This will help with
+ // various CPU count sanity checks.
//
CpuStatus = IoRead8 (CpuHpBase + QEMU_CPUHP_R_CPU_STAT);
if ((CpuStatus & QEMU_CPUHP_STAT_ENABLED) != 0) {
@@ -540,27 +595,7 @@ PlatformMaxCpuCountInitialization (
ASSERT (Selected == Possible || Selected == 0);
} while (Selected > 0);
- //
- // Sanity check: fw_cfg and the modern CPU hotplug interface should
- // return the same boot CPU count.
- //
- if (BootCpuCount != Present) {
- DEBUG ((
- DEBUG_WARN,
- "%a: QEMU v2.7 reset bug: BootCpuCount=%d "
- "Present=%u\n",
- __FUNCTION__,
- BootCpuCount,
- Present
- ));
- //
- // The handling of QemuFwCfgItemSmpCpuCount, across CPU hotplug plus
- // platform reset (including S3), was corrected in QEMU commit
- // e3cadac073a9 ("pc: fix FW_CFG_NB_CPUS to account for -device added
- // CPUs", 2016-11-16), part of release v2.8.0.
- //
- BootCpuCount = (UINT16)Present;
- }
+ PlatformCpuCountBugCheck (&BootCpuCount, &Present, &Possible);
MaxCpuCount = Possible;
}
next prev parent reply other threads:[~2023-01-19 11:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 11:01 [PATCH v3 0/2] OvmfPkg/PlatformInitLib: catch QEMU's CPU hotplug reg block regression Laszlo Ersek
2023-01-19 11:01 ` Laszlo Ersek [this message]
2023-01-19 11:01 ` [PATCH v3 2/2] " Laszlo Ersek
2023-01-19 11:27 ` Ard Biesheuvel
2023-01-20 8:50 ` Laszlo Ersek
2023-01-20 9:10 ` Ard Biesheuvel
2023-01-20 12:55 ` Laszlo Ersek
2023-01-20 9:17 ` Laszlo Ersek
2023-01-20 9:19 ` Laszlo Ersek
2023-01-19 11:25 ` [edk2-devel] [PATCH v3 0/2] " Michael Brown
2023-01-19 12:05 ` Gerd Hoffmann
2023-01-20 13:48 ` Laszlo Ersek
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=20230119110131.91923-2-lersek@redhat.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