]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
cpu_map: Add missing vmx features from MSR 0x491
authorTim Wiederhake <twiederh@redhat.com>
Thu, 9 Nov 2023 13:42:10 +0000 (14:42 +0100)
committerTim Wiederhake <twiederh@redhat.com>
Fri, 24 Nov 2023 09:47:05 +0000 (10:47 +0100)
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
16 files changed:
src/cpu_map/x86_features.xml
tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
tests/domaincapsdata/qemu_4.2.0.x86_64.xml
tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
tests/domaincapsdata/qemu_5.0.0.x86_64.xml
tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-4.2.0.args
tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.0.0.args

index 6769ef1cca4f949a70225b97346c5d28ff501324..b79ed579b25d663dce518f71f49e94a48fae30da 100644 (file)
   <feature name='vmx-entry-load-pkrs'>
     <msr index='0x490' edx='0x00000000' eax='0x00400000'/>
   </feature>
+
+  <feature name='vmx-eptp-switching'>
+    <msr index='0x491' edx='0x00000000' eax='0x00000001'/>
+  </feature>
 </cpus>
index d957d2a1558c9802420b2a009ddba083fb478fa6..80c24facdf2ea736097736b720f309eed456515a 100644 (file)
@@ -15,4 +15,5 @@
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
   <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+  <msr index='0x491' edx='0x00000000' eax='0x00000001'/>
 </cpudata>
index b867dbd44987f539cbb3f280e1b70b48eb189f0b..ff7ac5b391734d7c2cb65e77b35547cd036e1631 100644 (file)
@@ -87,6 +87,7 @@
   <feature policy='require' name='vmx-entry-ia32e-mode'/>
   <feature policy='require' name='vmx-entry-load-pat'/>
   <feature policy='require' name='vmx-entry-load-efer'/>
+  <feature policy='require' name='vmx-eptp-switching'/>
   <feature policy='disable' name='mpx'/>
   <feature policy='disable' name='core-capability'/>
   <feature policy='disable' name='pdpe1gb'/>
index 3ca004ac7d0c4a7d6adb2736a02df8162ee1f89d..c42a69d102faa1bae843f820019e5ad256d14097 100644 (file)
@@ -16,4 +16,5 @@
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
   <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+  <msr index='0x491' edx='0x00000000' eax='0x00000001'/>
 </cpudata>
index 2fcca6a12e8d7b0e09f6f2f90f1901ddeade5423..9dbb92e74fe1030252182898c3a998050afdba20 100644 (file)
@@ -83,4 +83,5 @@
   <feature policy='require' name='vmx-entry-ia32e-mode'/>
   <feature policy='require' name='vmx-entry-load-pat'/>
   <feature policy='require' name='vmx-entry-load-efer'/>
+  <feature policy='require' name='vmx-eptp-switching'/>
 </cpu>
index a1b9fc286c696a504adfe6d33e8887b4bbb96c4a..19dd4f6f0c174e3639ac451f793ae5ba724fa6b6 100644 (file)
@@ -14,4 +14,5 @@
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
   <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+  <msr index='0x491' edx='0x00000000' eax='0x00000001'/>
 </cpudata>
index 4b4dcd5e703704cdbf0a0f991a7bc3854af987e6..e933265248dc8ebd1c74ae6a68f848918018bf5b 100644 (file)
@@ -82,6 +82,7 @@
   <feature policy='require' name='vmx-entry-ia32e-mode'/>
   <feature policy='require' name='vmx-entry-load-pat'/>
   <feature policy='require' name='vmx-entry-load-efer'/>
+  <feature policy='require' name='vmx-eptp-switching'/>
   <feature policy='disable' name='hle'/>
   <feature policy='disable' name='rtm'/>
 </cpu>
index 3f49dfb594e980b3e4af73e02ffe8d8d861fb517..b830c52b8ccabaf7c4fe6eb6d5f7d1c2aa627434 100644 (file)
@@ -15,4 +15,5 @@
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
   <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+  <msr index='0x491' edx='0x00000000' eax='0x00000001'/>
 </cpudata>
index 935efce2d8a13e5e3b2a5024a0d517e88eca645e..ac0e52076723afed6bc9213ad4a8fca328b45d2c 100644 (file)
@@ -89,4 +89,5 @@
   <feature policy='require' name='vmx-entry-ia32e-mode'/>
   <feature policy='require' name='vmx-entry-load-pat'/>
   <feature policy='require' name='vmx-entry-load-efer'/>
+  <feature policy='require' name='vmx-eptp-switching'/>
 </cpu>
index 53d3d4209ae5273b4b319ed82ae63b8a3e525a93..f9e9c476b5857f884e460cf0d463d5ba18662cd3 100644 (file)
@@ -89,4 +89,5 @@
   <feature policy='require' name='vmx-entry-ia32e-mode'/>
   <feature policy='require' name='vmx-entry-load-pat'/>
   <feature policy='require' name='vmx-entry-load-efer'/>
+  <feature policy='require' name='vmx-eptp-switching'/>
 </cpu>
index f272b33bb4fc33393878f4098fc9d1327c5d5557..152f201ff97928d68cb1beb6374272fe042337af 100644 (file)
       <feature policy='require' name='vmx-entry-ia32e-mode'/>
       <feature policy='require' name='vmx-entry-load-pat'/>
       <feature policy='require' name='vmx-entry-load-efer'/>
+      <feature policy='require' name='vmx-eptp-switching'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index 41d51812222c1e92cf9c4ae640b78d06d8b90467..8b7cf44d6d7c5e805c5f091d47ef4fe9f854aa5d 100644 (file)
       <feature policy='require' name='vmx-entry-ia32e-mode'/>
       <feature policy='require' name='vmx-entry-load-pat'/>
       <feature policy='require' name='vmx-entry-load-efer'/>
+      <feature policy='require' name='vmx-eptp-switching'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index 317b7ff1f7abdadb1c46d65f570d402873c43d04..1d29a40f74c5edebe086acfe1a7705073c2178fd 100644 (file)
       <feature policy='require' name='vmx-entry-ia32e-mode'/>
       <feature policy='require' name='vmx-entry-load-pat'/>
       <feature policy='require' name='vmx-entry-load-efer'/>
+      <feature policy='require' name='vmx-eptp-switching'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index 90cb0ce36c450568005cb02b1da2441f6fb122d7..f3b3adb19e0feddaceb1d5877cbf7684339faf2f 100644 (file)
       <feature policy='require' name='vmx-entry-ia32e-mode'/>
       <feature policy='require' name='vmx-entry-load-pat'/>
       <feature policy='require' name='vmx-entry-load-efer'/>
+      <feature policy='require' name='vmx-eptp-switching'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index 0658650d822a7d1c137918174f3dad1a40ebf8bd..aacba803e8df24fe8056af2d99dcba78c91b61f8 100644 (file)
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-4.2,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on \
+-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
index a5013ed2f9b295c158d26abb5988160dee258d03..a2415bb667b26cbac5b88ee03825988c7c4198a2 100644 (file)
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.0,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on \
+-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \