]> xenbits.xensource.com Git - libvirt.git/commitdiff
cpu_map: Add missing vmx features from MSR 0x490
authorTim Wiederhake <twiederh@redhat.com>
Thu, 9 Nov 2023 13:41:35 +0000 (14:41 +0100)
committerTim Wiederhake <twiederh@redhat.com>
Fri, 24 Nov 2023 09:47:02 +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 396f0819741fbef5d201e50261537a9048070c7b..6769ef1cca4f949a70225b97346c5d28ff501324 100644 (file)
   <feature name='vmx-exit-load-pkrs'>
     <msr index='0x48f' edx='0x00000000' eax='0x20000000'/>
   </feature>
+
+  <feature name='vmx-entry-noload-debugctl'>
+    <msr index='0x490' edx='0x00000000' eax='0x00000004'/>
+  </feature>
+  <feature name='vmx-entry-ia32e-mode'>
+    <msr index='0x490' edx='0x00000000' eax='0x00000200'/>
+  </feature>
+  <feature name='vmx-entry-load-perf-global-ctrl'>
+    <msr index='0x490' edx='0x00000000' eax='0x00002000'/>
+  </feature>
+  <feature name='vmx-entry-load-pat'>
+    <msr index='0x490' edx='0x00000000' eax='0x00004000'/>
+  </feature>
+  <feature name='vmx-entry-load-efer'>
+    <msr index='0x490' edx='0x00000000' eax='0x00008000'/>
+  </feature>
+  <feature name='vmx-entry-load-bndcfgs'>
+    <msr index='0x490' edx='0x00000000' eax='0x00010000'/>
+  </feature>
+  <feature name='vmx-entry-load-rtit-ctl'>
+    <msr index='0x490' edx='0x00000000' eax='0x00040000'/>
+  </feature>
+  <feature name='vmx-entry-load-pkrs'>
+    <msr index='0x490' edx='0x00000000' eax='0x00400000'/>
+  </feature>
 </cpus>
index f0118636a1be7e8c328372cb037fedb119c8f3c4..d957d2a1558c9802420b2a009ddba083fb478fa6 100644 (file)
@@ -14,4 +14,5 @@
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
+  <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
 </cpudata>
index 11c0861f7731f18d7d929a9e836d3f917f33be24..b867dbd44987f539cbb3f280e1b70b48eb189f0b 100644 (file)
   <feature policy='require' name='vmx-exit-save-efer'/>
   <feature policy='require' name='vmx-exit-load-efer'/>
   <feature policy='require' name='vmx-exit-save-preemption-timer'/>
+  <feature policy='require' name='vmx-entry-noload-debugctl'/>
+  <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='disable' name='mpx'/>
   <feature policy='disable' name='core-capability'/>
   <feature policy='disable' name='pdpe1gb'/>
index 11a028e719a8524be36ee378be38aa330cb2615c..3ca004ac7d0c4a7d6adb2736a02df8162ee1f89d 100644 (file)
@@ -15,4 +15,5 @@
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
+  <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
 </cpudata>
index 3e605edf383bc920bed9f1c2eea94f77652f0355..2fcca6a12e8d7b0e09f6f2f90f1901ddeade5423 100644 (file)
@@ -79,4 +79,8 @@
   <feature policy='require' name='vmx-exit-save-efer'/>
   <feature policy='require' name='vmx-exit-load-efer'/>
   <feature policy='require' name='vmx-exit-save-preemption-timer'/>
+  <feature policy='require' name='vmx-entry-noload-debugctl'/>
+  <feature policy='require' name='vmx-entry-ia32e-mode'/>
+  <feature policy='require' name='vmx-entry-load-pat'/>
+  <feature policy='require' name='vmx-entry-load-efer'/>
 </cpu>
index 3e0f72a10973efb09b551bb5ac7384c1e5fdfe76..a1b9fc286c696a504adfe6d33e8887b4bbb96c4a 100644 (file)
@@ -13,4 +13,5 @@
   <msr index='0x48d' edx='0x00000000' eax='0x00000069'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
+  <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
 </cpudata>
index 763587169ec5c687d192a5d4a2c6882163487e31..4b4dcd5e703704cdbf0a0f991a7bc3854af987e6 100644 (file)
   <feature policy='require' name='vmx-exit-save-efer'/>
   <feature policy='require' name='vmx-exit-load-efer'/>
   <feature policy='require' name='vmx-exit-save-preemption-timer'/>
+  <feature policy='require' name='vmx-entry-noload-debugctl'/>
+  <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='disable' name='hle'/>
   <feature policy='disable' name='rtm'/>
 </cpu>
