File xsa435-0-13.patch of Package xen.33138
From 9276e832aef60437da13d91e66fc259fd94d6f91 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 10 Mar 2023 15:45:47 +0000
Subject: x86/spec-ctrl: Add BHI controls to userspace components
This was an oversight when adding the Xen parts.
Fixes: cea9ae062295 ("x86/spec-ctrl: Enumeration for new Intel BHI controls")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
--- a/tools/libxl/libxl_cpuid.c
+++ b/tools/libxl/libxl_cpuid.c
@@ -225,6 +225,9 @@ int libxl_cpuid_parse_config(libxl_cpuid
{"avx512-bf16", 0x00000007, 1, CPUID_REG_EAX, 5, 1},
{"intel-psfd", 0x00000007, 2, CPUID_REG_EDX, 0, 1},
+ {"ipred-ctrl", 0x00000007, 2, CPUID_REG_EDX, 1, 1},
+ {"rrsba-ctrl", 0x00000007, 2, CPUID_REG_EDX, 2, 1},
+ {"bhi-ctrl", 0x00000007, 2, CPUID_REG_EDX, 4, 1},
{"mcdt-no", 0x00000007, 2, CPUID_REG_EDX, 5, 1},
{"lahfsahf", 0x80000001, NA, CPUID_REG_ECX, 0, 1},
--- a/tools/misc/xen-cpuid.c
+++ b/tools/misc/xen-cpuid.c
@@ -201,9 +201,9 @@ static const char *const str_7d1[32] =
static const char *const str_7d2[32] =
{
- [ 0] = "intel-psfd",
-
- /* 4 */ [ 5] = "mcdt-no",
+ [ 0] = "intel-psfd", [ 1] = "ipred-ctrl",
+ [ 2] = "rrsba-ctrl",
+ [ 4] = "bhi-ctrl", [ 5] = "mcdt-no",
};
static const struct {