[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 4/5] x86/amd: Make cpu_has_amd_erratum() non-variadic


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Alejandro Vallejo <alejandro.garciavallejo@xxxxxxx>
  • Date: Wed, 18 Nov 2026 18:17:55 +0100
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=570usdvgqjyaV/aPVz22RPaLFmZG1ifiis106qZuf04=; b=YKGsElacN8Br71F/iJzciN1aq6hRZkuYToM5VUSXcH9ZzmMeTZgEKz5EZ1WmlZtHHbrUXqQ8Cvi1JUFYkeMVyWLn4ZyFFd1cVGXAUTJq/aGzsF0XzbOO/XuzrPRNZ5oJsJ38bxOaPbDd9IqQw6vqtfzAmH7jIFnk6aSfd83JAn8FI4XQDacH9WgiaMMmGUrDsdmGeL/2ro5i2rs83mopLWAYJLJQnTCCWKeOgtekw0mXhAioeZjmlirXMtFYcq0ni3G2kA06HTYvdeLYhrNj+6gQ9J7flr5c1OD3pfMSPCBJWo35SKAHqahRBDjuNwj/3Fp4nPvE6aslrgVfAiCDpg==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=piDb3EzM/+cuQtWL71JD2lfUhBia+Lsv+Q4h2/R7FMl4tpkzCNxeXcHJOTAycFDrwVsBFXg4azj7O6WkYPzEZ4UQyBbZ2rVllnTS475rNBbr4wQvTf/bIQQmJIVdpu+HjDgX2gtNKxU55xOGOBurCpDI2kUFagQBmPkgMDm0SdiznPT5XsNcoD4arVKFRlWFgV0UU7q0T2dz7V+ve4KZ9dyLxFvscAFtAVW0Opso8JbZ3CNZZ//9wDsTgr9klmWx7PWCCokZs0XADW1GJmim7D5rGkSYqLGy5IoD+5TQ0kLMrO/tk0BXvIcJvzRjnoSJhJoXrsXL6PivYYLkDBQgoA==
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=amd.com header.i="@amd.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck"
  • Cc: Alejandro Vallejo <alejandro.garciavallejo@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger@xxxxxxxxxxxxxx>, Teddy Astie <teddy.astie@xxxxxxxxxx>
  • Delivery-date: Wed, 18 Nov 2026 17:18:38 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

cpu_has_amd_erratum() takes the OSVW id and the family-model-stepping
ranges of an erratum as variadic arguments, which MISRA C Rule 17.1
forbids.

Have AMD_LEGACY_ERRATUM() and AMD_OSVW_ERRATUM() expand to a
zero-terminated array instead, and have cpu_has_amd_erratum() walk it.
Callers pass the AMD_ERRATUM_* macros, so they are unaffected.

No functional change.

Signed-off-by: Alejandro Vallejo <alejandro.garciavallejo@xxxxxxx>
---
 xen/arch/x86/cpu/amd.c         | 14 ++++++--------
 xen/arch/x86/include/asm/amd.h | 11 +++++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index fbbba0005c..5e22fff81c 100644
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -321,10 +321,10 @@ void amd_set_cpuid_user_dis(bool enable)
  * Check for the presence of an AMD erratum. Arguments are defined in amd.h 
  * for each known erratum. Return 1 if erratum is found.
  */
-int cpu_has_amd_erratum(const struct cpuinfo_x86 *cpu, int osvw_id, ...)
+int cpu_has_amd_erratum(const struct cpuinfo_x86 *cpu, const int *erratum)
 {
-       va_list ap;
-       u32 range;
+       int osvw_id = erratum[0];
+       const int *p;
        u32 ms;
        
        if (cpu->vendor != X86_VENDOR_AMD)
@@ -346,19 +346,17 @@ int cpu_has_amd_erratum(const struct cpuinfo_x86 *cpu, 
int osvw_id, ...)
        }
 
        /* OSVW unavailable or ID unknown, match family-model-stepping range */
-       va_start(ap, osvw_id);
-
        ms = (cpu->model << 4) | cpu->stepping;
-       while ((range = va_arg(ap, int))) {
+       for (p = &erratum[1]; *p; p++) {
+               u32 range = *p;
+
                if ((cpu->family == AMD_MODEL_RANGE_FAMILY(range)) &&
                    (ms >= AMD_MODEL_RANGE_START(range)) &&
                    (ms <= AMD_MODEL_RANGE_END(range))) {
-                       va_end(ap);
                        return 1;
                }
        }
 
-       va_end(ap);
        return 0;
 }
 
diff --git a/xen/arch/x86/include/asm/amd.h b/xen/arch/x86/include/asm/amd.h
index d21df0741a..d897943210 100644
--- a/xen/arch/x86/include/asm/amd.h
+++ b/xen/arch/x86/include/asm/amd.h
@@ -12,7 +12,8 @@
  * Errata are defined using the AMD_LEGACY_ERRATUM() or AMD_OSVW_ERRATUM()
  * macros. The latter is intended for newer errata that have an OSVW id
  * assigned, which it takes as first argument. Both take a variable number
- * of family-specific model-stepping ranges created by AMD_MODEL_RANGE().
+ * of family-specific model-stepping ranges created by AMD_MODEL_RANGE(),
+ * and yield a zero-terminated array to pass to cpu_has_amd_erratum().
  *
  * Example 1:
  * #define AMD_ERRATUM_319                                              \
@@ -26,8 +27,10 @@
  *   
  */
 
-#define AMD_LEGACY_ERRATUM(...)         -1 /* legacy */, __VA_ARGS__, 0
-#define AMD_OSVW_ERRATUM(osvw_id, ...)  osvw_id, __VA_ARGS__, 0
+#define AMD_LEGACY_ERRATUM(...) \
+    ((const int[]){ -1 /* legacy */, __VA_ARGS__, 0 })
+#define AMD_OSVW_ERRATUM(osvw_id, ...) \
+    ((const int[]){ osvw_id, __VA_ARGS__, 0 })
 #define AMD_MODEL_RANGE(f, m_start, s_start, m_end, s_end)              \
     (((f) << 24) | ((m_start) << 16) | ((s_start) << 12) | \
      ((m_end) << 4) | (s_end))
@@ -72,7 +75,7 @@
 #define is_zen6_uarch()   boot_cpu_has(X86_FEATURE_FRED)
 
 struct cpuinfo_x86;
-int cpu_has_amd_erratum(const struct cpuinfo_x86 *cpu, int osvw_id, ...);
+int cpu_has_amd_erratum(const struct cpuinfo_x86 *cpu, const int *erratum);
 
 extern int8_t opt_allow_unsafe;
 
-- 
2.43.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.