Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP3:Update
xen
xsa435-0-48.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File xsa435-0-48.patch of Package xen
# Commit 1299ea8d766d15edd130248e3a76770f1ca2a7f2 # Date 2023-08-03 19:14:19 +0100 # Author Roger Pau Monne <roger.pau@citrix.com> # Committer Andrew Cooper <andrew.cooper3@citrix.com> libxl: use the cpuid feature names from cpufeatureset.h The current implementation in libxl_cpuid_parse_config() requires keeping a list of cpuid feature bits that should be mostly in sync with the contents of cpufeatureset.h. Avoid such duplication by using the automatically generated list of cpuid features in INIT_FEATURE_NAMES in order to map feature names to featureset bits, and then translate from featureset bits into cpuid leaf, subleaf, register tuple. Note that the full contents of the previous cpuid translation table can't be removed. That's because some feature names allowed by libxl are not described in the featuresets, or because naming has diverged and the previous nomenclature is preserved for compatibility reasons. Should result in no functional change observed by callers, albeit some new cpuid features will be available as a result of the change. While there constify cpuid_flags name field. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Anthony PERARD <anthony.perard@citrix.com> (cherry picked from commit d638fe233cb3a45105319df75df0edfed2fde5a5) # Commit 7e10b39d9dfcde404edef9b16b8b0b2c887975fd # Date 2023-08-03 19:14:19 +0100 # Author Jan Beulich <jbeulich@suse.com> # Committer Andrew Cooper <andrew.cooper3@citrix.com> libxl: allow building with old gcc again We can't use initializers of unnamed struct/union members just yet. Fixes: d638fe233cb3 ("libxl: use the cpuid feature names from cpufeatureset.h") Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Juergen Gross <jgross@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> (cherry picked from commit 1aa5acbbec3f37bf38d78fa96d210053f8e8efd5) --- a/docs/man/xl.cfg.pod.5.in +++ b/docs/man/xl.cfg.pod.5.in @@ -1463,15 +1463,16 @@ List of keys taking a value: apicidsize brandid clflush family localapicid maxleaf maxhvleaf model nc proccount procpkg stepping -List of keys taking a character: -3dnow 3dnowext 3dnowprefetch abm acpi aes altmovcr8 apic avx clfsh cmov -cmplegacy cmpxchg16 cmpxchg8 cntxid dca de ds dscpl dtes64 est extapic f16c -ffxsr fma4 fpu fxsr htt hypervisor ia64 ibs lahfsahf lm lwp mca mce misalignsse -mmx mmxext monitor movbe msr mtrr nodeid nx osvw osxsave pae page1gb pat pbe -pclmulqdq pdcm pge popcnt pse pse36 psn rdtscp skinit smx ss sse sse2 sse3 -sse4_1 sse4_2 sse4a ssse3 svm svm_decode svm_lbrv svm_npt svm_nrips -svm_pausefilt svm_tscrate svm_vmcbclean syscall sysenter tbm tm tm2 topoext tsc -vme vmx wdt x2apic xop xsave xtpr +List of keys taking a character can be found in the public header file +L<arch-x86/cpufeatureset.h|https://xenbits.xen.org/docs/unstable/hypercall/x86_64/include,public,arch-x86,cpufeatureset.h.html> + +The feature names described in C<cpufeatureset.h> should be specified in all +lowercase letters, and with underscores converted to hyphens. For example in +order to reference feature C<LAHF_LM> the string C<lahf-lm> should be used. + +Note that C<clflush> is described as an option that takes a value, and that +takes precedence over the C<clflush> flag in C<cpufeatureset.h>. The feature +flag must be referenced as C<clfsh>. The xend syntax is a list of values in the form of 'leafnum:register=bitstring,register=bitstring' --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -14,6 +14,10 @@ #include "libxl_internal.h" +#include "../libxc/_xc_cpuid_autogen.h" + +#include <xen-tools/libs.h> + int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl) { return !*pl || !libxl_cpuid_policy_list_length(pl); @@ -51,7 +55,7 @@ void libxl_cpuid_dispose(libxl_cpuid_pol * Used for the static structure describing all features. */ struct cpuid_flags { - char* name; + const char *name; uint32_t leaf; uint32_t subleaf; int reg; @@ -138,7 +142,19 @@ static int cpuid_add(libxl_cpuid_policy_ entry->policy[flag->reg - 1] = resstr; return 0; +} + +struct feature_name { + const char *name; + unsigned int bit; +}; +static int search_feature(const void *a, const void *b) +{ + const char *key = a; + const char *feat = ((const struct feature_name *)b)->name; + + return strcmp(key, feat); } /* parse a single key=value pair and translate it into the libxc @@ -159,122 +175,29 @@ int libxl_cpuid_parse_config(libxl_cpuid {"proccount", 0x00000001, NA, CPUID_REG_EBX, 16, 8}, {"clflush", 0x00000001, NA, CPUID_REG_EBX, 8, 8}, {"brandid", 0x00000001, NA, CPUID_REG_EBX, 0, 8}, - {"hypervisor", 0x00000001, NA, CPUID_REG_ECX, 31, 1}, - {"f16c", 0x00000001, NA, CPUID_REG_ECX, 29, 1}, - {"avx", 0x00000001, NA, CPUID_REG_ECX, 28, 1}, - {"osxsave", 0x00000001, NA, CPUID_REG_ECX, 27, 1}, - {"xsave", 0x00000001, NA, CPUID_REG_ECX, 26, 1}, {"aes", 0x00000001, NA, CPUID_REG_ECX, 25, 1}, - {"popcnt", 0x00000001, NA, CPUID_REG_ECX, 23, 1}, - {"movbe", 0x00000001, NA, CPUID_REG_ECX, 22, 1}, - {"x2apic", 0x00000001, NA, CPUID_REG_ECX, 21, 1}, /* Linux uses sse4_{1,2}. Keep sse4.{1,2} for compatibility */ {"sse4.2", 0x00000001, NA, CPUID_REG_ECX, 20, 1}, {"sse4_2", 0x00000001, NA, CPUID_REG_ECX, 20, 1}, {"sse4.1", 0x00000001, NA, CPUID_REG_ECX, 19, 1}, {"sse4_1", 0x00000001, NA, CPUID_REG_ECX, 19, 1}, - {"dca", 0x00000001, NA, CPUID_REG_ECX, 18, 1}, - {"pdcm", 0x00000001, NA, CPUID_REG_ECX, 15, 1}, - {"xtpr", 0x00000001, NA, CPUID_REG_ECX, 14, 1}, {"cmpxchg16", 0x00000001, NA, CPUID_REG_ECX, 13, 1}, {"cntxid", 0x00000001, NA, CPUID_REG_ECX, 10, 1}, - {"ssse3", 0x00000001, NA, CPUID_REG_ECX, 9, 1}, - {"tm2", 0x00000001, NA, CPUID_REG_ECX, 8, 1}, {"est", 0x00000001, NA, CPUID_REG_ECX, 7, 1}, - {"smx", 0x00000001, NA, CPUID_REG_ECX, 6, 1}, - {"vmx", 0x00000001, NA, CPUID_REG_ECX, 5, 1}, - {"dscpl", 0x00000001, NA, CPUID_REG_ECX, 4, 1}, - {"monitor", 0x00000001, NA, CPUID_REG_ECX, 3, 1}, - {"dtes64", 0x00000001, NA, CPUID_REG_ECX, 2, 1}, - {"pclmulqdq", 0x00000001, NA, CPUID_REG_ECX, 1, 1}, - {"sse3", 0x00000001, NA, CPUID_REG_ECX, 0, 1}, {"pbe", 0x00000001, NA, CPUID_REG_EDX, 31, 1}, {"ia64", 0x00000001, NA, CPUID_REG_EDX, 30, 1}, {"tm", 0x00000001, NA, CPUID_REG_EDX, 29, 1}, {"htt", 0x00000001, NA, CPUID_REG_EDX, 28, 1}, - {"ss", 0x00000001, NA, CPUID_REG_EDX, 27, 1}, - {"sse2", 0x00000001, NA, CPUID_REG_EDX, 26, 1}, - {"sse", 0x00000001, NA, CPUID_REG_EDX, 25, 1}, - {"fxsr", 0x00000001, NA, CPUID_REG_EDX, 24, 1}, - {"mmx", 0x00000001, NA, CPUID_REG_EDX, 23, 1}, - {"acpi", 0x00000001, NA, CPUID_REG_EDX, 22, 1}, - {"ds", 0x00000001, NA, CPUID_REG_EDX, 21, 1}, {"clfsh", 0x00000001, NA, CPUID_REG_EDX, 19, 1}, {"psn", 0x00000001, NA, CPUID_REG_EDX, 18, 1}, - {"pse36", 0x00000001, NA, CPUID_REG_EDX, 17, 1}, - {"pat", 0x00000001, NA, CPUID_REG_EDX, 16, 1}, - {"cmov", 0x00000001, NA, CPUID_REG_EDX, 15, 1}, - {"mca", 0x00000001, NA, CPUID_REG_EDX, 14, 1}, - {"pge", 0x00000001, NA, CPUID_REG_EDX, 13, 1}, - {"mtrr", 0x00000001, NA, CPUID_REG_EDX, 12, 1}, {"sysenter", 0x00000001, NA, CPUID_REG_EDX, 11, 1}, - {"apic", 0x00000001, NA, CPUID_REG_EDX, 9, 1}, {"cmpxchg8", 0x00000001, NA, CPUID_REG_EDX, 8, 1}, - {"mce", 0x00000001, NA, CPUID_REG_EDX, 7, 1}, - {"pae", 0x00000001, NA, CPUID_REG_EDX, 6, 1}, - {"msr", 0x00000001, NA, CPUID_REG_EDX, 5, 1}, - {"tsc", 0x00000001, NA, CPUID_REG_EDX, 4, 1}, - {"pse", 0x00000001, NA, CPUID_REG_EDX, 3, 1}, - {"de", 0x00000001, NA, CPUID_REG_EDX, 2, 1}, - {"vme", 0x00000001, NA, CPUID_REG_EDX, 1, 1}, - {"fpu", 0x00000001, NA, CPUID_REG_EDX, 0, 1}, - {"srbds-ctrl", 0x00000007, 0, CPUID_REG_EDX, 9, 1}, - {"md-clear", 0x00000007, 0, CPUID_REG_EDX, 10, 1}, - {"ibrsb", 0x00000007, 0, CPUID_REG_EDX, 26, 1}, - {"stibp", 0x00000007, 0, CPUID_REG_EDX, 27, 1}, - {"l1d-flush", 0x00000007, 0, CPUID_REG_EDX, 28, 1}, - {"arch-caps", 0x00000007, 0, CPUID_REG_EDX, 29, 1}, - {"ssbd", 0x00000007, 0, CPUID_REG_EDX, 31, 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}, - {"ddp-ctrl", 0x00000007, 2, CPUID_REG_EDX, 3, 1}, - {"bhi-ctrl", 0x00000007, 2, CPUID_REG_EDX, 4, 1}, - {"mcdt-no", 0x00000007, 2, CPUID_REG_EDX, 5, 1}, - {"topoext", 0x80000001, NA, CPUID_REG_ECX, 22, 1}, - {"tbm", 0x80000001, NA, CPUID_REG_ECX, 21, 1}, {"nodeid", 0x80000001, NA, CPUID_REG_ECX, 19, 1}, - {"fma4", 0x80000001, NA, CPUID_REG_ECX, 16, 1}, - {"lwp", 0x80000001, NA, CPUID_REG_ECX, 15, 1}, - {"wdt", 0x80000001, NA, CPUID_REG_ECX, 13, 1}, - {"skinit", 0x80000001, NA, CPUID_REG_ECX, 12, 1}, - {"xop", 0x80000001, NA, CPUID_REG_ECX, 11, 1}, - {"ibs", 0x80000001, NA, CPUID_REG_ECX, 10, 1}, - {"osvw", 0x80000001, NA, CPUID_REG_ECX, 10, 1}, - {"3dnowprefetch",0x80000001, NA, CPUID_REG_ECX, 8, 1}, - {"misalignsse", 0x80000001, NA, CPUID_REG_ECX, 7, 1}, - {"sse4a", 0x80000001, NA, CPUID_REG_ECX, 6, 1}, - {"abm", 0x80000001, NA, CPUID_REG_ECX, 5, 1}, {"altmovcr8", 0x80000001, NA, CPUID_REG_ECX, 4, 1}, - {"extapic", 0x80000001, NA, CPUID_REG_ECX, 3, 1}, - {"svm", 0x80000001, NA, CPUID_REG_ECX, 2, 1}, {"cmplegacy", 0x80000001, NA, CPUID_REG_ECX, 1, 1}, {"lahfsahf", 0x80000001, NA, CPUID_REG_ECX, 0, 1}, - {"3dnow", 0x80000001, NA, CPUID_REG_EDX, 31, 1}, - {"3dnowext", 0x80000001, NA, CPUID_REG_EDX, 30, 1}, - {"lm", 0x80000001, NA, CPUID_REG_EDX, 29, 1}, - {"rdtscp", 0x80000001, NA, CPUID_REG_EDX, 27, 1}, - {"page1gb", 0x80000001, NA, CPUID_REG_EDX, 26, 1}, - {"ffxsr", 0x80000001, NA, CPUID_REG_EDX, 25, 1}, - {"mmxext", 0x80000001, NA, CPUID_REG_EDX, 22, 1}, - {"nx", 0x80000001, NA, CPUID_REG_EDX, 20, 1}, - {"syscall", 0x80000001, NA, CPUID_REG_EDX, 11, 1}, {"procpkg", 0x00000004, 0, CPUID_REG_EAX, 26, 6}, - {"ibpb", 0x80000008, NA, CPUID_REG_EBX, 12, 1}, - {"ibrs", 0x80000008, NA, CPUID_REG_EBX, 14, 1}, - {"amd-stibp", 0x80000008, NA, CPUID_REG_EBX, 15, 1}, - {"ibrs-always", 0x80000008, NA, CPUID_REG_EBX, 16, 1}, - {"stibp-always", 0x80000008, NA, CPUID_REG_EBX, 17, 1}, - {"ibrs-fast", 0x80000008, NA, CPUID_REG_EBX, 18, 1}, - {"ibrs-same-mode", 0x80000008, NA, CPUID_REG_EBX, 19, 1}, - {"amd-ssbd", 0x80000008, NA, CPUID_REG_EBX, 24, 1}, - {"virt-ssbd", 0x80000008, NA, CPUID_REG_EBX, 25, 1}, - {"ssb-no", 0x80000008, NA, CPUID_REG_EBX, 26, 1}, - {"psfd", 0x80000008, NA, CPUID_REG_EBX, 28, 1}, - {"btc-no", 0x80000008, NA, CPUID_REG_EBX, 29, 1}, - {"ibpb-ret", 0x80000008, NA, CPUID_REG_EBX, 30, 1}, {"apicidsize", 0x80000008, NA, CPUID_REG_ECX, 12, 4}, {"nc", 0x80000008, NA, CPUID_REG_ECX, 0, 8}, {"svm_npt", 0x8000000a, NA, CPUID_REG_EDX, 0, 1}, @@ -291,9 +214,62 @@ int libxl_cpuid_parse_config(libxl_cpuid {NULL, 0, NA, CPUID_REG_INV, 0, 0} }; + static const struct feature_name features[] = INIT_FEATURE_NAMES; + /* + * NB: if we switch to using a cpu_policy derived object instead of a + * libxl_cpuid_policy_list we could get rid of the featureset -> cpuid leaf + * conversion table and use a featureset directly as we have conversions + * to/from featureset and cpu_policy. + */ + static const struct { + enum { FEAT_CPUID, FEAT_MSR } type; + union { + struct { + uint32_t leaf, subleaf; + unsigned int reg; + } cpuid; + struct { + uint32_t index; + unsigned int reg; + } msr; + } u; + } feature_to_policy[] = { +#define CPUID_ENTRY(l, s, r) \ + { .type = FEAT_CPUID, \ + .u = { .cpuid.leaf = l, .cpuid.subleaf = s, .cpuid.reg = r } \ + } +#define MSR_ENTRY(i, r) \ + { .type = FEAT_MSR, \ + .u = { .msr.index = i, .msr.reg = r } \ + } + CPUID_ENTRY(0x00000001, NA, CPUID_REG_EDX), + CPUID_ENTRY(0x00000001, NA, CPUID_REG_ECX), + CPUID_ENTRY(0x80000001, NA, CPUID_REG_EDX), + CPUID_ENTRY(0x80000001, NA, CPUID_REG_ECX), + CPUID_ENTRY(0x0000000D, 1, CPUID_REG_EAX), + CPUID_ENTRY(0x00000007, 0, CPUID_REG_EBX), + CPUID_ENTRY(0x00000007, 0, CPUID_REG_ECX), + CPUID_ENTRY(0x80000007, NA, CPUID_REG_EDX), + CPUID_ENTRY(0x80000008, NA, CPUID_REG_EBX), + CPUID_ENTRY(0x00000007, 0, CPUID_REG_EDX), + CPUID_ENTRY(0x00000007, 1, CPUID_REG_EAX), + CPUID_ENTRY(0x80000021, NA, CPUID_REG_EAX), + CPUID_ENTRY(0x00000007, 1, CPUID_REG_EBX), + CPUID_ENTRY(0x00000007, 2, CPUID_REG_EDX), + CPUID_ENTRY(0x00000007, 1, CPUID_REG_ECX), + CPUID_ENTRY(0x00000007, 1, CPUID_REG_EDX), + MSR_ENTRY(0x10a, CPUID_REG_EAX), + MSR_ENTRY(0x10a, CPUID_REG_EDX), +#undef MSR_ENTRY +#undef CPUID_ENTRY + }; #undef NA const char *sep, *val; + char *name; struct cpuid_flags *flag; + const struct feature_name *feat; + + BUILD_BUG_ON(ARRAY_SIZE(feature_to_policy) != FEATURESET_NR_ENTRIES); sep = strchr(str, '='); if (sep == NULL) { @@ -306,6 +282,37 @@ int libxl_cpuid_parse_config(libxl_cpuid return cpuid_add(cpuid, flag, val); } + /* Provide a NUL terminated feature name to the search helper. */ + name = strndup(str, sep - str); + if (name == NULL) + return ERROR_NOMEM; + + feat = bsearch(name, features, ARRAY_SIZE(features), sizeof(features[0]), + search_feature); + free(name); + + if (feat == NULL) + return 2; + + switch (feature_to_policy[feat->bit / 32].type) { + case FEAT_CPUID: + { + struct cpuid_flags f; + + f.name = feat->name; + f.leaf = feature_to_policy[feat->bit / 32].u.cpuid.leaf; + f.subleaf = feature_to_policy[feat->bit / 32].u.cpuid.subleaf; + f.reg = feature_to_policy[feat->bit / 32].u.cpuid.reg; + f.bit = feat->bit % 32; + f.length = 1; + + return cpuid_add(cpuid, &f, val); + } + + case FEAT_MSR: + return 2; + } + return 2; } --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1821,6 +1821,9 @@ skip_usbdev: case 3: errstr = "illegal CPUID value (must be: [0|1|x|k|s])"; break; + case ERROR_NOMEM: + errstr = "out of memory"; + break; default: errstr = "unknown error"; break;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