index 44aec843bf53755545b0080eacd462916a721d3e..3f49dfb594e980b3e4af73e02ffe8d8d861fb517 100644 (file)
@@ -14,4 +14,5 @@
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
+  <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
 </cpudata>
index 763c99b009e48541bacc610ca677bcd83a427357..935efce2d8a13e5e3b2a5024a0d517e88eca645e 100644 (file)
@@ -85,4 +85,8 @@
   <feature policy='require' name='vmx-exit-save-efer'/>
   <feature policy='require' name='vmx-exit-load-efer'/>
   <feature policy='require' name='vmx-exit-save-preemption-timer'/>
+  <feature policy='require' name='vmx-entry-noload-debugctl'/>
+  <feature policy='require' name='vmx-entry-ia32e-mode'/>
+  <feature policy='require' name='vmx-entry-load-pat'/>
+  <feature policy='require' name='vmx-entry-load-efer'/>
 </cpu>
index 1949f2e49671beda81e55fd87f5fb6da77919677..53d3d4209ae5273b4b319ed82ae63b8a3e525a93 100644 (file)
@@ -85,4 +85,8 @@
   <feature policy='require' name='vmx-exit-save-efer'/>
   <feature policy='require' name='vmx-exit-load-efer'/>
   <feature policy='require' name='vmx-exit-save-preemption-timer'/>
+  <feature policy='require' name='vmx-entry-noload-debugctl'/>
+  <feature policy='require' name='vmx-entry-ia32e-mode'/>
+  <feature policy='require' name='vmx-entry-load-pat'/>
+  <feature policy='require' name='vmx-entry-load-efer'/>
 </cpu>
index 6d99e9c0765516567330fc18a1512ef60281aadd..f272b33bb4fc33393878f4098fc9d1327c5d5557 100644 (file)
       <feature policy='require' name='vmx-exit-save-efer'/>
       <feature policy='require' name='vmx-exit-load-efer'/>
       <feature policy='require' name='vmx-exit-save-preemption-timer'/>
+      <feature policy='require' name='vmx-entry-noload-debugctl'/>
+      <feature policy='require' name='vmx-entry-ia32e-mode'/>
+      <feature policy='require' name='vmx-entry-load-pat'/>
+      <feature policy='require' name='vmx-entry-load-efer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index 5d48e3d573ca9c6004dd2b88f38746548840ecd0..41d51812222c1e92cf9c4ae640b78d06d8b90467 100644 (file)
       <feature policy='require' name='vmx-exit-save-efer'/>
       <feature policy='require' name='vmx-exit-load-efer'/>
       <feature policy='require' name='vmx-exit-save-preemption-timer'/>
+      <feature policy='require' name='vmx-entry-noload-debugctl'/>
+      <feature policy='require' name='vmx-entry-ia32e-mode'/>
+      <feature policy='require' name='vmx-entry-load-pat'/>
+      <feature policy='require' name='vmx-entry-load-efer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index 1424d5832f76e0a27af05714f0b908f244e8877c..317b7ff1f7abdadb1c46d65f570d402873c43d04 100644 (file)
       <feature policy='require' name='vmx-exit-save-efer'/>
       <feature policy='require' name='vmx-exit-load-efer'/>
       <feature policy='require' name='vmx-exit-save-preemption-timer'/>
+      <feature policy='require' name='vmx-entry-noload-debugctl'/>
+      <feature policy='require' name='vmx-entry-ia32e-mode'/>
+      <feature policy='require' name='vmx-entry-load-pat'/>
+      <feature policy='require' name='vmx-entry-load-efer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index ab7aac730443b605fd0d4a925fc4509cd0cf98f3..90cb0ce36c450568005cb02b1da2441f6fb122d7 100644 (file)
       <feature policy='require' name='vmx-exit-save-efer'/>
       <feature policy='require' name='vmx-exit-load-efer'/>
       <feature policy='require' name='vmx-exit-save-preemption-timer'/>
+      <feature policy='require' name='vmx-entry-noload-debugctl'/>
+      <feature policy='require' name='vmx-entry-ia32e-mode'/>
+      <feature policy='require' name='vmx-entry-load-pat'/>
+      <feature policy='require' name='vmx-entry-load-efer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index 0bfcf26b346760bf7896caade3a4573eb8b7fa50..0658650d822a7d1c137918174f3dad1a40ebf8bd 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 \
+-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 \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
index bae9a211f3389dabcf06b6f8be6e1431b87ca1e3..a5013ed2f9b295c158d26abb5988160dee258d03 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 \
+-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 \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \