]> xenbits.xensource.com Git - libvirt.git/commitdiff
cpu_map: Add missing vmx features from MSR 0x48F
authorTim Wiederhake <twiederh@redhat.com>
Thu, 9 Nov 2023 13:39:59 +0000 (14:39 +0100)
committerTim Wiederhake <twiederh@redhat.com>
Fri, 24 Nov 2023 09:47:00 +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 2583f1c8252d9904da8c41654ca6a06317ea5379..396f0819741fbef5d201e50261537a9048070c7b 100644 (file)
   <feature name='vmx-secondary-ctls'>
     <msr index='0x48e' edx='0x00000000' eax='0x80000000'/>
   </feature>
+
+  <feature name='vmx-exit-nosave-debugctl'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00000004'/>
+  </feature>
+  <feature name='vmx-exit-load-perf-global-ctrl'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00001000'/>
+  </feature>
+  <feature name='vmx-exit-ack-intr'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00008000'/>
+  </feature>
+  <feature name='vmx-exit-save-pat'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00040000'/>
+  </feature>
+  <feature name='vmx-exit-load-pat'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00080000'/>
+  </feature>
+  <feature name='vmx-exit-save-efer'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00100000'/>
+  </feature>
+  <feature name='vmx-exit-load-efer'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00200000'/>
+  </feature>
+  <feature name='vmx-exit-save-preemption-timer'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00400000'/>
+  </feature>
+  <feature name='vmx-exit-clear-bndcfgs'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00800000'/>
+  </feature>
+  <feature name='vmx-exit-clear-rtit-ctl'>
+    <msr index='0x48f' edx='0x00000000' eax='0x02000000'/>
+  </feature>
+  <feature name='vmx-exit-load-pkrs'>
+    <msr index='0x48f' edx='0x00000000' eax='0x20000000'/>
+  </feature>
 </cpus>
index b8dc58f048d4455e7b7904efc85c2f5e012dd7dc..f0118636a1be7e8c328372cb037fedb119c8f3c4 100644 (file)
@@ -13,4 +13,5 @@
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
+  <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
 </cpudata>
index 9c115e2bfcc9055f50fed0dea33fa5fa3ee0fdd2..11c0861f7731f18d7d929a9e836d3f917f33be24 100644 (file)
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <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='disable' name='mpx'/>
   <feature policy='disable' name='core-capability'/>
   <feature policy='disable' name='pdpe1gb'/>
index c1dc3191ae0d0cf167b298ab3a5e1c2cd06cd605..11a028e719a8524be36ee378be38aa330cb2615c 100644 (file)
@@ -14,4 +14,5 @@
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
+  <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
 </cpudata>
index da24c5f06ea263de40bc39a927653c39040ca485..3e605edf383bc920bed9f1c2eea94f77652f0355 100644 (file)
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <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'/>
 </cpu>
index e37e437d378e100736aa1c658bd1c8b36f407903..3e0f72a10973efb09b551bb5ac7384c1e5fdfe76 100644 (file)
@@ -12,4 +12,5 @@
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x00000069'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
+  <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
 </cpudata>
index 247dbaa4cd293be4bc7ec3b9e59a8f5862dc9a0a..763587169ec5c687d192a5d4a2c6882163487e31 100644 (file)
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <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='disable' name='hle'/>
   <feature policy='disable' name='rtm'/>
 </cpu>
index 52763c7ddb240c33def78b3b938c01242db9ace2..44aec843bf53755545b0080eacd462916a721d3e 100644 (file)
@@ -13,4 +13,5 @@
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
+  <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
 </cpudata>
index f38ff7de22ca23e5f829babc12ff5aa4353af685..763c99b009e48541bacc610ca677bcd83a427357 100644 (file)
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <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'/>
 </cpu>
index 66327d5abbccb439648e9ab547603b31a76bc95d..1949f2e49671beda81e55fd87f5fb6da77919677 100644 (file)
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <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'/>
 </cpu>
index 713ecbcb0825065072a9e0c1079ac28b524f73e8..6d99e9c0765516567330fc18a1512ef60281aadd 100644 (file)
       <feature policy='require' name='vmx-monitor-exit'/>
       <feature policy='require' name='vmx-pause-exit'/>
       <feature policy='require' name='vmx-secondary-ctls'/>
+      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+      <feature policy='require' name='vmx-exit-ack-intr'/>
+      <feature policy='require' name='vmx-exit-save-pat'/>
+      <feature policy='require' name='vmx-exit-load-pat'/>
+      <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'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index 0aef295df2c8d4724f546cb9e22a685e1cd3c70a..5d48e3d573ca9c6004dd2b88f38746548840ecd0 100644 (file)
       <feature policy='require' name='vmx-monitor-exit'/>
       <feature policy='require' name='vmx-pause-exit'/>
       <feature policy='require' name='vmx-secondary-ctls'/>
+      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+      <feature policy='require' name='vmx-exit-ack-intr'/>
+      <feature policy='require' name='vmx-exit-save-pat'/>
+      <feature policy='require' name='vmx-exit-load-pat'/>
+      <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'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index e3dd4a82d02dd6e1de0ad95f9083063911d0de2b..1424d5832f76e0a27af05714f0b908f244e8877c 100644 (file)
       <feature policy='require' name='vmx-monitor-exit'/>
       <feature policy='require' name='vmx-pause-exit'/>
       <feature policy='require' name='vmx-secondary-ctls'/>
+      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+      <feature policy='require' name='vmx-exit-ack-intr'/>
+      <feature policy='require' name='vmx-exit-save-pat'/>
+      <feature policy='require' name='vmx-exit-load-pat'/>
+      <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'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index 54edcf46322e5ffb4a0a69d55780a91ead91de24..ab7aac730443b605fd0d4a925fc4509cd0cf98f3 100644 (file)
       <feature policy='require' name='vmx-monitor-exit'/>
       <feature policy='require' name='vmx-pause-exit'/>
       <feature policy='require' name='vmx-secondary-ctls'/>
+      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+      <feature policy='require' name='vmx-exit-ack-intr'/>
+      <feature policy='require' name='vmx-exit-save-pat'/>
+      <feature policy='require' name='vmx-exit-load-pat'/>
+      <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'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
index d7d30c733cbd3da27eb27e34f3be426f9e7d0ead..0bfcf26b346760bf7896caade3a4573eb8b7fa50 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 \
+-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 \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
index 707749596f916612cd569b61f23b75cd7eeca733..bae9a211f3389dabcf06b6f8be6e1431b87ca1e3 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 \
+-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 \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \