diff --git a/SOURCES/libvirt-Add-testdata-for-AMD-EPYC-7502.patch b/SOURCES/libvirt-Add-testdata-for-AMD-EPYC-7502.patch new file mode 100644 index 0000000..1530f4e --- /dev/null +++ b/SOURCES/libvirt-Add-testdata-for-AMD-EPYC-7502.patch @@ -0,0 +1,2173 @@ +From a2f2e97422de810517a77d8f098564e3b6c0f7c2 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Markus Schade +Date: Thu, 8 Oct 2020 18:01:24 +0200 +Subject: [PATCH] Add testdata for AMD EPYC 7502 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Markus Schade +Reviewed-by: Jiri Denemark +(cherry picked from commit e06590f1708a599286f3ee3690b3dc50ee525d40) + +https://bugzilla.redhat.com/show_bug.cgi?id=1861506 + +Signed-off-by: Jiri Denemark +Message-Id: <2efe44ce5c929916c92656803d39635ae7c189b9.1602172344.git.jdenemar@redhat.com> +Reviewed-by: Ján Tomko +--- + tests/cputest.c | 1 + + ...86_64-cpuid-EPYC-7502-32-Core-disabled.xml | 9 + + ...x86_64-cpuid-EPYC-7502-32-Core-enabled.xml | 11 + + .../x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 42 + + .../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 43 + + .../x86_64-cpuid-EPYC-7502-32-Core-json.xml | 31 + + .../x86_64-cpuid-EPYC-7502-32-Core.json | 1866 +++++++++++++++++ + .../x86_64-cpuid-EPYC-7502-32-Core.sig | 4 + + .../x86_64-cpuid-EPYC-7502-32-Core.xml | 66 + + 9 files changed, 2073 insertions(+) + create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-enabled.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.json + create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.sig + create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.xml + +diff --git a/tests/cputest.c b/tests/cputest.c +index 68e8eb0290..388174eba7 100644 +--- a/tests/cputest.c ++++ b/tests/cputest.c +@@ -1242,6 +1242,7 @@ mymain(void) + DO_TEST_CPUID(VIR_ARCH_X86_64, "Hygon-C86-7185-32-core", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "EPYC-7601-32-Core", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "EPYC-7601-32-Core-ibpb", JSON_MODELS_REQUIRED); ++ DO_TEST_CPUID(VIR_ARCH_X86_64, "EPYC-7502-32-Core", JSON_MODELS); + DO_TEST_CPUID(VIR_ARCH_X86_64, "FX-8150", JSON_NONE); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Opteron-1352", JSON_NONE); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Opteron-2350", JSON_HOST); +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml +new file mode 100644 +index 0000000000..ca71b9efb5 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml +@@ -0,0 +1,9 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-enabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-enabled.xml +new file mode 100644 +index 0000000000..09a9952c27 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-enabled.xml +@@ -0,0 +1,11 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml +new file mode 100644 +index 0000000000..1320f65a58 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml +@@ -0,0 +1,42 @@ ++ ++ EPYC-IBPB ++ AMD ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +new file mode 100644 +index 0000000000..37905ec812 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +@@ -0,0 +1,43 @@ ++ ++ x86_64 ++ EPYC-IBPB ++ AMD ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml +new file mode 100644 +index 0000000000..225cf63852 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml +@@ -0,0 +1,31 @@ ++ ++ EPYC-IBPB ++ AMD ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.json b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.json +new file mode 100644 +index 0000000000..06c265d829 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.json +@@ -0,0 +1,1866 @@ ++{ ++ "return": { ++ "model": { ++ "name": "base", ++ "props": { ++ "vmx-entry-load-rtit-ctl": false, ++ "phys-bits": 0, ++ "core-id": -1, ++ "xlevel": 2147483679, ++ "cmov": true, ++ "ia64": false, ++ "ssb-no": false, ++ "aes": true, ++ "vmx-apicv-xapic": false, ++ "mmx": true, ++ "arat": true, ++ "rdpid": true, ++ "vmx-page-walk-5": false, ++ "vmx-page-walk-4": false, ++ "vmx-desc-exit": false, ++ "gfni": false, ++ "ibrs-all": false, ++ "pause-filter": false, ++ "xsavec": true, ++ "intel-pt": false, ++ "vmx-cr8-store-exit": false, ++ "hv-frequencies": false, ++ "tsc-frequency": 0, ++ "vmx-rdseed-exit": false, ++ "xd": true, ++ "x-intel-pt-auto-level": true, ++ "hv-vendor-id": "", ++ "vmx-eptp-switching": false, ++ "kvm_asyncpf": true, ++ "kvm-asyncpf": true, ++ "perfctr_core": true, ++ "perfctr-core": true, ++ "mpx": false, ++ "avx512cd": false, ++ "pbe": false, ++ "decodeassists": false, ++ "vmx-exit-clear-bndcfgs": false, ++ "vmx-exit-load-efer": false, ++ "sse4_1": true, ++ "sse4-1": true, ++ "sse4.1": true, ++ "family": 23, ++ "legacy-cache": true, ++ "vmx-vmwrite-vmexit-fields": false, ++ "vmx-vnmi": false, ++ "vmx-true-ctls": false, ++ "host-phys-bits-limit": 0, ++ "vmx-ept-execonly": false, ++ "vmx-exit-save-efer": false, ++ "vmx-invept-all-context": false, ++ "vmware-cpuid-freq": true, ++ "wbnoinvd": true, ++ "avx512f": false, ++ "xcrypt": false, ++ "hv-runtime": false, ++ "hv-stimer-direct": false, ++ "mce": true, ++ "mca": true, ++ "msr": true, ++ "thread-id": -1, ++ "vmx-exit-load-pat": false, ++ "vmx-intr-exit": false, ++ "min-level": 16, ++ "vmx-flexpriority": false, ++ "xgetbv1": true, ++ "cid": false, ++ "hv-relaxed": false, ++ "avx512-bf16": false, ++ "ds": false, ++ "hv-crash": false, ++ "fxsr": true, ++ "vmx-cr8-load-exit": false, ++ "xsaveopt": true, ++ "vmx-apicv-vid": false, ++ "vmx-exit-save-pat": false, ++ "tsx-ctrl": false, ++ "xtpr": false, ++ "vmx-ple": false, ++ "hv-evmcs": false, ++ "avx512-vpopcntdq": false, ++ "phe": false, ++ "avx512vl": false, ++ "extapic": false, ++ "vmx-vmfunc": false, ++ "3dnowprefetch": true, ++ "vmx-activity-shutdown": false, ++ "avx512vbmi2": false, ++ "cr8legacy": true, ++ "vmx-encls-exit": false, ++ "stibp": true, ++ "vmx-msr-bitmap": false, ++ "cpuid-0xb": true, ++ "xcrypt-en": false, ++ "vmx-mwait-exit": false, ++ "kvm_pv_eoi": true, ++ "vmx-pml": false, ++ "apic-id": 4294967295, ++ "vmx-nmi-exit": false, ++ "vmx-invept-single-context-noglobals": false, ++ "pn": false, ++ "rsba": false, ++ "dca": false, ++ "vmx-unrestricted-guest": false, ++ "vendor": "AuthenticAMD", ++ "hv-ipi": false, ++ "vmx-cr3-store-noexit": false, ++ "pku": false, ++ "smx": false, ++ "cmp-legacy": true, ++ "cmp_legacy": true, ++ "node-id": -1, ++ "avx512-4fmaps": false, ++ "vmcb_clean": false, ++ "vmcb-clean": false, ++ "hle": false, ++ "amd-no-ssb": false, ++ "3dnowext": false, ++ "npt": true, ++ "rdctl-no": true, ++ "vmx-invvpid": false, ++ "memory": "/machine/unattached/system[0]", ++ "clwb": true, ++ "lbrv": false, ++ "adx": true, ++ "ss": false, ++ "pni": true, ++ "svm_lock": false, ++ "svm-lock": false, ++ "pfthreshold": false, ++ "smap": true, ++ "smep": true, ++ "vmx-invpcid-exit": false, ++ "x2apic": true, ++ "avx512vnni": false, ++ "avx512vbmi": false, ++ "vmx-apicv-x2apic": false, ++ "hv-stimer": false, ++ "kvm-pv-sched-yield": true, ++ "vmx-invlpg-exit": false, ++ "x-hv-synic-kvm-only": false, ++ "vmx-invvpid-all-context": false, ++ "i64": true, ++ "vmx-activity-hlt": false, ++ "flushbyasid": false, ++ "f16c": true, ++ "vmx-exit-ack-intr": false, ++ "ace2-en": false, ++ "pae": true, ++ "pat": true, ++ "sse": true, ++ "die-id": -1, ++ "vmx-tsc-offset": false, ++ "phe-en": false, ++ "kvm_nopiodelay": true, ++ "kvm-nopiodelay": true, ++ "tm": false, ++ "kvmclock-stable-bit": true, ++ "vmx-rdtsc-exit": false, ++ "hypervisor": true, ++ "vmx-rdtscp-exit": false, ++ "socket-id": -1, ++ "mds-no": true, ++ "pcommit": false, ++ "vmx-vpid": false, ++ "syscall": true, ++ "level": 16, ++ "avx512dq": false, ++ "x-migrate-smi-count": true, ++ "svm": true, ++ "full-cpuid-auto-level": true, ++ "hv-reset": false, ++ "invtsc": false, ++ "vmx-monitor-exit": false, ++ "sse3": true, ++ "sse2": true, ++ "ssbd": true, ++ "vmx-wbinvd-exit": false, ++ "est": false, ++ "kvm-poll-control": true, ++ "kvm_poll_control": true, ++ "avx512ifma": false, ++ "tm2": false, ++ "kvm-pv-eoi": true, ++ "kvm-pv-ipi": true, ++ "cx8": true, ++ "vmx-invvpid-single-addr": false, ++ "waitpkg": false, ++ "cldemote": false, ++ "vmx-ept": false, ++ "hv-reenlightenment": false, ++ "kvm_mmu": false, ++ "kvm-mmu": false, ++ "sse4-2": true, ++ "sse4.2": true, ++ "sse4_2": true, ++ "pge": true, ++ "fill-mtrr-mask": true, ++ "avx512bitalg": false, ++ "vmx-entry-load-bndcfgs": false, ++ "nodeid_msr": false, ++ "pdcm": false, ++ "vmx-exit-clear-rtit-ctl": false, ++ "model": 49, ++ "movbe": true, ++ "nrip_save": true, ++ "nrip-save": true, ++ "vmx-pause-exit": false, ++ "ssse3": true, ++ "kvm_pv_unhalt": true, ++ "sse4a": true, ++ "invpcid": false, ++ "pdpe1gb": true, ++ "tsc-deadline": true, ++ "skip-l1dfl-vmentry": true, ++ "vmx-exit-load-perf-global-ctrl": false, ++ "fma": true, ++ "cx16": true, ++ "de": true, ++ "enforce": false, ++ "stepping": 0, ++ "xsave": true, ++ "clflush": true, ++ "skinit": false, ++ "tsc": true, ++ "tce": false, ++ "fpu": true, ++ "ds-cpl": false, ++ "ds_cpl": false, ++ "ibs": false, ++ "fma4": false, ++ "host-phys-bits": false, ++ "vmx-exit-nosave-debugctl": false, ++ "vmx-invept": false, ++ "la57": false, ++ "osvw": true, ++ "check": true, ++ "hv-spinlocks": 4294967295, ++ "vmx-eptad": false, ++ "pmu": false, ++ "vmx-entry-noload-debugctl": false, ++ "pmm": false, ++ "apic": true, ++ "spec-ctrl": true, ++ "vmx-posted-intr": false, ++ "vmx-apicv-register": false, ++ "min-xlevel2": 0, ++ "tsc-adjust": true, ++ "tsc_adjust": true, ++ "kvm-steal-time": true, ++ "kvm_steal_time": true, ++ "kvmclock": true, ++ "vmx-zero-len-inject": false, ++ "l3-cache": true, ++ "pschange-mc-no": true, ++ "vmx-rdrand-exit": false, ++ "lwp": false, ++ "hv-passthrough": false, ++ "amd-ssbd": true, ++ "ibpb": true, ++ "xop": false, ++ "core-capability": false, ++ "avx": true, ++ "vmx-invept-single-context": false, ++ "movdiri": false, ++ "avx512bw": false, ++ "acpi": false, ++ "ace2": false, ++ "fsgsbase": true, ++ "hv-vapic": false, ++ "vmx-ept-1gb": false, ++ "vmx-ept-2mb": false, ++ "ht": false, ++ "vmx-io-exit": false, ++ "nx": true, ++ "pclmulqdq": true, ++ "mmxext": true, ++ "popcnt": true, ++ "vaes": false, ++ "xsaves": true, ++ "movdir64b": false, ++ "vmx-shadow-vmcs": false, ++ "tcg-cpuid": true, ++ "lm": true, ++ "vmx-exit-save-preemption-timer": false, ++ "vmx-entry-load-pat": false, ++ "vmx-entry-load-perf-global-ctrl": false, ++ "vmx-io-bitmap": false, ++ "vmx-store-lma": false, ++ "umip": true, ++ "vmx-movdr-exit": false, ++ "avx2": true, ++ "pse": true, ++ "pclmuldq": true, ++ "sep": true, ++ "vmx-cr3-load-noexit": false, ++ "virt-ssbd": true, ++ "x-hv-max-vps": -1, ++ "nodeid-msr": false, ++ "md-clear": false, ++ "split-lock-detect": false, ++ "kvm": true, ++ "misalignsse": true, ++ "min-xlevel": 2147483679, ++ "realized": false, ++ "kvm-pv-unhalt": true, ++ "bmi2": true, ++ "bmi1": true, ++ "tsc_scale": false, ++ "tsc-scale": false, ++ "topoext": false, ++ "amd-stibp": true, ++ "hv-vpindex": false, ++ "hv-no-nonarch-coresharing": "off", ++ "vmx-preemption-timer": false, ++ "xlevel2": 0, ++ "clflushopt": true, ++ "vmx-vnmi-pending": false, ++ "kvm-no-smi-migration": false, ++ "monitor": false, ++ "vmx-vintr-pending": false, ++ "avx512er": false, ++ "pmm-en": false, ++ "taa-no": false, ++ "pcid": false, ++ "vmx-secondary-ctls": false, ++ "arch-capabilities": true, ++ "vmx-xsaves": false, ++ "clzero": true, ++ "3dnow": false, ++ "erms": false, ++ "x-force-features": false, ++ "vmx-entry-ia32e-mode": false, ++ "lahf-lm": true, ++ "lahf_lm": true, ++ "vmx-ins-outs": false, ++ "vpclmulqdq": false, ++ "xstore": false, ++ "fxsr-opt": true, ++ "fxsr_opt": true, ++ "hv-synic": false, ++ "rtm": false, ++ "kvm-hint-dedicated": false, ++ "lmce": false, ++ "hv-time": false, ++ "perfctr_nb": false, ++ "perfctr-nb": false, ++ "hv-tlbflush": false, ++ "ffxsr": true, ++ "rdrand": true, ++ "rdseed": true, ++ "avx512-4vnniw": false, ++ "vme": true, ++ "vmx": false, ++ "dtes64": false, ++ "mtrr": true, ++ "rdtscp": true, ++ "xsaveerptr": true, ++ "pse36": true, ++ "kvm-pv-tlb-flush": true, ++ "vmx-activity-wait-sipi": false, ++ "tbm": false, ++ "vmx-rdpmc-exit": false, ++ "wdt": false, ++ "vmx-entry-load-efer": false, ++ "level-func7": 0, ++ "vmx-mtf": false, ++ "pause_filter": false, ++ "model-id": "AMD EPYC 7502 32-Core Processor ", ++ "sha-ni": true, ++ "abm": true, ++ "vmx-ept-advanced-exitinfo": false, ++ "avx512pf": false, ++ "vmx-hlt-exit": false, ++ "xstore-en": false ++ } ++ } ++ }, ++ "id": "model-expansion" ++} ++ ++{ ++ "return": [ ++ { ++ "name": "max", ++ "typename": "max-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": false ++ }, ++ { ++ "name": "host", ++ "typename": "host-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": false ++ }, ++ { ++ "name": "base", ++ "typename": "base-x86_64-cpu", ++ "unavailable-features": [], ++ "static": true, ++ "migration-safe": true ++ }, ++ { ++ "name": "qemu64-v1", ++ "typename": "qemu64-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "qemu64", ++ "typename": "qemu64-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "qemu64-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "qemu32-v1", ++ "typename": "qemu32-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "qemu32", ++ "typename": "qemu32-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "qemu32-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "phenom-v1", ++ "typename": "phenom-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "3dnowext", ++ "3dnow" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "phenom", ++ "typename": "phenom-x86_64-cpu", ++ "unavailable-features": [ ++ "3dnowext", ++ "3dnow" ++ ], ++ "alias-of": "phenom-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium3-v1", ++ "typename": "pentium3-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium3", ++ "typename": "pentium3-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "pentium3-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium2-v1", ++ "typename": "pentium2-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium2", ++ "typename": "pentium2-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "pentium2-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium-v1", ++ "typename": "pentium-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium", ++ "typename": "pentium-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "pentium-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "n270-v1", ++ "typename": "n270-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "ss" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "n270", ++ "typename": "n270-x86_64-cpu", ++ "unavailable-features": [ ++ "ss" ++ ], ++ "alias-of": "n270-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "kvm64-v1", ++ "typename": "kvm64-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "kvm64", ++ "typename": "kvm64-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "kvm64-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "kvm32-v1", ++ "typename": "kvm32-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "kvm32", ++ "typename": "kvm32-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "kvm32-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "coreduo-v1", ++ "typename": "coreduo-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "ss" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "coreduo", ++ "typename": "coreduo-x86_64-cpu", ++ "unavailable-features": [ ++ "ss" ++ ], ++ "alias-of": "coreduo-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "core2duo-v1", ++ "typename": "core2duo-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "ss" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "core2duo", ++ "typename": "core2duo-x86_64-cpu", ++ "unavailable-features": [ ++ "ss" ++ ], ++ "alias-of": "core2duo-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "athlon-v1", ++ "typename": "athlon-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "3dnowext", ++ "3dnow" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "athlon", ++ "typename": "athlon-x86_64-cpu", ++ "unavailable-features": [ ++ "3dnowext", ++ "3dnow" ++ ], ++ "alias-of": "athlon-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Westmere-v2", ++ "typename": "Westmere-v2-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Westmere-v1", ++ "typename": "Westmere-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Westmere-IBRS", ++ "typename": "Westmere-IBRS-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Westmere-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Westmere", ++ "typename": "Westmere-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Westmere-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Snowridge-v2", ++ "typename": "Snowridge-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "erms", ++ "gfni", ++ "cldemote", ++ "movdiri", ++ "movdir64b", ++ "core-capability", ++ "split-lock-detect" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Snowridge-v1", ++ "typename": "Snowridge-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "erms", ++ "mpx", ++ "gfni", ++ "cldemote", ++ "movdiri", ++ "movdir64b", ++ "core-capability", ++ "mpx", ++ "mpx", ++ "split-lock-detect" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Snowridge", ++ "typename": "Snowridge-x86_64-cpu", ++ "unavailable-features": [ ++ "erms", ++ "mpx", ++ "gfni", ++ "cldemote", ++ "movdiri", ++ "movdir64b", ++ "core-capability", ++ "mpx", ++ "mpx", ++ "split-lock-detect" ++ ], ++ "alias-of": "Snowridge-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-v3", ++ "typename": "Skylake-Server-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-v2", ++ "typename": "Skylake-Server-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-v1", ++ "typename": "Skylake-Server-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-noTSX-IBRS", ++ "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "alias-of": "Skylake-Server-v3", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-IBRS", ++ "typename": "Skylake-Server-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "alias-of": "Skylake-Server-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server", ++ "typename": "Skylake-Server-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "alias-of": "Skylake-Server-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-v3", ++ "typename": "Skylake-Client-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-v2", ++ "typename": "Skylake-Client-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-v1", ++ "typename": "Skylake-Client-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-noTSX-IBRS", ++ "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "alias-of": "Skylake-Client-v3", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-IBRS", ++ "typename": "Skylake-Client-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "alias-of": "Skylake-Client-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client", ++ "typename": "Skylake-Client-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "alias-of": "Skylake-Client-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "SandyBridge-v2", ++ "typename": "SandyBridge-v2-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "SandyBridge-v1", ++ "typename": "SandyBridge-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "SandyBridge-IBRS", ++ "typename": "SandyBridge-IBRS-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "SandyBridge-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "SandyBridge", ++ "typename": "SandyBridge-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "SandyBridge-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Penryn-v1", ++ "typename": "Penryn-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Penryn", ++ "typename": "Penryn-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Penryn-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G5-v1", ++ "typename": "Opteron_G5-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "xop", ++ "fma4", ++ "tbm" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G5", ++ "typename": "Opteron_G5-x86_64-cpu", ++ "unavailable-features": [ ++ "xop", ++ "fma4", ++ "tbm" ++ ], ++ "alias-of": "Opteron_G5-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G4-v1", ++ "typename": "Opteron_G4-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "xop", ++ "fma4" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G4", ++ "typename": "Opteron_G4-x86_64-cpu", ++ "unavailable-features": [ ++ "xop", ++ "fma4" ++ ], ++ "alias-of": "Opteron_G4-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G3-v1", ++ "typename": "Opteron_G3-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G3", ++ "typename": "Opteron_G3-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Opteron_G3-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G2-v1", ++ "typename": "Opteron_G2-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G2", ++ "typename": "Opteron_G2-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Opteron_G2-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G1-v1", ++ "typename": "Opteron_G1-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G1", ++ "typename": "Opteron_G1-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Opteron_G1-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Nehalem-v2", ++ "typename": "Nehalem-v2-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Nehalem-v1", ++ "typename": "Nehalem-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Nehalem-IBRS", ++ "typename": "Nehalem-IBRS-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Nehalem-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Nehalem", ++ "typename": "Nehalem-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Nehalem-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "KnightsMill-v1", ++ "typename": "KnightsMill-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "ss", ++ "erms", ++ "avx512f", ++ "avx512pf", ++ "avx512er", ++ "avx512cd", ++ "avx512-vpopcntdq", ++ "avx512-4vnniw", ++ "avx512-4fmaps", ++ "avx512f", ++ "avx512f", ++ "avx512f" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "KnightsMill", ++ "typename": "KnightsMill-x86_64-cpu", ++ "unavailable-features": [ ++ "ss", ++ "erms", ++ "avx512f", ++ "avx512pf", ++ "avx512er", ++ "avx512cd", ++ "avx512-vpopcntdq", ++ "avx512-4vnniw", ++ "avx512-4fmaps", ++ "avx512f", ++ "avx512f", ++ "avx512f" ++ ], ++ "alias-of": "KnightsMill-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "IvyBridge-v2", ++ "typename": "IvyBridge-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "erms" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "IvyBridge-v1", ++ "typename": "IvyBridge-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "erms" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "IvyBridge-IBRS", ++ "typename": "IvyBridge-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "erms" ++ ], ++ "alias-of": "IvyBridge-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "IvyBridge", ++ "typename": "IvyBridge-x86_64-cpu", ++ "unavailable-features": [ ++ "erms" ++ ], ++ "alias-of": "IvyBridge-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Server-v2", ++ "typename": "Icelake-Server-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "gfni", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "la57", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Server-v1", ++ "typename": "Icelake-Server-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "gfni", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "la57", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Server-noTSX", ++ "typename": "Icelake-Server-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "gfni", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "la57", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "alias-of": "Icelake-Server-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Server", ++ "typename": "Icelake-Server-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "gfni", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "la57", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "alias-of": "Icelake-Server-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Client-v2", ++ "typename": "Icelake-Client-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "gfni", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Client-v1", ++ "typename": "Icelake-Client-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "gfni", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Client-noTSX", ++ "typename": "Icelake-Client-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "gfni", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "pku" ++ ], ++ "alias-of": "Icelake-Client-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Client", ++ "typename": "Icelake-Client-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "gfni", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "pku" ++ ], ++ "alias-of": "Icelake-Client-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-v4", ++ "typename": "Haswell-v4-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-v3", ++ "typename": "Haswell-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-v2", ++ "typename": "Haswell-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-v1", ++ "typename": "Haswell-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-noTSX-IBRS", ++ "typename": "Haswell-noTSX-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "alias-of": "Haswell-v4", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-noTSX", ++ "typename": "Haswell-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "alias-of": "Haswell-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-IBRS", ++ "typename": "Haswell-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "alias-of": "Haswell-v3", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell", ++ "typename": "Haswell-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "alias-of": "Haswell-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-v3", ++ "typename": "EPYC-v3-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-v2", ++ "typename": "EPYC-v2-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-v1", ++ "typename": "EPYC-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-Rome-v1", ++ "typename": "EPYC-Rome-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-Rome", ++ "typename": "EPYC-Rome-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "EPYC-Rome-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-IBPB", ++ "typename": "EPYC-IBPB-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "EPYC-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC", ++ "typename": "EPYC-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "EPYC-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Dhyana-v1", ++ "typename": "Dhyana-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Dhyana", ++ "typename": "Dhyana-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Dhyana-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Denverton-v1", ++ "typename": "Denverton-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "erms", ++ "mpx", ++ "mpx", ++ "mpx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Denverton", ++ "typename": "Denverton-x86_64-cpu", ++ "unavailable-features": [ ++ "erms", ++ "mpx", ++ "mpx", ++ "mpx" ++ ], ++ "alias-of": "Denverton-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cooperlake-v1", ++ "typename": "Cooperlake-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "avx512-bf16", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku", ++ "ibrs-all" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cooperlake", ++ "typename": "Cooperlake-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "avx512-bf16", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku", ++ "ibrs-all" ++ ], ++ "alias-of": "Cooperlake-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Conroe-v1", ++ "typename": "Conroe-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Conroe", ++ "typename": "Conroe-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "Conroe-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server-v3", ++ "typename": "Cascadelake-Server-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku", ++ "ibrs-all" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server-v2", ++ "typename": "Cascadelake-Server-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku", ++ "ibrs-all" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server-v1", ++ "typename": "Cascadelake-Server-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server-noTSX", ++ "typename": "Cascadelake-Server-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku", ++ "ibrs-all" ++ ], ++ "alias-of": "Cascadelake-Server-v3", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server", ++ "typename": "Cascadelake-Server-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "alias-of": "Cascadelake-Server-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-v4", ++ "typename": "Broadwell-v4-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-v3", ++ "typename": "Broadwell-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-v2", ++ "typename": "Broadwell-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-v1", ++ "typename": "Broadwell-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-noTSX-IBRS", ++ "typename": "Broadwell-noTSX-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "alias-of": "Broadwell-v4", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-noTSX", ++ "typename": "Broadwell-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "erms", ++ "invpcid" ++ ], ++ "alias-of": "Broadwell-v2", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-IBRS", ++ "typename": "Broadwell-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "alias-of": "Broadwell-v3", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell", ++ "typename": "Broadwell-x86_64-cpu", ++ "unavailable-features": [ ++ "pcid", ++ "hle", ++ "erms", ++ "invpcid", ++ "rtm" ++ ], ++ "alias-of": "Broadwell-v1", ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "486-v1", ++ "typename": "486-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "486", ++ "typename": "486-x86_64-cpu", ++ "unavailable-features": [], ++ "alias-of": "486-v1", ++ "static": false, ++ "migration-safe": true ++ } ++ ], ++ "id": "definitions" ++} +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.sig b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.sig +new file mode 100644 +index 0000000000..cf54739de9 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.sig +@@ -0,0 +1,4 @@ ++830f10 ++family: 23 (0x17) ++model: 49 (0x31) ++stepping: 0 (0x00) +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.xml +new file mode 100644 +index 0000000000..d6753065b9 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core.xml +@@ -0,0 +1,66 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +-- +2.29.2 + diff --git a/SOURCES/libvirt-Allow-NUMA-nodes-without-vCPUs.patch b/SOURCES/libvirt-Allow-NUMA-nodes-without-vCPUs.patch new file mode 100644 index 0000000..37df946 --- /dev/null +++ b/SOURCES/libvirt-Allow-NUMA-nodes-without-vCPUs.patch @@ -0,0 +1,456 @@ +From 5f6723e71e3765d1d43bfa9ba1c66e0e05e11a48 Mon Sep 17 00:00:00 2001 +Message-Id: <5f6723e71e3765d1d43bfa9ba1c66e0e05e11a48@dist-git> +From: Michal Privoznik +Date: Mon, 9 Nov 2020 17:22:32 +0100 +Subject: [PATCH] Allow NUMA nodes without vCPUs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +QEMU allows creating NUMA nodes that have memory only. +These are somehow important for HMAT. + +With check done in qemuValidateDomainDef() for QEMU 2.7 or newer +(checked via QEMU_CAPS_NUMA), we can be sure that the vCPUs are +fully assigned to NUMA nodes in domain XML. + +Signed-off-by: Michal Privoznik +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit a26f61ee0cffa421b87ef568002b684dd8025432) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 + +Conflicts: +- src/qemu/qemu_validate.c: This file doesn't exist in downstream +yet, so I've moved the change that original patch would do to +qemu_domain.c where the validator lives. + +Signed-off-by: Michal Privoznik +Message-Id: <365508c75e579e9037ad555d6c372068ccd50c95.1604938867.git.mprivozn@redhat.com> +Reviewed-by: Ján Tomko +--- + docs/formatdomain.html.in | 2 + + docs/schemas/cputypes.rng | 8 ++- + src/conf/numa_conf.c | 59 ++++++++++--------- + src/libxl/xen_xl.c | 10 ++-- + src/qemu/qemu_command.c | 26 ++++---- + src/qemu/qemu_domain.c | 22 +++---- + tests/qemuxml2argvdata/numatune-no-vcpu.args | 33 +++++++++++ + tests/qemuxml2argvdata/numatune-no-vcpu.xml | 42 +++++++++++++ + tests/qemuxml2argvtest.c | 1 + + tests/qemuxml2xmloutdata/numatune-no-vcpu.xml | 1 + + tests/qemuxml2xmltest.c | 1 + + 11 files changed, 149 insertions(+), 56 deletions(-) + create mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.args + create mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.xml + create mode 120000 tests/qemuxml2xmloutdata/numatune-no-vcpu.xml + +diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in +index 76799f5ffc..4b8d312596 100644 +--- a/docs/formatdomain.html.in ++++ b/docs/formatdomain.html.in +@@ -1783,6 +1783,8 @@ + cpus specifies the CPU or range of CPUs that are + part of the node. memory specifies the node memory + in kibibytes (i.e. blocks of 1024 bytes). ++ Since 6.6.0 the cpus attribute ++ is optional and if omitted a CPU-less NUMA node is created. + Since 1.2.11 one can use an additional unit attribute to + define units in which memory is specified. +diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng +index e2744acad3..a1682a1003 100644 +--- a/docs/schemas/cputypes.rng ++++ b/docs/schemas/cputypes.rng +@@ -115,9 +115,11 @@ + + + +- +- +- ++ ++ ++ ++ ++ + + + +diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c +index c9cc8ac22e..a805336d16 100644 +--- a/src/conf/numa_conf.c ++++ b/src/conf/numa_conf.c +@@ -889,32 +889,28 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, + } + VIR_FREE(tmp); + +- if (def->mem_nodes[cur_cell].cpumask) { ++ if (def->mem_nodes[cur_cell].mem) { + virReportError(VIR_ERR_XML_ERROR, + _("Duplicate NUMA cell info for cell id '%u'"), + cur_cell); + goto cleanup; + } + +- if (!(tmp = virXMLPropString(nodes[i], "cpus"))) { +- virReportError(VIR_ERR_XML_ERROR, "%s", +- _("Missing 'cpus' attribute in NUMA cell")); +- goto cleanup; +- } ++ if ((tmp = virXMLPropString(nodes[i], "cpus"))) { ++ g_autoptr(virBitmap) cpumask = NULL; + +- if (virBitmapParse(tmp, &def->mem_nodes[cur_cell].cpumask, +- VIR_DOMAIN_CPUMASK_LEN) < 0) +- goto cleanup; ++ if (virBitmapParse(tmp, &cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) ++ goto cleanup; + +- if (virBitmapIsAllClear(def->mem_nodes[cur_cell].cpumask)) { +- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, +- _("NUMA cell %d has no vCPUs assigned"), cur_cell); +- goto cleanup; ++ if (!virBitmapIsAllClear(cpumask)) ++ def->mem_nodes[cur_cell].cpumask = g_steal_pointer(&cpumask); ++ VIR_FREE(tmp); + } +- VIR_FREE(tmp); + + for (j = 0; j < n; j++) { +- if (j == cur_cell || !def->mem_nodes[j].cpumask) ++ if (j == cur_cell || ++ !def->mem_nodes[j].cpumask || ++ !def->mem_nodes[cur_cell].cpumask) + continue; + + if (virBitmapOverlaps(def->mem_nodes[j].cpumask, +@@ -976,7 +972,6 @@ virDomainNumaDefFormatXML(virBufferPtr buf, + { + virDomainMemoryAccess memAccess; + virTristateBool discard; +- char *cpustr; + size_t ncells = virDomainNumaGetNodeCount(def); + size_t i; + +@@ -986,17 +981,22 @@ virDomainNumaDefFormatXML(virBufferPtr buf, + virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); + for (i = 0; i < ncells; i++) { ++ virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(def, i); + int ndistances; + + memAccess = virDomainNumaGetNodeMemoryAccessMode(def, i); + discard = virDomainNumaGetNodeDiscard(def, i); + +- if (!(cpustr = virBitmapFormat(virDomainNumaGetNodeCpumask(def, i)))) +- return -1; +- + virBufferAddLit(buf, "\n"); + } +- +- VIR_FREE(cpustr); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); +@@ -1048,8 +1046,12 @@ virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa) + size_t i; + unsigned int ret = 0; + +- for (i = 0; i < numa->nmem_nodes; i++) +- ret += virBitmapCountBits(virDomainNumaGetNodeCpumask(numa, i)); ++ for (i = 0; i < numa->nmem_nodes; i++) { ++ virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(numa, i); ++ ++ if (cpumask) ++ ret += virBitmapCountBits(cpumask); ++ } + + return ret; + } +@@ -1061,11 +1063,14 @@ virDomainNumaGetMaxCPUID(virDomainNumaPtr numa) + unsigned int ret = 0; + + for (i = 0; i < numa->nmem_nodes; i++) { ++ virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(numa, i); + int bit; + +- bit = virBitmapLastSetBit(virDomainNumaGetNodeCpumask(numa, i)); +- if (bit > ret) +- ret = bit; ++ if (cpumask) { ++ bit = virBitmapLastSetBit(cpumask); ++ if (bit > ret) ++ ret = bit; ++ } + } + + return ret; +diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c +index edea30a86a..752fa925ec 100644 +--- a/src/libxl/xen_xl.c ++++ b/src/libxl/xen_xl.c +@@ -1443,19 +1443,21 @@ xenFormatXLVnuma(virConfValuePtr list, + { + int ret = -1; + size_t i; +- + virBuffer buf = VIR_BUFFER_INITIALIZER; + virConfValuePtr numaVnode, tmp; +- ++ virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(numa, node); + size_t nodeSize = virDomainNumaGetNodeMemorySize(numa, node) / 1024; +- char *nodeVcpus = virBitmapFormat(virDomainNumaGetNodeCpumask(numa, node)); ++ g_autofree char *nodeVcpus = NULL; + +- if (VIR_ALLOC(numaVnode) < 0) ++ if (!cpumask || ++ VIR_ALLOC(numaVnode) < 0) + goto cleanup; + + numaVnode->type = VIR_CONF_LIST; + numaVnode->list = NULL; + ++ nodeVcpus = virBitmapFormat(cpumask); ++ + /* pnode */ + virBufferAsprintf(&buf, "pnode=%zu", node); + xenFormatXLVnode(numaVnode, &buf); +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index 1a573c2817..ac63d18a42 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -7364,8 +7364,6 @@ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg, + size_t i, j; + virQEMUCapsPtr qemuCaps = priv->qemuCaps; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; +- char *cpumask = NULL; +- char *tmpmask = NULL; + char *next = NULL; + virBufferPtr nodeBackends = NULL; + bool needBackend = false; +@@ -7400,9 +7398,7 @@ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg, + goto cleanup; + + for (i = 0; i < ncells; i++) { +- VIR_FREE(cpumask); +- if (!(cpumask = virBitmapFormat(virDomainNumaGetNodeCpumask(def->numa, i)))) +- goto cleanup; ++ virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(def->numa, i); + + if (needBackend) { + virCommandAddArg(cmd, "-object"); +@@ -7412,11 +7408,19 @@ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg, + virCommandAddArg(cmd, "-numa"); + virBufferAsprintf(&buf, "node,nodeid=%zu", i); + +- for (tmpmask = cpumask; tmpmask; tmpmask = next) { +- if ((next = strchr(tmpmask, ','))) +- *(next++) = '\0'; +- virBufferAddLit(&buf, ",cpus="); +- virBufferAdd(&buf, tmpmask, -1); ++ if (cpumask) { ++ g_autofree char *cpumaskStr = NULL; ++ char *tmpmask; ++ ++ if (!(cpumaskStr = virBitmapFormat(cpumask))) ++ goto cleanup; ++ ++ for (tmpmask = cpumaskStr; tmpmask; tmpmask = next) { ++ if ((next = strchr(tmpmask, ','))) ++ *(next++) = '\0'; ++ virBufferAddLit(&buf, ",cpus="); ++ virBufferAdd(&buf, tmpmask, -1); ++ } + } + + if (needBackend) +@@ -7447,8 +7451,6 @@ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg, + ret = 0; + + cleanup: +- VIR_FREE(cpumask); +- + if (nodeBackends) { + for (i = 0; i < ncells; i++) + virBufferFreeAndReset(&nodeBackends[i]); +diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c +index 35b536868a..be25790f12 100644 +--- a/src/qemu/qemu_domain.c ++++ b/src/qemu/qemu_domain.c +@@ -5373,7 +5373,7 @@ qemuDomainDefValidateNuma(const virDomainDef *def, + } + + for (i = 0; i < ncells; i++) { +- g_autofree char * cpumask = NULL; ++ virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(def->numa, i); + + if (!hasMemoryCap && + virDomainNumaGetNodeMemoryAccessMode(def->numa, i)) { +@@ -5383,17 +5383,19 @@ qemuDomainDefValidateNuma(const virDomainDef *def, + return -1; + } + +- if (!(cpumask = virBitmapFormat(virDomainNumaGetNodeCpumask(def->numa, i)))) +- return -1; ++ if (cpumask) { ++ g_autofree char * cpumaskStr = NULL; ++ if (!(cpumaskStr = virBitmapFormat(cpumask))) ++ return -1; + +- if (strchr(cpumask, ',') && +- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA)) { +- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", +- _("disjoint NUMA cpu ranges are not supported " +- "with this QEMU")); +- return -1; ++ if (strchr(cpumaskStr, ',') && ++ !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA)) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("disjoint NUMA cpu ranges are not supported " ++ "with this QEMU")); ++ return -1; ++ } + } +- + } + + if (virDomainNumaNodesDistancesAreBeingSet(def->numa) && +diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args b/tests/qemuxml2argvdata/numatune-no-vcpu.args +new file mode 100644 +index 0000000000..a1f1ee044e +--- /dev/null ++++ b/tests/qemuxml2argvdata/numatune-no-vcpu.args +@@ -0,0 +1,33 @@ ++LC_ALL=C \ ++PATH=/bin \ ++HOME=/tmp/lib/domain--1-QEMUGuest \ ++USER=test \ ++LOGNAME=test \ ++XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \ ++XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \ ++XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \ ++QEMU_AUDIO_DRV=none \ ++/usr/bin/qemu-system-x86_64 \ ++-name QEMUGuest \ ++-S \ ++-machine pc,accel=tcg,usb=off,dump-guest-core=off \ ++-m 12288 \ ++-realtime mlock=off \ ++-smp 12,sockets=12,cores=1,threads=1 \ ++-numa node,nodeid=0,cpus=0-3,mem=2048 \ ++-numa node,nodeid=1,cpus=4-7,mem=2048 \ ++-numa node,nodeid=2,cpus=8-11,mem=2048 \ ++-numa node,nodeid=3,mem=2048 \ ++-numa node,nodeid=4,mem=2048 \ ++-numa node,nodeid=5,mem=2048 \ ++-uuid c7a5fdb2-cdaf-9455-926a-d65c16db1809 \ ++-display none \ ++-no-user-config \ ++-nodefaults \ ++-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\ ++server,nowait \ ++-mon chardev=charmonitor,id=monitor,mode=control \ ++-rtc base=utc \ ++-no-shutdown \ ++-usb \ ++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.xml b/tests/qemuxml2argvdata/numatune-no-vcpu.xml +new file mode 100644 +index 0000000000..f25a07d7ed +--- /dev/null ++++ b/tests/qemuxml2argvdata/numatune-no-vcpu.xml +@@ -0,0 +1,42 @@ ++ ++ QEMUGuest ++ c7a5fdb2-cdaf-9455-926a-d65c16db1809 ++ 12582912 ++ 12582912 ++ 12 ++ ++ hvm ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ destroy ++ restart ++ restart ++ ++ /usr/bin/qemu-system-x86_64 ++ ++
++ ++ ++ ++ ++ ++
++ ++ ++ +diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c +index ff92af606d..49699e495d 100644 +--- a/tests/qemuxml2argvtest.c ++++ b/tests/qemuxml2argvtest.c +@@ -1812,6 +1812,7 @@ mymain(void) + DO_TEST_PARSE_ERROR("numatune-memnode-no-memory", NONE); + + DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST); ++ DO_TEST("numatune-no-vcpu", NONE); + + DO_TEST("numatune-auto-nodeset-invalid", NONE); + DO_TEST("numatune-auto-prefer", QEMU_CAPS_OBJECT_MEMORY_RAM, +diff --git a/tests/qemuxml2xmloutdata/numatune-no-vcpu.xml b/tests/qemuxml2xmloutdata/numatune-no-vcpu.xml +new file mode 120000 +index 0000000000..f213032685 +--- /dev/null ++++ b/tests/qemuxml2xmloutdata/numatune-no-vcpu.xml +@@ -0,0 +1 @@ ++../qemuxml2argvdata/numatune-no-vcpu.xml +\ No newline at end of file +diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c +index 6c3f5c4a9e..1ddeba30f0 100644 +--- a/tests/qemuxml2xmltest.c ++++ b/tests/qemuxml2xmltest.c +@@ -1105,6 +1105,7 @@ mymain(void) + DO_TEST("numatune-memnode", QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST("numatune-memnode-no-memory", QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST); ++ DO_TEST("numatune-no-vcpu", QEMU_CAPS_NUMA); + + DO_TEST("bios-nvram", NONE); + DO_TEST("bios-nvram-os-interleave", NONE); +-- +2.29.2 + diff --git a/SOURCES/libvirt-RNG-Allow-interleaving-of-domain-cpu-numa-cell-children.patch b/SOURCES/libvirt-RNG-Allow-interleaving-of-domain-cpu-numa-cell-children.patch new file mode 100644 index 0000000..27fb4b4 --- /dev/null +++ b/SOURCES/libvirt-RNG-Allow-interleaving-of-domain-cpu-numa-cell-children.patch @@ -0,0 +1,63 @@ +From e37b1531942872a229b9f45524ea4679f3b1e8d6 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Mon, 9 Nov 2020 17:22:33 +0100 +Subject: [PATCH] RNG: Allow interleaving of /domain/cpu/numa/cell children +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +So far, the element can have two types of children +elements: and (which can be repeated more +times). However, there is no reason to require specific order in +input XML. Allow elements to be interleaved. + +Signed-off-by: Michal Privoznik +Reviewed-by: Ján Tomko +(cherry picked from commit fd2ad818b29ca56904dd228f0774f553f99c1157) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 + +Signed-off-by: Michal Privoznik +Message-Id: <48b8e99ea6fbc6bcab0f7b3d17e7824ef1b232e2.1604938847.git.mprivozn@redhat.com> +Reviewed-by: Ján Tomko +--- + docs/schemas/cputypes.rng | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng +index ba30dbf9ff..a1cae23161 100644 +--- a/docs/schemas/cputypes.rng ++++ b/docs/schemas/cputypes.rng +@@ -146,16 +146,18 @@ + + + +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +-- +2.29.2 + diff --git a/SOURCES/libvirt-cgroup-use-virCgroupSetCpuShares-instead-of-virCgroupSetupCpuShares.patch b/SOURCES/libvirt-cgroup-use-virCgroupSetCpuShares-instead-of-virCgroupSetupCpuShares.patch new file mode 100644 index 0000000..9eec89b --- /dev/null +++ b/SOURCES/libvirt-cgroup-use-virCgroupSetCpuShares-instead-of-virCgroupSetupCpuShares.patch @@ -0,0 +1,146 @@ +From 8d08db00d403ddd17cb51d972842c6d13a122d57 Mon Sep 17 00:00:00 2001 +Message-Id: <8d08db00d403ddd17cb51d972842c6d13a122d57@dist-git> +From: Pavel Hrdina +Date: Thu, 4 Mar 2021 12:57:58 +0100 +Subject: [PATCH] cgroup: use virCgroupSetCpuShares instead of + virCgroupSetupCpuShares +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Now that we enforce the cpu.shares range kernel will no longer silently +change the value that libvirt configures so there is no need to read +the value back to get the actual configuration. + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit e95489d813cb7cc68b02905ce3ec059bc395b465) + +Conflicts: + src/lxc/lxc_cgroup.c + src/lxc/lxc_driver.c + src/qemu/qemu_cgroup.c + src/qemu/qemu_driver.c + - downstream doesn't have virCgroupSetupCpuShares() function + so we just remove usage of virCgroupGetCpuShares() + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: +Reviewed-by: Ján Tomko +--- + src/lxc/lxc_cgroup.c | 5 ----- + src/lxc/lxc_driver.c | 6 +----- + src/qemu/qemu_cgroup.c | 20 -------------------- + src/qemu/qemu_driver.c | 8 ++------ + 4 files changed, 3 insertions(+), 36 deletions(-) + +diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c +index 7f3701593a..f785f50754 100644 +--- a/src/lxc/lxc_cgroup.c ++++ b/src/lxc/lxc_cgroup.c +@@ -38,13 +38,8 @@ static int virLXCCgroupSetupCpuTune(virDomainDefPtr def, + virCgroupPtr cgroup) + { + if (def->cputune.sharesSpecified) { +- unsigned long long val; + if (virCgroupSetCpuShares(cgroup, def->cputune.shares) < 0) + return -1; +- +- if (virCgroupGetCpuShares(cgroup, &val) < 0) +- return -1; +- def->cputune.shares = val; + } + + if (def->cputune.quota != 0 && +diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c +index a8c93dd228..853ddac8b9 100644 +--- a/src/lxc/lxc_driver.c ++++ b/src/lxc/lxc_driver.c +@@ -1909,14 +1909,10 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, + + if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CPU_SHARES)) { + if (def) { +- unsigned long long val; + if (virCgroupSetCpuShares(priv->cgroup, params[i].value.ul) < 0) + goto endjob; + +- if (virCgroupGetCpuShares(priv->cgroup, &val) < 0) +- goto endjob; +- +- def->cputune.shares = val; ++ def->cputune.shares = params[i].value.ul; + def->cputune.sharesSpecified = true; + } + +diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c +index 3a62b4ac15..95ea5bed74 100644 +--- a/src/qemu/qemu_cgroup.c ++++ b/src/qemu/qemu_cgroup.c +@@ -933,10 +933,6 @@ static int + qemuSetupCpuCgroup(virDomainObjPtr vm) + { + qemuDomainObjPrivatePtr priv = vm->privateData; +- virObjectEventPtr event = NULL; +- virTypedParameterPtr eventParams = NULL; +- int eventNparams = 0; +- int eventMaxparams = 0; + + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPU)) { + if (vm->def->cputune.sharesSpecified) { +@@ -949,24 +945,8 @@ qemuSetupCpuCgroup(virDomainObjPtr vm) + } + + if (vm->def->cputune.sharesSpecified) { +- unsigned long long val; + if (virCgroupSetCpuShares(priv->cgroup, vm->def->cputune.shares) < 0) + return -1; +- +- if (virCgroupGetCpuShares(priv->cgroup, &val) < 0) +- return -1; +- if (vm->def->cputune.shares != val) { +- vm->def->cputune.shares = val; +- if (virTypedParamsAddULLong(&eventParams, &eventNparams, +- &eventMaxparams, +- VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES, +- val) < 0) +- return -1; +- +- event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); +- } +- +- virObjectEventStateQueue(priv->driver->domainEventState, event); + } + + return 0; +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index a1103a96dd..3914d3ff68 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -10625,20 +10625,16 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, + + if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CPU_SHARES)) { + if (def) { +- unsigned long long val; + if (virCgroupSetCpuShares(priv->cgroup, value_ul) < 0) + goto endjob; + +- if (virCgroupGetCpuShares(priv->cgroup, &val) < 0) +- goto endjob; +- +- def->cputune.shares = val; ++ def->cputune.shares = value_ul; + def->cputune.sharesSpecified = true; + + if (virTypedParamsAddULLong(&eventParams, &eventNparams, + &eventMaxNparams, + VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES, +- val) < 0) ++ value_ul) < 0) + goto endjob; + } + +-- +2.30.0 + diff --git a/SOURCES/libvirt-conf-Move-and-rename-virDomainParseScaledValue.patch b/SOURCES/libvirt-conf-Move-and-rename-virDomainParseScaledValue.patch new file mode 100644 index 0000000..52e7f0b --- /dev/null +++ b/SOURCES/libvirt-conf-Move-and-rename-virDomainParseScaledValue.patch @@ -0,0 +1,357 @@ +From 0cee78aa69f5e3317b5e4853454a108e597228e5 Mon Sep 17 00:00:00 2001 +Message-Id: <0cee78aa69f5e3317b5e4853454a108e597228e5@dist-git> +From: Michal Privoznik +Date: Wed, 7 Oct 2020 18:45:33 +0200 +Subject: [PATCH] conf: Move and rename virDomainParseScaledValue() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There is nothing domain specific about the function, thus it +should not have virDomain prefix. Also, the fact that it is a +static function makes it impossible to use from other files. +Move the function to virxml.c and drop the 'Domain' infix. + +Signed-off-by: Michal Privoznik +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit 04bd77a19f8312493151ce377da40577b1470a0b) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 + +Conflicts: +- src/conf/domain_conf.c: Some context mismatch, and some areas +the original commit changes don't exist in this old libvirt yet +or the calls are in other places because of refactors. + +Signed-off-by: Michal Privoznik +Message-Id: <26a847deef5941fd90f892cf5fe1443cf3fc90ca.1602087923.git.mprivozn@redhat.com> +Reviewed-by: Ján Tomko +--- + src/conf/domain_conf.c | 135 ++++++++++----------------------------- + src/libvirt_private.syms | 1 + + src/util/virxml.c | 72 +++++++++++++++++++++ + src/util/virxml.h | 8 +++ + 4 files changed, 114 insertions(+), 102 deletions(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 306926b64c..484f3b4352 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -10644,75 +10644,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, + goto cleanup; + } + +-/** +- * virDomainParseScaledValue: +- * @xpath: XPath to memory amount +- * @units_xpath: XPath to units attribute +- * @ctxt: XPath context +- * @val: scaled value is stored here +- * @scale: default scale for @val +- * @max: maximal @val allowed +- * @required: is the value required? +- * +- * Parse a value located at @xpath within @ctxt, and store the +- * result into @val. The value is scaled by units located at +- * @units_xpath (or the 'unit' attribute under @xpath if +- * @units_xpath is NULL). If units are not present, the default +- * @scale is used. If @required is set, then the value must +- * exist; otherwise, the value is optional. The resulting value +- * is in bytes. +- * +- * Returns 1 on success, +- * 0 if the value was not present and !@required, +- * -1 on failure after issuing error. +- */ +-static int +-virDomainParseScaledValue(const char *xpath, +- const char *units_xpath, +- xmlXPathContextPtr ctxt, +- unsigned long long *val, +- unsigned long long scale, +- unsigned long long max, +- bool required) +-{ +- unsigned long long bytes; +- g_autofree char *xpath_full = NULL; +- g_autofree char *unit = NULL; +- g_autofree char *bytes_str = NULL; +- +- *val = 0; +- xpath_full = g_strdup_printf("string(%s)", xpath); +- +- bytes_str = virXPathString(xpath_full, ctxt); +- if (!bytes_str) { +- if (!required) +- return 0; +- virReportError(VIR_ERR_XML_ERROR, +- _("missing element or attribute '%s'"), +- xpath); +- return -1; +- } +- VIR_FREE(xpath_full); +- +- if (virStrToLong_ullp(bytes_str, NULL, 10, &bytes) < 0) { +- virReportError(VIR_ERR_XML_ERROR, +- _("Invalid value '%s' for element or attribute '%s'"), +- bytes_str, xpath); +- return -1; +- } +- +- if (units_xpath) +- xpath_full = g_strdup_printf("string(%s)", units_xpath); +- else +- xpath_full = g_strdup_printf("string(%s/@unit)", xpath); +- unit = virXPathString(xpath_full, ctxt); +- +- if (virScaleInteger(&bytes, unit, scale, max) < 0) +- return -1; +- +- *val = bytes; +- return 1; +-} + + + /** +@@ -10749,8 +10680,8 @@ virDomainParseMemory(const char *xpath, + + max = virMemoryMaxValue(capped); + +- if (virDomainParseScaledValue(xpath, units_xpath, ctxt, +- &bytes, 1024, max, required) < 0) ++ if (virParseScaledValue(xpath, units_xpath, ctxt, ++ &bytes, 1024, max, required) < 0) + return -1; + + /* Yes, we really do use kibibytes for our internal sizing. */ +@@ -10792,9 +10723,9 @@ virDomainParseMemoryLimit(const char *xpath, + int ret; + unsigned long long bytes; + +- ret = virDomainParseScaledValue(xpath, units_xpath, ctxt, &bytes, 1024, +- VIR_DOMAIN_MEMORY_PARAM_UNLIMITED << 10, +- false); ++ ret = virParseScaledValue(xpath, units_xpath, ctxt, &bytes, 1024, ++ VIR_DOMAIN_MEMORY_PARAM_UNLIMITED << 10, ++ false); + + if (ret < 0) + return -1; +@@ -11125,9 +11056,9 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt, + "have an address")); + goto error; + } +- if ((rc = virDomainParseScaledValue("./pcihole64", NULL, +- ctxt, &bytes, 1024, +- 1024ULL * ULONG_MAX, false)) < 0) ++ if ((rc = virParseScaledValue("./pcihole64", NULL, ++ ctxt, &bytes, 1024, ++ 1024ULL * ULONG_MAX, false)) < 0) + goto error; + + if (rc == 1) +@@ -11349,14 +11280,14 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, + } + } + +- if (virDomainParseScaledValue("./space_hard_limit[1]", +- NULL, ctxt, &def->space_hard_limit, +- 1, ULLONG_MAX, false) < 0) ++ if (virParseScaledValue("./space_hard_limit[1]", ++ NULL, ctxt, &def->space_hard_limit, ++ 1, ULLONG_MAX, false) < 0) + goto error; + +- if (virDomainParseScaledValue("./space_soft_limit[1]", +- NULL, ctxt, &def->space_soft_limit, +- 1, ULLONG_MAX, false) < 0) ++ if (virParseScaledValue("./space_soft_limit[1]", ++ NULL, ctxt, &def->space_soft_limit, ++ 1, ULLONG_MAX, false) < 0) + goto error; + + cur = node->children; +@@ -15205,8 +15136,8 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt, + goto cleanup; + } + +- if (virDomainParseScaledValue("./size[1]", NULL, ctxt, +- &def->size, 1, ULLONG_MAX, false) < 0) ++ if (virParseScaledValue("./size[1]", NULL, ctxt, ++ &def->size, 1, ULLONG_MAX, false) < 0) + goto cleanup; + + if ((server = virXPathNode("./server[1]", ctxt))) { +@@ -19603,9 +19534,9 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt, + return -1; + } + +- if (virDomainParseScaledValue("./@size", "./@unit", +- ctxt, &size, 1024, +- ULLONG_MAX, true) < 0) ++ if (virParseScaledValue("./@size", "./@unit", ++ ctxt, &size, 1024, ++ ULLONG_MAX, true) < 0) + return -1; + + if (virResctrlAllocSetCacheSize(alloc, level, type, cache, size) < 0) +@@ -20712,13 +20643,13 @@ virDomainDefParseXML(xmlDocPtr xml, + VIR_FREE(tmp); + } + +- if (virDomainParseScaledValue("./features/hpt/maxpagesize", +- NULL, +- ctxt, +- &def->hpt_maxpagesize, +- 1024, +- ULLONG_MAX, +- false) < 0) { ++ if (virParseScaledValue("./features/hpt/maxpagesize", ++ NULL, ++ ctxt, ++ &def->hpt_maxpagesize, ++ 1024, ++ ULLONG_MAX, ++ false) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", + _("Unable to parse HPT maxpagesize setting")); +@@ -20944,13 +20875,13 @@ virDomainDefParseXML(xmlDocPtr xml, + } + + if (def->features[VIR_DOMAIN_FEATURE_SMM] == VIR_TRISTATE_SWITCH_ON) { +- int rv = virDomainParseScaledValue("string(./features/smm/tseg)", +- "string(./features/smm/tseg/@unit)", +- ctxt, +- &def->tseg_size, +- 1024 * 1024, /* Defaults to mebibytes */ +- ULLONG_MAX, +- false); ++ int rv = virParseScaledValue("string(./features/smm/tseg)", ++ "string(./features/smm/tseg/@unit)", ++ ctxt, ++ &def->tseg_size, ++ 1024 * 1024, /* Defaults to mebibytes */ ++ ULLONG_MAX, ++ false); + if (rv < 0) + goto error; + def->tseg_specified = rv; +diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms +index 130828706a..acb25eb8c8 100644 +--- a/src/libvirt_private.syms ++++ b/src/libvirt_private.syms +@@ -3442,6 +3442,7 @@ virVsockSetGuestCid; + + + # util/virxml.h ++virParseScaledValue; + virXMLCheckIllegalChars; + virXMLChildElementCount; + virXMLExtractNamespaceXML; +diff --git a/src/util/virxml.c b/src/util/virxml.c +index 0e66d1623b..bae2e6aca5 100644 +--- a/src/util/virxml.c ++++ b/src/util/virxml.c +@@ -33,6 +33,7 @@ + #include "viralloc.h" + #include "virfile.h" + #include "virstring.h" ++#include "virutil.h" + + #define VIR_FROM_THIS VIR_FROM_XML + +@@ -1433,3 +1434,74 @@ virXMLNamespaceRegister(xmlXPathContextPtr ctxt, + + return 0; + } ++ ++ ++/** ++ * virParseScaledValue: ++ * @xpath: XPath to memory amount ++ * @units_xpath: XPath to units attribute ++ * @ctxt: XPath context ++ * @val: scaled value is stored here ++ * @scale: default scale for @val ++ * @max: maximal @val allowed ++ * @required: is the value required? ++ * ++ * Parse a value located at @xpath within @ctxt, and store the ++ * result into @val. The value is scaled by units located at ++ * @units_xpath (or the 'unit' attribute under @xpath if ++ * @units_xpath is NULL). If units are not present, the default ++ * @scale is used. If @required is set, then the value must ++ * exist; otherwise, the value is optional. The resulting value ++ * is in bytes. ++ * ++ * Returns 1 on success, ++ * 0 if the value was not present and !@required, ++ * -1 on failure after issuing error. ++ */ ++int ++virParseScaledValue(const char *xpath, ++ const char *units_xpath, ++ xmlXPathContextPtr ctxt, ++ unsigned long long *val, ++ unsigned long long scale, ++ unsigned long long max, ++ bool required) ++{ ++ unsigned long long bytes; ++ g_autofree char *xpath_full = NULL; ++ g_autofree char *unit = NULL; ++ g_autofree char *bytes_str = NULL; ++ ++ *val = 0; ++ xpath_full = g_strdup_printf("string(%s)", xpath); ++ ++ bytes_str = virXPathString(xpath_full, ctxt); ++ if (!bytes_str) { ++ if (!required) ++ return 0; ++ virReportError(VIR_ERR_XML_ERROR, ++ _("missing element or attribute '%s'"), ++ xpath); ++ return -1; ++ } ++ VIR_FREE(xpath_full); ++ ++ if (virStrToLong_ullp(bytes_str, NULL, 10, &bytes) < 0) { ++ virReportError(VIR_ERR_XML_ERROR, ++ _("Invalid value '%s' for element or attribute '%s'"), ++ bytes_str, xpath); ++ return -1; ++ } ++ ++ if (units_xpath) ++ xpath_full = g_strdup_printf("string(%s)", units_xpath); ++ else ++ xpath_full = g_strdup_printf("string(%s/@unit)", xpath); ++ unit = virXPathString(xpath_full, ctxt); ++ ++ if (virScaleInteger(&bytes, unit, scale, max) < 0) ++ return -1; ++ ++ *val = bytes; ++ return 1; ++} +diff --git a/src/util/virxml.h b/src/util/virxml.h +index 26ab9f9c2d..39b261687a 100644 +--- a/src/util/virxml.h ++++ b/src/util/virxml.h +@@ -269,3 +269,11 @@ virXMLNamespaceFormatNS(virBufferPtr buf, + int + virXMLNamespaceRegister(xmlXPathContextPtr ctxt, + virXMLNamespace const *ns); ++ ++int virParseScaledValue(const char *xpath, ++ const char *units_xpath, ++ xmlXPathContextPtr ctxt, ++ unsigned long long *val, ++ unsigned long long scale, ++ unsigned long long max, ++ bool required); +-- +2.29.2 + diff --git a/SOURCES/libvirt-conf-Parse-and-format-HMAT.patch b/SOURCES/libvirt-conf-Parse-and-format-HMAT.patch new file mode 100644 index 0000000..6f3d8f6 --- /dev/null +++ b/SOURCES/libvirt-conf-Parse-and-format-HMAT.patch @@ -0,0 +1,877 @@ +From 17e9b949ec3876e74bcaa217810afbd46f297a65 Mon Sep 17 00:00:00 2001 +Message-Id: <17e9b949ec3876e74bcaa217810afbd46f297a65@dist-git> +From: Michal Privoznik +Date: Wed, 7 Oct 2020 18:45:39 +0200 +Subject: [PATCH] conf: Parse and format HMAT +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To cite ACPI specification: + + Heterogeneous Memory Attribute Table describes the memory + attributes, such as memory side cache attributes and bandwidth + and latency details, related to the System Physical Address + (SPA) Memory Ranges. The software is expected to use this + information as hint for optimization. + +According to our upstream discussion [1] this is exposed under + as under NUMA and or + under numa/latencies. + +1: https://www.redhat.com/archives/libvir-list/2020-January/msg00422.html + +Signed-off-by: Michal Privoznik +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit a89bbbac86383a10be0cec5a93feb7ed820871eb) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 + +Conflicts: +- src/conf/numa_conf.c: Context, because we're not using +VIR_XPATH_NODE_AUTORESTORE() everywhere in the old code. + +Signed-off-by: Michal Privoznik +Message-Id: +Reviewed-by: Ján Tomko +--- + docs/formatdomain.html.in | 107 +++++++ + docs/schemas/cputypes.rng | 110 ++++++- + src/conf/numa_conf.c | 349 ++++++++++++++++++++- + src/conf/numa_conf.h | 33 ++ + src/libvirt_private.syms | 6 + + tests/qemuxml2argvdata/numatune-hmat.xml | 52 +++ + tests/qemuxml2xmloutdata/numatune-hmat.xml | 1 + + tests/qemuxml2xmltest.c | 1 + + 8 files changed, 644 insertions(+), 15 deletions(-) + create mode 100644 tests/qemuxml2argvdata/numatune-hmat.xml + create mode 120000 tests/qemuxml2xmloutdata/numatune-hmat.xml + +diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in +index 4b8d312596..bec753e37f 100644 +--- a/docs/formatdomain.html.in ++++ b/docs/formatdomain.html.in +@@ -1874,6 +1874,113 @@ + using 10 for local and 20 for remote distances. +

+ ++

ACPI Heterogeneous Memory Attribute Table

++ ++
++...
++<cpu>
++  ...
++  <numa>
++    <cell id='0' cpus='0-3' memory='512000' unit='KiB' discard='yes'/>
++    <cell id='1' cpus='4-7' memory='512000' unit='KiB' memAccess='shared'/>
++    <cell id='3' cpus='0-3' memory='2097152' unit='KiB'>
++      <cache level='1' associativity='direct' policy='writeback'>
++        <size value='10' unit='KiB'/>
++        <line value='8' unit='B'/>
++      </cache>
++    </cell>
++    <interconnects>
++      <latency initiator='0' target='0' type='access' value='5'/>
++      <latency initiator='0' target='0' cache='1' type='access' value='10'/>
++      <bandwidth initiator='0' target='0' type='access' value='204800' unit='KiB'/>
++    </interconnects>
++  </numa>
++  ...
++</cpu>
++...
++ ++

++ Since 6.6.0 the cell element can ++ have a cache child element which describes memory side cache ++ for memory proximity domains. The cache element has a ++ level attribute describing the cache level and thus the ++ element can be repeated multiple times to describe different levels of ++ the cache. ++

++ ++

++ The cache element then has following mandatory attributes: ++

++ ++
++
level
++
++ Level of the cache this description refers to. ++
++ ++
associativity
++
++ Describes cache associativity (accepted values are none, ++ direct and full). ++
++ ++
policy
++
++ Describes cache write associativity (accepted values are ++ none, writeback and ++ writethrough). ++
++
++ ++

++ The cache element has two mandatory child elements then: ++ size and line which describe cache size and ++ cache line size. Both elements accept two attributes: value ++ and unit which set the value of corresponding cache ++ attribute. ++

++ ++

++ The NUMA description has an optional interconnects element that ++ describes the normalized memory read/write latency, read/write bandwidth ++ between Initiator Proximity Domains (Processor or I/O) and Target ++ Proximity Domains (Memory). ++

++ ++

++ The interconnects element can have zero or more ++ latency child elements to describe latency between two ++ memory nodes and zero or more bandwidth child elements to ++ describe bandwidth between two memory nodes. Both these have the ++ following mandatory attributes: ++

++ ++
++
initiator
++
Refers to the source NUMA node
++ ++
target
++
Refers to the target NUMA node
++ ++
type
++
The type of the access. Accepted values: access, ++ read, write
++ ++
value
++
The actual value. For latency this is delay in nanoseconds, for ++ bandwidth this value is in kibibytes per second. Use additional ++ unit attribute to change the units.
++
++ ++

++ To describe latency from one NUMA node to a cache of another NUMA node ++ the latency element has optional cache ++ attribute which in combination with target attribute creates ++ full reference to distant NUMA node's cache level. For instance, ++ target='0' cache='1' refers to the first level cache of NUMA ++ node 0. ++

++ +

Events configuration

+ +

+diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng +index a1682a1003..ba30dbf9ff 100644 +--- a/docs/schemas/cputypes.rng ++++ b/docs/schemas/cputypes.rng +@@ -102,9 +102,14 @@ + + + +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -148,6 +153,9 @@ + + + ++ ++ ++ + + + +@@ -162,6 +170,102 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ none ++ direct ++ full ++ ++ ++ ++ ++ none ++ writeback ++ writethrough ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ access ++ read ++ write ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ access ++ read ++ write ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c +index a805336d16..5c764190c3 100644 +--- a/src/conf/numa_conf.c ++++ b/src/conf/numa_conf.c +@@ -59,9 +59,37 @@ VIR_ENUM_IMPL(virDomainMemoryAccess, + "private", + ); + ++VIR_ENUM_IMPL(virDomainCacheAssociativity, ++ VIR_DOMAIN_CACHE_ASSOCIATIVITY_LAST, ++ "none", ++ "direct", ++ "full", ++); ++ ++VIR_ENUM_IMPL(virDomainCachePolicy, ++ VIR_DOMAIN_CACHE_POLICY_LAST, ++ "none", ++ "writeback", ++ "writethrough", ++); ++ ++VIR_ENUM_IMPL(virDomainMemoryLatency, ++ VIR_DOMAIN_MEMORY_LATENCY_LAST, ++ "none", ++ "access", ++ "read", ++ "write" ++); ++ + typedef struct _virDomainNumaDistance virDomainNumaDistance; + typedef virDomainNumaDistance *virDomainNumaDistancePtr; + ++typedef struct _virDomainNumaCache virDomainNumaCache; ++typedef virDomainNumaCache *virDomainNumaCachePtr; ++ ++typedef struct _virDomainNumaInterconnect virDomainNumaInterconnect; ++typedef virDomainNumaInterconnect *virDomainNumaInterconnectPtr; ++ + typedef struct _virDomainNumaNode virDomainNumaNode; + typedef virDomainNumaNode *virDomainNumaNodePtr; + +@@ -86,9 +114,30 @@ struct _virDomainNuma { + unsigned int cellid; + } *distances; /* remote node distances */ + size_t ndistances; ++ ++ struct _virDomainNumaCache { ++ unsigned int level; /* cache level */ ++ unsigned int size; /* cache size */ ++ unsigned int line; /* line size, !!! in bytes !!! */ ++ virDomainCacheAssociativity associativity; /* cache associativity */ ++ virDomainCachePolicy policy; /* cache policy */ ++ } *caches; ++ size_t ncaches; + } *mem_nodes; /* guest node configuration */ + size_t nmem_nodes; + ++ struct _virDomainNumaInterconnect { ++ virDomainNumaInterconnectType type; /* whether structure describes latency ++ or bandwidth */ ++ unsigned int initiator; /* the initiator NUMA node */ ++ unsigned int target; /* the target NUMA node */ ++ unsigned int cache; /* the target cache on @target; if 0 then the ++ memory on @target */ ++ virDomainMemoryLatency accessType; /* what type of access is defined */ ++ unsigned long value; /* value itself */ ++ } *interconnects; ++ size_t ninterconnects; ++ + /* Future NUMA tuning related stuff should go here. */ + }; + +@@ -368,9 +417,13 @@ virDomainNumaFree(virDomainNumaPtr numa) + + if (numa->mem_nodes[i].ndistances > 0) + VIR_FREE(numa->mem_nodes[i].distances); ++ ++ VIR_FREE(numa->mem_nodes[i].caches); + } + VIR_FREE(numa->mem_nodes); + ++ VIR_FREE(numa->interconnects); ++ + VIR_FREE(numa); + } + +@@ -841,6 +894,97 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPtr def, + return ret; + } + ++ ++static int ++virDomainNumaDefNodeCacheParseXML(virDomainNumaPtr def, ++ xmlXPathContextPtr ctxt, ++ unsigned int cur_cell) ++{ ++ g_autofree xmlNodePtr *nodes = NULL; ++ int n; ++ size_t i; ++ ++ if ((n = virXPathNodeSet("./cache", ctxt, &nodes)) < 0) ++ return -1; ++ ++ def->mem_nodes[cur_cell].caches = g_new0(virDomainNumaCache, n); ++ ++ for (i = 0; i < n; i++) { ++ VIR_XPATH_NODE_AUTORESTORE(ctxt); ++ virDomainNumaCachePtr cache = &def->mem_nodes[cur_cell].caches[i]; ++ g_autofree char *tmp = NULL; ++ unsigned int level; ++ int associativity; ++ int policy; ++ unsigned long long size; ++ unsigned long long line; ++ ++ if (!(tmp = virXMLPropString(nodes[i], "level"))) { ++ virReportError(VIR_ERR_XML_ERROR, ++ _("Missing 'level' attribute in cache " ++ "element for NUMA node %d"), ++ cur_cell); ++ return -1; ++ } ++ ++ if (virStrToLong_uip(tmp, NULL, 10, &level) < 0 || ++ level == 0) { ++ virReportError(VIR_ERR_XML_ERROR, ++ _("Invalid 'level' attribute in cache " ++ "element for NUMA node %d"), ++ cur_cell); ++ return -1; ++ } ++ VIR_FREE(tmp); ++ ++ if (!(tmp = virXMLPropString(nodes[i], "associativity"))) { ++ virReportError(VIR_ERR_XML_ERROR, ++ _("Missing 'associativity' attribute in cache " ++ "element for NUMA node %d"), ++ cur_cell); ++ return -1; ++ } ++ ++ if ((associativity = virDomainCacheAssociativityTypeFromString(tmp)) < 0) { ++ virReportError(VIR_ERR_XML_ERROR, ++ _("Invalid cache associativity '%s'"), ++ tmp); ++ return -1; ++ } ++ VIR_FREE(tmp); ++ ++ if (!(tmp = virXMLPropString(nodes[i], "policy"))) { ++ virReportError(VIR_ERR_XML_ERROR, ++ _("Missing 'policy' attribute in cache " ++ "element for NUMA node %d"), ++ cur_cell); ++ } ++ ++ if ((policy = virDomainCachePolicyTypeFromString(tmp)) < 0) { ++ virReportError(VIR_ERR_XML_ERROR, ++ _("Invalid cache policy '%s'"), ++ tmp); ++ return -1; ++ } ++ VIR_FREE(tmp); ++ ++ ctxt->node = nodes[i]; ++ if (virDomainParseMemory("./size/@value", "./size/unit", ++ ctxt, &size, true, false) < 0) ++ return -1; ++ ++ if (virParseScaledValue("./line/@value", "./line/unit", ++ ctxt, &line, 1, ULLONG_MAX, true) < 0) ++ return -1; ++ ++ *cache = (virDomainNumaCache){level, size, line, associativity, policy}; ++ def->mem_nodes[cur_cell].ncaches++; ++ } ++ ++ return 0; ++} ++ ++ + int + virDomainNumaDefParseXML(virDomainNumaPtr def, + xmlXPathContextPtr ctxt) +@@ -867,6 +1011,7 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, + def->nmem_nodes = n; + + for (i = 0; i < n; i++) { ++ VIR_XPATH_NODE_AUTORESTORE(ctxt); + int rc; + unsigned int cur_cell = i; + +@@ -953,7 +1098,109 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, + + /* Parse NUMA distances info */ + if (virDomainNumaDefNodeDistanceParseXML(def, ctxt, cur_cell) < 0) ++ goto cleanup; ++ ++ /* Parse cache info */ ++ if (virDomainNumaDefNodeCacheParseXML(def, ctxt, cur_cell) < 0) ++ goto cleanup; ++ } ++ ++ VIR_FREE(nodes); ++ if ((n = virXPathNodeSet("./cpu/numa[1]/interconnects[1]/latency|" ++ "./cpu/numa[1]/interconnects[1]/bandwidth", ctxt, &nodes)) < 0) ++ goto cleanup; ++ ++ def->interconnects = g_new0(virDomainNumaInterconnect, n); ++ for (i = 0; i < n; i++) { ++ virDomainNumaInterconnectType type; ++ unsigned int initiator; ++ unsigned int target; ++ unsigned int cache = 0; ++ int accessType; ++ unsigned long long value; ++ ++ if (virXMLNodeNameEqual(nodes[i], "latency")) { ++ type = VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY; ++ ++ if (!(tmp = virXMLPropString(nodes[i], "value"))) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Missing 'value' attribute in NUMA interconnects")); + goto cleanup; ++ } ++ ++ if (virStrToLong_ullp(tmp, NULL, 10, &value) < 0) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Invalid 'value' attribute in NUMA interconnects")); ++ goto cleanup; ++ } ++ VIR_FREE(tmp); ++ } else if (virXMLNodeNameEqual(nodes[i], "bandwidth")) { ++ VIR_XPATH_NODE_AUTORESTORE(ctxt); ++ type = VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH; ++ ++ ctxt->node = nodes[i]; ++ ++ if (virDomainParseMemory("./@value", "./@unit", ctxt, &value, true, false) < 0) ++ goto cleanup; ++ } else { ++ /* Ignore yet unknown child elements. */ ++ continue; ++ } ++ ++ if (!(tmp = virXMLPropString(nodes[i], "initiator"))) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Missing 'initiator' attribute in NUMA interconnects")); ++ goto cleanup; ++ } ++ ++ if (virStrToLong_uip(tmp, NULL, 10, &initiator) < 0) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Invalid 'initiator' attribute in NUMA interconnects")); ++ goto cleanup; ++ } ++ VIR_FREE(tmp); ++ ++ if (!(tmp = virXMLPropString(nodes[i], "target"))) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Missing 'target' attribute in NUMA interconnects")); ++ goto cleanup; ++ } ++ ++ if (virStrToLong_uip(tmp, NULL, 10, &target) < 0) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Invalid 'target' attribute in NUMA interconnects")); ++ goto cleanup; ++ } ++ VIR_FREE(tmp); ++ ++ ++ /* cache attribute is optional */ ++ if ((tmp = virXMLPropString(nodes[i], "cache"))) { ++ if (virStrToLong_uip(tmp, NULL, 10, &cache) < 0 || ++ cache == 0) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Invalid 'cache' attribute in NUMA interconnects")); ++ goto cleanup; ++ } ++ } ++ VIR_FREE(tmp); ++ ++ if (!(tmp = virXMLPropString(nodes[i], "type"))) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Missing 'type' attribute in NUMA interconnects")); ++ goto cleanup; ++ } ++ ++ if ((accessType = virDomainMemoryLatencyTypeFromString(tmp)) <= 0) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Invalid 'type' attribute in NUMA interconnects")); ++ goto cleanup; ++ } ++ VIR_FREE(tmp); ++ ++ def->interconnects[i] = (virDomainNumaInterconnect) {type, initiator, target, ++ cache, accessType, value}; ++ def->ninterconnects++; + } + + ret = 0; +@@ -983,6 +1230,7 @@ virDomainNumaDefFormatXML(virBufferPtr buf, + for (i = 0; i < ncells; i++) { + virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(def, i); + int ndistances; ++ size_t ncaches; + + memAccess = virDomainNumaGetNodeMemoryAccessMode(def, i); + discard = virDomainNumaGetNodeDiscard(def, i); +@@ -1009,30 +1257,107 @@ virDomainNumaDefFormatXML(virBufferPtr buf, + virTristateBoolTypeToString(discard)); + + ndistances = def->mem_nodes[i].ndistances; +- if (ndistances == 0) { ++ ncaches = def->mem_nodes[i].ncaches; ++ if (ndistances == 0 && ncaches == 0) { + virBufferAddLit(buf, "/>\n"); + } else { + size_t j; +- virDomainNumaDistancePtr distances = def->mem_nodes[i].distances; + + virBufferAddLit(buf, ">\n"); + virBufferAdjustIndent(buf, 2); +- virBufferAddLit(buf, "\n"); +- virBufferAdjustIndent(buf, 2); +- for (j = 0; j < ndistances; j++) { +- if (distances[j].value) { +- virBufferAddLit(buf, "\n"); ++ ++ if (ndistances) { ++ virDomainNumaDistancePtr distances = def->mem_nodes[i].distances; ++ ++ virBufferAddLit(buf, "\n"); ++ virBufferAdjustIndent(buf, 2); ++ for (j = 0; j < ndistances; j++) { ++ if (distances[j].value) { ++ virBufferAddLit(buf, "\n"); ++ } + } ++ virBufferAdjustIndent(buf, -2); ++ virBufferAddLit(buf, "\n"); ++ } ++ ++ for (j = 0; j < ncaches; j++) { ++ virDomainNumaCachePtr cache = &def->mem_nodes[i].caches[j]; ++ ++ virBufferAsprintf(buf, "level); ++ if (cache->associativity) { ++ virBufferAsprintf(buf, " associativity='%s'", ++ virDomainCacheAssociativityTypeToString(cache->associativity)); ++ } ++ ++ if (cache->policy) { ++ virBufferAsprintf(buf, " policy='%s'", ++ virDomainCachePolicyTypeToString(cache->policy)); ++ } ++ virBufferAddLit(buf, ">\n"); ++ ++ virBufferAdjustIndent(buf, 2); ++ virBufferAsprintf(buf, ++ "\n", ++ cache->size); ++ ++ if (cache->line) { ++ virBufferAsprintf(buf, ++ "\n", ++ cache->line); ++ } ++ ++ virBufferAdjustIndent(buf, -2); ++ virBufferAddLit(buf, "\n"); + } +- virBufferAdjustIndent(buf, -2); +- virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + } + } ++ ++ if (def->ninterconnects) { ++ virBufferAddLit(buf, "\n"); ++ virBufferAdjustIndent(buf, 2); ++ } ++ ++ for (i = 0; i < def->ninterconnects; i++) { ++ virDomainNumaInterconnectPtr l = &def->interconnects[i]; ++ ++ switch (l->type) { ++ case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY: ++ virBufferAddLit(buf, "initiator, l->target); ++ ++ if (l->cache > 0) { ++ virBufferAsprintf(buf, ++ " cache='%u'", ++ l->cache); ++ } ++ ++ virBufferAsprintf(buf, ++ " type='%s' value='%lu'", ++ virDomainMemoryLatencyTypeToString(l->accessType), ++ l->value); ++ ++ if (l->type == VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH) ++ virBufferAddLit(buf, " unit='KiB'"); ++ virBufferAddLit(buf, "/>\n"); ++ } ++ ++ if (def->ninterconnects) { ++ virBufferAdjustIndent(buf, -2); ++ virBufferAddLit(buf, "\n"); ++ } ++ + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + +diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h +index 6808439a7c..5043c5a6d4 100644 +--- a/src/conf/numa_conf.h ++++ b/src/conf/numa_conf.h +@@ -52,6 +52,39 @@ typedef enum { + } virDomainMemoryAccess; + VIR_ENUM_DECL(virDomainMemoryAccess); + ++typedef enum { ++ VIR_DOMAIN_CACHE_ASSOCIATIVITY_NONE, /* No associativity */ ++ VIR_DOMAIN_CACHE_ASSOCIATIVITY_DIRECT, /* Direct mapped cache */ ++ VIR_DOMAIN_CACHE_ASSOCIATIVITY_FULL, /* Fully associative cache */ ++ ++ VIR_DOMAIN_CACHE_ASSOCIATIVITY_LAST ++} virDomainCacheAssociativity; ++VIR_ENUM_DECL(virDomainCacheAssociativity); ++ ++typedef enum { ++ VIR_DOMAIN_CACHE_POLICY_NONE, /* No policy */ ++ VIR_DOMAIN_CACHE_POLICY_WRITEBACK, /* Write-back policy */ ++ VIR_DOMAIN_CACHE_POLICY_WRITETHROUGH, /* Write-through policy */ ++ ++ VIR_DOMAIN_CACHE_POLICY_LAST ++} virDomainCachePolicy; ++VIR_ENUM_DECL(virDomainCachePolicy); ++ ++typedef enum { ++ VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY, ++ VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH, ++} virDomainNumaInterconnectType; ++ ++typedef enum { ++ VIR_DOMAIN_MEMORY_LATENCY_NONE = 0, /* No memory latency defined */ ++ VIR_DOMAIN_MEMORY_LATENCY_ACCESS, /* Access latency */ ++ VIR_DOMAIN_MEMORY_LATENCY_READ, /* Read latency */ ++ VIR_DOMAIN_MEMORY_LATENCY_WRITE, /* Write latency */ ++ ++ VIR_DOMAIN_MEMORY_LATENCY_LAST ++} virDomainMemoryLatency; ++VIR_ENUM_DECL(virDomainMemoryLatency); ++ + + virDomainNumaPtr virDomainNumaNew(void); + void virDomainNumaFree(virDomainNumaPtr numa); +diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms +index acb25eb8c8..de95e3b116 100644 +--- a/src/libvirt_private.syms ++++ b/src/libvirt_private.syms +@@ -808,8 +808,14 @@ virNodeDeviceDeleteVport; + virNodeDeviceGetParentName; + + # conf/numa_conf.h ++virDomainCacheAssociativityTypeFromString; ++virDomainCacheAssociativityTypeToString; ++virDomainCachePolicyTypeFromString; ++virDomainCachePolicyTypeToString; + virDomainMemoryAccessTypeFromString; + virDomainMemoryAccessTypeToString; ++virDomainMemoryLatencyTypeFromString; ++virDomainMemoryLatencyTypeToString; + virDomainNumaCheckABIStability; + virDomainNumaEquals; + virDomainNumaFree; +diff --git a/tests/qemuxml2argvdata/numatune-hmat.xml b/tests/qemuxml2argvdata/numatune-hmat.xml +new file mode 100644 +index 0000000000..83f0b56c9b +--- /dev/null ++++ b/tests/qemuxml2argvdata/numatune-hmat.xml +@@ -0,0 +1,52 @@ ++ ++ QEMUGuest ++ c7a5fdb2-cdaf-9455-926a-d65c16db1809 ++ 8388608 ++ 8388608 ++ 12 ++ ++ hvm ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ destroy ++ restart ++ restart ++ ++ /usr/bin/qemu-system-x86_64 ++ ++

++ ++ ++ ++ ++ ++
++ ++ ++ +diff --git a/tests/qemuxml2xmloutdata/numatune-hmat.xml b/tests/qemuxml2xmloutdata/numatune-hmat.xml +new file mode 120000 +index 0000000000..6903a80ab1 +--- /dev/null ++++ b/tests/qemuxml2xmloutdata/numatune-hmat.xml +@@ -0,0 +1 @@ ++../qemuxml2argvdata/numatune-hmat.xml +\ No newline at end of file +diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c +index 1ddeba30f0..de1d720e1d 100644 +--- a/tests/qemuxml2xmltest.c ++++ b/tests/qemuxml2xmltest.c +@@ -1106,6 +1106,7 @@ mymain(void) + DO_TEST("numatune-memnode-no-memory", QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST); + DO_TEST("numatune-no-vcpu", QEMU_CAPS_NUMA); ++ DO_TEST("numatune-hmat", NONE); + + DO_TEST("bios-nvram", NONE); + DO_TEST("bios-nvram-os-interleave", NONE); +-- +2.29.2 + diff --git a/SOURCES/libvirt-conf-Validate-NUMA-HMAT-configuration.patch b/SOURCES/libvirt-conf-Validate-NUMA-HMAT-configuration.patch new file mode 100644 index 0000000..1ca6905 --- /dev/null +++ b/SOURCES/libvirt-conf-Validate-NUMA-HMAT-configuration.patch @@ -0,0 +1,166 @@ +From 0ae283a1cb5224f3eb4fa32706e9b9c212577e51 Mon Sep 17 00:00:00 2001 +Message-Id: <0ae283a1cb5224f3eb4fa32706e9b9c212577e51@dist-git> +From: Michal Privoznik +Date: Wed, 7 Oct 2020 18:45:40 +0200 +Subject: [PATCH] conf: Validate NUMA HMAT configuration +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There are several restrictions, for instance @initiator and +@target have to refer to existing NUMA nodes (daa), @cache has to +refer to a defined cache level and so on. + +Signed-off-by: Michal Privoznik +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit f0611fe8830543d03d1871422f8c542453f0c8db) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 + +Signed-off-by: Michal Privoznik +Message-Id: +Reviewed-by: Ján Tomko +--- + src/conf/domain_conf.c | 3 ++ + src/conf/numa_conf.c | 99 ++++++++++++++++++++++++++++++++++++++++++ + src/conf/numa_conf.h | 1 + + 3 files changed, 103 insertions(+) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 3229d5ec95..f41559f33e 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -7144,6 +7144,9 @@ virDomainDefValidateInternal(const virDomainDef *def, + if (virDomainDefCputuneValidate(def) < 0) + return -1; + ++ if (virDomainNumaDefValidate(def->numa) < 0) ++ return -1; ++ + return 0; + } + +diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c +index 5c764190c3..c90fb01bb6 100644 +--- a/src/conf/numa_conf.c ++++ b/src/conf/numa_conf.c +@@ -1365,6 +1365,105 @@ virDomainNumaDefFormatXML(virBufferPtr buf, + } + + ++int ++virDomainNumaDefValidate(const virDomainNuma *def) ++{ ++ size_t i; ++ size_t j; ++ ++ if (!def) ++ return 0; ++ ++ for (i = 0; i < def->nmem_nodes; i++) { ++ const virDomainNumaNode *node = &def->mem_nodes[i]; ++ g_autoptr(virBitmap) levelsSeen = virBitmapNewEmpty(); ++ ++ for (j = 0; j < node->ncaches; j++) { ++ const virDomainNumaCache *cache = &node->caches[j]; ++ ++ /* Relax this if there's ever fourth layer of cache */ ++ if (cache->level > 3) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Ain't nobody heard of that much cache level")); ++ return -1; ++ } ++ ++ if (virBitmapIsBitSet(levelsSeen, cache->level)) { ++ virReportError(VIR_ERR_XML_ERROR, ++ _("Cache level '%u' already defined"), ++ cache->level); ++ return -1; ++ } ++ ++ if (virBitmapSetBitExpand(levelsSeen, cache->level)) ++ return -1; ++ } ++ } ++ ++ for (i = 0; i < def->ninterconnects; i++) { ++ const virDomainNumaInterconnect *l = &def->interconnects[i]; ++ ++ if (l->initiator >= def->nmem_nodes) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("'initiator' refers to a non-existent NUMA node")); ++ return -1; ++ } ++ ++ if (l->target >= def->nmem_nodes) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("'target' refers to a non-existent NUMA node")); ++ return -1; ++ } ++ ++ if (!def->mem_nodes[l->initiator].cpumask) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("NUMA nodes without CPUs can't be initiator")); ++ return -1; ++ } ++ ++ if (l->cache > 0) { ++ for (j = 0; j < def->mem_nodes[l->target].ncaches; j++) { ++ const virDomainNumaCache *cache = def->mem_nodes[l->target].caches; ++ ++ if (l->cache == cache->level) ++ break; ++ } ++ ++ if (j == def->mem_nodes[l->target].ncaches) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("'cache' refers to a non-existent NUMA node cache")); ++ return -1; ++ } ++ } ++ ++ for (j = 0; j < i; j++) { ++ const virDomainNumaInterconnect *ll = &def->interconnects[j]; ++ ++ if (l->type == ll->type && ++ l->initiator == ll->initiator && ++ l->target == ll->target && ++ l->cache == ll->cache && ++ l->accessType == ll->accessType) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Duplicate info for NUMA latencies")); ++ return -1; ++ } ++ ++ ++ if (l->initiator != l->target && ++ l->initiator == ll->target && ++ l->target == ll->initiator) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Link already defined")); ++ return -1; ++ } ++ } ++ } ++ ++ return 0; ++} ++ ++ + unsigned int + virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa) + { +diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h +index 5043c5a6d4..2963004c94 100644 +--- a/src/conf/numa_conf.h ++++ b/src/conf/numa_conf.h +@@ -217,5 +217,6 @@ bool virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune, + + int virDomainNumaDefParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt); + int virDomainNumaDefFormatXML(virBufferPtr buf, virDomainNumaPtr def); ++int virDomainNumaDefValidate(const virDomainNuma *def); + + unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa); +-- +2.29.2 + diff --git a/SOURCES/libvirt-conf-properly-clear-out-autogenerated-macvtap-names-when-formatting-parsing.patch b/SOURCES/libvirt-conf-properly-clear-out-autogenerated-macvtap-names-when-formatting-parsing.patch new file mode 100644 index 0000000..0133af5 --- /dev/null +++ b/SOURCES/libvirt-conf-properly-clear-out-autogenerated-macvtap-names-when-formatting-parsing.patch @@ -0,0 +1,117 @@ +From b2e0155b59ae9f038bcf21da7c6b7fb0a99a7b67 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Laine Stump +Date: Tue, 1 Dec 2020 22:01:00 -0500 +Subject: [PATCH] conf: properly clear out autogenerated macvtap names when + formatting/parsing + +Back when macvtap support was added in commit 315baab9443 in Feb. 2010 +(libvirt-0.7.7), it was setup to autogenerate a name for the device if +one wasn't supplied, in the pattern "macvtap%d" (or "macvlan%d"), +similar to the way an unspecified standard tap device name will lead +to an autogenerated "vnet%d". + +As a matter of fact, in commit ca1b7cc8e45 added in May 2010, the code +was changed to *always* ignore a supplied device name for macvtap +interfaces by deleting *any* name immediately during the +parsing (this was intended to prevent one domain which had failed to +completely start from deleting the macvtap device of another domain +which had subsequently been provided the same device name (this will +seem mildly ironic later). This was later fixed to only clear the +device name when inactive XML was being parsed. HOWEVER - this was +only done if the xml was - autogenerated +names were not cleared for (which could +also result in a macvtap device). + +Although the names of "vnetX" tap devices had always been +automatically cleared when parsing (see commit d1304583d +from July 2008 (!)), at the time macvtap support was added, both vnetX +and macvtapX device names were always included when formatting the +XML. + +Then in commit a8be259d0cc (July 2011, libvirt-0.9.4), +formatting was changed to also clear out "vnetX" device names during +XML formatting as well. However the same treatment wasn't given to +"macvtapX". + +Now in 2020, there has been a report that a failed migration leads to +the macvtap device of some other unrelated guest on the destination +host losing its network connectivity. It was determined that this was +due to the domain XML in the migration containing a macvtap device +name, e.g. "macvtap0", that was already in use by the other guest on +the destination. Normally this wouldn't be a problem, because libvirt +would see that the device was already in use, and then find a +different unused name. But in this case, other external problems were +causing the migration to fail prior to selecting a macvtap device and +successfully opening it, and during error recovery, qemuProcessStop() +was called, which went through all def->nets objects and (if they were +macvtap) deleted the device specified in net->ifname; since libvirt +hadn't gotten to the point of replacing the incoming "macvtap0" with +the name of a device it actually created for this guest, that meant +that "macvtap0" was deleted, *even though it was currently in use by a +different guest*! + +Whew! + +So, it turns out that when formatting "migratable" XML, "vnetX" +devices are omitted, just as when formatting "inactive" XML. By making +the code in both interface parsing and formatting consistent for +"vnetX", "macvtapX", and "macvlanX", we can thus make sure that the +autogenerated (and unneeded / completely *not* wanted) macvtap device +name will not be sent with the migration XML. This way when a +migration fails, net->ifname will be NULL, and libvirt won't have any +device to try and (erroneously) delete. + +Signed-off-by: Laine Stump +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit 282d135ddbb7203565cd5527b451469b14953994) + +https://bugzilla.redhat.com/1872610 + +Signed-off-by: Laine Stump +Message-Id: <20201202030100.458879-1-laine@redhat.com> +Reviewed-by: Michal Privoznik +--- + src/conf/domain_conf.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index f41559f33e..cd5c15f297 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -12183,14 +12183,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, + } + + def->data.direct.linkdev = g_steal_pointer(&dev); +- +- if (ifname && +- flags & VIR_DOMAIN_DEF_PARSE_INACTIVE && +- (STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) || +- STRPREFIX(ifname, VIR_NET_GENERATED_MACVLAN_PREFIX))) { +- VIR_FREE(ifname); +- } +- + break; + + case VIR_DOMAIN_NET_TYPE_HOSTDEV: +@@ -12238,6 +12230,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, + if (def->managed_tap != VIR_TRISTATE_BOOL_NO && ifname && + (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && + (STRPREFIX(ifname, VIR_NET_GENERATED_TAP_PREFIX) || ++ STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) || ++ STRPREFIX(ifname, VIR_NET_GENERATED_MACVLAN_PREFIX) || + (prefix && STRPREFIX(ifname, prefix)))) { + /* An auto-generated target name, blank it out */ + VIR_FREE(ifname); +@@ -25996,6 +25990,8 @@ virDomainNetDefFormat(virBufferPtr buf, + (def->managed_tap == VIR_TRISTATE_BOOL_NO || + !((flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE) && + (STRPREFIX(def->ifname, VIR_NET_GENERATED_TAP_PREFIX) || ++ STRPREFIX(def->ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) || ++ STRPREFIX(def->ifname, VIR_NET_GENERATED_MACVLAN_PREFIX) || + (prefix && STRPREFIX(def->ifname, prefix)))))) { + /* Skip auto-generated target names for inactive config. */ + virBufferEscapeString(&attrBuf, " dev='%s'", def->ifname); +-- +2.29.2 + diff --git a/SOURCES/libvirt-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch new file mode 100644 index 0000000..3257983 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch @@ -0,0 +1,145 @@ +From b5716d1b191eb52cd88d7b94cb9bf0186f3e427b Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Wed, 3 Mar 2021 11:11:54 +0100 +Subject: [PATCH] cpu_map: Add EPYC-Milan x86 CPU model +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Introduced in QEMU 6.0.0 by 623972ceae091b31331ae4a1dc94fe5cbb891937 + +Signed-off-by: Jiri Denemark +Reviewed-by: Ján Tomko +(cherry picked from commit f321a4822e9fa6542e48a78611989ecd9acaa83a) + +https://bugzilla.redhat.com/show_bug.cgi?id=1926864 + +Conflicts: + src/cpu_map/index.xml + - context: commit 82bebba1803c63a733e17f5ab2618e020e4abd8d + "cpu_map: Unify apostrophe and quotation mark usage" was + not backported + +Signed-off-by: Jiri Denemark +Message-Id: <715abc0f90faafb7daa193dd24bad65046c36de0.1614766279.git.jdenemar@redhat.com> +Reviewed-by: Ján Tomko +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/x86_EPYC-Milan.xml | 92 ++++++++++++++++++++++++++++++++++ + 2 files changed, 93 insertions(+) + create mode 100644 src/cpu_map/x86_EPYC-Milan.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 2f58261e6d..c3dda794b1 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -68,6 +68,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml +new file mode 100644 +index 0000000000..53f0cd6aac +--- /dev/null ++++ b/src/cpu_map/x86_EPYC-Milan.xml +@@ -0,0 +1,92 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +-- +2.30.0 + diff --git a/SOURCES/libvirt-cpu_map-Add-missing-AMD-SVM-features.patch b/SOURCES/libvirt-cpu_map-Add-missing-AMD-SVM-features.patch new file mode 100644 index 0000000..b907c79 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-missing-AMD-SVM-features.patch @@ -0,0 +1,896 @@ +From 5936216b6e32392d785979bfd6ccafc5174ec519 Mon Sep 17 00:00:00 2001 +Message-Id: <5936216b6e32392d785979bfd6ccafc5174ec519@dist-git> +From: Jiri Denemark +Date: Thu, 8 Oct 2020 18:01:23 +0200 +Subject: [PATCH] cpu_map: Add missing AMD SVM features +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jiri Denemark +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 96a39aad705f8e37950109d11636085b212af790) + +https://bugzilla.redhat.com/show_bug.cgi?id=1861506 + +Conflicts: + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml + tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml + tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml + tests/domaincapsdata/qemu_5.1.0.x86_64.xml + - not present downstream + +Signed-off-by: Jiri Denemark +Message-Id: +Reviewed-by: Ján Tomko +--- + src/cpu_map/x86_features.xml | 32 +++++++++++++++++++ + .../x86_64-cpuid-A10-5800K-disabled.xml | 1 + + .../x86_64-cpuid-A10-5800K-enabled.xml | 1 + + .../x86_64-cpuid-A10-5800K-guest.xml | 10 ++++++ + .../x86_64-cpuid-A10-5800K-host.xml | 10 ++++++ + .../x86_64-cpuid-A10-5800K-json.xml | 2 ++ + ...86_64-cpuid-EPYC-7601-32-Core-disabled.xml | 1 + + ...x86_64-cpuid-EPYC-7601-32-Core-enabled.xml | 1 + + .../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 10 ++++++ + .../x86_64-cpuid-EPYC-7601-32-Core-host.xml | 10 ++++++ + ...-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml | 1 + + ...4-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml | 1 + + ..._64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 10 ++++++ + ...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 10 ++++++ + ...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 2 ++ + .../x86_64-cpuid-EPYC-7601-32-Core-json.xml | 2 ++ + .../x86_64-cpuid-FX-8150-guest.xml | 10 ++++++ + .../cputestdata/x86_64-cpuid-FX-8150-host.xml | 10 ++++++ + ...-cpuid-Hygon-C86-7185-32-core-disabled.xml | 1 + + ...4-cpuid-Hygon-C86-7185-32-core-enabled.xml | 1 + + ..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 10 ++++++ + ...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 10 ++++++ + ...6_64-cpuid-Hygon-C86-7185-32-core-json.xml | 2 ++ + .../x86_64-cpuid-Opteron-1352-guest.xml | 3 ++ + .../x86_64-cpuid-Opteron-1352-host.xml | 3 ++ + .../x86_64-cpuid-Opteron-2350-disabled.xml | 1 + + .../x86_64-cpuid-Opteron-2350-enabled.xml | 1 + + .../x86_64-cpuid-Opteron-2350-guest.xml | 3 ++ + .../x86_64-cpuid-Opteron-2350-host.xml | 3 ++ + .../x86_64-cpuid-Opteron-2350-json.xml | 1 + + .../x86_64-cpuid-Opteron-6234-disabled.xml | 1 + + .../x86_64-cpuid-Opteron-6234-enabled.xml | 1 + + .../x86_64-cpuid-Opteron-6234-guest.xml | 10 ++++++ + .../x86_64-cpuid-Opteron-6234-host.xml | 10 ++++++ + .../x86_64-cpuid-Opteron-6234-json.xml | 2 ++ + .../x86_64-cpuid-Opteron-6282-guest.xml | 10 ++++++ + .../x86_64-cpuid-Opteron-6282-host.xml | 10 ++++++ + .../x86_64-cpuid-Phenom-B95-disabled.xml | 1 + + .../x86_64-cpuid-Phenom-B95-enabled.xml | 1 + + .../x86_64-cpuid-Phenom-B95-guest.xml | 4 +++ + .../x86_64-cpuid-Phenom-B95-host.xml | 4 +++ + .../x86_64-cpuid-Phenom-B95-json.xml | 2 ++ + ...puid-Ryzen-7-1800X-Eight-Core-disabled.xml | 1 + + ...cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml | 1 + + ...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 10 ++++++ + ...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 10 ++++++ + ...64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml | 2 ++ + .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 + + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 2 ++ + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 2 ++ + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 2 ++ + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 2 ++ + .../cpu-host-model-cmt.x86_64-4.0.0.args | 6 ++-- + 54 files changed, 256 insertions(+), 3 deletions(-) + +diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml +index 5265b2989b..30d1375437 100644 +--- a/src/cpu_map/x86_features.xml ++++ b/src/cpu_map/x86_features.xml +@@ -508,6 +508,38 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml +index 6ed5b3573b..3bacf2cf95 100644 +--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml +@@ -3,4 +3,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml +index 5cae0b7130..f6afbe2cb3 100644 +--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml +@@ -3,4 +3,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml +index 98a95e1c41..8401e53d30 100644 +--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml +@@ -22,4 +22,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml +index cb90c967a3..2430adbfbc 100644 +--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml +@@ -23,4 +23,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml +index fa61b7b60b..51e6d2b660 100644 +--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml +@@ -11,6 +11,8 @@ + + + ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml +index c26c9c7be3..25ef2d3314 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml +@@ -5,4 +5,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml +index 70b75f7115..e46908e981 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml +@@ -5,4 +5,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml +index 612e571609..0053913327 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml +@@ -15,4 +15,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml +index 7498d924e2..7acab0a999 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml +@@ -16,4 +16,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml +index a7f4fa3f01..f4d92cf034 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml +@@ -5,4 +5,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml +index 772456f947..910491c7f6 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml +@@ -6,4 +6,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml +index 96fdea306f..9164987bbd 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml +@@ -15,5 +15,15 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml +index 4fff74f3aa..2fa8861e44 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml +@@ -16,4 +16,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml +index c4e34a0fa1..af1e7f2f32 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml +@@ -6,6 +6,8 @@ + + + ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml +index 7bf2d1b852..4450a40f61 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml +@@ -6,6 +6,8 @@ + + + ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml +index 6bd032bbcb..ee34ea8547 100644 +--- a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml +@@ -20,4 +20,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml +index ec670c612e..75595c02af 100644 +--- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml +@@ -21,4 +21,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml +index c26c9c7be3..25ef2d3314 100644 +--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml +@@ -5,4 +5,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-enabled.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-enabled.xml +index fcefcf73c8..9181c3a9fe 100644 +--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-enabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-enabled.xml +@@ -6,4 +6,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml +index 844b8b9d4f..08c574255e 100644 +--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml +@@ -15,4 +15,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml +index 3d1b143eba..f1cddb6a19 100644 +--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml +@@ -16,4 +16,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml +index d3003b6965..0fdd934c08 100644 +--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml +@@ -7,6 +7,8 @@ + + + ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml +index 652f1e4333..a52c4cd303 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml +@@ -15,4 +15,7 @@ + + + ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml +index 399398eb3a..800b092f14 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml +@@ -16,4 +16,7 @@ + + + ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml +index 8ec1b12582..3f6fe54055 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml +@@ -3,4 +3,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml +index 913980f15f..5fd0d6066d 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml +@@ -2,4 +2,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml +index 652f1e4333..a52c4cd303 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml +@@ -15,4 +15,7 @@ + + + ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml +index 399398eb3a..800b092f14 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml +@@ -16,4 +16,7 @@ + + + ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml +index 741757aeb2..d128553c13 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml +@@ -14,6 +14,7 @@ + + + ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml +index 88124d1745..4dcd74103b 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml +@@ -3,4 +3,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml +index 38d716449d..890b5df060 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml +@@ -4,4 +4,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml +index 6bd032bbcb..ee34ea8547 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml +@@ -20,4 +20,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml +index ec670c612e..75595c02af 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml +@@ -21,4 +21,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml +index 2ad3c98a5a..abfc8db290 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml +@@ -12,6 +12,8 @@ + + + ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml +index 6bd032bbcb..ee34ea8547 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml +@@ -20,4 +20,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml +index ec670c612e..75595c02af 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml +@@ -21,4 +21,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml +index d8d4e8a5f9..3910eb6e57 100644 +--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml +@@ -3,4 +3,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml +index d15e625087..2a090a04d8 100644 +--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml +@@ -2,4 +2,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml +index d7a06108bc..ab0e99f97d 100644 +--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml +@@ -17,5 +17,9 @@ + + + ++ ++ ++ ++ + + +diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml +index 127b047854..95875918c9 100644 +--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml +@@ -28,4 +28,8 @@ + + + ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml +index 7ce56ac8e7..d161709981 100644 +--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml +@@ -13,6 +13,8 @@ + + + ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml +index 0358ecf478..a63cd5c4b4 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml +@@ -6,4 +6,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml +index a212679fba..f1a0ad3315 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml +@@ -5,4 +5,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml +index 612e571609..0053913327 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml +@@ -15,4 +15,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml +index 7498d924e2..7acab0a999 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml +@@ -16,4 +16,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml +index 32064548c7..aecc335c1e 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml +@@ -6,6 +6,8 @@ + + + ++ ++ + + + +diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml +index d369fa827a..d3211e7a13 100644 +--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml +@@ -43,6 +43,7 @@ + + + ++ + + + +diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml +index 444d90504e..756b28034e 100644 +--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml +@@ -43,6 +43,7 @@ + + + ++ + + + +diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml +index 463f0db390..0aa8aa18be 100644 +--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml +@@ -43,6 +43,7 @@ + + + ++ + + + +@@ -57,6 +58,7 @@ + + + ++ + + + qemu64 +diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml +index 5bfd065986..d6265ce243 100644 +--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml +@@ -43,6 +43,7 @@ + + + ++ + + + +@@ -57,6 +58,7 @@ + + + ++ + + + qemu64 +diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +index c762b0b600..bcaf9afd6f 100644 +--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +@@ -43,6 +43,7 @@ + + + ++ + + + +@@ -57,6 +58,7 @@ + + + ++ + + + qemu64 +diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +index 0a4bb16a89..eb456dea28 100644 +--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +@@ -43,6 +43,7 @@ + + + ++ + + + +@@ -56,6 +57,7 @@ + + + ++ + + + qemu64 +diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args +index b44dc2ec48..6ee7bed18e 100644 +--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args ++++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args +@@ -14,9 +14,9 @@ QEMU_AUDIO_DRV=none \ + file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ + -machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ + -cpu EPYC,acpi=on,ss=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,pku=on,\ +-la57=on,3dnowext=on,3dnow=on,vme=off,fma=off,avx=off,f16c=off,rdrand=off,\ +-avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,misalignsse=off,\ +-3dnowprefetch=off,osvw=off,topoext=off \ ++la57=on,3dnowext=on,3dnow=on,npt=on,vme=off,fma=off,avx=off,f16c=off,\ ++rdrand=off,avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,\ ++misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \ + -m 214 \ + -overcommit mem-lock=off \ + -smp 6,sockets=6,cores=1,threads=1 \ +-- +2.29.2 + diff --git a/SOURCES/libvirt-cpu_map-Add-missing-x86-features-in-0x7-CPUID-leaf.patch b/SOURCES/libvirt-cpu_map-Add-missing-x86-features-in-0x7-CPUID-leaf.patch new file mode 100644 index 0000000..42bfd9e --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-missing-x86-features-in-0x7-CPUID-leaf.patch @@ -0,0 +1,107 @@ +From cff220056e78bad15a8addf9739f8a556b7a6ea2 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Thu, 8 Oct 2020 18:01:21 +0200 +Subject: [PATCH] cpu_map: Add missing x86 features in 0x7 CPUID leaf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jiri Denemark +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 6ea3bb19c6fed39429c95eb284487b849cb12e2a) + +https://bugzilla.redhat.com/show_bug.cgi?id=1861506 + +Conflicts: + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml + tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml + tests/domaincapsdata/qemu_5.1.0.x86_64.xml + - not present downstream + +Signed-off-by: Jiri Denemark +Message-Id: <04da640b0fbbbcec9be63e552a3029f983bf879a.1602172344.git.jdenemar@redhat.com> +Reviewed-by: Ján Tomko +--- + src/cpu_map/x86_features.xml | 12 ++++++++++++ + .../x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +- + .../x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 + + .../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 + + 4 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml +index 8525ae0fa5..364e45fb32 100644 +--- a/src/cpu_map/x86_features.xml ++++ b/src/cpu_map/x86_features.xml +@@ -286,6 +286,9 @@ + + + ++ ++ ++ + + + +@@ -310,9 +313,18 @@ + + + ++ ++ ++ + + + ++ ++ ++ ++ ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml +index 62c6bad612..ce65579bcc 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml +@@ -1,7 +1,7 @@ + + + +- ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml +index 4676f3aa7d..9b75ace710 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml +@@ -23,6 +23,7 @@ + + + ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml +index 35b9e39629..efbf9d363b 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml +@@ -24,6 +24,7 @@ + + + ++ + + + +-- +2.29.2 + diff --git a/SOURCES/libvirt-cpu_map-Add-missing-x86-features-in-0x80000008-CPUID-leaf.patch b/SOURCES/libvirt-cpu_map-Add-missing-x86-features-in-0x80000008-CPUID-leaf.patch new file mode 100644 index 0000000..b7020fc --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-missing-x86-features-in-0x80000008-CPUID-leaf.patch @@ -0,0 +1,224 @@ +From 1d6a30efa98fc0cf39725792efae1a151797589f Mon Sep 17 00:00:00 2001 +Message-Id: <1d6a30efa98fc0cf39725792efae1a151797589f@dist-git> +From: Jiri Denemark +Date: Thu, 8 Oct 2020 18:01:22 +0200 +Subject: [PATCH] cpu_map: Add missing x86 features in 0x80000008 CPUID leaf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jiri Denemark +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 892b7c70f66abc511e1251382c9183493024f253) + +https://bugzilla.redhat.com/show_bug.cgi?id=1861506 + +Conflicts: + tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml + tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml + tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml + tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml + - commit df69263c26 (cpu_map: Request test files update when + adding x86 features) not backported + + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml + tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml + tests/domaincapsdata/qemu_5.1.0.x86_64.xml + - not present downstream + +Signed-off-by: Jiri Denemark +Message-Id: <27effeb5e12252982411796bd72e078d3afe49cb.1602172344.git.jdenemar@redhat.com> +Reviewed-by: Ján Tomko +--- + src/cpu_map/x86_features.xml | 6 ++++++ + tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml | 2 +- + tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml | 1 + + .../cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml | 1 + + tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 1 + + tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml | 1 + + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml | 1 + + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 1 + + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 1 + + .../x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml | 1 + + .../x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml | 1 + + .../x86_64-cpuid-Hygon-C86-7185-32-core-host.xml | 1 + + .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml | 1 + + .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 1 + + .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 1 + + 15 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml +index 364e45fb32..5265b2989b 100644 +--- a/src/cpu_map/x86_features.xml ++++ b/src/cpu_map/x86_features.xml +@@ -486,12 +486,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml +index 2d7f83c80f..1d91c3efa8 100644 +--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml +@@ -6,6 +6,6 @@ + + + +- ++ + + +diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml +index fb319d547c..c89e0e5350 100644 +--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml +@@ -10,6 +10,7 @@ + + + ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml +index 747d725acf..c26c9c7be3 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml +@@ -4,4 +4,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml +index b75196aac5..612e571609 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml +@@ -14,4 +14,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml +index fd84b526db..7498d924e2 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml +@@ -15,4 +15,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml +index af43fca98d..a7f4fa3f01 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml +@@ -4,4 +4,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml +index 5044c8cc35..96fdea306f 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml +@@ -14,5 +14,6 @@ + + + ++ + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml +index d7d5ce88d9..4fff74f3aa 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml +@@ -15,4 +15,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml +index 747d725acf..c26c9c7be3 100644 +--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml +@@ -4,4 +4,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml +index 75c71233c6..844b8b9d4f 100644 +--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml +@@ -14,4 +14,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml +index 82f28067c4..3d1b143eba 100644 +--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml +@@ -15,4 +15,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml +index b085050618..0358ecf478 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml +@@ -5,4 +5,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml +index b75196aac5..612e571609 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml +@@ -14,4 +14,5 @@ + + + ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml +index fd84b526db..7498d924e2 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml +@@ -15,4 +15,5 @@ + + + ++ + +-- +2.29.2 + diff --git a/SOURCES/libvirt-cpu_map-Add-support-for-core-capability-CPU-feature.patch b/SOURCES/libvirt-cpu_map-Add-support-for-core-capability-CPU-feature.patch new file mode 100644 index 0000000..0140b50 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-support-for-core-capability-CPU-feature.patch @@ -0,0 +1,76 @@ +From 287c112945dda0837c31348dc3c07ad7ed19596f Mon Sep 17 00:00:00 2001 +Message-Id: <287c112945dda0837c31348dc3c07ad7ed19596f@dist-git> +From: Tim Wiederhake +Date: Fri, 15 Jan 2021 15:17:20 +0100 +Subject: [PATCH] cpu_map: Add support for core-capability CPU feature + +Signed-off-by: Tim Wiederhake +Reviewed-by: Jiri Denemark +(cherry picked from commit e06dd56032acf904da1aedfc097fa0cae7cb0b0f) + +https://bugzilla.redhat.com/show_bug.cgi?id=1537734 + +Signed-off-by: Tim Wiederhake +Message-Id: <20210115141722.14986-5-twiederh@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/cpu_map/x86_features.xml | 3 +++ + tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml | 2 +- + tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml | 1 + + tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml +index 70e1c7b3fc..f8c0b9046c 100644 +--- a/src/cpu_map/x86_features.xml ++++ b/src/cpu_map/x86_features.xml +@@ -350,6 +350,9 @@ + + + ++ ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml +index 842c7b4a2a..50e8084140 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml +@@ -1,7 +1,7 @@ + + + +- ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml +index 0f3e2e506e..4ad95f06b4 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml +@@ -37,6 +37,7 @@ + + + ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml +index 3bd009c1da..cc2b208e6a 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml +@@ -47,6 +47,7 @@ + + + ++ + + + +-- +2.30.0 + diff --git a/SOURCES/libvirt-cpu_map-Add-support-for-fsrm-CPU-feature.patch b/SOURCES/libvirt-cpu_map-Add-support-for-fsrm-CPU-feature.patch new file mode 100644 index 0000000..c6bd8ab --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-support-for-fsrm-CPU-feature.patch @@ -0,0 +1,76 @@ +From 7de3eaba72cecf596c732d12485e4f1a6115bf2f Mon Sep 17 00:00:00 2001 +Message-Id: <7de3eaba72cecf596c732d12485e4f1a6115bf2f@dist-git> +From: Tim Wiederhake +Date: Fri, 15 Jan 2021 15:17:19 +0100 +Subject: [PATCH] cpu_map: Add support for fsrm CPU feature + +Signed-off-by: Tim Wiederhake +Reviewed-by: Jiri Denemark +(cherry picked from commit 8c5c660b99101544d8cfcb8edbe48688c04bee25) + +https://bugzilla.redhat.com/show_bug.cgi?id=1537734 + +Signed-off-by: Tim Wiederhake +Message-Id: <20210115141722.14986-4-twiederh@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/cpu_map/x86_features.xml | 3 +++ + tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +- + tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 + + tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml +index 30d1375437..70e1c7b3fc 100644 +--- a/src/cpu_map/x86_features.xml ++++ b/src/cpu_map/x86_features.xml +@@ -332,6 +332,9 @@ + + + ++ ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml +index ce65579bcc..33bd1013f0 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml +@@ -1,7 +1,7 @@ + + + +- ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml +index 9b75ace710..3a71b28cfb 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml +@@ -24,6 +24,7 @@ + + + ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml +index efbf9d363b..1582de0422 100644 +--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml +@@ -25,6 +25,7 @@ + + + ++ + + + +-- +2.30.0 + diff --git a/SOURCES/libvirt-cpu_map-Add-support-for-split-lock-detect-CPU-feature.patch b/SOURCES/libvirt-cpu_map-Add-support-for-split-lock-detect-CPU-feature.patch new file mode 100644 index 0000000..9eee928 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-support-for-split-lock-detect-CPU-feature.patch @@ -0,0 +1,72 @@ +From 4b6dd39819e82b0775e0f324b0b4efa537882878 Mon Sep 17 00:00:00 2001 +Message-Id: <4b6dd39819e82b0775e0f324b0b4efa537882878@dist-git> +From: Tim Wiederhake +Date: Fri, 15 Jan 2021 15:17:21 +0100 +Subject: [PATCH] cpu_map: Add support for split-lock-detect CPU feature + +Signed-off-by: Tim Wiederhake +Reviewed-by: Jiri Denemark +(cherry picked from commit 13db542cf3099f7955438e208dbe4b2b4e58067e) + +https://bugzilla.redhat.com/show_bug.cgi?id=1537734 + +Signed-off-by: Tim Wiederhake +Message-Id: <20210115141722.14986-6-twiederh@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/cpu_map/x86_features.xml | 5 +++++ + tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml | 1 + + tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml | 1 + + tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml | 1 + + 4 files changed, 8 insertions(+) + +diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml +index f8c0b9046c..83d8e641a8 100644 +--- a/src/cpu_map/x86_features.xml ++++ b/src/cpu_map/x86_features.xml +@@ -574,4 +574,9 @@ + + + ++ ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml +index 50e8084140..81ffa7bfd3 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml +@@ -4,5 +4,6 @@ + + + ++ + + +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml +index 4ad95f06b4..2eeff136c4 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml +@@ -53,6 +53,7 @@ + + + ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml +index cc2b208e6a..b3e9d5c1ff 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml +@@ -64,4 +64,5 @@ + + + ++ + +-- +2.30.0 + diff --git a/SOURCES/libvirt-cpu_map-Define-and-enable-Snowridge-model.patch b/SOURCES/libvirt-cpu_map-Define-and-enable-Snowridge-model.patch new file mode 100644 index 0000000..6a04845 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Define-and-enable-Snowridge-model.patch @@ -0,0 +1,373 @@ +From b177f66b37d0c64216ec579a5211461609a96ea8 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Tim Wiederhake +Date: Fri, 15 Jan 2021 15:17:22 +0100 +Subject: [PATCH] cpu_map: Define and enable Snowridge model + +Due to missing pdpe1gb support in the host CPU data, the CPU is still +incorrectly detected as Westmere-IBRS for host capabilities because we +don't have the option to disable features included in the base model +there. + +Signed-off-by: Tim Wiederhake +Reviewed-by: Jiri Denemark +(cherry picked from commit f0a5cf4b8a8b5a68348df5e8b197f30dd90b3c34) + +https://bugzilla.redhat.com/show_bug.cgi?id=1537734 + +Conflicts: +- src/cpu_map/index.xml: Context +- src/cpu_map/meson.build: Not present downstream +- tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml: Not present downstream +- tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml: Not present downstream +- tests/domaincapsdata/qemu_5.1.0.x86_64.xml: Not present downstream +- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml: Not present downstream +- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml: Not present downstream +- tests/domaincapsdata/qemu_5.2.0.x86_64.xml: Not present downstream + +Additions: +- src/cpu_map/Makefile.inc.am: Replaces upstream change of "meson.build" + +Signed-off-by: Tim Wiederhake +Message-Id: <20210115141722.14986-7-twiederh@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/cpu_map/Makefile.inc.am | 1 + + src/cpu_map/index.xml | 1 + + src/cpu_map/x86_Snowridge.xml | 71 +++++++++++++++++++ + .../x86_64-cpuid-Atom-P5362-guest.xml | 28 ++------ + .../x86_64-cpuid-Atom-P5362-json.xml | 26 ++----- + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + + 14 files changed, 92 insertions(+), 44 deletions(-) + create mode 100644 src/cpu_map/x86_Snowridge.xml + +diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am +index aad4b410f9..1dd78c6715 100644 +--- a/src/cpu_map/Makefile.inc.am ++++ b/src/cpu_map/Makefile.inc.am +@@ -67,6 +67,7 @@ cpumap_DATA = \ + cpu_map/x86_Skylake-Server.xml \ + cpu_map/x86_Skylake-Server-IBRS.xml \ + cpu_map/x86_Skylake-Server-noTSX-IBRS.xml \ ++ cpu_map/x86_Snowridge.xml \ + cpu_map/x86_Westmere.xml \ + cpu_map/x86_Westmere-IBRS.xml \ + $(NULL) +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 633b017a93..2f58261e6d 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -55,6 +55,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/x86_Snowridge.xml b/src/cpu_map/x86_Snowridge.xml +new file mode 100644 +index 0000000000..383a24d367 +--- /dev/null ++++ b/src/cpu_map/x86_Snowridge.xml +@@ -0,0 +1,71 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml +index 2eeff136c4..f28e70b9e0 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml +@@ -1,5 +1,5 @@ + +- IvyBridge-IBRS ++ Snowridge + Intel + + +@@ -16,36 +16,17 @@ + + + +- + +- + + +- +- +- +- + +- +- + +- + +- +- +- + + +- +- +- +- +- +- + + + +- + + + +@@ -53,7 +34,8 @@ + + + +- +- +- ++ ++ ++ ++ + +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +index ca685d2f80..bbe0919706 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +@@ -1,33 +1,15 @@ + +- IvyBridge-IBRS ++ Snowridge + Intel + + + +- + +- + +- +- +- +- +- +- +- + +- +- +- + + +- +- +- +- +- + +- + + + +@@ -36,6 +18,8 @@ + + + +- +- ++ ++ ++ ++ + +diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml +index f4ddb66e38..228acde33b 100644 +--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml +@@ -63,6 +63,7 @@ + athlon + Westmere-IBRS + Westmere ++ Snowridge + Skylake-Server-IBRS + Skylake-Server + Skylake-Client-IBRS +diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml +index d6265ce243..bda1aba8ed 100644 +--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml +@@ -75,6 +75,7 @@ + athlon + Westmere-IBRS + Westmere ++ Snowridge + Skylake-Server-IBRS + Skylake-Server + Skylake-Client-IBRS +diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml +index bcc8bbcc7a..bb53138712 100644 +--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml +@@ -62,6 +62,7 @@ + athlon + Westmere-IBRS + Westmere ++ Snowridge + Skylake-Server-IBRS + Skylake-Server + Skylake-Client-IBRS +diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +index 4d9616cb69..0a3f3ef564 100644 +--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +@@ -64,6 +64,7 @@ + athlon + Westmere-IBRS + Westmere ++ Snowridge + Skylake-Server-noTSX-IBRS + Skylake-Server-IBRS + Skylake-Server +diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +index bcaf9afd6f..e64b647f51 100644 +--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +@@ -75,6 +75,7 @@ + athlon + Westmere-IBRS + Westmere ++ Snowridge + Skylake-Server-noTSX-IBRS + Skylake-Server-IBRS + Skylake-Server +diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +index 5210c917aa..5525758a48 100644 +--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +@@ -63,6 +63,7 @@ + athlon + Westmere-IBRS + Westmere ++ Snowridge + Skylake-Server-noTSX-IBRS + Skylake-Server-IBRS + Skylake-Server +diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +index b2a7087a0e..4cb4bf6cce 100644 +--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +@@ -64,6 +64,7 @@ + athlon + Westmere-IBRS + Westmere ++ Snowridge + Skylake-Server-noTSX-IBRS + Skylake-Server-IBRS + Skylake-Server +diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +index 39b11fb634..b5986404ae 100644 +--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +@@ -74,6 +74,7 @@ + athlon + Westmere-IBRS + Westmere ++ Snowridge + Skylake-Server-noTSX-IBRS + Skylake-Server-IBRS + Skylake-Server +diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +index 3a1ee23302..0297ce600b 100644 +--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +@@ -63,6 +63,7 @@ + athlon + Westmere-IBRS + Westmere ++ Snowridge + Skylake-Server-noTSX-IBRS + Skylake-Server-IBRS + Skylake-Server +-- +2.30.0 + diff --git a/SOURCES/libvirt-cpu_map-Defined-and-enable-EPYC-Rome-model.patch b/SOURCES/libvirt-cpu_map-Defined-and-enable-EPYC-Rome-model.patch new file mode 100644 index 0000000..0e6323a --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Defined-and-enable-EPYC-Rome-model.patch @@ -0,0 +1,310 @@ +From f441299f1b589a60199156a217c5f49fc9de954d Mon Sep 17 00:00:00 2001 +Message-Id: +From: Markus Schade +Date: Thu, 8 Oct 2020 18:01:25 +0200 +Subject: [PATCH] cpu_map: Defined and enable EPYC-Rome model +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Markus Schade +Reviewed-by: Jiri Denemark +(cherry picked from commit f941639f86f4bc66c106eb1291f1b58cf9e24680) + +https://bugzilla.redhat.com/show_bug.cgi?id=1861506 + +Conflicts: + src/cpu_map/meson.build + - the corresponding change was applied to Makefile.inc.am as + downstream still uses autotools + + tests/cputest.c + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml + - test data for Ryzen 9 3900X are not present downstream + + tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml + tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml + tests/domaincapsdata/qemu_5.1.0.x86_64.xml + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml + tests/domaincapsdata/qemu_5.2.0.x86_64.xml + - not present downstream + +Signed-off-by: Jiri Denemark +Message-Id: +Reviewed-by: Ján Tomko +--- + src/cpu_map/Makefile.inc.am | 1 + + src/cpu_map/index.xml | 1 + + src/cpu_map/x86_EPYC-Rome.xml | 84 +++++++++++++++++++ + .../x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 12 +-- + .../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 12 +-- + .../x86_64-cpuid-EPYC-7502-32-Core-json.xml | 12 +-- + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + + 9 files changed, 92 insertions(+), 33 deletions(-) + create mode 100644 src/cpu_map/x86_EPYC-Rome.xml + +diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am +index b949cb0bea..aad4b410f9 100644 +--- a/src/cpu_map/Makefile.inc.am ++++ b/src/cpu_map/Makefile.inc.am +@@ -30,6 +30,7 @@ cpumap_DATA = \ + cpu_map/x86_Dhyana.xml \ + cpu_map/x86_EPYC.xml \ + cpu_map/x86_EPYC-IBPB.xml \ ++ cpu_map/x86_EPYC-Rome.xml \ + cpu_map/x86_Haswell.xml \ + cpu_map/x86_Haswell-IBRS.xml \ + cpu_map/x86_Haswell-noTSX.xml \ +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index ff1da2e677..633b017a93 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -66,6 +66,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml +new file mode 100644 +index 0000000000..99fc015fdd +--- /dev/null ++++ b/src/cpu_map/x86_EPYC-Rome.xml +@@ -0,0 +1,84 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml +index 1320f65a58..cb2caab6f5 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml +@@ -1,12 +1,9 @@ + +- EPYC-IBPB ++ EPYC-Rome + AMD + + + +- +- +- + + + +@@ -17,18 +14,11 @@ + + + +- + + +- +- +- +- + +- + + +- + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +index 37905ec812..b6784f9eba 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +@@ -1,13 +1,10 @@ + + x86_64 +- EPYC-IBPB ++ EPYC-Rome + AMD + + + +- +- +- + + + +@@ -18,18 +15,11 @@ + + + +- + + +- +- +- +- + +- + + +- + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml +index 225cf63852..86466c0547 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml +@@ -1,28 +1,18 @@ + +- EPYC-IBPB ++ EPYC-Rome + AMD + + + + +- +- +- + + + + + + +- +- +- +- +- + + +- +- + + + +diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +index 7bfd786ff6..b2a7087a0e 100644 +--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +@@ -90,6 +90,7 @@ + Haswell-noTSX + Haswell-IBRS + Haswell ++ EPYC-Rome + EPYC-IBPB + EPYC + Dhyana +diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +index eb456dea28..39b11fb634 100644 +--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +@@ -100,6 +100,7 @@ + Haswell-noTSX + Haswell-IBRS + Haswell ++ EPYC-Rome + EPYC-IBPB + EPYC + Dhyana +diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +index d6ee66ab60..3a1ee23302 100644 +--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +@@ -89,6 +89,7 @@ + Haswell-noTSX + Haswell-IBRS + Haswell ++ EPYC-Rome + EPYC-IBPB + EPYC + Dhyana +-- +2.29.2 + diff --git a/SOURCES/libvirt-cpu_map-Fix-Icelake-Server-model-number.patch b/SOURCES/libvirt-cpu_map-Fix-Icelake-Server-model-number.patch new file mode 100644 index 0000000..0ec9af6 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Fix-Icelake-Server-model-number.patch @@ -0,0 +1,52 @@ +From a6293a2b28a65f3c9ae0dcf387b222ebd242fa63 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Tim Wiederhake +Date: Fri, 15 Jan 2021 15:17:17 +0100 +Subject: [PATCH] cpu_map: Fix Icelake Server model number + +See arch/x86/include/asm/intel-family.h in the Kernel: + #define INTEL_FAM6_ICELAKE_X 0x6A + +Signed-off-by: Tim Wiederhake +Reviewed-by: Jiri Denemark +(cherry picked from commit 1278ac6265589cd83cc2e661056c860e98105507) + +https://bugzilla.redhat.com/show_bug.cgi?id=1537734 + +Signed-off-by: Tim Wiederhake +Message-Id: <20210115141722.14986-2-twiederh@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/cpu_map/x86_Icelake-Server-noTSX.xml | 2 +- + src/cpu_map/x86_Icelake-Server.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml +index 2fd6906406..34a0f7c18c 100644 +--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml ++++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml +@@ -1,7 +1,7 @@ + + + +- ++ + + + +diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml +index 367ade7240..1ee4ea9cd4 100644 +--- a/src/cpu_map/x86_Icelake-Server.xml ++++ b/src/cpu_map/x86_Icelake-Server.xml +@@ -1,7 +1,7 @@ + + + +- ++ + + + +-- +2.30.0 + diff --git a/SOURCES/libvirt-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch b/SOURCES/libvirt-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch new file mode 100644 index 0000000..a603df9 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch @@ -0,0 +1,59 @@ +From a7fb45c4e5a807a7b437a91cfc96c8c811351578 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Thu, 4 Mar 2021 09:41:53 +0100 +Subject: [PATCH] cpu_map: Fix spelling of svme-addr-chk feature +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit a208176ca1d9eedf8aa6bf12fde6a7a9579ab549 introduced this feature +with an incorrect "svme-addr-check" spelling. + +Signed-off-by: Jiri Denemark +Reviewed-by: Tim Wiederhake +(cherry picked from commit b5abf9a192248b1005f63a7102d2627375d70fe5) + +https://bugzilla.redhat.com/show_bug.cgi?id=1926864 + +Conflicts: + src/cpu_map/sync_qemu_i386.py + - the original change to this file was not backported + +Signed-off-by: Jiri Denemark +Message-Id: <75071287f9fc55f4bec82916726fcb8f31c1e014.1614847231.git.jdenemar@redhat.com> +Reviewed-by: Ján Tomko +--- + src/cpu_map/x86_EPYC-Milan.xml | 2 +- + src/cpu_map/x86_features.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml +index 53f0cd6aac..3055e175fa 100644 +--- a/src/cpu_map/x86_EPYC-Milan.xml ++++ b/src/cpu_map/x86_EPYC-Milan.xml +@@ -76,7 +76,7 @@ + + + +- ++ + + + +diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml +index 8acd42f796..ba23f553c3 100644 +--- a/src/cpu_map/x86_features.xml ++++ b/src/cpu_map/x86_features.xml +@@ -548,7 +548,7 @@ + + + +- ++ + + + +-- +2.30.0 + diff --git a/SOURCES/libvirt-cpu_map-Install-x86_EPYC-Milan.xml.patch b/SOURCES/libvirt-cpu_map-Install-x86_EPYC-Milan.xml.patch new file mode 100644 index 0000000..4652d0e --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Install-x86_EPYC-Milan.xml.patch @@ -0,0 +1,41 @@ +From 8b1e1aa7cb9dc428a36b549a73286ec7040864ed Mon Sep 17 00:00:00 2001 +Message-Id: <8b1e1aa7cb9dc428a36b549a73286ec7040864ed@dist-git> +From: Jiri Denemark +Date: Wed, 3 Mar 2021 11:11:55 +0100 +Subject: [PATCH] cpu_map: Install x86_EPYC-Milan.xml +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jiri Denemark +Reviewed-by: Pavel Hrdina +(cherry picked from commit d3de79dbfc20dc4dfc19154b16079861c542b71e) + +https://bugzilla.redhat.com/show_bug.cgi?id=1926864 + +Conflicts: + src/cpu_map/meson.build + - change goes to Makefile.inc.am instead + +Signed-off-by: Jiri Denemark +Message-Id: <77cf69a7222fd9fc5ef0f1c25f0534090c29865f.1614766279.git.jdenemar@redhat.com> +Reviewed-by: Ján Tomko +--- + src/cpu_map/Makefile.inc.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am +index 1dd78c6715..45dbe9e216 100644 +--- a/src/cpu_map/Makefile.inc.am ++++ b/src/cpu_map/Makefile.inc.am +@@ -30,6 +30,7 @@ cpumap_DATA = \ + cpu_map/x86_Dhyana.xml \ + cpu_map/x86_EPYC.xml \ + cpu_map/x86_EPYC-IBPB.xml \ ++ cpu_map/x86_EPYC-Milan.xml \ + cpu_map/x86_EPYC-Rome.xml \ + cpu_map/x86_Haswell.xml \ + cpu_map/x86_Haswell-IBRS.xml \ +-- +2.30.0 + diff --git a/SOURCES/libvirt-cpu_map-Remove-monitor-feature-from-EPYC-Rome.patch b/SOURCES/libvirt-cpu_map-Remove-monitor-feature-from-EPYC-Rome.patch new file mode 100644 index 0000000..09af67b --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Remove-monitor-feature-from-EPYC-Rome.patch @@ -0,0 +1,90 @@ +From b91bb231645300a29ab82994a003ba22835ee994 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Thu, 8 Oct 2020 18:01:26 +0200 +Subject: [PATCH] cpu_map: Remove monitor feature from EPYC-Rome +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The feature is filtered by KVM and never automatically enabled. So even +though QEMU definition of EPYC-Rome contains this feature, the guest +won't see it. Also domain capabilities will show it as disabled for KVM +domains. Thus the feature should not really be included in our +definition of EPYC-Rome. + +Signed-off-by: Jiri Denemark +Reviewed-by: Peter Krempa +(cherry picked from commit 3bf6f9fe22dfbd3c1dcc614b31f2f4fe8b71a2f2) + +https://bugzilla.redhat.com/show_bug.cgi?id=1861506 + +Conflicts: + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml + tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml + tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml + tests/domaincapsdata/qemu_5.1.0.x86_64.xml + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml + tests/domaincapsdata/qemu_5.2.0.x86_64.xml + - not present downstream + +Signed-off-by: Jiri Denemark +Message-Id: <74b9257f49925312b025a99dd934a9613ca295d4.1602172344.git.jdenemar@redhat.com> +Reviewed-by: Ján Tomko +--- + src/cpu_map/x86_EPYC-Rome.xml | 1 - + tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 + + tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 + + tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml | 1 - + 4 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml +index 99fc015fdd..e54d0a48d8 100644 +--- a/src/cpu_map/x86_EPYC-Rome.xml ++++ b/src/cpu_map/x86_EPYC-Rome.xml +@@ -37,7 +37,6 @@ + + + +- + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml +index cb2caab6f5..6d95b508b2 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml +@@ -2,6 +2,7 @@ + EPYC-Rome + AMD + ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +index b6784f9eba..65eaeabdd0 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +@@ -3,6 +3,7 @@ + EPYC-Rome + AMD + ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml +index 86466c0547..febfdfcf2b 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml +@@ -17,5 +17,4 @@ + + + +- + +-- +2.29.2 + diff --git a/SOURCES/libvirt-cpumap-Add-support-for-ibrs-CPU-feature.patch b/SOURCES/libvirt-cpumap-Add-support-for-ibrs-CPU-feature.patch new file mode 100644 index 0000000..9fcd3a4 --- /dev/null +++ b/SOURCES/libvirt-cpumap-Add-support-for-ibrs-CPU-feature.patch @@ -0,0 +1,65 @@ +From bb9f39342d4ea6b76b67378f514f52a9627206b9 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Tim Wiederhake +Date: Wed, 3 Mar 2021 11:11:52 +0100 +Subject: [PATCH] cpumap: Add support for ibrs CPU feature +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Tim Wiederhake +Reviewed-by: Jiri Denemark +(cherry picked from commit 5c17a7ba41670f3182186c06e621995b5d03fc95) + +https://bugzilla.redhat.com/show_bug.cgi?id=1926864 + +Signed-off-by: Jiri Denemark +Message-Id: <0aee3baa35e04f56e3c95bb2f60c8a17d7806e7a.1614766279.git.jdenemar@redhat.com> +Reviewed-by: Ján Tomko +--- + src/cpu_map/x86_features.xml | 3 +++ + tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 + + tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 + + 3 files changed, 5 insertions(+) + +diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml +index 83d8e641a8..abefb7928e 100644 +--- a/src/cpu_map/x86_features.xml ++++ b/src/cpu_map/x86_features.xml +@@ -501,6 +501,9 @@ + + + ++ ++ ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml +index 6d95b508b2..40e7912398 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml +@@ -17,6 +17,7 @@ + + + ++ + + + +diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +index 65eaeabdd0..9f8108cdaa 100644 +--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +@@ -18,6 +18,7 @@ + + + ++ + + + +-- +2.30.0 + diff --git a/SOURCES/libvirt-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch b/SOURCES/libvirt-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch new file mode 100644 index 0000000..97d1b6f --- /dev/null +++ b/SOURCES/libvirt-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch @@ -0,0 +1,39 @@ +From 87fdbd2d0ab24f00c70a298317d50df44a5f76ad Mon Sep 17 00:00:00 2001 +Message-Id: <87fdbd2d0ab24f00c70a298317d50df44a5f76ad@dist-git> +From: Tim Wiederhake +Date: Wed, 3 Mar 2021 11:11:53 +0100 +Subject: [PATCH] cpumap: Add support for svme-addr-check CPU feature +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Tim Wiederhake +Reviewed-by: Jiri Denemark +(cherry picked from commit 5ac6ab2fde63881d3c5cc7372a0d0e59618feb55) + +https://bugzilla.redhat.com/show_bug.cgi?id=1926864 + +Signed-off-by: Jiri Denemark +Message-Id: +Reviewed-by: Ján Tomko +--- + src/cpu_map/x86_features.xml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml +index abefb7928e..8acd42f796 100644 +--- a/src/cpu_map/x86_features.xml ++++ b/src/cpu_map/x86_features.xml +@@ -548,6 +548,9 @@ + + + ++ ++ ++ + + + +-- +2.30.0 + diff --git a/SOURCES/libvirt-cputestdata-Add-test-data-for-Snowridge.patch b/SOURCES/libvirt-cputestdata-Add-test-data-for-Snowridge.patch new file mode 100644 index 0000000..0ee3ed2 --- /dev/null +++ b/SOURCES/libvirt-cputestdata-Add-test-data-for-Snowridge.patch @@ -0,0 +1,2763 @@ +From 2d95faf1042465489753179ca46b7ade6225b171 Mon Sep 17 00:00:00 2001 +Message-Id: <2d95faf1042465489753179ca46b7ade6225b171@dist-git> +From: Tim Wiederhake +Date: Fri, 15 Jan 2021 15:17:18 +0100 +Subject: [PATCH] cputestdata: Add test data for Snowridge + +It's obvious the CPU model detection provides strange results, which +will be fixed by adding a new Snowridge CPU model few patches later. + +Signed-off-by: Tim Wiederhake +Reviewed-by: Jiri Denemark +(cherry picked from commit 59a585fdb047669ee36251c7338bb2e2ccd58998) + +https://bugzilla.redhat.com/show_bug.cgi?id=1537734 + +Signed-off-by: Tim Wiederhake +Message-Id: <20210115141722.14986-3-twiederh@redhat.com> +Reviewed-by: Jiri Denemark +--- + tests/cputest.c | 1 + + .../x86_64-cpuid-Atom-P5362-disabled.xml | 8 + + .../x86_64-cpuid-Atom-P5362-enabled.xml | 10 + + .../x86_64-cpuid-Atom-P5362-guest.xml | 57 + + .../x86_64-cpuid-Atom-P5362-host.xml | 66 + + .../x86_64-cpuid-Atom-P5362-json.xml | 41 + + .../cputestdata/x86_64-cpuid-Atom-P5362.json | 2415 +++++++++++++++++ + tests/cputestdata/x86_64-cpuid-Atom-P5362.sig | 4 + + tests/cputestdata/x86_64-cpuid-Atom-P5362.xml | 61 + + 9 files changed, 2663 insertions(+) + create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml + create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-P5362.json + create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-P5362.sig + create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-P5362.xml + +diff --git a/tests/cputest.c b/tests/cputest.c +index 388174eba7..2ec3337476 100644 +--- a/tests/cputest.c ++++ b/tests/cputest.c +@@ -1218,6 +1218,7 @@ mymain(void) + DO_TEST_CPUID(VIR_ARCH_X86_64, "A10-5800K", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Atom-D510", JSON_NONE); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Atom-N450", JSON_NONE); ++ DO_TEST_CPUID(VIR_ARCH_X86_64, "Atom-P5362", JSON_MODELS_REQUIRED); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i5-650", JSON_MODELS_REQUIRED); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i5-2500", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i5-2540M", JSON_MODELS); +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml +new file mode 100644 +index 0000000000..842c7b4a2a +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml +new file mode 100644 +index 0000000000..2214d448ef +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml +@@ -0,0 +1,10 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml +new file mode 100644 +index 0000000000..0f3e2e506e +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml +@@ -0,0 +1,57 @@ ++ ++ IvyBridge-IBRS ++ Intel ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml +new file mode 100644 +index 0000000000..3bd009c1da +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml +@@ -0,0 +1,66 @@ ++ ++ x86_64 ++ Westmere-IBRS ++ Intel ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +new file mode 100644 +index 0000000000..ca685d2f80 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +@@ -0,0 +1,41 @@ ++ ++ IvyBridge-IBRS ++ Intel ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362.json b/tests/cputestdata/x86_64-cpuid-Atom-P5362.json +new file mode 100644 +index 0000000000..4e5545f177 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362.json +@@ -0,0 +1,2415 @@ ++{ ++ "return": { ++ "model": { ++ "name": "base", ++ "props": { ++ "vmx-entry-load-rtit-ctl": false, ++ "phys-bits": 0, ++ "core-id": -1, ++ "xlevel": 2147483656, ++ "cmov": true, ++ "ia64": false, ++ "ssb-no": false, ++ "aes": true, ++ "vmx-apicv-xapic": true, ++ "mmx": true, ++ "rdpid": true, ++ "vmx-page-walk-4": true, ++ "vmx-page-walk-5": false, ++ "arat": true, ++ "gfni": true, ++ "vmx-desc-exit": true, ++ "ibrs-all": true, ++ "pause-filter": false, ++ "xsavec": true, ++ "intel-pt": false, ++ "vmx-cr8-store-exit": true, ++ "hv-frequencies": false, ++ "tsc-frequency": 0, ++ "vmx-rdseed-exit": true, ++ "xd": true, ++ "x-intel-pt-auto-level": false, ++ "hv-vendor-id": "", ++ "vmx-eptp-switching": true, ++ "kvm-asyncpf": true, ++ "kvm_asyncpf": true, ++ "perfctr_core": false, ++ "perfctr-core": false, ++ "mpx": false, ++ "pbe": false, ++ "decodeassists": false, ++ "avx512cd": false, ++ "vmx-exit-load-efer": true, ++ "vmx-exit-clear-bndcfgs": false, ++ "sse4_1": true, ++ "sse4.1": true, ++ "sse4-1": true, ++ "family": 6, ++ "legacy-cache": true, ++ "vmx-vmwrite-vmexit-fields": true, ++ "vmx-vnmi": true, ++ "vmx-true-ctls": true, ++ "host-phys-bits-limit": 48, ++ "vmx-ept-execonly": true, ++ "vmx-exit-save-efer": true, ++ "vmx-invept-all-context": true, ++ "vmware-cpuid-freq": true, ++ "wbnoinvd": false, ++ "avx512f": false, ++ "hv-stimer-direct": false, ++ "msr": true, ++ "mce": true, ++ "mca": true, ++ "hv-runtime": false, ++ "xcrypt": false, ++ "thread-id": -1, ++ "vmx-exit-load-pat": true, ++ "vmx-intr-exit": true, ++ "min-level": 27, ++ "vmx-flexpriority": true, ++ "xgetbv1": true, ++ "cid": false, ++ "hv-relaxed": false, ++ "hv-crash": false, ++ "ds": false, ++ "fxsr": true, ++ "avx512-bf16": false, ++ "vmx-cr8-load-exit": true, ++ "xsaveopt": true, ++ "vmx-apicv-vid": true, ++ "vmx-exit-save-pat": true, ++ "xtpr": false, ++ "tsx-ctrl": false, ++ "vmx-ple": false, ++ "hv-evmcs": false, ++ "avx512vl": false, ++ "avx512-vpopcntdq": false, ++ "phe": false, ++ "extapic": false, ++ "3dnowprefetch": true, ++ "vmx-vmfunc": true, ++ "vmx-activity-shutdown": false, ++ "avx512vbmi2": false, ++ "vmx-encls-exit": false, ++ "cr8legacy": false, ++ "vmx-msr-bitmap": true, ++ "stibp": true, ++ "cpuid-0xb": true, ++ "xcrypt-en": false, ++ "vmx-mwait-exit": true, ++ "kvm_pv_eoi": true, ++ "vmx-pml": true, ++ "apic-id": 4294967295, ++ "vmx-nmi-exit": true, ++ "vmx-invept-single-context-noglobals": true, ++ "rsba": false, ++ "pn": false, ++ "dca": false, ++ "vendor": "GenuineIntel", ++ "vmx-unrestricted-guest": true, ++ "hv-ipi": false, ++ "vmx-cr3-store-noexit": true, ++ "pku": false, ++ "smx": false, ++ "cmp_legacy": false, ++ "cmp-legacy": false, ++ "node-id": -1, ++ "avx512-4fmaps": false, ++ "vmcb_clean": false, ++ "vmcb-clean": false, ++ "3dnowext": false, ++ "amd-no-ssb": false, ++ "hle": false, ++ "npt": false, ++ "rdctl-no": true, ++ "vmx-invvpid": true, ++ "memory": "/machine/unattached/system[0]", ++ "clwb": true, ++ "lbrv": false, ++ "adx": false, ++ "ss": true, ++ "pni": true, ++ "svm_lock": false, ++ "svm-lock": false, ++ "pfthreshold": false, ++ "smep": true, ++ "smap": true, ++ "vmx-invpcid-exit": false, ++ "x2apic": true, ++ "avx512vbmi": false, ++ "avx512vnni": false, ++ "vmx-apicv-x2apic": true, ++ "kvm-pv-sched-yield": true, ++ "hv-stimer": false, ++ "vmx-invlpg-exit": true, ++ "x-hv-synic-kvm-only": true, ++ "vmx-invvpid-all-context": true, ++ "i64": true, ++ "vmx-activity-hlt": true, ++ "flushbyasid": false, ++ "f16c": false, ++ "vmx-exit-ack-intr": true, ++ "ace2-en": false, ++ "pat": true, ++ "pae": true, ++ "sse": true, ++ "die-id": -1, ++ "vmx-tsc-offset": true, ++ "phe-en": false, ++ "kvm_nopiodelay": true, ++ "kvm-nopiodelay": true, ++ "tm": false, ++ "kvmclock-stable-bit": true, ++ "vmx-rdtsc-exit": true, ++ "hypervisor": true, ++ "vmx-rdtscp-exit": true, ++ "socket-id": -1, ++ "mds-no": true, ++ "pcommit": false, ++ "vmx-vpid": true, ++ "syscall": true, ++ "level": 27, ++ "avx512dq": false, ++ "x-migrate-smi-count": false, ++ "svm": false, ++ "full-cpuid-auto-level": true, ++ "hv-reset": false, ++ "invtsc": false, ++ "vmx-monitor-exit": true, ++ "sse3": true, ++ "sse2": true, ++ "vmx-wbinvd-exit": true, ++ "ssbd": true, ++ "est": false, ++ "kvm-poll-control": true, ++ "kvm_poll_control": true, ++ "avx512ifma": false, ++ "tm2": false, ++ "kvm-pv-ipi": true, ++ "kvm-pv-eoi": true, ++ "cx8": true, ++ "vmx-invvpid-single-addr": true, ++ "waitpkg": false, ++ "cldemote": true, ++ "vmx-ept": true, ++ "hv-reenlightenment": false, ++ "kvm_mmu": false, ++ "kvm-mmu": false, ++ "sse4_2": true, ++ "sse4.2": true, ++ "sse4-2": true, ++ "pge": true, ++ "fill-mtrr-mask": true, ++ "avx512bitalg": false, ++ "nodeid_msr": false, ++ "vmx-entry-load-bndcfgs": false, ++ "pdcm": true, ++ "vmx-exit-clear-rtit-ctl": false, ++ "movbe": true, ++ "model": 134, ++ "nrip_save": false, ++ "nrip-save": false, ++ "kvm_pv_unhalt": true, ++ "ssse3": true, ++ "sse4a": false, ++ "vmx-pause-exit": true, ++ "invpcid": false, ++ "pdpe1gb": false, ++ "tsc-deadline": true, ++ "skip-l1dfl-vmentry": true, ++ "vmx-exit-load-perf-global-ctrl": false, ++ "fma": false, ++ "cx16": true, ++ "de": true, ++ "enforce": false, ++ "stepping": 5, ++ "xsave": true, ++ "clflush": true, ++ "skinit": false, ++ "tsc": true, ++ "tce": false, ++ "fpu": true, ++ "ibs": false, ++ "ds_cpl": false, ++ "ds-cpl": false, ++ "vmx-exit-nosave-debugctl": true, ++ "host-phys-bits": true, ++ "fma4": false, ++ "vmx-invept": true, ++ "la57": false, ++ "osvw": false, ++ "check": true, ++ "hv-spinlocks": 4294967295, ++ "vmx-eptad": true, ++ "pmu": false, ++ "pmm": false, ++ "apic": true, ++ "vmx-entry-noload-debugctl": true, ++ "spec-ctrl": true, ++ "vmx-posted-intr": true, ++ "vmx-apicv-register": true, ++ "min-xlevel2": 0, ++ "tsc-adjust": true, ++ "tsc_adjust": true, ++ "kvm-steal-time": true, ++ "kvm_steal_time": true, ++ "vmx-zero-len-inject": false, ++ "kvmclock": true, ++ "pschange-mc-no": true, ++ "l3-cache": true, ++ "vmx-rdrand-exit": true, ++ "lwp": false, ++ "hv-passthrough": false, ++ "amd-ssbd": true, ++ "ibpb": true, ++ "xop": false, ++ "avx": false, ++ "core-capability": false, ++ "vmx-invept-single-context": true, ++ "movdiri": true, ++ "ace2": false, ++ "avx512bw": false, ++ "acpi": false, ++ "hv-vapic": false, ++ "fsgsbase": true, ++ "vmx-ept-1gb": true, ++ "vmx-ept-2mb": true, ++ "ht": false, ++ "vmx-io-exit": true, ++ "nx": true, ++ "pclmulqdq": true, ++ "mmxext": false, ++ "vaes": false, ++ "popcnt": true, ++ "xsaves": true, ++ "movdir64b": true, ++ "tcg-cpuid": true, ++ "vmx-shadow-vmcs": true, ++ "lm": true, ++ "vmx-exit-save-preemption-timer": true, ++ "vmx-entry-load-pat": true, ++ "vmx-entry-load-perf-global-ctrl": false, ++ "vmx-io-bitmap": true, ++ "umip": true, ++ "vmx-store-lma": true, ++ "vmx-movdr-exit": true, ++ "pse": true, ++ "avx2": false, ++ "sep": true, ++ "pclmuldq": true, ++ "virt-ssbd": false, ++ "vmx-cr3-load-noexit": true, ++ "x-hv-max-vps": -1, ++ "nodeid-msr": false, ++ "md-clear": true, ++ "split-lock-detect": false, ++ "kvm": true, ++ "misalignsse": false, ++ "min-xlevel": 2147483656, ++ "kvm-pv-unhalt": true, ++ "bmi2": false, ++ "bmi1": false, ++ "realized": false, ++ "tsc_scale": false, ++ "tsc-scale": false, ++ "topoext": false, ++ "hv-vpindex": false, ++ "hv-no-nonarch-coresharing": "off", ++ "amd-stibp": true, ++ "vmx-preemption-timer": true, ++ "ucode-rev": 0, ++ "xlevel2": 0, ++ "clflushopt": true, ++ "vmx-vnmi-pending": true, ++ "kvm-no-smi-migration": false, ++ "monitor": false, ++ "vmx-vintr-pending": true, ++ "avx512er": false, ++ "pmm-en": false, ++ "pcid": false, ++ "taa-no": false, ++ "vmx-secondary-ctls": true, ++ "arch-capabilities": true, ++ "vmx-xsaves": true, ++ "clzero": false, ++ "3dnow": false, ++ "erms": true, ++ "vmx-entry-ia32e-mode": true, ++ "x-force-features": false, ++ "lahf_lm": true, ++ "lahf-lm": true, ++ "vpclmulqdq": false, ++ "vmx-ins-outs": true, ++ "fxsr-opt": false, ++ "hv-synic": false, ++ "xstore": false, ++ "fxsr_opt": false, ++ "kvm-hint-dedicated": false, ++ "rtm": false, ++ "lmce": true, ++ "hv-time": false, ++ "perfctr-nb": false, ++ "perfctr_nb": false, ++ "ffxsr": false, ++ "hv-tlbflush": false, ++ "rdrand": true, ++ "rdseed": true, ++ "avx512-4vnniw": false, ++ "vmx": true, ++ "vme": true, ++ "dtes64": false, ++ "mtrr": true, ++ "rdtscp": true, ++ "xsaveerptr": false, ++ "pse36": true, ++ "kvm-pv-tlb-flush": true, ++ "vmx-activity-wait-sipi": false, ++ "tbm": false, ++ "wdt": false, ++ "vmx-rdpmc-exit": true, ++ "level-func7": 0, ++ "vmx-entry-load-efer": true, ++ "vmx-mtf": true, ++ "pause_filter": false, ++ "sha-ni": true, ++ "model-id": "Intel Atom(R) P5362 processor", ++ "abm": false, ++ "vmx-ept-advanced-exitinfo": false, ++ "avx512pf": false, ++ "vmx-hlt-exit": true, ++ "xstore-en": false ++ } ++ } ++ }, ++ "id": "model-expansion" ++} ++ ++{ ++ "return": [ ++ { ++ "name": "max", ++ "typename": "max-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": false ++ }, ++ { ++ "name": "host", ++ "typename": "host-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": false ++ }, ++ { ++ "name": "base", ++ "typename": "base-x86_64-cpu", ++ "unavailable-features": [], ++ "static": true, ++ "migration-safe": true ++ }, ++ { ++ "name": "qemu64-v1", ++ "typename": "qemu64-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "qemu64", ++ "typename": "qemu64-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "qemu32-v1", ++ "typename": "qemu32-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "qemu32", ++ "typename": "qemu32-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "phenom-v1", ++ "typename": "phenom-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "3dnowext", ++ "3dnow", ++ "abm", ++ "sse4a" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "phenom", ++ "typename": "phenom-x86_64-cpu", ++ "unavailable-features": [ ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "3dnowext", ++ "3dnow", ++ "abm", ++ "sse4a" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium3-v1", ++ "typename": "pentium3-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium3", ++ "typename": "pentium3-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium2-v1", ++ "typename": "pentium2-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium2", ++ "typename": "pentium2-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium-v1", ++ "typename": "pentium-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "pentium", ++ "typename": "pentium-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "n270-v1", ++ "typename": "n270-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "n270", ++ "typename": "n270-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "kvm64-v1", ++ "typename": "kvm64-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "kvm64", ++ "typename": "kvm64-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "kvm32-v1", ++ "typename": "kvm32-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "kvm32", ++ "typename": "kvm32-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "coreduo-v1", ++ "typename": "coreduo-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "coreduo", ++ "typename": "coreduo-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "core2duo-v1", ++ "typename": "core2duo-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "core2duo", ++ "typename": "core2duo-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "athlon-v1", ++ "typename": "athlon-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "mmxext", ++ "3dnowext", ++ "3dnow" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "athlon", ++ "typename": "athlon-x86_64-cpu", ++ "unavailable-features": [ ++ "mmxext", ++ "3dnowext", ++ "3dnow" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Westmere-v2", ++ "typename": "Westmere-v2-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Westmere-v1", ++ "typename": "Westmere-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Westmere-IBRS", ++ "typename": "Westmere-IBRS-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Westmere", ++ "typename": "Westmere-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Snowridge-v2", ++ "typename": "Snowridge-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "core-capability", ++ "pdpe1gb", ++ "split-lock-detect" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Snowridge-v1", ++ "typename": "Snowridge-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "mpx", ++ "core-capability", ++ "pdpe1gb", ++ "mpx", ++ "mpx", ++ "split-lock-detect" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Snowridge", ++ "typename": "Snowridge-x86_64-cpu", ++ "unavailable-features": [ ++ "mpx", ++ "core-capability", ++ "pdpe1gb", ++ "mpx", ++ "mpx", ++ "split-lock-detect" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-v3", ++ "typename": "Skylake-Server-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-v2", ++ "typename": "Skylake-Server-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-v1", ++ "typename": "Skylake-Server-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-noTSX-IBRS", ++ "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server-IBRS", ++ "typename": "Skylake-Server-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "mpx", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "mpx", ++ "mpx", ++ "avx512f", ++ "avx512f", ++ "avx512f" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Server", ++ "typename": "Skylake-Server-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "mpx", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "mpx", ++ "mpx", ++ "avx512f", ++ "avx512f", ++ "avx512f" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-v3", ++ "typename": "Skylake-Client-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-v2", ++ "typename": "Skylake-Client-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-v1", ++ "typename": "Skylake-Client-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-noTSX-IBRS", ++ "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client-IBRS", ++ "typename": "Skylake-Client-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "mpx", ++ "adx", ++ "abm", ++ "avx", ++ "mpx", ++ "mpx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Skylake-Client", ++ "typename": "Skylake-Client-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "mpx", ++ "adx", ++ "abm", ++ "avx", ++ "mpx", ++ "mpx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "SandyBridge-v2", ++ "typename": "SandyBridge-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "SandyBridge-v1", ++ "typename": "SandyBridge-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "SandyBridge-IBRS", ++ "typename": "SandyBridge-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "SandyBridge", ++ "typename": "SandyBridge-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Penryn-v1", ++ "typename": "Penryn-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Penryn", ++ "typename": "Penryn-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G5-v1", ++ "typename": "Opteron_G5-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "pdpe1gb", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "xop", ++ "fma4", ++ "tbm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G5", ++ "typename": "Opteron_G5-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "pdpe1gb", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "xop", ++ "fma4", ++ "tbm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G4-v1", ++ "typename": "Opteron_G4-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "pdpe1gb", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "xop", ++ "fma4", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G4", ++ "typename": "Opteron_G4-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "pdpe1gb", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "xop", ++ "fma4", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G3-v1", ++ "typename": "Opteron_G3-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "abm", ++ "sse4a", ++ "misalignsse" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G3", ++ "typename": "Opteron_G3-x86_64-cpu", ++ "unavailable-features": [ ++ "abm", ++ "sse4a", ++ "misalignsse" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G2-v1", ++ "typename": "Opteron_G2-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G2", ++ "typename": "Opteron_G2-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G1-v1", ++ "typename": "Opteron_G1-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Opteron_G1", ++ "typename": "Opteron_G1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Nehalem-v2", ++ "typename": "Nehalem-v2-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Nehalem-v1", ++ "typename": "Nehalem-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Nehalem-IBRS", ++ "typename": "Nehalem-IBRS-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Nehalem", ++ "typename": "Nehalem-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "KnightsMill-v1", ++ "typename": "KnightsMill-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "avx512f", ++ "adx", ++ "avx512pf", ++ "avx512er", ++ "avx512cd", ++ "avx512-vpopcntdq", ++ "avx512-4vnniw", ++ "avx512-4fmaps", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "KnightsMill", ++ "typename": "KnightsMill-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "avx512f", ++ "adx", ++ "avx512pf", ++ "avx512er", ++ "avx512cd", ++ "avx512-vpopcntdq", ++ "avx512-4vnniw", ++ "avx512-4fmaps", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "IvyBridge-v2", ++ "typename": "IvyBridge-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "f16c", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "IvyBridge-v1", ++ "typename": "IvyBridge-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "f16c", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "IvyBridge-IBRS", ++ "typename": "IvyBridge-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "f16c", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "IvyBridge", ++ "typename": "IvyBridge-x86_64-cpu", ++ "unavailable-features": [ ++ "avx", ++ "f16c", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Server-v3", ++ "typename": "Icelake-Server-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "la57", ++ "pdpe1gb", ++ "abm", ++ "wbnoinvd", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku", ++ "taa-no" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Server-v2", ++ "typename": "Icelake-Server-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "la57", ++ "pdpe1gb", ++ "abm", ++ "wbnoinvd", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Server-v1", ++ "typename": "Icelake-Server-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "la57", ++ "pdpe1gb", ++ "abm", ++ "wbnoinvd", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Server-noTSX", ++ "typename": "Icelake-Server-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "la57", ++ "pdpe1gb", ++ "abm", ++ "wbnoinvd", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Server", ++ "typename": "Icelake-Server-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "mpx", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "la57", ++ "pdpe1gb", ++ "abm", ++ "wbnoinvd", ++ "avx", ++ "mpx", ++ "mpx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Client-v2", ++ "typename": "Icelake-Client-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "adx", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "abm", ++ "wbnoinvd", ++ "avx", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Client-v1", ++ "typename": "Icelake-Client-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "adx", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "abm", ++ "wbnoinvd", ++ "avx", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Client-noTSX", ++ "typename": "Icelake-Client-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "adx", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "abm", ++ "wbnoinvd", ++ "avx", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Icelake-Client", ++ "typename": "Icelake-Client-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "mpx", ++ "adx", ++ "avx512vbmi", ++ "pku", ++ "avx512vbmi2", ++ "vaes", ++ "vpclmulqdq", ++ "avx512vnni", ++ "avx512bitalg", ++ "avx512-vpopcntdq", ++ "abm", ++ "wbnoinvd", ++ "avx", ++ "mpx", ++ "mpx", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-v4", ++ "typename": "Haswell-v4-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-v3", ++ "typename": "Haswell-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-v2", ++ "typename": "Haswell-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-v1", ++ "typename": "Haswell-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-noTSX-IBRS", ++ "typename": "Haswell-noTSX-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-noTSX", ++ "typename": "Haswell-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell-IBRS", ++ "typename": "Haswell-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Haswell", ++ "typename": "Haswell-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-v2", ++ "typename": "EPYC-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "adx", ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "cr8legacy", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "osvw", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-v1", ++ "typename": "EPYC-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "adx", ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "cr8legacy", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "osvw", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-Rome-v1", ++ "typename": "EPYC-Rome-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "adx", ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "cr8legacy", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "osvw", ++ "perfctr-core", ++ "clzero", ++ "xsaveerptr", ++ "wbnoinvd", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-Rome", ++ "typename": "EPYC-Rome-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "adx", ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "cr8legacy", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "osvw", ++ "perfctr-core", ++ "clzero", ++ "xsaveerptr", ++ "wbnoinvd", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC-IBPB", ++ "typename": "EPYC-IBPB-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "adx", ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "cr8legacy", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "osvw", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "EPYC", ++ "typename": "EPYC-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "adx", ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "cr8legacy", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "osvw", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Dhyana-v1", ++ "typename": "Dhyana-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "adx", ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "cr8legacy", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "osvw", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Dhyana", ++ "typename": "Dhyana-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "adx", ++ "mmxext", ++ "fxsr-opt", ++ "pdpe1gb", ++ "cr8legacy", ++ "abm", ++ "sse4a", ++ "misalignsse", ++ "osvw", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Denverton-v1", ++ "typename": "Denverton-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "mpx", ++ "pdpe1gb", ++ "mpx", ++ "mpx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Denverton", ++ "typename": "Denverton-x86_64-cpu", ++ "unavailable-features": [ ++ "mpx", ++ "pdpe1gb", ++ "mpx", ++ "mpx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cooperlake-v1", ++ "typename": "Cooperlake-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "avx512-bf16", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku", ++ "taa-no" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cooperlake", ++ "typename": "Cooperlake-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "avx512-bf16", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku", ++ "taa-no" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Conroe-v1", ++ "typename": "Conroe-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Conroe", ++ "typename": "Conroe-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server-v3", ++ "typename": "Cascadelake-Server-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server-v2", ++ "typename": "Cascadelake-Server-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server-v1", ++ "typename": "Cascadelake-Server-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server-noTSX", ++ "typename": "Cascadelake-Server-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Cascadelake-Server", ++ "typename": "Cascadelake-Server-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "mpx", ++ "avx512f", ++ "avx512dq", ++ "adx", ++ "avx512cd", ++ "avx512bw", ++ "avx512vl", ++ "pku", ++ "avx512vnni", ++ "pdpe1gb", ++ "abm", ++ "avx", ++ "mpx", ++ "mpx", ++ "avx512f", ++ "avx512f", ++ "avx512f", ++ "pku" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-v4", ++ "typename": "Broadwell-v4-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-v3", ++ "typename": "Broadwell-v3-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-v2", ++ "typename": "Broadwell-v2-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-v1", ++ "typename": "Broadwell-v1-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-noTSX-IBRS", ++ "typename": "Broadwell-noTSX-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-noTSX", ++ "typename": "Broadwell-noTSX-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell-IBRS", ++ "typename": "Broadwell-IBRS-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "Broadwell", ++ "typename": "Broadwell-x86_64-cpu", ++ "unavailable-features": [ ++ "fma", ++ "pcid", ++ "avx", ++ "f16c", ++ "bmi1", ++ "hle", ++ "avx2", ++ "bmi2", ++ "invpcid", ++ "rtm", ++ "adx", ++ "abm", ++ "avx" ++ ], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "486-v1", ++ "typename": "486-v1-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ }, ++ { ++ "name": "486", ++ "typename": "486-x86_64-cpu", ++ "unavailable-features": [], ++ "static": false, ++ "migration-safe": true ++ } ++ ], ++ "id": "definitions" ++} +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362.sig b/tests/cputestdata/x86_64-cpuid-Atom-P5362.sig +new file mode 100644 +index 0000000000..788ae6efba +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362.sig +@@ -0,0 +1,4 @@ ++080665 ++family: 6 (0x06) ++model: 134 (0x86) ++stepping: 5 (0x05) +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362.xml +new file mode 100644 +index 0000000000..4fe97c0866 +--- /dev/null ++++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362.xml +@@ -0,0 +1,61 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +-- +2.30.0 + diff --git a/SOURCES/libvirt-docs-use-proper-cpu-quota-value-in-our-documentation.patch b/SOURCES/libvirt-docs-use-proper-cpu-quota-value-in-our-documentation.patch new file mode 100644 index 0000000..abe880f --- /dev/null +++ b/SOURCES/libvirt-docs-use-proper-cpu-quota-value-in-our-documentation.patch @@ -0,0 +1,101 @@ +From c9113d8cd9d68c932175ea63b634fc5cb7e51ef2 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Pavel Hrdina +Date: Thu, 4 Mar 2021 12:57:56 +0100 +Subject: [PATCH] docs: use proper cpu quota value in our documentation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit changed the cpu quota +value that reflects what kernel allows but did not update our +documentation. + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit 992635b142b261cedb6075e459918418fe6e6962) + +Conflicts: + docs/formatdomain.rst + - missing in downstream, we use formatdomain.html.in + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: +Reviewed-by: Ján Tomko +--- + docs/formatdomain.html.in | 8 ++++---- + docs/manpages/virsh.rst | 2 +- + docs/schemas/domaincommon.rng | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in +index 127dd13cc0..4341e256a8 100644 +--- a/docs/formatdomain.html.in ++++ b/docs/formatdomain.html.in +@@ -872,7 +872,7 @@ + bandwidth (unit: microseconds). A domain with quota as any + negative value indicates that the domain has infinite bandwidth for + vCPU threads, which means that it is not bandwidth controlled. The value +- should be in range [1000, 18446744073709551] or less than 0. A quota ++ should be in range [1000, 17592186044415] or less than 0. A quota + with value 0 means no value. You can use this feature to ensure that all + vCPUs run at the same speed. + Only QEMU driver support since 0.9.4, LXC since +@@ -894,7 +894,7 @@ + domain. A domain with global_quota as any negative + value indicates that the domain has infinite bandwidth, which means that + it is not bandwidth controlled. The value should be in range +- [1000, 18446744073709551] or less than 0. A global_quota ++ [1000, 17592186044415] or less than 0. A global_quota + with value 0 means no value. + Only QEMU driver support since 1.3.3 + +@@ -915,7 +915,7 @@ + excluding vCPUs). A domain with emulator_quota as any negative + value indicates that the domain has infinite bandwidth for emulator threads + (those excluding vCPUs), which means that it is not bandwidth controlled. +- The value should be in range [1000, 18446744073709551] or less than 0. A ++ The value should be in range [1000, 17592186044415] or less than 0. A + quota with value 0 means no value. + Only QEMU driver support since 0.10.0 + +@@ -937,7 +937,7 @@ + iothread_quota as any negative value indicates that the + domain IOThreads have infinite bandwidth, which means that it is + not bandwidth controlled. The value should be in range +- [1000, 18446744073709551] or less than 0. An iothread_quota ++ [1000, 17592186044415] or less than 0. An iothread_quota + with value 0 means no value. You can use this feature to ensure that + all IOThreads run at the same speed. + Only QEMU driver support since 2.1.0 +diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst +index 0804465d44..a5b95c1123 100644 +--- a/docs/manpages/virsh.rst ++++ b/docs/manpages/virsh.rst +@@ -3715,7 +3715,7 @@ XEN_CREDIT scheduler. + ``Note``: The vcpu_period, emulator_period, and iothread_period parameters + have a valid value range of 1000-1000000 or 0, and the vcpu_quota, + emulator_quota, and iothread_quota parameters have a valid value range of +-1000-18446744073709551 or less than 0. The value 0 for ++1000-17592186044415 or less than 0. The value 0 for + either parameter is the same as not specifying that parameter. + + +diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng +index 4a42cb9b40..6671ef3dfa 100644 +--- a/docs/schemas/domaincommon.rng ++++ b/docs/schemas/domaincommon.rng +@@ -6649,7 +6649,7 @@ + + + -?[0-9]+ +- 18446744073709551 ++ 17592186044415 + -1 + + +-- +2.30.0 + diff --git a/SOURCES/libvirt-domain_validate-use-defines-for-cpu-period-and-quota-limits.patch b/SOURCES/libvirt-domain_validate-use-defines-for-cpu-period-and-quota-limits.patch new file mode 100644 index 0000000..e293dd5 --- /dev/null +++ b/SOURCES/libvirt-domain_validate-use-defines-for-cpu-period-and-quota-limits.patch @@ -0,0 +1,85 @@ +From 499e3eb6bdca10a5fac9279261e32e64c28273bd Mon Sep 17 00:00:00 2001 +Message-Id: <499e3eb6bdca10a5fac9279261e32e64c28273bd@dist-git> +From: Pavel Hrdina +Date: Thu, 4 Mar 2021 12:57:55 +0100 +Subject: [PATCH] domain_validate: use defines for cpu period and quota limits +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commints and +<98a09ca48ed4fc011abf2aa290e02ce1b8f1bb5f> fixed the code to use +defines instead of magic numbers but missed this place. + +Following commit changed +the cpu quota limit to reflect what kernel actually allows so using +the defines fixes XML validations as well. + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit 22cae2ea4bad7e285ba19d536bd475f8b00841f8) + +Conflicts: + src/conf/domain_validate.c + - not present in downstream, the code is still part of + domain_conf.c + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: <63a44700876e2bd59f276fcd8395abaff011b4c1.1614858616.git.phrdina@redhat.com> +Reviewed-by: Ján Tomko +--- + src/conf/domain_conf.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 166c3e48d2..9f6cdb0de8 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -34,6 +34,7 @@ + #include "domain_addr.h" + #include "domain_conf.h" + #include "snapshot_conf.h" ++#include "vircgroup.h" + #include "viralloc.h" + #include "virxml.h" + #include "viruuid.h" +@@ -6997,10 +6998,13 @@ virDomainDefLifecycleActionValidate(const virDomainDef *def) + #define CPUTUNE_VALIDATE_PERIOD(name) \ + do { \ + if (def->cputune.name > 0 && \ +- (def->cputune.name < 1000 || def->cputune.name > 1000000)) { \ ++ (def->cputune.name < VIR_CGROUP_CPU_PERIOD_MIN || \ ++ def->cputune.name > VIR_CGROUP_CPU_PERIOD_MAX)) { \ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ +- _("Value of cputune '%s' must be in range " \ +- "[1000, 1000000]"), #name); \ ++ _("Value of cputune '%s' must be in range [%llu, %llu]"), \ ++ #name, \ ++ VIR_CGROUP_CPU_PERIOD_MIN, \ ++ VIR_CGROUP_CPU_PERIOD_MAX); \ + return -1; \ + } \ + } while (0) +@@ -7008,11 +7012,13 @@ virDomainDefLifecycleActionValidate(const virDomainDef *def) + #define CPUTUNE_VALIDATE_QUOTA(name) \ + do { \ + if (def->cputune.name > 0 && \ +- (def->cputune.name < 1000 || \ +- def->cputune.name > 18446744073709551LL)) { \ ++ (def->cputune.name < VIR_CGROUP_CPU_QUOTA_MIN || \ ++ def->cputune.name > VIR_CGROUP_CPU_QUOTA_MAX)) { \ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ +- _("Value of cputune '%s' must be in range " \ +- "[1000, 18446744073709551]"), #name); \ ++ _("Value of cputune '%s' must be in range [%llu, %llu]"), \ ++ #name, \ ++ VIR_CGROUP_CPU_QUOTA_MIN, \ ++ VIR_CGROUP_CPU_QUOTA_MAX); \ + return -1; \ + } \ + } while (0) +-- +2.30.0 + diff --git a/SOURCES/libvirt-network-be-more-verbose-about-the-reason-for-a-firewall-reload.patch b/SOURCES/libvirt-network-be-more-verbose-about-the-reason-for-a-firewall-reload.patch new file mode 100644 index 0000000..4499c36 --- /dev/null +++ b/SOURCES/libvirt-network-be-more-verbose-about-the-reason-for-a-firewall-reload.patch @@ -0,0 +1,57 @@ +From 3a0200ee7544307a9708a6e876603425647bad34 Mon Sep 17 00:00:00 2001 +Message-Id: <3a0200ee7544307a9708a6e876603425647bad34@dist-git> +From: Laine Stump +Date: Fri, 15 Jan 2021 22:51:48 -0500 +Subject: [PATCH] network: be more verbose about the reason for a firewall + reload + +https://bugzilla.redhat.com/1607929 + +Signed-off-by: Laine Stump +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit c102bbd3efc358fb44fa2bb37fb0bcbeaaab72a5) + +Conflicts: src/network/bridge_driver.c: + some minor things due to upstream switch to using glib for DBus +Signed-off-by: Laine Stump +Message-Id: <20210116035151.1066734-6-laine@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/network/bridge_driver.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c +index c9c45df758..5995396f78 100644 +--- a/src/network/bridge_driver.c ++++ b/src/network/bridge_driver.c +@@ -665,6 +665,7 @@ firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED, + if (dbus_message_is_signal(message, + "org.fedoraproject.FirewallD1", "Reloaded")) { + reload = true; ++ VIR_DEBUG("Reload in bridge_driver because of 'Reloaded' signal"); + + } else if (dbus_message_is_signal(message, + DBUS_INTERFACE_DBUS, "NameOwnerChanged")) { +@@ -681,14 +682,15 @@ firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED, + * if new_owner is empty, firewalld is shutting down. If it is + * non-empty, then it is starting + */ +- if (new_owner && *new_owner) ++ if (new_owner && *new_owner) { ++ VIR_DEBUG("Reload in bridge_driver because of 'NameOwnerChanged' signal, new owner is: '%s'", ++ new_owner); + reload = true; ++ } + } + +- if (reload) { +- VIR_DEBUG("Reload in bridge_driver because of firewalld."); ++ if (reload) + networkReloadFirewallRules(driver, false); +- } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } +-- +2.30.0 + diff --git a/SOURCES/libvirt-numa-expose-HMAT-APIs.patch b/SOURCES/libvirt-numa-expose-HMAT-APIs.patch new file mode 100644 index 0000000..08b3549 --- /dev/null +++ b/SOURCES/libvirt-numa-expose-HMAT-APIs.patch @@ -0,0 +1,242 @@ +From f2670434261a395acfe97a9bd93bd55c6b3fb1f2 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Wed, 7 Oct 2020 18:45:41 +0200 +Subject: [PATCH] numa: expose HMAT APIs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These APIs will be used by QEMU driver when building the command +line. + +Signed-off-by: Michal Privoznik +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit 11d8ca9794e80224d0634d67da86a20380c22ab5) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 + +Conflicts: +- src/conf/numa_conf.c: +- src/conf/numa_conf.h: Both are context. + +Signed-off-by: Michal Privoznik +Message-Id: +Reviewed-by: Ján Tomko +--- + src/conf/numa_conf.c | 139 +++++++++++++++++++++++++++++++++++++++ + src/conf/numa_conf.h | 28 ++++++++ + src/libvirt_private.syms | 6 ++ + 3 files changed, 173 insertions(+) + +diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c +index c90fb01bb6..277a695d84 100644 +--- a/src/conf/numa_conf.c ++++ b/src/conf/numa_conf.c +@@ -1800,3 +1800,142 @@ virDomainNumaGetMemorySize(virDomainNumaPtr numa) + + return ret; + } ++ ++ ++bool ++virDomainNumaHasHMAT(const virDomainNuma *numa) ++{ ++ size_t i; ++ ++ if (!numa) ++ return false; ++ ++ if (numa->ninterconnects) ++ return true; ++ ++ for (i = 0; i < numa->nmem_nodes; i++) { ++ if (numa->mem_nodes[i].ncaches) ++ return true; ++ } ++ ++ return false; ++} ++ ++ ++size_t ++virDomainNumaGetNodeCacheCount(const virDomainNuma *numa, ++ size_t node) ++{ ++ if (!numa || node >= numa->nmem_nodes) ++ return 0; ++ ++ return numa->mem_nodes[node].ncaches; ++} ++ ++ ++int ++virDomainNumaGetNodeCache(const virDomainNuma *numa, ++ size_t node, ++ size_t cache, ++ unsigned int *level, ++ unsigned int *size, ++ unsigned int *line, ++ virDomainCacheAssociativity *associativity, ++ virDomainCachePolicy *policy) ++{ ++ const virDomainNumaNode *cell; ++ ++ if (!numa || node >= numa->nmem_nodes) ++ return -1; ++ ++ cell = &numa->mem_nodes[node]; ++ ++ if (cache >= cell->ncaches) ++ return -1; ++ ++ *level = cell->caches[cache].level; ++ *size = cell->caches[cache].size; ++ *line = cell->caches[cache].line; ++ *associativity = cell->caches[cache].associativity; ++ *policy = cell->caches[cache].policy; ++ return 0; ++} ++ ++ ++ssize_t ++virDomainNumaGetNodeInitiator(const virDomainNuma *numa, ++ size_t node) ++{ ++ size_t i; ++ unsigned int maxBandwidth = 0; ++ ssize_t candidateBandwidth = -1; ++ unsigned int minLatency = UINT_MAX; ++ ssize_t candidateLatency = -1; ++ ++ if (!numa || node >= numa->nmem_nodes) ++ return -1; ++ ++ for (i = 0; i < numa->ninterconnects; i++) { ++ const virDomainNumaInterconnect *l = &numa->interconnects[i]; ++ ++ if (l->target != node) ++ continue; ++ ++ switch (l->type) { ++ case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY: ++ if (l->value < minLatency) { ++ minLatency = l->value; ++ candidateLatency = l->initiator; ++ } ++ break; ++ ++ case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH: ++ if (l->value > maxBandwidth) { ++ maxBandwidth = l->value; ++ candidateBandwidth = l->initiator; ++ } ++ break; ++ } ++ } ++ ++ if (candidateLatency >= 0) ++ return candidateLatency; ++ ++ return candidateBandwidth; ++} ++ ++ ++size_t ++virDomainNumaGetInterconnectsCount(const virDomainNuma *numa) ++{ ++ if (!numa) ++ return 0; ++ ++ return numa->ninterconnects; ++} ++ ++ ++int ++virDomainNumaGetInterconnect(const virDomainNuma *numa, ++ size_t i, ++ virDomainNumaInterconnectType *type, ++ unsigned int *initiator, ++ unsigned int *target, ++ unsigned int *cache, ++ virDomainMemoryLatency *accessType, ++ unsigned long *value) ++{ ++ const virDomainNumaInterconnect *l; ++ ++ if (!numa || i >= numa->ninterconnects) ++ return -1; ++ ++ l = &numa->interconnects[i]; ++ *type = l->type; ++ *initiator = l->initiator; ++ *target = l->target; ++ *cache = l->cache; ++ *accessType = l->accessType; ++ *value = l->value; ++ return 0; ++} +diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h +index 2963004c94..63843a1cc6 100644 +--- a/src/conf/numa_conf.h ++++ b/src/conf/numa_conf.h +@@ -220,3 +220,31 @@ int virDomainNumaDefFormatXML(virBufferPtr buf, virDomainNumaPtr def); + int virDomainNumaDefValidate(const virDomainNuma *def); + + unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa); ++ ++bool virDomainNumaHasHMAT(const virDomainNuma *numa); ++ ++size_t virDomainNumaGetNodeCacheCount(const virDomainNuma *numa, ++ size_t node); ++ ++int virDomainNumaGetNodeCache(const virDomainNuma *numa, ++ size_t node, ++ size_t cache, ++ unsigned int *level, ++ unsigned int *size, ++ unsigned int *line, ++ virDomainCacheAssociativity *associativity, ++ virDomainCachePolicy *policy); ++ ++ssize_t virDomainNumaGetNodeInitiator(const virDomainNuma *numa, ++ size_t node); ++ ++size_t virDomainNumaGetInterconnectsCount(const virDomainNuma *numa); ++ ++int virDomainNumaGetInterconnect(const virDomainNuma *numa, ++ size_t i, ++ virDomainNumaInterconnectType *type, ++ unsigned int *initiator, ++ unsigned int *target, ++ unsigned int *cache, ++ virDomainMemoryLatency *accessType, ++ unsigned long *value); +diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms +index de95e3b116..fdd104cd25 100644 +--- a/src/libvirt_private.syms ++++ b/src/libvirt_private.syms +@@ -820,14 +820,20 @@ virDomainNumaCheckABIStability; + virDomainNumaEquals; + virDomainNumaFree; + virDomainNumaGetCPUCountTotal; ++virDomainNumaGetInterconnect; ++virDomainNumaGetInterconnectsCount; + virDomainNumaGetMaxCPUID; + virDomainNumaGetMemorySize; ++virDomainNumaGetNodeCache; ++virDomainNumaGetNodeCacheCount; + virDomainNumaGetNodeCount; + virDomainNumaGetNodeCpumask; + virDomainNumaGetNodeDiscard; + virDomainNumaGetNodeDistance; ++virDomainNumaGetNodeInitiator; + virDomainNumaGetNodeMemoryAccessMode; + virDomainNumaGetNodeMemorySize; ++virDomainNumaHasHMAT; + virDomainNumaNew; + virDomainNumaNodeDistanceIsUsingDefaults; + virDomainNumaNodesDistancesAreBeingSet; +-- +2.29.2 + diff --git a/SOURCES/libvirt-numa_conf-Drop-CPU-from-name-of-two-functions.patch b/SOURCES/libvirt-numa_conf-Drop-CPU-from-name-of-two-functions.patch new file mode 100644 index 0000000..2974deb --- /dev/null +++ b/SOURCES/libvirt-numa_conf-Drop-CPU-from-name-of-two-functions.patch @@ -0,0 +1,102 @@ +From c049804bc3b296a183ce0bd819d5f9b1d1a45ea7 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Wed, 7 Oct 2020 18:45:34 +0200 +Subject: [PATCH] numa_conf: Drop CPU from name of two functions +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There are two functions virDomainNumaDefCPUFormatXML() and +virDomainNumaDefCPUParseXML() which format and parse domain's +. There is nothing CPU specific about them. Drop the +infix. + +Signed-off-by: Michal Privoznik +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit 68c5b0183cb157c4672a6af3a14375df4434cee5) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 + +Conflicts: +- src/conf/domain_conf.c: Context. + +Signed-off-by: Michal Privoznik +Message-Id: +Reviewed-by: Ján Tomko +--- + src/conf/cpu_conf.c | 2 +- + src/conf/domain_conf.c | 2 +- + src/conf/numa_conf.c | 8 ++++---- + src/conf/numa_conf.h | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c +index 1a2948ce11..dfd0c1f798 100644 +--- a/src/conf/cpu_conf.c ++++ b/src/conf/cpu_conf.c +@@ -746,7 +746,7 @@ virCPUDefFormatBufFull(virBufferPtr buf, + if (virCPUDefFormatBuf(&childrenBuf, def) < 0) + goto cleanup; + +- if (virDomainNumaDefCPUFormatXML(&childrenBuf, numa) < 0) ++ if (virDomainNumaDefFormatXML(&childrenBuf, numa) < 0) + goto cleanup; + + /* Put it all together */ +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 484f3b4352..3229d5ec95 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -20487,7 +20487,7 @@ virDomainDefParseXML(xmlDocPtr xml, + if (virCPUDefParseXML(ctxt, "./cpu[1]", VIR_CPU_TYPE_GUEST, &def->cpu) < 0) + goto error; + +- if (virDomainNumaDefCPUParseXML(def->numa, ctxt) < 0) ++ if (virDomainNumaDefParseXML(def->numa, ctxt) < 0) + goto error; + + if (virDomainNumaGetCPUCountTotal(def->numa) > virDomainDefGetVcpusMax(def)) { +diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c +index 6f1257fd8e..38fcf9d9aa 100644 +--- a/src/conf/numa_conf.c ++++ b/src/conf/numa_conf.c +@@ -842,8 +842,8 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPtr def, + } + + int +-virDomainNumaDefCPUParseXML(virDomainNumaPtr def, +- xmlXPathContextPtr ctxt) ++virDomainNumaDefParseXML(virDomainNumaPtr def, ++ xmlXPathContextPtr ctxt) + { + xmlNodePtr *nodes = NULL; + xmlNodePtr oldNode = ctxt->node; +@@ -971,8 +971,8 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def, + + + int +-virDomainNumaDefCPUFormatXML(virBufferPtr buf, +- virDomainNumaPtr def) ++virDomainNumaDefFormatXML(virBufferPtr buf, ++ virDomainNumaPtr def) + { + virDomainMemoryAccess memAccess; + virTristateBool discard; +diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h +index b1b8e3274d..ce865cbfbb 100644 +--- a/src/conf/numa_conf.h ++++ b/src/conf/numa_conf.h +@@ -182,7 +182,7 @@ bool virDomainNumatuneNodesetIsAvailable(virDomainNumaPtr numatune, + bool virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune, + int cellid); + +-int virDomainNumaDefCPUParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt); +-int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def); ++int virDomainNumaDefParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt); ++int virDomainNumaDefFormatXML(virBufferPtr buf, virDomainNumaPtr def); + + unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa); +-- +2.29.2 + diff --git a/SOURCES/libvirt-numa_conf-Make-virDomainNumaSetNodeCpumask-return-void.patch b/SOURCES/libvirt-numa_conf-Make-virDomainNumaSetNodeCpumask-return-void.patch new file mode 100644 index 0000000..f9c60df --- /dev/null +++ b/SOURCES/libvirt-numa_conf-Make-virDomainNumaSetNodeCpumask-return-void.patch @@ -0,0 +1,87 @@ +From a1af99a1129058f2aa312e3c9d125f5bc7693912 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Wed, 7 Oct 2020 18:45:37 +0200 +Subject: [PATCH] numa_conf: Make virDomainNumaSetNodeCpumask() return void +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There is only one caller of virDomainNumaSetNodeCpumask() which +checks for the return value but because the function will return +NULL iff the @cpumask was NULL in the first place. But in that +place @cpumask can't be NULL because it was just allocated by +virBitmapParse(). + +Signed-off-by: Michal Privoznik +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit 1050c6beb1f2238cd847d93eab17d658720b08e1) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 + +Signed-off-by: Michal Privoznik +Message-Id: <8564849f4fc4aaca69eec3d2b7e59d03234ea39f.1602087923.git.mprivozn@redhat.com> +Reviewed-by: Ján Tomko +--- + src/conf/numa_conf.c | 4 +--- + src/conf/numa_conf.h | 6 +++--- + src/libxl/xen_xl.c | 4 ++-- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c +index 38fcf9d9aa..c9cc8ac22e 100644 +--- a/src/conf/numa_conf.c ++++ b/src/conf/numa_conf.c +@@ -1318,14 +1318,12 @@ virDomainNumaGetNodeCpumask(virDomainNumaPtr numa, + } + + +-virBitmapPtr ++void + virDomainNumaSetNodeCpumask(virDomainNumaPtr numa, + size_t node, + virBitmapPtr cpumask) + { + numa->mem_nodes[node].cpumask = cpumask; +- +- return numa->mem_nodes[node].cpumask; + } + + +diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h +index ce865cbfbb..6808439a7c 100644 +--- a/src/conf/numa_conf.h ++++ b/src/conf/numa_conf.h +@@ -156,9 +156,9 @@ size_t virDomainNumaSetNodeDistanceCount(virDomainNumaPtr numa, + size_t ndistances) + ATTRIBUTE_NONNULL(1); + +-virBitmapPtr virDomainNumaSetNodeCpumask(virDomainNumaPtr numa, +- size_t node, +- virBitmapPtr cpumask) ++void virDomainNumaSetNodeCpumask(virDomainNumaPtr numa, ++ size_t node, ++ virBitmapPtr cpumask) + ATTRIBUTE_NONNULL(1); + + /* +diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c +index 91b1825399..edea30a86a 100644 +--- a/src/libxl/xen_xl.c ++++ b/src/libxl/xen_xl.c +@@ -508,10 +508,10 @@ xenParseXLVnuma(virConfPtr conf, + goto cleanup; + } + +- if ((virBitmapParse(vtoken, &cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) || +- (virDomainNumaSetNodeCpumask(numa, vnodeCnt, cpumask) == NULL)) ++ if (virBitmapParse(vtoken, &cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; + ++ virDomainNumaSetNodeCpumask(numa, vnodeCnt, cpumask); + vcpus += virBitmapCountBits(cpumask); + + } else if (STRPREFIX(str, "vdistances")) { +-- +2.29.2 + diff --git a/SOURCES/libvirt-numa_conf-Properly-check-for-caches-in-virDomainNumaDefValidate.patch b/SOURCES/libvirt-numa_conf-Properly-check-for-caches-in-virDomainNumaDefValidate.patch new file mode 100644 index 0000000..525beef --- /dev/null +++ b/SOURCES/libvirt-numa_conf-Properly-check-for-caches-in-virDomainNumaDefValidate.patch @@ -0,0 +1,91 @@ +From 8521a431d3da3cc360eb8102eda1c0d649f1ecc3 Mon Sep 17 00:00:00 2001 +Message-Id: <8521a431d3da3cc360eb8102eda1c0d649f1ecc3@dist-git> +From: Michal Privoznik +Date: Wed, 7 Oct 2020 18:45:45 +0200 +Subject: [PATCH] numa_conf: Properly check for caches in + virDomainNumaDefValidate() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When adding support for HMAT, in f0611fe8830 I've introduced a +check which aims to validate /domain/cpu/numa/interconnects. As a +part of that, there is a loop which checks whether all +with @cache attribute refer to an existing cache level. For +instance: + + + + + + + + + + + + + + + + +This XML defines that accessing L1 cache of node #0 from node #0 +has latency of 5ns. + +However, the loop was not written properly. Well, the check in +it, as it was always checking for the first cache in the target +node and not the rest. Therefore, the following example errors +out: + + + + + + + + + + + + + + + + + + + + +This errors out even though it is a valid configuration. The L1 +cache under node #0 is still present. + +Fixes: f0611fe8830 +Signed-off-by: Michal Privoznik +Reviewed-by: Laine Stump +(cherry picked from commit e41ac71fca309b50e2c8e6ec142d8fe1280ca2ad) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 + +Signed-off-by: Michal Privoznik +Message-Id: <4bb47f9e97ca097cee1259449da4739b55753751.1602087923.git.mprivozn@redhat.com> +Reviewed-by: Ján Tomko +--- + src/conf/numa_conf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c +index 5a92eb35cc..a20398714e 100644 +--- a/src/conf/numa_conf.c ++++ b/src/conf/numa_conf.c +@@ -1423,7 +1423,7 @@ virDomainNumaDefValidate(const virDomainNuma *def) + + if (l->cache > 0) { + for (j = 0; j < def->mem_nodes[l->target].ncaches; j++) { +- const virDomainNumaCache *cache = def->mem_nodes[l->target].caches; ++ const virDomainNumaCache *cache = &def->mem_nodes[l->target].caches[j]; + + if (l->cache == cache->level) + break; +-- +2.29.2 + diff --git a/SOURCES/libvirt-qemu-Add-virtio-related-options-to-vsock.patch b/SOURCES/libvirt-qemu-Add-virtio-related-options-to-vsock.patch new file mode 100644 index 0000000..4b1eab9 --- /dev/null +++ b/SOURCES/libvirt-qemu-Add-virtio-related-options-to-vsock.patch @@ -0,0 +1,312 @@ +From 362d106d8897a3982f5eaed0c4bc0194d6f9ef28 Mon Sep 17 00:00:00 2001 +Message-Id: <362d106d8897a3982f5eaed0c4bc0194d6f9ef28@dist-git> +From: Boris Fiuczynski +Date: Fri, 26 Feb 2021 06:43:35 -0500 +Subject: [PATCH] qemu: Add virtio related options to vsock + +Add virtio related options iommu, ats and packed as driver element attributes +to vsock devices. Ex: + + + + + + +Signed-off-by: Boris Fiuczynski +Signed-off-by: Michal Privoznik +Reviewed-by: Michal Privoznik +(cherry picked from commit bd112c9e0f7523b90bf1362cf60deea7db05a32b) + +Resolves: https://bugzilla.redhat.com/1931548 + +Note: since the virtio option packed is not yet available in the code +version it will also not be available with this backported patch. + +Conflicts: docs/formatdomain.rst: + converted changes into docs/formatdomain.html.in + src/conf/domain_conf.c: + resolved conflicts by moving the code into the correct methods + src/conf/domain_validate.c: + does not exist downstream. moved code to src/conf/domain_conf.c + src/qemu/qemu_validate.c: + does not exist downstream. can be neglected + +Message-Id: <20210226114335.100390-2-bfiuczyn@redhat.com> +Reviewed-by: Pavel Hrdina +--- + docs/formatdomain.html.in | 5 ++- + docs/schemas/domaincommon.rng | 5 +++ + src/conf/domain_conf.c | 27 ++++++++++++++ + src/conf/domain_conf.h | 1 + + src/qemu/qemu_command.c | 4 ++ + .../vhost-vsock-ccw-iommu.s390x-latest.args | 37 +++++++++++++++++++ + .../vhost-vsock-ccw-iommu.xml | 37 +++++++++++++++++++ + tests/qemuxml2argvtest.c | 1 + + .../vhost-vsock-ccw-iommu.s390x-latest.xml | 1 + + tests/qemuxml2xmltest.c | 2 + + 10 files changed, 119 insertions(+), 1 deletion(-) + create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args + create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml + create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml + +diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in +index bec753e37f..127dd13cc0 100644 +--- a/docs/formatdomain.html.in ++++ b/docs/formatdomain.html.in +@@ -9240,7 +9240,10 @@ qemu-kvm -net nic,model=? /dev/null + element specifies the CID assigned to the guest. If the attribute + auto is set to yes, libvirt + will assign a free CID automatically on domain startup. +- Since 4.4.0

++ Since 4.4.0 ++ The optional driver element allows to specify virtio options, see ++ Virtio-specific options for more details. ++ Since 7.1.0

+ + 
+ ...
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 9fda5f17e0..4a42cb9b40 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -4685,6 +4685,11 @@
+         
+           
+         
++        
++          
++            
++          
++        
+       
+     
+   
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index c5a0442c6f..166c3e48d2 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -2392,6 +2392,7 @@ virDomainVsockDefFree(virDomainVsockDefPtr vsock)
+ 
+     virObjectUnref(vsock->privateData);
+     virDomainDeviceInfoClear(&vsock->info);
++    VIR_FREE(vsock->virtio);
+     VIR_FREE(vsock);
+ }
+ 
+@@ -6504,6 +6505,15 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem)
+ }
+ 
+ 
++static bool
++virDomainVsockIsVirtioModel(const virDomainVsockDef *vsock)
++{
++    return (vsock->model == VIR_DOMAIN_VSOCK_MODEL_VIRTIO ||
++            vsock->model == VIR_DOMAIN_VSOCK_MODEL_VIRTIO_TRANSITIONAL ||
++            vsock->model == VIR_DOMAIN_VSOCK_MODEL_VIRTIO_NON_TRANSITIONAL);
++}
++
++
+ static int
+ virDomainVsockDefValidate(const virDomainVsockDef *vsock)
+ {
+@@ -6513,6 +6523,10 @@ virDomainVsockDefValidate(const virDomainVsockDef *vsock)
+         return -1;
+     }
+ 
++    if (!virDomainVsockIsVirtioModel(vsock) &&
++        virDomainCheckVirtioOptions(vsock->virtio) < 0)
++        return -1;
++
+     return 0;
+ }
+ 
+@@ -16649,6 +16663,11 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt,
+     if (virDomainDeviceInfoParseXML(xmlopt, node, &vsock->info, flags) < 0)
+         return NULL;
+ 
++    if (virDomainVirtioOptionsParseXML(virXPathNode("./driver", ctxt),
++                                       &vsock->virtio) < 0)
++        return NULL;
++
++
+     return g_steal_pointer(&vsock);
+ }
+ 
+@@ -23350,6 +23369,10 @@ virDomainVsockDefCheckABIStability(virDomainVsockDefPtr src,
+         return false;
+     }
+ 
++    if (src->virtio && dst->virtio &&
++        !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio))
++        return false;
++
+     if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info))
+         return false;
+ 
+@@ -28364,6 +28387,7 @@ virDomainVsockDefFormat(virBufferPtr buf,
+     g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
+     g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
+     g_auto(virBuffer) cidAttrBuf = VIR_BUFFER_INITIALIZER;
++    g_auto(virBuffer) drvAttrBuf = VIR_BUFFER_INITIALIZER;
+ 
+     if (vsock->model) {
+         virBufferAsprintf(&attrBuf, " model='%s'",
+@@ -28381,6 +28405,9 @@ virDomainVsockDefFormat(virBufferPtr buf,
+     if (virDomainDeviceInfoFormat(&childBuf, &vsock->info, 0) < 0)
+         return -1;
+ 
++    virDomainVirtioOptionsFormat(&drvAttrBuf, vsock->virtio);
++
++    virXMLFormatElement(&childBuf, "driver", &drvAttrBuf, NULL);
+     virXMLFormatElement(buf, "vsock", &attrBuf, &childBuf);
+ 
+     return 0;
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index 118077edaa..3aed1fb22a 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -2389,6 +2389,7 @@ struct _virDomainVsockDef {
+     virTristateBool auto_cid;
+ 
+     virDomainDeviceInfo info;
++    virDomainVirtioOptionsPtr virtio;
+ };
+ 
+ struct _virDomainVirtioOptions {
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 67d7334b0f..998c3c90f8 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -9965,6 +9965,10 @@ qemuBuildVsockDevStr(virDomainDefPtr def,
+     virBufferAsprintf(&buf, ",id=%s", vsock->info.alias);
+     virBufferAsprintf(&buf, ",guest-cid=%u", vsock->guest_cid);
+     virBufferAsprintf(&buf, ",vhostfd=%s%u", fdprefix, priv->vhostfd);
++
++    if (qemuBuildVirtioOptionsStr(&buf, vsock->virtio, qemuCaps) < 0)
++        return NULL;
++
+     if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info, qemuCaps) < 0)
+         return NULL;
+ 
+diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args
+new file mode 100644
+index 0000000000..78eede78d3
+--- /dev/null
++++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args
+@@ -0,0 +1,37 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-QEMUGuest1 \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-s390x \
++-name guest=QEMUGuest1,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
++-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
++-cpu qemu \
++-m 214 \
++-overcommit mem-lock=off \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-boot strict=on \
++-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
++-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
++id=virtio-disk0,bootindex=1 \
++-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-device vhost-vsock-ccw,id=vsock0,guest-cid=4,vhostfd=6789,iommu_platform=on,\
++devno=fe.0.0002 \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
+new file mode 100644
+index 0000000000..dbfe082a6f
+--- /dev/null
++++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
+@@ -0,0 +1,37 @@
++
++  QEMUGuest1
++  c7a5fdbd-edaf-9455-926a-d65c16db1809
++  219136
++  219136
++  1
++  
++    hvm
++    
++  
++  
++    qemu
++  
++  
++  destroy
++  restart
++  destroy
++  
++    /usr/bin/qemu-system-s390x
++    
++      
++      
++      
++      

++    
++    
++    
++      

++    
++    
++    
++      
++      

++      
++    
++  
++
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index 629f5ac100..a22e3ba157 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -3056,6 +3056,7 @@ mymain(void)
+     DO_TEST_CAPS_LATEST("vhost-vsock-auto");
+     DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw", "s390x");
+     DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x");
++    DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x");
+ 
+     DO_TEST_CAPS_VER("launch-security-sev", "2.12.0");
+ 
+diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml
+new file mode 120000
+index 0000000000..78971a8ef9
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml
+@@ -0,0 +1 @@
++../qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
+\ No newline at end of file
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index 60efcac6c8..461b5bc68f 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -1433,6 +1433,8 @@ mymain(void)
+             QEMU_CAPS_CCW);
+     DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK,
+             QEMU_CAPS_CCW);
++    DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x");
++
+ 
+     DO_TEST_CAPS_LATEST("vhost-user-fs-fd-memory");
+     DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages");
+-- 
+2.30.0
+
diff --git a/SOURCES/libvirt-qemu-Build-HMAT-command-line.patch b/SOURCES/libvirt-qemu-Build-HMAT-command-line.patch
new file mode 100644
index 0000000..d65e257
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Build-HMAT-command-line.patch
@@ -0,0 +1,388 @@
+From fe08906feb3ab006c4013957895cfb4fa69b7396 Mon Sep 17 00:00:00 2001
+Message-Id: 
+From: Michal Privoznik 
+Date: Wed, 7 Oct 2020 18:45:43 +0200
+Subject: [PATCH] qemu: Build HMAT command line
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1786303
+
+Signed-off-by: Michal Privoznik 
+Reviewed-by: Daniel Henrique Barboza 
+(cherry picked from commit aeecbc87b7317e88a8ef8c82b29bcacd1005c8c2)
+
+Apart from conflicts below, I had to remove '-cpu qemu64' from
+tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args to make
+qemuxml2argvtest happy. This is because
+3b8feb4793cef66f5dbfb9bdabe4d40834f1e90e isn't backported.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518
+
+Conflicts:
+- src/qemu/qemu_command.c: Context
+- src/qemu/qemu_validate.c: The file doesn't exist in downstream.
+I've made the change to validator that lives in qemu_domain.c.
+
+Signed-off-by: Michal Privoznik 
+Message-Id: <0e8dfded8022b564ec7d0563cd745a0d3ffc815f.1602087923.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko 
+---
+ src/conf/numa_conf.c                          |   7 +
+ src/qemu/qemu_command.c                       | 171 ++++++++++++++++++
+ src/qemu/qemu_domain.c                        |   7 +
+ .../numatune-hmat.x86_64-latest.args          |  52 ++++++
+ tests/qemuxml2argvtest.c                      |   1 +
+ tests/qemuxml2xmltest.c                       |   2 +-
+ 6 files changed, 239 insertions(+), 1 deletion(-)
+ create mode 100644 tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args
+
+diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
+index 277a695d84..5a92eb35cc 100644
+--- a/src/conf/numa_conf.c
++++ b/src/conf/numa_conf.c
+@@ -1875,6 +1875,13 @@ virDomainNumaGetNodeInitiator(const virDomainNuma *numa,
+     if (!numa || node >= numa->nmem_nodes)
+         return -1;
+ 
++    /* A NUMA node which has at least one vCPU is initiator to itself by
++     * definition. */
++    if (numa->mem_nodes[node].cpumask)
++        return node;
++
++    /* For the rest, "NUMA node that has best performance (the lowest
++     * latency or largest bandwidth) to this NUMA node." */
+     for (i = 0; i < numa->ninterconnects; i++) {
+         const virDomainNumaInterconnect *l = &numa->interconnects[i];
+ 
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index ac63d18a42..959207bfea 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -7172,6 +7172,9 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
+             virBufferAsprintf(&buf, ",pflash1=%s", priv->pflash1->nodeformat);
+     }
+ 
++    if (virDomainNumaHasHMAT(def->numa))
++        virBufferAddLit(&buf, ",hmat=on");
++
+     virCommandAddArgBuffer(cmd, &buf);
+ 
+     return 0;
+@@ -7355,6 +7358,134 @@ qemuBuildIOThreadCommandLine(virCommandPtr cmd,
+ }
+ 
+ 
++static int
++qemuBuilNumaCellCache(virCommandPtr cmd,
++                      const virDomainDef *def,
++                      size_t cell)
++{
++    size_t ncaches = virDomainNumaGetNodeCacheCount(def->numa, cell);
++    size_t i;
++
++    if (ncaches == 0)
++        return 0;
++
++    for (i = 0; i < ncaches; i++) {
++        g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
++        unsigned int level;
++        unsigned int size;
++        unsigned int line;
++        virDomainCacheAssociativity associativity;
++        virDomainCachePolicy policy;
++
++        if (virDomainNumaGetNodeCache(def->numa, cell, i,
++                                      &level, &size, &line,
++                                      &associativity, &policy) < 0) {
++            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
++                           _("Unable to format NUMA node cache"));
++            return -1;
++        }
++
++        virBufferAsprintf(&buf,
++                          "hmat-cache,node-id=%zu,size=%uK,level=%u",
++                          cell, size, level);
++
++        switch (associativity) {
++        case VIR_DOMAIN_CACHE_ASSOCIATIVITY_NONE:
++            virBufferAddLit(&buf, ",associativity=none");
++            break;
++        case VIR_DOMAIN_CACHE_ASSOCIATIVITY_DIRECT:
++            virBufferAddLit(&buf, ",associativity=direct");
++            break;
++        case VIR_DOMAIN_CACHE_ASSOCIATIVITY_FULL:
++            virBufferAddLit(&buf, ",associativity=complex");
++            break;
++        case VIR_DOMAIN_CACHE_ASSOCIATIVITY_LAST:
++            break;
++        }
++
++        switch (policy) {
++        case VIR_DOMAIN_CACHE_POLICY_NONE:
++            virBufferAddLit(&buf, ",policy=none");
++            break;
++        case VIR_DOMAIN_CACHE_POLICY_WRITEBACK:
++            virBufferAddLit(&buf, ",policy=write-back");
++            break;
++        case VIR_DOMAIN_CACHE_POLICY_WRITETHROUGH:
++            virBufferAddLit(&buf, ",policy=write-through");
++            break;
++        case VIR_DOMAIN_CACHE_POLICY_LAST:
++            break;
++        }
++
++        if (line > 0)
++            virBufferAsprintf(&buf, ",line=%u", line);
++
++        virCommandAddArg(cmd, "-numa");
++        virCommandAddArgBuffer(cmd, &buf);
++    }
++
++    return 0;
++}
++
++
++VIR_ENUM_DECL(qemuDomainMemoryHierarchy);
++VIR_ENUM_IMPL(qemuDomainMemoryHierarchy,
++              4, /* Maximum level of cache */
++              "memory", /* Special case, whole memory not specific cache */
++              "first-level",
++              "second-level",
++              "third-level");
++
++static int
++qemuBuildNumaHMATCommandLine(virCommandPtr cmd,
++                             const virDomainDef *def)
++{
++    size_t nlatencies;
++    size_t i;
++
++    if (!def->numa)
++        return 0;
++
++    nlatencies = virDomainNumaGetInterconnectsCount(def->numa);
++    for (i = 0; i < nlatencies; i++) {
++        g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
++        virDomainNumaInterconnectType type;
++        unsigned int initiator;
++        unsigned int target;
++        unsigned int cache;
++        virDomainMemoryLatency accessType;
++        unsigned long value;
++        const char *hierarchyStr;
++        const char *accessStr;
++
++        if (virDomainNumaGetInterconnect(def->numa, i,
++                                         &type, &initiator, &target,
++                                         &cache, &accessType, &value) < 0)
++            return -1;
++
++        hierarchyStr = qemuDomainMemoryHierarchyTypeToString(cache);
++        accessStr = virDomainMemoryLatencyTypeToString(accessType);
++        virBufferAsprintf(&buf,
++                          "hmat-lb,initiator=%u,target=%u,hierarchy=%s,data-type=%s-",
++                          initiator, target, hierarchyStr, accessStr);
++
++        switch (type) {
++        case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY:
++            virBufferAsprintf(&buf, "latency,latency=%lu", value);
++            break;
++        case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH:
++            virBufferAsprintf(&buf, "bandwidth,bandwidth=%luK", value);
++            break;
++        }
++
++        virCommandAddArg(cmd, "-numa");
++        virCommandAddArgBuffer(cmd, &buf);
++    }
++
++    return 0;
++}
++
++
+ static int
+ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg,
+                          virDomainDefPtr def,
+@@ -7367,13 +7498,20 @@ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg,
+     char *next = NULL;
+     virBufferPtr nodeBackends = NULL;
+     bool needBackend = false;
++    bool hmat = false;
+     int rc;
+     int ret = -1;
+     size_t ncells = virDomainNumaGetNodeCount(def->numa);
++    ssize_t masterInitiator = -1;
+ 
+     if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset))
+         goto cleanup;
+ 
++    if (virDomainNumaHasHMAT(def->numa)) {
++        needBackend = true;
++        hmat = true;
++    }
++
+     if (VIR_ALLOC_N(nodeBackends, ncells) < 0)
+         goto cleanup;
+ 
+@@ -7397,8 +7535,22 @@ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg,
+         qemuBuildMemPathStr(cfg, def, cmd, priv) < 0)
+         goto cleanup;
+ 
++    for (i = 0; i < ncells; i++) {
++        if (virDomainNumaGetNodeCpumask(def->numa, i)) {
++            masterInitiator = i;
++            break;
++        }
++    }
++
++    if (masterInitiator) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                       _("At least one NUMA node has to have CPUs"));
++        goto cleanup;
++    }
++
+     for (i = 0; i < ncells; i++) {
+         virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(def->numa, i);
++        ssize_t initiator = virDomainNumaGetNodeInitiator(def->numa, i);
+ 
+         if (needBackend) {
+             virCommandAddArg(cmd, "-object");
+@@ -7423,6 +7575,13 @@ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg,
+             }
+         }
+ 
++        if (hmat) {
++            if (initiator < 0)
++                initiator = masterInitiator;
++
++            virBufferAsprintf(&buf, ",initiator=%zd", initiator);
++        }
++
+         if (needBackend)
+             virBufferAsprintf(&buf, ",memdev=ram-node%zu", i);
+         else
+@@ -7448,6 +7607,18 @@ qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg,
+         }
+     }
+ 
++    if (hmat) {
++        if (qemuBuildNumaHMATCommandLine(cmd, def) < 0)
++            goto cleanup;
++
++        /* This can't be moved into any of the loops above,
++         * because hmat-cache can be specified only after hmat-lb. */
++        for (i = 0; i < ncells; i++) {
++            if (qemuBuilNumaCellCache(cmd, def, i) < 0)
++                goto cleanup;
++        }
++    }
++
+     ret = 0;
+ 
+  cleanup:
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index be25790f12..e51e176a80 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -5904,6 +5904,13 @@ qemuDomainDefValidate(const virDomainDef *def,
+         }
+     }
+ 
++    if (virDomainNumaHasHMAT(def->numa) &&
++        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA_HMAT)) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                       _("HMAT is not supported with this QEMU"));
++        return -1;
++    }
++
+     if (def->genidRequested &&
+         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID)) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args
+new file mode 100644
+index 0000000000..413d247a4d
+--- /dev/null
++++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args
+@@ -0,0 +1,52 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-QEMUGuest \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-x86_64 \
++-name guest=QEMUGuest,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-QEMUGuest/master-key.aes \
++-machine pc,accel=tcg,usb=off,dump-guest-core=off,hmat=on \
++-m 12288 \
++-overcommit mem-lock=off \
++-smp 12,sockets=12,cores=1,threads=1 \
++-object memory-backend-ram,id=ram-node0,size=2147483648 \
++-numa node,nodeid=0,cpus=0-3,initiator=0,memdev=ram-node0 \
++-object memory-backend-ram,id=ram-node1,size=2147483648 \
++-numa node,nodeid=1,cpus=4-7,initiator=1,memdev=ram-node1 \
++-object memory-backend-ram,id=ram-node2,size=2147483648 \
++-numa node,nodeid=2,cpus=8-11,initiator=2,memdev=ram-node2 \
++-object memory-backend-ram,id=ram-node3,size=2147483648 \
++-numa node,nodeid=3,initiator=0,memdev=ram-node3 \
++-object memory-backend-ram,id=ram-node4,size=2147483648 \
++-numa node,nodeid=4,initiator=0,memdev=ram-node4 \
++-object memory-backend-ram,id=ram-node5,size=2147483648 \
++-numa node,nodeid=5,initiator=0,memdev=ram-node5 \
++-numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,\
++latency=5 \
++-numa hmat-lb,initiator=0,target=0,hierarchy=first-level,\
++data-type=access-latency,latency=10 \
++-numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,\
++bandwidth=204800K \
++-numa hmat-cache,node-id=0,size=10K,level=1,associativity=direct,\
++policy=write-back,line=8 \
++-uuid c7a5fdb2-cdaf-9455-926a-d65c16db1809 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-boot strict=on \
++-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index 49699e495d..629f5ac100 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -1813,6 +1813,7 @@ mymain(void)
+ 
+     DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST);
+     DO_TEST("numatune-no-vcpu", NONE);
++    DO_TEST_CAPS_LATEST("numatune-hmat");
+ 
+     DO_TEST("numatune-auto-nodeset-invalid", NONE);
+     DO_TEST("numatune-auto-prefer", QEMU_CAPS_OBJECT_MEMORY_RAM,
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index de1d720e1d..f790bbc6f1 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -1106,7 +1106,7 @@ mymain(void)
+     DO_TEST("numatune-memnode-no-memory", QEMU_CAPS_OBJECT_MEMORY_FILE);
+     DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST);
+     DO_TEST("numatune-no-vcpu", QEMU_CAPS_NUMA);
+-    DO_TEST("numatune-hmat", NONE);
++    DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT);
+ 
+     DO_TEST("bios-nvram", NONE);
+     DO_TEST("bios-nvram-os-interleave", NONE);
+-- 
+2.29.2
+
diff --git a/SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_NUMA_HMAT-capability.patch b/SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_NUMA_HMAT-capability.patch
new file mode 100644
index 0000000..1354f7c
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_NUMA_HMAT-capability.patch
@@ -0,0 +1,97 @@
+From f1de31795f1010016beab3b669db821799e5a6d3 Mon Sep 17 00:00:00 2001
+Message-Id: 
+From: Michal Privoznik 
+Date: Wed, 7 Oct 2020 18:45:42 +0200
+Subject: [PATCH] qemu: Introduce QEMU_CAPS_NUMA_HMAT capability
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This capability tracks whether QEMU is capable of defining HMAT
+ACPI table for the guest.
+
+Signed-off-by: Michal Privoznik 
+Reviewed-by: Daniel Henrique Barboza 
+(cherry picked from commit c2f15f1b1869c1732e529967d1851582409290fb)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518
+
+Conflicts:
+- src/qemu/qemu_capabilities.c: The set of capabilities diverged.
+- src/qemu/qemu_capabilities.h: Ditto.
+- tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml: Ditto.
+- tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml: Ditto.
+- tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml: Doesn't exist
+  downstream.
+- tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml: Ditto.
+- tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml: Ditto.
+
+Signed-off-by: Michal Privoznik 
+Message-Id: 
+Reviewed-by: Ján Tomko 
+---
+ src/qemu/qemu_capabilities.c                      | 2 ++
+ src/qemu/qemu_capabilities.h                      | 1 +
+ tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 +
+ tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 +
+ 4 files changed, 5 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 278eaa0009..ce52c51199 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -568,6 +568,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "storage.werror",
+               "pcie-root-port.hotplug",
+               "i8042",
++              "numa.hmat",
+     );
+ 
+ 
+@@ -1451,6 +1452,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
+     { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
+     { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
+     { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
++    { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT },
+ };
+ 
+ typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 15ebcb5077..98cac5b9dc 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -548,6 +548,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
+     QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG, /* pcie-root-port.hotplug */
+     QEMU_CAPS_DEVICE_I8042, /* PS/2 controller */
++    QEMU_CAPS_NUMA_HMAT, /* -numa hmat */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+index 140a466910..92da5cbd94 100644
+--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+@@ -181,6 +181,7 @@
+   
+   
+   
++  
+   4002050
+   0
+   61700241
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+index 733e6b1eb4..0b841a49ac 100644
+--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+@@ -226,6 +226,7 @@
+   
+   
+   
++  
+   4002091
+   0
+   43100241
+-- 
+2.29.2
+
diff --git a/SOURCES/libvirt-qemu-format-ramfb-attribute-for-mediated-devices.patch b/SOURCES/libvirt-qemu-format-ramfb-attribute-for-mediated-devices.patch
new file mode 100644
index 0000000..8545d91
--- /dev/null
+++ b/SOURCES/libvirt-qemu-format-ramfb-attribute-for-mediated-devices.patch
@@ -0,0 +1,114 @@
+From 9a993a7d566b7acdc548c1f0114b99fe17ba3c12 Mon Sep 17 00:00:00 2001
+Message-Id: <9a993a7d566b7acdc548c1f0114b99fe17ba3c12@dist-git>
+From: Jonathon Jongsma 
+Date: Fri, 4 Dec 2020 15:02:42 -0600
+Subject: [PATCH] qemu: format 'ramfb' attribute for mediated devices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It's possible to use ramfb as the boot display of an assigned vgpu
+device. This was introduced in 4b95738c, but unfortunately the attribute
+was not formatted into the xml output for such a device. This patch
+fixes that oversight and adds a xml2xml test to verify proper behavior.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1847791
+
+(the expected test results were massaged slightly due to the fact that
+commit 3b8feb4793cef66f5dbfb9bdabe4d40834f1e90e is not present in this
+build).
+
+Signed-off-by: Jonathon Jongsma 
+Reviewed-by: Daniel Henrique Barboza 
+Signed-off-by: Ján Tomko 
+Reviewed-by: Ján Tomko 
+(cherry picked from commit c5815b31976f3982d18c7f6c1367ab6e403eb7eb)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1876297
+
+Signed-off-by: Jonathon Jongsma 
+Message-Id: <20201204210242.822641-2-jjongsma@redhat.com>
+Reviewed-by: Michal Privoznik 
+---
+ src/conf/domain_conf.c                        |  3 ++
+ ...stdev-mdev-display-ramfb.x86_64-latest.xml | 41 +++++++++++++++++++
+ tests/qemuxml2xmltest.c                       |  1 +
+ 3 files changed, 45 insertions(+)
+ create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index cd5c15f297..c5a0442c6f 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -27603,6 +27603,9 @@ virDomainHostdevDefFormat(virBufferPtr buf,
+             if (mdevsrc->display != VIR_TRISTATE_SWITCH_ABSENT)
+                 virBufferAsprintf(buf, " display='%s'",
+                                   virTristateSwitchTypeToString(mdevsrc->display));
++            if (mdevsrc->ramfb != VIR_TRISTATE_SWITCH_ABSENT)
++                virBufferAsprintf(buf, " ramfb='%s'",
++                                  virTristateSwitchTypeToString(mdevsrc->ramfb));
+         }
+ 
+     }
+diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
+new file mode 100644
+index 0000000000..90c49842a5
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
+@@ -0,0 +1,41 @@
++
++  QEMUGuest2
++  c7a5fdbd-edaf-9455-926a-d65c16db1809
++  219136
++  219136
++  1
++  
++    hvm
++    
++  
++  
++  destroy
++  restart
++  destroy
++  
++    /usr/bin/qemu-system-i386
++    
++      

++    
++    
++    
++      

++    
++    
++    
++    
++      
++    
++
+ ++

++ Prior libvirt 7.1.0 the topology doesn't have extra ++ libvirt directory. ++

++ +

Non-systemd cgroups layout

+ +

+diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c +index 8f5bcd94f4..d0f867ba7f 100644 +--- a/src/util/vircgroup.c ++++ b/src/util/vircgroup.c +@@ -639,6 +639,22 @@ virCgroupMakeGroup(virCgroupPtr parent, + } + + ++static bool ++virCgroupExists(virCgroupPtr group) ++{ ++ size_t i; ++ ++ for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { ++ if (group->backends[i] && ++ !group->backends[i]->exists(group)) { ++ return false; ++ } ++ } ++ ++ return true; ++} ++ ++ + /** + * virCgroupNew: + * @path: path for the new group +@@ -695,10 +711,11 @@ virCgroupAddTaskInternal(virCgroupPtr group, + unsigned int flags) + { + size_t i; ++ virCgroupPtr parent = virCgroupGetNested(group); + + for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { +- if (group->backends[i] && +- group->backends[i]->addTask(group, pid, flags) < 0) { ++ if (parent->backends[i] && ++ parent->backends[i]->addTask(parent, pid, flags) < 0) { + return -1; + } + } +@@ -871,6 +888,30 @@ virCgroupNewPartition(const char *path, + } + + ++static int ++virCgroupNewNested(virCgroupPtr parent, ++ int controllers, ++ bool create, ++ pid_t pid, ++ virCgroupPtr *nested) ++{ ++ virCgroupPtr new = NULL; ++ ++ if (virCgroupNew(-1, "libvirt", parent, controllers, &new) < 0) ++ return -1; ++ ++ if (create) { ++ if (virCgroupMakeGroup(parent, new, create, pid, VIR_CGROUP_NONE) < 0) { ++ virCgroupFree(&new); ++ return -1; ++ } ++ } ++ ++ *nested = g_steal_pointer(&new); ++ return 0; ++} ++ ++ + /** + * virCgroupNewSelf: + * +@@ -954,6 +995,7 @@ virCgroupNewThread(virCgroupPtr domain, + virCgroupPtr *group) + { + g_autofree char *name = NULL; ++ virCgroupPtr parent = NULL; + int controllers; + + switch (nameval) { +@@ -976,10 +1018,12 @@ virCgroupNewThread(virCgroupPtr domain, + (1 << VIR_CGROUP_CONTROLLER_CPUACCT) | + (1 << VIR_CGROUP_CONTROLLER_CPUSET)); + +- if (virCgroupNew(-1, name, domain, controllers, group) < 0) ++ parent = virCgroupGetNested(domain); ++ ++ if (virCgroupNew(-1, name, parent, controllers, group) < 0) + return -1; + +- if (virCgroupMakeGroup(domain, *group, create, -1, VIR_CGROUP_THREAD) < 0) { ++ if (virCgroupMakeGroup(parent, *group, create, -1, VIR_CGROUP_THREAD) < 0) { + virCgroupFree(group); + return -1; + } +@@ -1009,6 +1053,7 @@ virCgroupNewDetectMachine(const char *name, + virCgroupPtr *group) + { + size_t i; ++ virCgroupPtr nested = NULL; + + if (virCgroupNewDetect(pid, controllers, group) < 0) { + if (virCgroupNewIgnoreError()) +@@ -1032,6 +1077,14 @@ virCgroupNewDetectMachine(const char *name, + if (virSystemdHasMachined() == 0 && !(*group)->unitName) + return -1; + ++ if (virCgroupNewNested((*group), controllers, false, -1, &nested) < 0) ++ return -1; ++ ++ if (virCgroupExists(nested)) ++ (*group)->nested = g_steal_pointer(&nested); ++ ++ virCgroupFree(&nested); ++ + return 0; + } + +@@ -1107,6 +1160,7 @@ virCgroupNewMachineSystemd(const char *name, + { + int rv; + virCgroupPtr init; ++ virCgroupPtr nested = NULL; + g_autofree char *path = NULL; + size_t i; + +@@ -1157,6 +1211,13 @@ virCgroupNewMachineSystemd(const char *name, + return -1; + } + ++ if (virCgroupNewNested((*group), controllers, true, pidleader, &nested) < 0) { ++ virCgroupFree(group); ++ return -1; ++ } ++ ++ (*group)->nested = nested; ++ + if (virCgroupAddProcess(*group, pidleader) < 0) { + virErrorPtr saved; + +@@ -1349,7 +1410,9 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group, + long long *requests_read, + long long *requests_write) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + getBlkioIoServiced, -1, + bytes_read, bytes_write, + requests_read, requests_write); +@@ -1376,7 +1439,9 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group, + long long *requests_read, + long long *requests_write) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + getBlkioIoDeviceServiced, -1, + path, bytes_read, bytes_write, + requests_read, requests_write); +@@ -1427,7 +1492,9 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group, + const char *path, + unsigned int riops) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + setBlkioDeviceReadIops, -1, path, riops); + } + +@@ -1445,7 +1512,9 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group, + const char *path, + unsigned int wiops) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + setBlkioDeviceWriteIops, -1, path, wiops); + } + +@@ -1463,7 +1532,9 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group, + const char *path, + unsigned long long rbps) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + setBlkioDeviceReadBps, -1, path, rbps); + } + +@@ -1480,7 +1551,9 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group, + const char *path, + unsigned long long wbps) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + setBlkioDeviceWriteBps, -1, path, wbps); + } + +@@ -1516,7 +1589,9 @@ virCgroupGetBlkioDeviceReadIops(virCgroupPtr group, + const char *path, + unsigned int *riops) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + getBlkioDeviceReadIops, -1, path, riops); + } + +@@ -1533,7 +1608,9 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group, + const char *path, + unsigned int *wiops) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + getBlkioDeviceWriteIops, -1, path, wiops); + } + +@@ -1550,7 +1627,9 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group, + const char *path, + unsigned long long *rbps) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + getBlkioDeviceReadBps, -1, path, rbps); + } + +@@ -1567,7 +1646,9 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group, + const char *path, + unsigned long long *wbps) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_BLKIO, + getBlkioDeviceWriteBps, -1, path, wbps); + } + +@@ -1600,7 +1681,9 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group, + int + virCgroupSetMemory(virCgroupPtr group, unsigned long long kb) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + setMemory, -1, kb); + } + +@@ -1627,7 +1710,9 @@ virCgroupGetMemoryStat(virCgroupPtr group, + unsigned long long *inactiveFile, + unsigned long long *unevictable) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + getMemoryStat, -1, cache, + activeAnon, inactiveAnon, + activeFile, inactiveFile, +@@ -1646,7 +1731,9 @@ virCgroupGetMemoryStat(virCgroupPtr group, + int + virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + getMemoryUsage, -1, kb); + } + +@@ -1662,7 +1749,9 @@ virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb) + int + virCgroupSetMemoryHardLimit(virCgroupPtr group, unsigned long long kb) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + setMemoryHardLimit, -1, kb); + } + +@@ -1678,7 +1767,9 @@ virCgroupSetMemoryHardLimit(virCgroupPtr group, unsigned long long kb) + int + virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + getMemoryHardLimit, -1, kb); + } + +@@ -1694,7 +1785,9 @@ virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb) + int + virCgroupSetMemorySoftLimit(virCgroupPtr group, unsigned long long kb) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + setMemorySoftLimit, -1, kb); + } + +@@ -1710,7 +1803,9 @@ virCgroupSetMemorySoftLimit(virCgroupPtr group, unsigned long long kb) + int + virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + getMemorySoftLimit, -1, kb); + } + +@@ -1726,7 +1821,9 @@ virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb) + int + virCgroupSetMemSwapHardLimit(virCgroupPtr group, unsigned long long kb) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + setMemSwapHardLimit, -1, kb); + } + +@@ -1742,7 +1839,9 @@ virCgroupSetMemSwapHardLimit(virCgroupPtr group, unsigned long long kb) + int + virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + getMemSwapHardLimit, -1, kb); + } + +@@ -1758,7 +1857,9 @@ virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb) + int + virCgroupGetMemSwapUsage(virCgroupPtr group, unsigned long long *kb) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_MEMORY, + getMemSwapUsage, -1, kb); + } + +@@ -1774,7 +1875,9 @@ virCgroupGetMemSwapUsage(virCgroupPtr group, unsigned long long *kb) + int + virCgroupSetCpusetMems(virCgroupPtr group, const char *mems) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPUSET, + setCpusetMems, -1, mems); + } + +@@ -1790,7 +1893,9 @@ virCgroupSetCpusetMems(virCgroupPtr group, const char *mems) + int + virCgroupGetCpusetMems(virCgroupPtr group, char **mems) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPUSET, + getCpusetMems, -1, mems); + } + +@@ -1806,7 +1911,9 @@ virCgroupGetCpusetMems(virCgroupPtr group, char **mems) + int + virCgroupSetCpusetMemoryMigrate(virCgroupPtr group, bool migrate) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPUSET, + setCpusetMemoryMigrate, -1, migrate); + } + +@@ -1822,7 +1929,9 @@ virCgroupSetCpusetMemoryMigrate(virCgroupPtr group, bool migrate) + int + virCgroupGetCpusetMemoryMigrate(virCgroupPtr group, bool *migrate) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPUSET, + getCpusetMemoryMigrate, -1, migrate); + } + +@@ -1838,7 +1947,9 @@ virCgroupGetCpusetMemoryMigrate(virCgroupPtr group, bool *migrate) + int + virCgroupSetCpusetCpus(virCgroupPtr group, const char *cpus) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPUSET, + setCpusetCpus, -1, cpus); + } + +@@ -1854,7 +1965,9 @@ virCgroupSetCpusetCpus(virCgroupPtr group, const char *cpus) + int + virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPUSET, + getCpusetCpus, -1, cpus); + } + +@@ -1869,7 +1982,9 @@ virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus) + int + virCgroupDenyAllDevices(virCgroupPtr group) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_DEVICES, + denyAllDevices, -1); + } + +@@ -1890,7 +2005,9 @@ virCgroupDenyAllDevices(virCgroupPtr group) + int + virCgroupAllowAllDevices(virCgroupPtr group, int perms) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_DEVICES, + allowAllDevices, -1, perms); + } + +@@ -1910,7 +2027,9 @@ int + virCgroupAllowDevice(virCgroupPtr group, char type, int major, int minor, + int perms) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_DEVICES, + allowDevice, -1, type, major, minor, perms); + } + +@@ -1936,6 +2055,7 @@ virCgroupAllowDevicePath(virCgroupPtr group, + bool ignoreEacces) + { + struct stat sb; ++ virCgroupPtr parent = virCgroupGetNested(group); + + if (stat(path, &sb) < 0) { + if (errno == EACCES && ignoreEacces) +@@ -1950,7 +2070,7 @@ virCgroupAllowDevicePath(virCgroupPtr group, + if (!S_ISCHR(sb.st_mode) && !S_ISBLK(sb.st_mode)) + return 1; + +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES, ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_DEVICES, + allowDevice, -1, + S_ISCHR(sb.st_mode) ? 'c' : 'b', + major(sb.st_rdev), +@@ -1974,7 +2094,9 @@ int + virCgroupDenyDevice(virCgroupPtr group, char type, int major, int minor, + int perms) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_DEVICES, + denyDevice, -1, type, major, minor, perms); + } + +@@ -2000,6 +2122,7 @@ virCgroupDenyDevicePath(virCgroupPtr group, + bool ignoreEacces) + { + struct stat sb; ++ virCgroupPtr parent = virCgroupGetNested(group); + + if (stat(path, &sb) < 0) { + if (errno == EACCES && ignoreEacces) +@@ -2014,7 +2137,7 @@ virCgroupDenyDevicePath(virCgroupPtr group, + if (!S_ISCHR(sb.st_mode) && !S_ISBLK(sb.st_mode)) + return 1; + +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES, ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_DEVICES, + denyDevice, -1, + S_ISCHR(sb.st_mode) ? 'c' : 'b', + major(sb.st_rdev), +@@ -2282,7 +2405,9 @@ virCgroupGetCpuShares(virCgroupPtr group, unsigned long long *shares) + int + virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPU, + setCpuCfsPeriod, -1, cfs_period); + } + +@@ -2298,7 +2423,9 @@ virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period) + int + virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_period) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPU, + getCpuCfsPeriod, -1, cfs_period); + } + +@@ -2315,7 +2442,9 @@ virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_period) + int + virCgroupSetCpuCfsQuota(virCgroupPtr group, long long cfs_quota) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPU, + setCpuCfsQuota, -1, cfs_quota); + } + +@@ -2323,7 +2452,9 @@ virCgroupSetCpuCfsQuota(virCgroupPtr group, long long cfs_quota) + int + virCgroupGetCpuacctPercpuUsage(virCgroupPtr group, char **usage) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUACCT, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPUACCT, + getCpuacctPercpuUsage, -1, usage); + } + +@@ -2669,7 +2800,9 @@ virCgroupKillPainfully(virCgroupPtr group) + int + virCgroupGetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPU, + getCpuCfsQuota, -1, cfs_quota); + } + +@@ -2677,7 +2810,9 @@ virCgroupGetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota) + int + virCgroupGetCpuacctUsage(virCgroupPtr group, unsigned long long *usage) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUACCT, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPUACCT, + getCpuacctUsage, -1, usage); + } + +@@ -2686,7 +2821,9 @@ int + virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user, + unsigned long long *sys) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUACCT, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPUACCT, + getCpuacctStat, -1, user, sys); + } + +@@ -2694,7 +2831,9 @@ virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user, + int + virCgroupSetFreezerState(virCgroupPtr group, const char *state) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_FREEZER, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_FREEZER, + setFreezerState, -1, state); + } + +@@ -2702,7 +2841,9 @@ virCgroupSetFreezerState(virCgroupPtr group, const char *state) + int + virCgroupGetFreezerState(virCgroupPtr group, char **state) + { +- VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_FREEZER, ++ virCgroupPtr parent = virCgroupGetNested(group); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_FREEZER, + getFreezerState, -1, state); + } + +@@ -2712,10 +2853,11 @@ virCgroupBindMount(virCgroupPtr group, const char *oldroot, + const char *mountopts) + { + size_t i; ++ virCgroupPtr parent = virCgroupGetNested(group); + + for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { +- if (group->backends[i] && +- group->backends[i]->bindMount(group, oldroot, mountopts) < 0) { ++ if (parent->backends[i] && ++ parent->backends[i]->bindMount(parent, oldroot, mountopts) < 0) { + return -1; + } + } +@@ -2730,10 +2872,11 @@ int virCgroupSetOwner(virCgroupPtr cgroup, + int controllers) + { + size_t i; ++ virCgroupPtr parent = virCgroupGetNested(cgroup); + + for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { +- if (cgroup->backends[i] && +- cgroup->backends[i]->setOwner(cgroup, uid, gid, controllers) < 0) { ++ if (parent->backends[i] && ++ parent->backends[i]->setOwner(parent, uid, gid, controllers) < 0) { + return -1; + } + } +@@ -2752,7 +2895,9 @@ int virCgroupSetOwner(virCgroupPtr cgroup, + bool + virCgroupSupportsCpuBW(virCgroupPtr cgroup) + { +- VIR_CGROUP_BACKEND_CALL(cgroup, VIR_CGROUP_CONTROLLER_CPU, ++ virCgroupPtr parent = virCgroupGetNested(cgroup); ++ ++ VIR_CGROUP_BACKEND_CALL(parent, VIR_CGROUP_CONTROLLER_CPU, + supportsCpuBW, false); + } + +@@ -2760,10 +2905,11 @@ int + virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller) + { + size_t i; ++ virCgroupPtr parent = virCgroupGetNested(cgroup); + + for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { +- if (cgroup->backends[i]) { +- int rc = cgroup->backends[i]->hasEmptyTasks(cgroup, controller); ++ if (parent->backends[i]) { ++ int rc = parent->backends[i]->hasEmptyTasks(parent, controller); + if (rc <= 0) + return rc; + } +@@ -3565,6 +3711,7 @@ virCgroupFree(virCgroupPtr *group) + VIR_FREE((*group)->unified.mountPoint); + VIR_FREE((*group)->unified.placement); + VIR_FREE((*group)->unitName); ++ VIR_FREE((*group)->nested); + + VIR_FREE((*group)->path); + VIR_FREE(*group); +@@ -3577,9 +3724,12 @@ virCgroupDelThread(virCgroupPtr cgroup, + int idx) + { + virCgroupPtr new_cgroup = NULL; ++ virCgroupPtr parent = NULL; + + if (cgroup) { +- if (virCgroupNewThread(cgroup, nameval, idx, false, &new_cgroup) < 0) ++ parent = virCgroupGetNested(cgroup); ++ ++ if (virCgroupNewThread(parent, nameval, idx, false, &new_cgroup) < 0) + return -1; + + /* Remove the offlined cgroup */ +diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h +index b4a9e0b379..104d74e4d7 100644 +--- a/src/util/vircgrouppriv.h ++++ b/src/util/vircgrouppriv.h +@@ -69,8 +69,12 @@ struct _virCgroup { + virCgroupV2Controller unified; + + char *unitName; ++ virCgroupPtr nested; + }; + ++#define virCgroupGetNested(cgroup) \ ++ (cgroup->nested ? cgroup->nested : cgroup) ++ + #define virCgroupSetValueDBus(unitName, key, ...) \ + ({ \ + int __ret = -1; \ +diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c +index 57d617cb69..49a2cb023e 100644 +--- a/src/util/vircgroupv1.c ++++ b/src/util/vircgroupv1.c +@@ -338,6 +338,8 @@ virCgroupV1DetectPlacement(virCgroupPtr group, + + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + const char *typestr = virCgroupV1ControllerTypeToString(i); ++ g_autofree char* placement = NULL; ++ char *tmp = NULL; + + if (!virCgroupV1MountOptsMatchController(controllers, typestr)) + continue; +@@ -348,17 +350,24 @@ virCgroupV1DetectPlacement(virCgroupPtr group, + if (group->legacy[i].placement) + continue; + ++ /* On systemd we create a nested cgroup for some cgroup tasks ++ * but the placement should point to the root cgroup. */ ++ placement = g_strdup(selfpath); ++ tmp = g_strrstr(placement, "/libvirt"); ++ if (tmp) ++ *tmp = '\0'; ++ + /* + * selfpath == "/" + path="" -> "/" + * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service" + * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo" + */ + if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) { +- group->legacy[i].placement = g_strdup(selfpath); ++ group->legacy[i].placement = g_strdup(placement); + } else { +- bool delim = STREQ(selfpath, "/") || STREQ(path, ""); ++ bool delim = STREQ(placement, "/") || STREQ(path, ""); + +- group->legacy[i].placement = g_strdup_printf("%s%s%s", selfpath, ++ group->legacy[i].placement = g_strdup_printf("%s%s%s", placement, + delim ? "" : "/", + path); + } +diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c +index d15e2354cf..a14fc669fb 100644 +--- a/src/util/vircgroupv2.c ++++ b/src/util/vircgroupv2.c +@@ -210,6 +210,12 @@ virCgroupV2DetectPlacement(virCgroupPtr group, + if (tmp) + *tmp = '\0'; + ++ /* On systemd we create a nested cgroup for some cgroup tasks ++ * but the placement should point to the root cgroup. */ ++ tmp = g_strrstr(placement, "/libvirt"); ++ if (tmp) ++ *tmp = '\0'; ++ + /* + * selfpath == "/" + path="" -> "/" + * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service" +-- +2.30.0 + diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV1Exists-and-virCgroupV2Exists.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV1Exists-and-virCgroupV2Exists.patch new file mode 100644 index 0000000..c73bf43 --- /dev/null +++ b/SOURCES/libvirt-vircgroup-introduce-virCgroupV1Exists-and-virCgroupV2Exists.patch @@ -0,0 +1,129 @@ +From f835b834d7922bed1ccda35885e42ab7c3f4a70f Mon Sep 17 00:00:00 2001 +Message-Id: +From: Pavel Hrdina +Date: Fri, 19 Feb 2021 13:33:58 +0100 +Subject: [PATCH] vircgroup: introduce virCgroupV1Exists and virCgroupV2Exists +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This will check if the cgroup actually exists on the system. + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit badc2bcc7398d8c0a739998a80411ddebf129512) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: <14297ed923f0f23cc52506e61e637c8f45e331ee.1613737828.git.phrdina@redhat.com> +Reviewed-by: Ján Tomko +--- + src/util/vircgroupbackend.h | 4 ++++ + src/util/vircgroupv1.c | 27 +++++++++++++++++++++++++++ + src/util/vircgroupv2.c | 15 +++++++++++++++ + 3 files changed, 46 insertions(+) + +diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h +index ac7b3ae517..dabc7bd4b4 100644 +--- a/src/util/vircgroupbackend.h ++++ b/src/util/vircgroupbackend.h +@@ -115,6 +115,9 @@ typedef int + const char *key, + char **path); + ++typedef bool ++(*virCgroupExistsCB)(virCgroupPtr group); ++ + typedef int + (*virCgroupMakeGroupCB)(virCgroupPtr parent, + virCgroupPtr group, +@@ -378,6 +381,7 @@ struct _virCgroupBackend { + virCgroupGetAnyControllerCB getAnyController; + virCgroupPathOfControllerCB pathOfController; + virCgroupMakeGroupCB makeGroup; ++ virCgroupExistsCB exists; + virCgroupRemoveCB remove; + virCgroupAddTaskCB addTask; + virCgroupHasEmptyTasksCB hasEmptyTasks; +diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c +index eb2b611cee..57d617cb69 100644 +--- a/src/util/vircgroupv1.c ++++ b/src/util/vircgroupv1.c +@@ -670,6 +670,32 @@ virCgroupV1MakeGroup(virCgroupPtr parent, + } + + ++static bool ++virCgroupV1Exists(virCgroupPtr group) ++{ ++ size_t i; ++ ++ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { ++ g_autofree char *path = NULL; ++ ++ if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) ++ continue; ++ ++ if (!group->legacy[i].mountPoint) ++ continue; ++ ++ if (virCgroupV1PathOfController(group, i, "", &path) < 0) ++ return false; ++ ++ if (!virFileExists(path)) { ++ return false; ++ } ++ } ++ ++ return true; ++} ++ ++ + static int + virCgroupV1Remove(virCgroupPtr group) + { +@@ -2136,6 +2162,7 @@ virCgroupBackend virCgroupV1Backend = { + .getAnyController = virCgroupV1GetAnyController, + .pathOfController = virCgroupV1PathOfController, + .makeGroup = virCgroupV1MakeGroup, ++ .exists = virCgroupV1Exists, + .remove = virCgroupV1Remove, + .addTask = virCgroupV1AddTask, + .hasEmptyTasks = virCgroupV1HasEmptyTasks, +diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c +index 5e19ed8332..d15e2354cf 100644 +--- a/src/util/vircgroupv2.c ++++ b/src/util/vircgroupv2.c +@@ -493,6 +493,20 @@ virCgroupV2MakeGroup(virCgroupPtr parent, + } + + ++static bool ++virCgroupV2Exists(virCgroupPtr group) ++{ ++ g_autofree char *path = NULL; ++ int controller; ++ ++ controller = virCgroupV2GetAnyController(group); ++ if (virCgroupV2PathOfController(group, controller, "", &path) < 0) ++ return false; ++ ++ return virFileExists(path); ++} ++ ++ + static int + virCgroupV2Remove(virCgroupPtr group) + { +@@ -1886,6 +1900,7 @@ virCgroupBackend virCgroupV2Backend = { + .getAnyController = virCgroupV2GetAnyController, + .pathOfController = virCgroupV2PathOfController, + .makeGroup = virCgroupV2MakeGroup, ++ .exists = virCgroupV2Exists, + .remove = virCgroupV2Remove, + .addTask = virCgroupV2AddTask, + .hasEmptyTasks = virCgroupV2HasEmptyTasks, +-- +2.30.0 + diff --git a/SOURCES/libvirt-vircgroup-use-DBus-call-to-systemd-for-some-APIs.patch b/SOURCES/libvirt-vircgroup-use-DBus-call-to-systemd-for-some-APIs.patch new file mode 100644 index 0000000..8d300b3 --- /dev/null +++ b/SOURCES/libvirt-vircgroup-use-DBus-call-to-systemd-for-some-APIs.patch @@ -0,0 +1,310 @@ +From 205289d2792aacf68ed2cb8563d1860bd36137a0 Mon Sep 17 00:00:00 2001 +Message-Id: <205289d2792aacf68ed2cb8563d1860bd36137a0@dist-git> +From: Pavel Hrdina +Date: Fri, 19 Feb 2021 13:33:55 +0100 +Subject: [PATCH] vircgroup: use DBus call to systemd for some APIs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When running on host with systemd we register VMs with machined. +In this case systemd creates the root VM cgroup for us. This has some +implications where one of them is that systemd owns all files inside +the root VM cgroup and we should not touch them. + +If we change any value in file that systemd knows about it will be +changed to what systemd thinks it should be when executing +`systemctl daemon-reload`. + +These are the APIs that we need to call using systemd because they set +limits that are proportional to sibling cgroups. + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit 9c1693eff427661616ce1bd2795688f87288a412) + +Conflicts: + src/util/vircgroup.c + - missing upstream g_autofree rewrite + - missing upstream glib dbus rewrite, hence the ugly macro + instead of a function + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: <5d22d307112333f1da565cb642ea9001a7b8b55b.1613737828.git.phrdina@redhat.com> +Reviewed-by: Ján Tomko +--- + src/util/vircgroup.c | 11 ++++++++++ + src/util/vircgrouppriv.h | 25 +++++++++++++++++++++++ + src/util/vircgroupv1.c | 44 +++++++++++++++++++++++++++------------- + src/util/vircgroupv2.c | 44 +++++++++++++++++++++++++++------------- + tests/Makefile.am | 1 + + 5 files changed, 97 insertions(+), 28 deletions(-) + +diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c +index a45c2e7f2f..10b934291c 100644 +--- a/src/util/vircgroup.c ++++ b/src/util/vircgroup.c +@@ -1027,6 +1027,10 @@ virCgroupNewDetectMachine(const char *name, + } + } + ++ (*group)->unitName = virSystemdGetMachineUnitByPID(pid); ++ if (virSystemdHasMachined() == 0 && !(*group)->unitName) ++ return -1; ++ + return 0; + } + +@@ -1146,6 +1150,12 @@ virCgroupNewMachineSystemd(const char *name, + return -1; + } + ++ (*group)->unitName = virSystemdGetMachineUnitByPID(pidleader); ++ if (!(*group)->unitName) { ++ virCgroupFree(group); ++ return -1; ++ } ++ + if (virCgroupAddProcess(*group, pidleader) < 0) { + virErrorPtr saved; + +@@ -3553,6 +3563,7 @@ virCgroupFree(virCgroupPtr *group) + + VIR_FREE((*group)->unified.mountPoint); + VIR_FREE((*group)->unified.placement); ++ VIR_FREE((*group)->unitName); + + VIR_FREE((*group)->path); + VIR_FREE(*group); +diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h +index f2a80aeb82..b4a9e0b379 100644 +--- a/src/util/vircgrouppriv.h ++++ b/src/util/vircgrouppriv.h +@@ -27,6 +27,7 @@ + + #include "vircgroup.h" + #include "vircgroupbackend.h" ++#include "virdbus.h" + + struct _virCgroupV1Controller { + int type; +@@ -66,8 +67,32 @@ struct _virCgroup { + + virCgroupV1Controller legacy[VIR_CGROUP_CONTROLLER_LAST]; + virCgroupV2Controller unified; ++ ++ char *unitName; + }; + ++#define virCgroupSetValueDBus(unitName, key, ...) \ ++ ({ \ ++ int __ret = -1; \ ++ do { \ ++ DBusConnection *__conn; \ ++ if (!(__conn = virDBusGetSystemBus())) \ ++ break; \ ++ __ret = virDBusCallMethod(__conn, NULL, NULL, \ ++ "org.freedesktop.systemd1", \ ++ "/org/freedesktop/systemd1", \ ++ "org.freedesktop.systemd1.Manager", \ ++ "SetUnitProperties", \ ++ "sba(sv)", \ ++ unitName, \ ++ true, \ ++ 1, \ ++ key, \ ++ __VA_ARGS__); \ ++ } while (0); \ ++ __ret; \ ++ }) ++ + int virCgroupSetValueRaw(const char *path, + const char *value); + +diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c +index c35088a3c4..7ec8f3a316 100644 +--- a/src/util/vircgroupv1.c ++++ b/src/util/vircgroupv1.c +@@ -931,7 +931,6 @@ virCgroupV1SetBlkioWeight(virCgroupPtr group, + unsigned int weight) + { + g_autofree char *path = NULL; +- g_autofree char *value = NULL; + + if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.bfq.weight", &path) < 0) { +@@ -953,9 +952,14 @@ virCgroupV1SetBlkioWeight(virCgroupPtr group, + return -1; + } + +- value = g_strdup_printf("%u", weight); ++ if (group->unitName) { ++ return virCgroupSetValueDBus(group->unitName, "BlockIOWeight", ++ "t", (unsigned long long) weight); ++ } else { ++ g_autofree char *value = g_strdup_printf("%u", weight); + +- return virCgroupSetValueRaw(path, value); ++ return virCgroupSetValueRaw(path, value); ++ } + } + + +@@ -1188,15 +1192,8 @@ virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group, + const char *devPath, + unsigned int weight) + { +- g_autofree char *str = NULL; +- g_autofree char *blkstr = NULL; + g_autofree char *path = NULL; + +- if (!(blkstr = virCgroupGetBlockDevString(devPath))) +- return -1; +- +- str = g_strdup_printf("%s%d", blkstr, weight); +- + if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.weight_device", &path) < 0) { + return -1; +@@ -1208,7 +1205,21 @@ virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group, + return -1; + } + +- return virCgroupSetValueRaw(path, str); ++ if (group->unitName) { ++ return virCgroupSetValueDBus(group->unitName, "BlockIODeviceWeight", ++ "a(st)", ++ 1, path, (unsigned long long) weight); ++ } else { ++ g_autofree char *str = NULL; ++ g_autofree char *blkstr = NULL; ++ ++ if (!(blkstr = virCgroupGetBlockDevString(devPath))) ++ return -1; ++ ++ str = g_strdup_printf("%s%d", blkstr, weight); ++ ++ return virCgroupSetValueRaw(path, str); ++ } + } + + +@@ -1849,9 +1860,14 @@ static int + virCgroupV1SetCpuShares(virCgroupPtr group, + unsigned long long shares) + { +- return virCgroupSetValueU64(group, +- VIR_CGROUP_CONTROLLER_CPU, +- "cpu.shares", shares); ++ if (group->unitName) { ++ return virCgroupSetValueDBus(group->unitName, "CPUShares", ++ "t", shares); ++ } else { ++ return virCgroupSetValueU64(group, ++ VIR_CGROUP_CONTROLLER_CPU, ++ "cpu.shares", shares); ++ } + } + + +diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c +index 4682a6a920..8fe4894a9e 100644 +--- a/src/util/vircgroupv2.c ++++ b/src/util/vircgroupv2.c +@@ -606,7 +606,6 @@ virCgroupV2SetBlkioWeight(virCgroupPtr group, + unsigned int weight) + { + g_autofree char *path = NULL; +- g_autofree char *value = NULL; + const char *format = "%u"; + + if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, +@@ -630,9 +629,14 @@ virCgroupV2SetBlkioWeight(virCgroupPtr group, + return -1; + } + +- value = g_strdup_printf(format, weight); ++ if (group->unitName) { ++ return virCgroupSetValueDBus(group->unitName, "IOWeight", ++ "t", (unsigned long long) weight); ++ } else { ++ g_autofree char *value = g_strdup_printf(format, weight); + +- return virCgroupSetValueRaw(path, value); ++ return virCgroupSetValueRaw(path, value); ++ } + } + + +@@ -817,13 +821,6 @@ virCgroupV2SetBlkioDeviceWeight(virCgroupPtr group, + unsigned int weight) + { + g_autofree char *path = NULL; +- g_autofree char *str = NULL; +- g_autofree char *blkstr = NULL; +- +- if (!(blkstr = virCgroupGetBlockDevString(devPath))) +- return -1; +- +- str = g_strdup_printf("%s%d", blkstr, weight); + + if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, + "io.weight", &path) < 0) { +@@ -836,7 +833,21 @@ virCgroupV2SetBlkioDeviceWeight(virCgroupPtr group, + return -1; + } + +- return virCgroupSetValueRaw(path, str); ++ if (group->unitName) { ++ return virCgroupSetValueDBus(group->unitName, "IODeviceWeight", ++ "a(st)", ++ 1, path, (unsigned long long) weight); ++ } else { ++ g_autofree char *str = NULL; ++ g_autofree char *blkstr = NULL; ++ ++ if (!(blkstr = virCgroupGetBlockDevString(devPath))) ++ return -1; ++ ++ str = g_strdup_printf("%s%d", blkstr, weight); ++ ++ return virCgroupSetValueRaw(path, str); ++ } + } + + +@@ -1455,9 +1466,14 @@ static int + virCgroupV2SetCpuShares(virCgroupPtr group, + unsigned long long shares) + { +- return virCgroupSetValueU64(group, +- VIR_CGROUP_CONTROLLER_CPU, +- "cpu.weight", shares); ++ if (group->unitName) { ++ return virCgroupSetValueDBus(group->unitName, "CPUWeight", ++ "t", shares); ++ } else { ++ return virCgroupSetValueU64(group, ++ VIR_CGROUP_CONTROLLER_CPU, ++ "cpu.weight", shares); ++ } + } + + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index f957c7d1ba..b030d0e8f6 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1188,6 +1188,7 @@ libvirportallocatormock_la_LIBADD = $(MOCKLIBS_LIBS) + + vircgrouptest_SOURCES = \ + vircgrouptest.c testutils.h testutils.c ++vircgrouptest_CFLAGS = $(DBUS_CFLAGS) $(AM_CFLAGS) + vircgrouptest_LDADD = $(LDADDS) + + libvircgroupmock_la_SOURCES = \ +-- +2.30.0 + diff --git a/SOURCES/libvirt-vircgroupv1-refactor-virCgroupV1DetectPlacement.patch b/SOURCES/libvirt-vircgroupv1-refactor-virCgroupV1DetectPlacement.patch new file mode 100644 index 0000000..d8035c1 --- /dev/null +++ b/SOURCES/libvirt-vircgroupv1-refactor-virCgroupV1DetectPlacement.patch @@ -0,0 +1,77 @@ +From a88996cc6c72a6f7fd034c0890747c54cc377484 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Pavel Hrdina +Date: Fri, 19 Feb 2021 13:33:56 +0100 +Subject: [PATCH] vircgroupv1: refactor virCgroupV1DetectPlacement +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Remove one level of indentation by splitting the condition. + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit 5f56dd7c83493f14a471bb9e33415b04329a08bf) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: +Reviewed-by: Ján Tomko +--- + src/util/vircgroupv1.c | 39 ++++++++++++++++++++++----------------- + 1 file changed, 22 insertions(+), 17 deletions(-) + +diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c +index 7ec8f3a316..09165ece4d 100644 +--- a/src/util/vircgroupv1.c ++++ b/src/util/vircgroupv1.c +@@ -339,23 +339,28 @@ virCgroupV1DetectPlacement(virCgroupPtr group, + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + const char *typestr = virCgroupV1ControllerTypeToString(i); + +- if (virCgroupV1MountOptsMatchController(controllers, typestr) && +- group->legacy[i].mountPoint != NULL && +- group->legacy[i].placement == NULL) { +- /* +- * selfpath == "/" + path="" -> "/" +- * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service" +- * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo" +- */ +- if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) { +- group->legacy[i].placement = g_strdup(selfpath); +- } else { +- bool delim = STREQ(selfpath, "/") || STREQ(path, ""); +- +- group->legacy[i].placement = g_strdup_printf("%s%s%s", selfpath, +- delim ? "" : "/", +- path); +- } ++ if (!virCgroupV1MountOptsMatchController(controllers, typestr)) ++ continue; ++ ++ if (!group->legacy[i].mountPoint) ++ continue; ++ ++ if (group->legacy[i].placement) ++ continue; ++ ++ /* ++ * selfpath == "/" + path="" -> "/" ++ * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service" ++ * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo" ++ */ ++ if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) { ++ group->legacy[i].placement = g_strdup(selfpath); ++ } else { ++ bool delim = STREQ(selfpath, "/") || STREQ(path, ""); ++ ++ group->legacy[i].placement = g_strdup_printf("%s%s%s", selfpath, ++ delim ? "" : "/", ++ path); + } + } + +-- +2.30.0 + diff --git a/SOURCES/libvirt-vircgroupv1-use-defines-for-cpu-period-and-quota-limits.patch b/SOURCES/libvirt-vircgroupv1-use-defines-for-cpu-period-and-quota-limits.patch new file mode 100644 index 0000000..649bb1e --- /dev/null +++ b/SOURCES/libvirt-vircgroupv1-use-defines-for-cpu-period-and-quota-limits.patch @@ -0,0 +1,66 @@ +From 2fb78d18ea95c2dcb4c5b0e29171636e51bb2149 Mon Sep 17 00:00:00 2001 +Message-Id: <2fb78d18ea95c2dcb4c5b0e29171636e51bb2149@dist-git> +From: Pavel Hrdina +Date: Thu, 21 Jan 2021 10:24:04 -0300 +Subject: [PATCH] vircgroupv1: use defines for cpu period and quota limits + +Signed-off-by: Pavel Hrdina +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit bc760f4d7c4f964fadcb2a73e126b0053e7a9b06) + +https://bugzilla.redhat.com/1915733 + +Signed-off-by: Daniel Henrique Barboza +Message-Id: <20210121132406.337681-3-dbarboza@redhat.com> +Reviewed-by: Pavel Hrdina +--- + src/util/vircgroupv1.c | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c +index d2ec7106db..c35088a3c4 100644 +--- a/src/util/vircgroupv1.c ++++ b/src/util/vircgroupv1.c +@@ -1869,13 +1869,13 @@ static int + virCgroupV1SetCpuCfsPeriod(virCgroupPtr group, + unsigned long long cfs_period) + { +- /* The cfs_period should be greater or equal than 1ms, and less or equal +- * than 1s. +- */ +- if (cfs_period < 1000 || cfs_period > 1000000) { ++ if (cfs_period < VIR_CGROUP_CPU_PERIOD_MIN || ++ cfs_period > VIR_CGROUP_CPU_PERIOD_MAX) { + virReportError(VIR_ERR_INVALID_ARG, +- _("cfs_period '%llu' must be in range (1000, 1000000)"), +- cfs_period); ++ _("cfs_period '%llu' must be in range (%llu, %llu)"), ++ cfs_period, ++ VIR_CGROUP_CPU_PERIOD_MIN, ++ VIR_CGROUP_CPU_PERIOD_MAX); + return -1; + } + +@@ -1899,13 +1899,14 @@ static int + virCgroupV1SetCpuCfsQuota(virCgroupPtr group, + long long cfs_quota) + { +- /* The cfs_quota should be greater or equal than 1ms */ + if (cfs_quota >= 0 && +- (cfs_quota < 1000 || +- cfs_quota > ULLONG_MAX / 1000)) { ++ (cfs_quota < VIR_CGROUP_CPU_QUOTA_MIN || ++ cfs_quota > VIR_CGROUP_CPU_QUOTA_MAX)) { + virReportError(VIR_ERR_INVALID_ARG, +- _("cfs_quota '%lld' must be in range (1000, %llu)"), +- cfs_quota, ULLONG_MAX / 1000); ++ _("cfs_quota '%lld' must be in range (%llu, %llu)"), ++ cfs_quota, ++ VIR_CGROUP_CPU_QUOTA_MIN, ++ VIR_CGROUP_CPU_QUOTA_MAX); + return -1; + } + +-- +2.30.0 + diff --git a/SOURCES/libvirt-vircgroupv2-move-task-into-cgroup-before-enabling-controllers.patch b/SOURCES/libvirt-vircgroupv2-move-task-into-cgroup-before-enabling-controllers.patch new file mode 100644 index 0000000..7a161d9 --- /dev/null +++ b/SOURCES/libvirt-vircgroupv2-move-task-into-cgroup-before-enabling-controllers.patch @@ -0,0 +1,155 @@ +From 41a7547b32786b1a84c8ee7bad0c4cf9559ea4b9 Mon Sep 17 00:00:00 2001 +Message-Id: <41a7547b32786b1a84c8ee7bad0c4cf9559ea4b9@dist-git> +From: Pavel Hrdina +Date: Fri, 19 Feb 2021 13:33:57 +0100 +Subject: [PATCH] vircgroupv2: move task into cgroup before enabling + controllers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When we create a new child cgroup and the parent cgroup has any process +attached to it enabling controllers for the child cgroup fails with +error. We need to move the process into the child cgroup first before +enabling any controllers. + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit 382fa15cde538cba3888a89b301fd3d9a0ce69ea) + +Conflicts: + src/util/vircgroup.c + - missing upstream g_autofree rewrite + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: <85d34403caacb571cb78539d5c4f56eee9484d57.1613737828.git.phrdina@redhat.com> +Reviewed-by: Ján Tomko +--- + src/util/vircgroup.c | 13 +++++++------ + src/util/vircgroupbackend.h | 1 + + src/util/vircgroupv1.c | 1 + + src/util/vircgroupv2.c | 13 +++++++++++++ + 4 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c +index 10b934291c..8f5bcd94f4 100644 +--- a/src/util/vircgroup.c ++++ b/src/util/vircgroup.c +@@ -622,13 +622,14 @@ static int + virCgroupMakeGroup(virCgroupPtr parent, + virCgroupPtr group, + bool create, ++ pid_t pid, + unsigned int flags) + { + size_t i; + + for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { + if (group->backends[i] && +- group->backends[i]->makeGroup(parent, group, create, flags) < 0) { ++ group->backends[i]->makeGroup(parent, group, create, pid, flags) < 0) { + virCgroupRemove(group); + return -1; + } +@@ -857,8 +858,8 @@ virCgroupNewPartition(const char *path, + goto cleanup; + + if (parent) { +- if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) +- goto cleanup; ++ if (virCgroupMakeGroup(parent, *group, create, -1, VIR_CGROUP_NONE) < 0) ++ return -1; + } + + ret = 0; +@@ -924,7 +925,7 @@ virCgroupNewDomainPartition(virCgroupPtr partition, + * a group for driver, is to avoid overhead to track + * cumulative usage that we don't need. + */ +- if (virCgroupMakeGroup(partition, *group, create, ++ if (virCgroupMakeGroup(partition, *group, create, -1, + VIR_CGROUP_MEM_HIERACHY) < 0) { + virCgroupFree(group); + return -1; +@@ -978,7 +979,7 @@ virCgroupNewThread(virCgroupPtr domain, + if (virCgroupNew(-1, name, domain, controllers, group) < 0) + return -1; + +- if (virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_THREAD) < 0) { ++ if (virCgroupMakeGroup(domain, *group, create, -1, VIR_CGROUP_THREAD) < 0) { + virCgroupFree(group); + return -1; + } +@@ -1065,7 +1066,7 @@ virCgroupEnableMissingControllers(char *path, + &tmp) < 0) + goto cleanup; + +- if (virCgroupMakeGroup(parent, tmp, true, VIR_CGROUP_SYSTEMD) < 0) { ++ if (virCgroupMakeGroup(parent, tmp, true, -1, VIR_CGROUP_SYSTEMD) < 0) { + virCgroupFree(&tmp); + goto cleanup; + } +diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h +index e12a2e8b9d..ac7b3ae517 100644 +--- a/src/util/vircgroupbackend.h ++++ b/src/util/vircgroupbackend.h +@@ -119,6 +119,7 @@ typedef int + (*virCgroupMakeGroupCB)(virCgroupPtr parent, + virCgroupPtr group, + bool create, ++ pid_t pid, + unsigned int flags); + + typedef int +diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c +index 09165ece4d..eb2b611cee 100644 +--- a/src/util/vircgroupv1.c ++++ b/src/util/vircgroupv1.c +@@ -601,6 +601,7 @@ static int + virCgroupV1MakeGroup(virCgroupPtr parent, + virCgroupPtr group, + bool create, ++ pid_t pid G_GNUC_UNUSED, + unsigned int flags) + { + size_t i; +diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c +index 8fe4894a9e..5e19ed8332 100644 +--- a/src/util/vircgroupv2.c ++++ b/src/util/vircgroupv2.c +@@ -398,10 +398,17 @@ virCgroupV2EnableController(virCgroupPtr group, + } + + ++static int ++virCgroupV2AddTask(virCgroupPtr group, ++ pid_t pid, ++ unsigned int flags); ++ ++ + static int + virCgroupV2MakeGroup(virCgroupPtr parent, + virCgroupPtr group, + bool create, ++ pid_t pid, + unsigned int flags) + { + g_autofree char *path = NULL; +@@ -449,6 +456,12 @@ virCgroupV2MakeGroup(virCgroupPtr parent, + } + } else { + size_t i; ++ ++ if (pid > 0) { ++ if (virCgroupV2AddTask(group, pid, VIR_CGROUP_TASK_PROCESS) < 0) ++ return -1; ++ } ++ + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + int rc; + +-- +2.30.0 + diff --git a/SOURCES/libvirt-vircgroupv2-properly-detect-placement-of-running-VM.patch b/SOURCES/libvirt-vircgroupv2-properly-detect-placement-of-running-VM.patch new file mode 100644 index 0000000..799b56b --- /dev/null +++ b/SOURCES/libvirt-vircgroupv2-properly-detect-placement-of-running-VM.patch @@ -0,0 +1,88 @@ +From 9cf56b5a0d1394fef10afdd763dc8005457bbaf5 Mon Sep 17 00:00:00 2001 +Message-Id: <9cf56b5a0d1394fef10afdd763dc8005457bbaf5@dist-git> +From: Pavel Hrdina +Date: Fri, 19 Feb 2021 13:33:51 +0100 +Subject: [PATCH] vircgroupv2: properly detect placement of running VM +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When libvirtd starts a VM it internally stores a path to the main +cgroup. When we restart libvirtd we should get to the same state. + +When we start a VM on host with systemd the cgroup is created for us and +the process is already placed into that cgroup and we detect the path +created by systemd using /proc/$PID/cgroup. After that we create +sub-cgroups and move all threads there. + +Once libvirtd is restarted we again detect the cgroup path using +/proc/$PID/cgroup, but in this case we will get a different path because +the main thread was moved to a "emulator" cgroup. + +Instead of ignoring the "emulator" directory when validating cgroups +remove it completely when detecting cgroup otherwise cgroups will not +work properly when libvirtd is restarted. + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit 902c6644a8ec292789d561b3188e576c37a86872) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: <10fb6b61cbb4f9caf8e8ba7706ec01d1da41fc67.1613737828.git.phrdina@redhat.com> +Reviewed-by: Ján Tomko +--- + src/util/vircgroupv2.c | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c +index 92ae3ec839..4682a6a920 100644 +--- a/src/util/vircgroupv2.c ++++ b/src/util/vircgroupv2.c +@@ -121,12 +121,6 @@ virCgroupV2ValidateMachineGroup(virCgroupPtr group, + if (!(tmp = strrchr(group->unified.placement, '/'))) + return false; + +- if (STREQ(tmp, "/emulator")) { +- *tmp = '\0'; +- +- if (!(tmp = strrchr(group->unified.placement, '/'))) +- return false; +- } + tmp++; + + if (STRNEQ(tmp, partmachinename) && +@@ -197,6 +191,9 @@ virCgroupV2DetectPlacement(virCgroupPtr group, + const char *controllers, + const char *selfpath) + { ++ g_autofree char *placement = g_strdup(selfpath); ++ char *tmp = NULL; ++ + if (group->unified.placement) + return 0; + +@@ -207,12 +204,18 @@ virCgroupV2DetectPlacement(virCgroupPtr group, + if (STRNEQ(controllers, "")) + return 0; + ++ /* Running VM will have the main thread placed in emulator cgroup ++ * but we need to get the main cgroup. */ ++ tmp = g_strrstr(placement, "/emulator"); ++ if (tmp) ++ *tmp = '\0'; ++ + /* + * selfpath == "/" + path="" -> "/" + * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service" + * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo" + */ +- group->unified.placement = g_strdup_printf("%s%s%s", selfpath, ++ group->unified.placement = g_strdup_printf("%s%s%s", placement, + (STREQ(selfpath, "/") || STREQ(path, "") ? "" : "/"), path); + + return 0; +-- +2.30.0 + diff --git a/SOURCES/libvirt-vircgroupv2-use-defines-for-cpu-period-and-quota-limits.patch b/SOURCES/libvirt-vircgroupv2-use-defines-for-cpu-period-and-quota-limits.patch new file mode 100644 index 0000000..bcb1769 --- /dev/null +++ b/SOURCES/libvirt-vircgroupv2-use-defines-for-cpu-period-and-quota-limits.patch @@ -0,0 +1,78 @@ +From b96501e90f7b3fbea1427ab6adeade7d8e707d07 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Pavel Hrdina +Date: Thu, 21 Jan 2021 10:24:05 -0300 +Subject: [PATCH] vircgroupv2: use defines for cpu period and quota limits + +Signed-off-by: Pavel Hrdina +Reviewed-by: Daniel Henrique Barboza +(cherry picked from commit 98a09ca48ed4fc011abf2aa290e02ce1b8f1bb5f) + +https://bugzilla.redhat.com/1915733 + +Signed-off-by: Daniel Henrique Barboza +Message-Id: <20210121132406.337681-4-dbarboza@redhat.com> +Reviewed-by: Pavel Hrdina +--- + src/util/vircgroupv2.c | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) + +diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c +index 1d8c599f6a..92ae3ec839 100644 +--- a/src/util/vircgroupv2.c ++++ b/src/util/vircgroupv2.c +@@ -1476,12 +1476,12 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group, + g_autofree char *str = NULL; + char *tmp; + +- /* The cfs_period should be greater or equal than 1ms, and less or equal +- * than 1s. +- */ +- if (cfs_period < 1000 || cfs_period > 1000000) { ++ if (cfs_period < VIR_CGROUP_CPU_PERIOD_MIN || ++ cfs_period > VIR_CGROUP_CPU_PERIOD_MAX) { + virReportError(VIR_ERR_INVALID_ARG, +- _("cfs_period '%llu' must be in range (1000, 1000000)"), ++ _("cfs_period '%llu' must be in range (%llu, %llu)"), ++ VIR_CGROUP_CPU_PERIOD_MIN, ++ VIR_CGROUP_CPU_PERIOD_MAX, + cfs_period); + return -1; + } +@@ -1537,17 +1537,18 @@ static int + virCgroupV2SetCpuCfsQuota(virCgroupPtr group, + long long cfs_quota) + { +- /* The cfs_quota should be greater or equal than 1ms */ + if (cfs_quota >= 0 && +- (cfs_quota < 1000 || +- cfs_quota > ULLONG_MAX / 1000)) { ++ (cfs_quota < VIR_CGROUP_CPU_QUOTA_MIN || ++ cfs_quota > VIR_CGROUP_CPU_QUOTA_MAX)) { + virReportError(VIR_ERR_INVALID_ARG, +- _("cfs_quota '%lld' must be in range (1000, %llu)"), +- cfs_quota, ULLONG_MAX / 1000); ++ _("cfs_quota '%lld' must be in range (%llu, %llu)"), ++ cfs_quota, ++ VIR_CGROUP_CPU_QUOTA_MIN, ++ VIR_CGROUP_CPU_QUOTA_MAX); + return -1; + } + +- if (cfs_quota == ULLONG_MAX / 1000) { ++ if (cfs_quota == VIR_CGROUP_CPU_QUOTA_MAX) { + return virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_CPU, + "cpu.max", "max"); +@@ -1572,7 +1573,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group, + } + + if (STREQLEN(str, "max", 3)) { +- *cfs_quota = ULLONG_MAX / 1000; ++ *cfs_quota = VIR_CGROUP_CPU_QUOTA_MAX; + return 0; + } + +-- +2.30.0 + diff --git a/SOURCES/libvirt-virsystemd-export-virSystemdHasMachined.patch b/SOURCES/libvirt-virsystemd-export-virSystemdHasMachined.patch new file mode 100644 index 0000000..df82c03 --- /dev/null +++ b/SOURCES/libvirt-virsystemd-export-virSystemdHasMachined.patch @@ -0,0 +1,65 @@ +From c8fb30409d501e5d9299ac7c08c43917b199a72b Mon Sep 17 00:00:00 2001 +Message-Id: +From: Pavel Hrdina +Date: Fri, 19 Feb 2021 13:33:52 +0100 +Subject: [PATCH] virsystemd: export virSystemdHasMachined +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit a51147d9065217d9087449b4e601e3294c0a22cf) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: <9a861adc0dc51679d7178e464255c80465247333.1613737828.git.phrdina@redhat.com> +Reviewed-by: Ján Tomko +--- + src/libvirt_private.syms | 1 + + src/util/virsystemd.c | 2 +- + src/util/virsystemd.h | 2 ++ + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms +index 9d87e2a27b..a869d1f7a4 100644 +--- a/src/libvirt_private.syms ++++ b/src/libvirt_private.syms +@@ -3243,6 +3243,7 @@ virSystemdGetActivation; + virSystemdGetMachineNameByPID; + virSystemdHasLogind; + virSystemdHasLogindResetCachedValue; ++virSystemdHasMachined; + virSystemdHasMachinedResetCachedValue; + virSystemdMakeScopeName; + virSystemdMakeSliceName; +diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c +index 96d43e5440..ca708cd1bd 100644 +--- a/src/util/virsystemd.c ++++ b/src/util/virsystemd.c +@@ -153,7 +153,7 @@ void virSystemdHasLogindResetCachedValue(void) + * -1 = error + * 0 = machine1 is available + */ +-static int ++int + virSystemdHasMachined(void) + { + int ret; +diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h +index dfea75948b..9ce16b7de1 100644 +--- a/src/util/virsystemd.h ++++ b/src/util/virsystemd.h +@@ -57,6 +57,8 @@ int virSystemdTerminateMachine(const char *name); + + void virSystemdNotifyStartup(void); + ++int virSystemdHasMachined(void); ++ + int virSystemdHasLogind(void); + + int virSystemdCanSuspend(bool *result); +-- +2.30.0 + diff --git a/SOURCES/libvirt-virsystemd-introduce-virSystemdGetMachineByPID.patch b/SOURCES/libvirt-virsystemd-introduce-virSystemdGetMachineByPID.patch new file mode 100644 index 0000000..c7242c1 --- /dev/null +++ b/SOURCES/libvirt-virsystemd-introduce-virSystemdGetMachineByPID.patch @@ -0,0 +1,102 @@ +From a3a5c16f04d044502eecedbef6043bce79043df9 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Pavel Hrdina +Date: Fri, 19 Feb 2021 13:33:53 +0100 +Subject: [PATCH] virsystemd: introduce virSystemdGetMachineByPID +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit 385704d5a4e1c02c21fb5779fa5067cf0d8ab56c) + +Conflicts: + src/util/virsystemd.c + - missing upstream glib dbus rewrite + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: <7de7eae45f139e79c45731263924ae078f3e33c5.1613737828.git.phrdina@redhat.com> +Reviewed-by: Ján Tomko +--- + src/util/virsystemd.c | 46 +++++++++++++++++++++++++++++++++---------- + 1 file changed, 36 insertions(+), 10 deletions(-) + +diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c +index ca708cd1bd..394eb13f38 100644 +--- a/src/util/virsystemd.c ++++ b/src/util/virsystemd.c +@@ -200,19 +200,24 @@ virSystemdHasLogind(void) + } + + +-char * +-virSystemdGetMachineNameByPID(pid_t pid) ++/** ++ * virSystemdGetMachineByPID: ++ * @conn: dbus connection ++ * @pid: pid of running VM ++ * ++ * Returns dbus object path to VM registered with machined. ++ * On error returns NULL. ++ */ ++static char * ++virSystemdGetMachineByPID(DBusConnection *conn, ++ pid_t pid) + { +- DBusConnection *conn; + DBusMessage *reply = NULL; +- char *name = NULL, *object = NULL; ++ char *object = NULL; + + if (virSystemdHasMachined() < 0) + goto cleanup; + +- if (!(conn = virDBusGetSystemBus())) +- goto cleanup; +- + if (virDBusCallMethod(conn, &reply, NULL, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", +@@ -224,12 +229,33 @@ virSystemdGetMachineNameByPID(pid_t pid) + if (virDBusMessageDecode(reply, "o", &object) < 0) + goto cleanup; + +- virDBusMessageUnref(reply); +- reply = NULL; +- + VIR_DEBUG("Domain with pid %lld has object path '%s'", + (long long) pid, object); + ++ cleanup: ++ virDBusMessageUnref(reply); ++ ++ return object; ++} ++ ++ ++char * ++virSystemdGetMachineNameByPID(pid_t pid) ++{ ++ DBusConnection *conn; ++ DBusMessage *reply = NULL; ++ char *name = NULL, *object = NULL; ++ ++ if (virSystemdHasMachined() < 0) ++ goto cleanup; ++ ++ if (!(conn = virDBusGetSystemBus())) ++ goto cleanup; ++ ++ object = virSystemdGetMachineByPID(conn, pid); ++ if (!object) ++ goto cleanup; ++ + if (virDBusCallMethod(conn, &reply, NULL, + "org.freedesktop.machine1", + object, +-- +2.30.0 + diff --git a/SOURCES/libvirt-virsystemd-introduce-virSystemdGetMachineUnitByPID.patch b/SOURCES/libvirt-virsystemd-introduce-virSystemdGetMachineUnitByPID.patch new file mode 100644 index 0000000..5918571 --- /dev/null +++ b/SOURCES/libvirt-virsystemd-introduce-virSystemdGetMachineUnitByPID.patch @@ -0,0 +1,205 @@ +From 9ec1193393c48198fd05b795bcce0d607b45d4ee Mon Sep 17 00:00:00 2001 +Message-Id: <9ec1193393c48198fd05b795bcce0d607b45d4ee@dist-git> +From: Pavel Hrdina +Date: Fri, 19 Feb 2021 13:33:54 +0100 +Subject: [PATCH] virsystemd: introduce virSystemdGetMachineUnitByPID +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Pavel Hrdina +Reviewed-by: Michal Privoznik +(cherry picked from commit d3fb774b1ed548c0338b3338a87094dafea32aa2) + +Conflicts: + src/util/virsystemd.c + tests/virsystemdtest.c + - missing upstream glib dbus rewrite + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463 + +Signed-off-by: Pavel Hrdina +Message-Id: <28be8d962cde455d215fe9ee09fbdcc4145e931f.1613737828.git.phrdina@redhat.com> +Reviewed-by: Ján Tomko +--- + src/libvirt_private.syms | 1 + + src/util/virsystemd.c | 48 ++++++++++++++++++++++++++++++++ + src/util/virsystemd.h | 2 ++ + tests/virsystemdtest.c | 59 ++++++++++++++++++++++++++++++++++------ + 4 files changed, 101 insertions(+), 9 deletions(-) + +diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms +index a869d1f7a4..af6f32fb1e 100644 +--- a/src/libvirt_private.syms ++++ b/src/libvirt_private.syms +@@ -3241,6 +3241,7 @@ virSystemdCanSuspend; + virSystemdCreateMachine; + virSystemdGetActivation; + virSystemdGetMachineNameByPID; ++virSystemdGetMachineUnitByPID; + virSystemdHasLogind; + virSystemdHasLogindResetCachedValue; + virSystemdHasMachined; +diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c +index 394eb13f38..0b8e21ae46 100644 +--- a/src/util/virsystemd.c ++++ b/src/util/virsystemd.c +@@ -280,6 +280,54 @@ virSystemdGetMachineNameByPID(pid_t pid) + } + + ++/** ++ * virSystemdGetMachineUnitByPID: ++ * @pid: pid of running VM ++ * ++ * Returns systemd Unit name of a running VM registered with machined. ++ * On error returns NULL. ++ */ ++char * ++virSystemdGetMachineUnitByPID(pid_t pid) ++{ ++ DBusConnection *conn; ++ DBusMessage *reply = NULL; ++ char *unit = NULL, *object = NULL; ++ ++ if (virSystemdHasMachined() < 0) ++ goto cleanup; ++ ++ if (!(conn = virDBusGetSystemBus())) ++ goto cleanup; ++ ++ object = virSystemdGetMachineByPID(conn, pid); ++ if (!object) ++ goto cleanup; ++ ++ if (virDBusCallMethod(conn, &reply, NULL, ++ "org.freedesktop.machine1", ++ object, ++ "org.freedesktop.DBus.Properties", ++ "Get", ++ "ss", ++ "org.freedesktop.machine1.Machine", ++ "Unit") < 0) ++ goto cleanup; ++ ++ if (virDBusMessageDecode(reply, "v", "s", &unit) < 0) ++ goto cleanup; ++ ++ VIR_DEBUG("Domain with pid %lld has unit name '%s'", ++ (long long) pid, unit); ++ ++ cleanup: ++ VIR_FREE(object); ++ virDBusMessageUnref(reply); ++ ++ return unit; ++} ++ ++ + /** + * virSystemdCreateMachine: + * @name: driver unique name of the machine +diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h +index 9ce16b7de1..cd329c49f9 100644 +--- a/src/util/virsystemd.h ++++ b/src/util/virsystemd.h +@@ -69,6 +69,8 @@ int virSystemdCanHybridSleep(bool *result); + + char *virSystemdGetMachineNameByPID(pid_t pid); + ++char *virSystemdGetMachineUnitByPID(pid_t pid); ++ + int virSystemdGetActivation(virSystemdActivationMap *map, + size_t nmap, + virSystemdActivationPtr *act); +diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c +index eb510b40e4..475bf8debc 100644 +--- a/tests/virsystemdtest.c ++++ b/tests/virsystemdtest.c +@@ -69,19 +69,42 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, + &object_path)) + goto error; + } else if (STREQ(member, "Get")) { +- const char *name = "qemu-demo"; ++ const char *name = NULL; ++ char *iface = NULL; ++ char *prop = NULL; + DBusMessageIter iter; + DBusMessageIter sub; + +- dbus_message_iter_init_append(reply, &iter); +- dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, +- "s", &sub); +- +- if (!dbus_message_iter_append_basic(&sub, +- DBUS_TYPE_STRING, +- &name)) ++ if (virDBusMessageDecode(message, "ss", &iface, &prop) < 0) + goto error; +- dbus_message_iter_close_container(&iter, &sub); ++ ++ VIR_FREE(iface); ++ ++ if (STREQ(prop, "Name")) { ++ name = "qemu-demo"; ++ } else if (STREQ(prop, "Unit")) { ++ name = "machine-qemu-demo.scope"; ++ } else { ++ dbus_set_error_const(error, ++ "org.freedesktop.systemd.badthing", ++ "Unknown machine property"); ++ } ++ ++ VIR_FREE(prop); ++ ++ if (name) { ++ dbus_message_iter_init_append(reply, &iter); ++ ++ dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, ++ "s", &sub); ++ ++ if (!dbus_message_iter_append_basic(&sub, ++ DBUS_TYPE_STRING, ++ &name)) ++ goto error; ++ ++ dbus_message_iter_close_container(&iter, &sub); ++ } + } + } + } else if (STREQ(service, "org.freedesktop.login1")) { +@@ -376,6 +399,23 @@ testGetMachineName(const void *opaque G_GNUC_UNUSED) + } + + ++static int ++testGetMachineUnit(const void *opaque G_GNUC_UNUSED) ++{ ++ g_autofree char *tmp = virSystemdGetMachineUnitByPID(1234); ++ ++ if (!tmp) { ++ fprintf(stderr, "%s", "Failed to create get machine unit\n"); ++ return -1; ++ } ++ ++ if (STREQ(tmp, "machine-qemu-demo.scope")) ++ return 0; ++ ++ return -1; ++} ++ ++ + struct testNameData { + const char *name; + const char *expected; +@@ -698,6 +738,7 @@ mymain(void) + DO_TEST("Test create bad systemd ", testCreateBadSystemd); + DO_TEST("Test create with network ", testCreateNetwork); + DO_TEST("Test getting machine name ", testGetMachineName); ++ DO_TEST("Test getting machine unit ", testGetMachineUnit); + + # define TEST_SCOPE(_name, unitname, _legacy) \ + do { \ +-- +2.30.0 + diff --git a/SPECS/libvirt.spec b/SPECS/libvirt.spec index 33d7e2b..e3acab3 100644 --- a/SPECS/libvirt.spec +++ b/SPECS/libvirt.spec @@ -219,7 +219,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.0.0 -Release: 29%{?dist}%{?extra_release} +Release: 35%{?dist}%{?extra_release} License: LGPLv2+ URL: https://libvirt.org/ @@ -684,6 +684,76 @@ Patch452: libvirt-node_device-detect-CSS-devices.patch Patch453: libvirt-virsh-nodedev-ability-to-filter-CSS-capabilities.patch Patch454: libvirt-node_device-detect-DASD-devices.patch Patch455: libvirt-udevProcessCSS-Check-if-def-driver-is-non-NULL.patch +Patch456: libvirt-cpu_map-Add-missing-x86-features-in-0x7-CPUID-leaf.patch +Patch457: libvirt-cpu_map-Add-missing-x86-features-in-0x80000008-CPUID-leaf.patch +Patch458: libvirt-cpu_map-Add-missing-AMD-SVM-features.patch +Patch459: libvirt-Add-testdata-for-AMD-EPYC-7502.patch +Patch460: libvirt-cpu_map-Defined-and-enable-EPYC-Rome-model.patch +Patch461: libvirt-cpu_map-Remove-monitor-feature-from-EPYC-Rome.patch +Patch462: libvirt-tests-qemuxml2argv-Use-existing-machine-type-for-numatune-distances-case.patch +Patch463: libvirt-qemuxml2xmltest-Add-numatune-distance-test-case.patch +Patch464: libvirt-conf-Move-and-rename-virDomainParseScaledValue.patch +Patch465: libvirt-numa_conf-Drop-CPU-from-name-of-two-functions.patch +Patch466: libvirt-qemu_command-Rename-qemuBuildNumaArgStr.patch +Patch467: libvirt-qemuBuildMachineCommandLine-Drop-needless-check.patch +Patch468: libvirt-numa_conf-Make-virDomainNumaSetNodeCpumask-return-void.patch +Patch469: libvirt-Allow-NUMA-nodes-without-vCPUs.patch +Patch470: libvirt-conf-Parse-and-format-HMAT.patch +Patch471: libvirt-conf-Validate-NUMA-HMAT-configuration.patch +Patch472: libvirt-numa-expose-HMAT-APIs.patch +Patch473: libvirt-qemu-Introduce-QEMU_CAPS_NUMA_HMAT-capability.patch +Patch474: libvirt-qemu-Build-HMAT-command-line.patch +Patch475: libvirt-qemuBuildNumaCommandLine-Fix-masterInitiator-check.patch +Patch476: libvirt-numa_conf-Properly-check-for-caches-in-virDomainNumaDefValidate.patch +Patch477: libvirt-RNG-Allow-interleaving-of-domain-cpu-numa-cell-children.patch +Patch478: libvirt-conf-properly-clear-out-autogenerated-macvtap-names-when-formatting-parsing.patch +Patch479: libvirt-qemu-format-ramfb-attribute-for-mediated-devices.patch +Patch480: libvirt-util-replace-macvtap-name-reservation-bitmap-with-a-simple-counter.patch +Patch481: libvirt-util-assign-tap-device-names-using-a-monotonically-increasing-integer.patch +Patch482: libvirt-util-virNetDevTapCreate-initialize-fd-to-1.patch +Patch483: libvirt-cpu_map-Fix-Icelake-Server-model-number.patch +Patch484: libvirt-cputestdata-Add-test-data-for-Snowridge.patch +Patch485: libvirt-cpu_map-Add-support-for-fsrm-CPU-feature.patch +Patch486: libvirt-cpu_map-Add-support-for-core-capability-CPU-feature.patch +Patch487: libvirt-cpu_map-Add-support-for-split-lock-detect-CPU-feature.patch +Patch488: libvirt-cpu_map-Define-and-enable-Snowridge-model.patch +Patch489: libvirt-util-fix-typo-in-VIR_MOCK_WRAP_RET_ARGS.patch +Patch490: libvirt-util-tests-enable-locking-on-iptables-ebtables-commandlines-in-unit-tests.patch +Patch491: libvirt-util-tests-enable-locking-on-iptables-ebtables-commandlines-by-default.patch +Patch492: libvirt-tests-fix-iptables-test-case-commandline-options-in-virfirewalltest.c.patch +Patch493: libvirt-network-be-more-verbose-about-the-reason-for-a-firewall-reload.patch +Patch494: libvirt-util-always-check-for-ebtables-iptables-binaries-even-when-using-firewalld.patch +Patch495: libvirt-util-synchronize-with-firewalld-before-we-start-calling-iptables-directly.patch +Patch496: libvirt-util-call-iptables-directly-rather-than-via-firewalld.patch +Patch497: libvirt-util-virhostcpu-Fail-when-fetching-CPU-Stats-for-invalid-cpu.patch +Patch498: libvirt-qemu-move-cgroup-cpu-period-and-quota-defines-to-vircgroup.h.patch +Patch499: libvirt-vircgroupv1-use-defines-for-cpu-period-and-quota-limits.patch +Patch500: libvirt-vircgroupv2-use-defines-for-cpu-period-and-quota-limits.patch +Patch501: libvirt-vircgroup-fix-cpu-quota-maximum-limit.patch +Patch502: libvirt-util-add-virNetDevGetPhysPortName.patch +Patch503: libvirt-util-avoid-manual-VIR_FREE-of-a-g_autofree-pointer-in-virPCIGetName.patch +Patch504: libvirt-util-Add-phys_port_name-support-on-virPCIGetNetName.patch +Patch505: libvirt-vircgroupv2-properly-detect-placement-of-running-VM.patch +Patch506: libvirt-virsystemd-export-virSystemdHasMachined.patch +Patch507: libvirt-virsystemd-introduce-virSystemdGetMachineByPID.patch +Patch508: libvirt-virsystemd-introduce-virSystemdGetMachineUnitByPID.patch +Patch509: libvirt-vircgroup-use-DBus-call-to-systemd-for-some-APIs.patch +Patch510: libvirt-vircgroupv1-refactor-virCgroupV1DetectPlacement.patch +Patch511: libvirt-vircgroupv2-move-task-into-cgroup-before-enabling-controllers.patch +Patch512: libvirt-vircgroup-introduce-virCgroupV1Exists-and-virCgroupV2Exists.patch +Patch513: libvirt-vircgroup-introduce-nested-cgroup-to-properly-work-with-systemd.patch +Patch514: libvirt-tests-add-cgroup-nested-tests.patch +Patch515: libvirt-vircgroup-correctly-free-nested-virCgroupPtr.patch +Patch516: libvirt-qemu-Add-virtio-related-options-to-vsock.patch +Patch517: libvirt-domain_validate-use-defines-for-cpu-period-and-quota-limits.patch +Patch518: libvirt-docs-use-proper-cpu-quota-value-in-our-documentation.patch +Patch519: libvirt-vircgroup-enforce-range-limit-for-cpu.shares.patch +Patch520: libvirt-cgroup-use-virCgroupSetCpuShares-instead-of-virCgroupSetupCpuShares.patch +Patch521: libvirt-cpumap-Add-support-for-ibrs-CPU-feature.patch +Patch522: libvirt-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch +Patch523: libvirt-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch +Patch524: libvirt-cpu_map-Install-x86_EPYC-Milan.xml.patch +Patch525: libvirt-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2460,6 +2530,88 @@ exit 0 %changelog +* Thu Mar 4 2021 Jiri Denemark - 6.0.0-35 +- vircgroupv2: properly detect placement of running VM (rhbz#1798463) +- virsystemd: export virSystemdHasMachined (rhbz#1798463) +- virsystemd: introduce virSystemdGetMachineByPID (rhbz#1798463) +- virsystemd: introduce virSystemdGetMachineUnitByPID (rhbz#1798463) +- vircgroup: use DBus call to systemd for some APIs (rhbz#1798463) +- vircgroupv1: refactor virCgroupV1DetectPlacement (rhbz#1798463) +- vircgroupv2: move task into cgroup before enabling controllers (rhbz#1798463) +- vircgroup: introduce virCgroupV1Exists and virCgroupV2Exists (rhbz#1798463) +- vircgroup: introduce nested cgroup to properly work with systemd (rhbz#1798463) +- tests: add cgroup nested tests (rhbz#1798463) +- vircgroup: correctly free nested virCgroupPtr (rhbz#1798463) +- qemu: Add virtio related options to vsock (rhbz#1931548) +- domain_validate: use defines for cpu period and quota limits (rhbz#1798463) +- docs: use proper cpu quota value in our documentation (rhbz#1798463) +- vircgroup: enforce range limit for cpu.shares (rhbz#1798463) +- cgroup: use virCgroupSetCpuShares instead of virCgroupSetupCpuShares (rhbz#1798463) +- cpumap: Add support for ibrs CPU feature (rhbz#1926864) +- cpumap: Add support for svme-addr-check CPU feature (rhbz#1926864) +- cpu_map: Add EPYC-Milan x86 CPU model (rhbz#1926864) +- cpu_map: Install x86_EPYC-Milan.xml (rhbz#1926864) +- cpu_map: Fix spelling of svme-addr-chk feature (rhbz#1926864) + +* Mon Feb 1 2021 Jiri Denemark - 6.0.0-34 +- qemu: move cgroup cpu period and quota defines to vircgroup.h (rhbz#1915733) +- vircgroupv1: use defines for cpu period and quota limits (rhbz#1915733) +- vircgroupv2: use defines for cpu period and quota limits (rhbz#1915733) +- vircgroup: fix cpu quota maximum limit (rhbz#1915733) +- util: add virNetDevGetPhysPortName (rhbz#1918708) +- util: avoid manual VIR_FREE of a g_autofree pointer in virPCIGetName() (rhbz#1918708) +- util: Add phys_port_name support on virPCIGetNetName (rhbz#1918708) + +* Thu Jan 21 2021 Jiri Denemark - 6.0.0-33 +- cpu_map: Fix Icelake Server model number (rhbz#1537734) +- cputestdata: Add test data for Snowridge (rhbz#1537734) +- cpu_map: Add support for fsrm CPU feature (rhbz#1537734) +- cpu_map: Add support for core-capability CPU feature (rhbz#1537734) +- cpu_map: Add support for split-lock-detect CPU feature (rhbz#1537734) +- cpu_map: Define and enable Snowridge model (rhbz#1537734) +- util: fix typo in VIR_MOCK_WRAP_RET_ARGS() (rhbz#1607929) +- util/tests: enable locking on iptables/ebtables commandlines in unit tests (rhbz#1607929) +- util/tests: enable locking on iptables/ebtables commandlines by default (rhbz#1607929) +- tests: fix iptables test case commandline options in virfirewalltest.c (rhbz#1607929) +- network: be more verbose about the reason for a firewall reload (rhbz#1607929) +- util: always check for ebtables/iptables binaries, even when using firewalld (rhbz#1607929) +- util: synchronize with firewalld before we start calling iptables directly (rhbz#1607929) +- util: call iptables directly rather than via firewalld (rhbz#1607929) +- util: virhostcpu: Fail when fetching CPU Stats for invalid cpu (rhbz#1915183) + +* Tue Dec 15 2020 Jiri Denemark - 6.0.0-32 +- util: replace macvtap name reservation bitmap with a simple counter (rhbz#1874304) +- util: assign tap device names using a monotonically increasing integer (rhbz#1874304) +- util: virNetDevTapCreate: initialize fd to -1 (rhbz#1874304) + +* Thu Dec 10 2020 Jiri Denemark - 6.0.0-31 +- conf: properly clear out autogenerated macvtap names when formatting/parsing (rhbz#1872610) +- qemu: format 'ramfb' attribute for mediated devices (rhbz#1876297) + +* Mon Nov 9 2020 Jiri Denemark - 6.0.0-30 +- cpu_map: Add missing x86 features in 0x7 CPUID leaf (rhbz#1861506) +- cpu_map: Add missing x86 features in 0x80000008 CPUID leaf (rhbz#1861506) +- cpu_map: Add missing AMD SVM features (rhbz#1861506) +- Add testdata for AMD EPYC 7502 (rhbz#1861506) +- cpu_map: Defined and enable EPYC-Rome model (rhbz#1861506) +- cpu_map: Remove monitor feature from EPYC-Rome (rhbz#1861506) +- tests: qemuxml2argv: Use existing machine type for 'numatune-distances' case (rhbz#1749518) +- qemuxml2xmltest: Add "numatune-distance" test case (rhbz#1749518) +- conf: Move and rename virDomainParseScaledValue() (rhbz#1749518) +- numa_conf: Drop CPU from name of two functions (rhbz#1749518) +- qemu_command: Rename qemuBuildNumaArgStr() (rhbz#1749518) +- qemuBuildMachineCommandLine: Drop needless check (rhbz#1749518) +- numa_conf: Make virDomainNumaSetNodeCpumask() return void (rhbz#1749518) +- Allow NUMA nodes without vCPUs (rhbz#1749518) +- conf: Parse and format HMAT (rhbz#1749518) +- conf: Validate NUMA HMAT configuration (rhbz#1749518) +- numa: expose HMAT APIs (rhbz#1749518) +- qemu: Introduce QEMU_CAPS_NUMA_HMAT capability (rhbz#1749518) +- qemu: Build HMAT command line (rhbz#1749518) +- qemuBuildNumaCommandLine: Fix @masterInitiator check (rhbz#1749518) +- numa_conf: Properly check for caches in virDomainNumaDefValidate() (rhbz#1749518) +- RNG: Allow interleaving of /domain/cpu/numa/cell children (rhbz#1749518) + * Fri Oct 9 2020 Jiri Denemark - 6.0.0-29 - qemu: substitute missing model name for host-passthrough (rhbz#1850680) - rpc: gendispatch: handle empty flags (CVE-2020-25637)