cpu_map: Add missing vmx features from MSR 0x491

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Tim Wiederhake 2023-11-09 14:42:10 +01:00
parent a155693a40
commit 6562669388
16 changed files with 19 additions and 2 deletions

View File

@ -1071,4 +1071,8 @@
<feature name='vmx-entry-load-pkrs'> <feature name='vmx-entry-load-pkrs'>
<msr index='0x490' edx='0x00000000' eax='0x00400000'/> <msr index='0x490' edx='0x00000000' eax='0x00400000'/>
</feature> </feature>
<feature name='vmx-eptp-switching'>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</feature>
</cpus> </cpus>

View File

@ -15,4 +15,5 @@
<msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
<msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
<msr index='0x490' edx='0x00000000' eax='0x0000c204'/> <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata> </cpudata>

View File

@ -87,6 +87,7 @@
<feature policy='require' name='vmx-entry-ia32e-mode'/> <feature policy='require' name='vmx-entry-ia32e-mode'/>
<feature policy='require' name='vmx-entry-load-pat'/> <feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/> <feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
<feature policy='disable' name='mpx'/> <feature policy='disable' name='mpx'/>
<feature policy='disable' name='core-capability'/> <feature policy='disable' name='core-capability'/>
<feature policy='disable' name='pdpe1gb'/> <feature policy='disable' name='pdpe1gb'/>

View File

@ -16,4 +16,5 @@
<msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
<msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
<msr index='0x490' edx='0x00000000' eax='0x0000c204'/> <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata> </cpudata>

View File

@ -83,4 +83,5 @@
<feature policy='require' name='vmx-entry-ia32e-mode'/> <feature policy='require' name='vmx-entry-ia32e-mode'/>
<feature policy='require' name='vmx-entry-load-pat'/> <feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/> <feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
</cpu> </cpu>

View File

@ -14,4 +14,5 @@
<msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
<msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
<msr index='0x490' edx='0x00000000' eax='0x0000c204'/> <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata> </cpudata>

View File

@ -82,6 +82,7 @@
<feature policy='require' name='vmx-entry-ia32e-mode'/> <feature policy='require' name='vmx-entry-ia32e-mode'/>
<feature policy='require' name='vmx-entry-load-pat'/> <feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/> <feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
<feature policy='disable' name='hle'/> <feature policy='disable' name='hle'/>
<feature policy='disable' name='rtm'/> <feature policy='disable' name='rtm'/>
</cpu> </cpu>

View File

@ -15,4 +15,5 @@
<msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
<msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
<msr index='0x490' edx='0x00000000' eax='0x0000c204'/> <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata> </cpudata>

View File

@ -89,4 +89,5 @@
<feature policy='require' name='vmx-entry-ia32e-mode'/> <feature policy='require' name='vmx-entry-ia32e-mode'/>
<feature policy='require' name='vmx-entry-load-pat'/> <feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/> <feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
</cpu> </cpu>

View File

@ -89,4 +89,5 @@
<feature policy='require' name='vmx-entry-ia32e-mode'/> <feature policy='require' name='vmx-entry-ia32e-mode'/>
<feature policy='require' name='vmx-entry-load-pat'/> <feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/> <feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
</cpu> </cpu>

View File

@ -126,6 +126,7 @@
<feature policy='require' name='vmx-entry-ia32e-mode'/> <feature policy='require' name='vmx-entry-ia32e-mode'/>
<feature policy='require' name='vmx-entry-load-pat'/> <feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/> <feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
</mode> </mode>
<mode name='custom' supported='yes'> <mode name='custom' supported='yes'>
<model usable='yes' vendor='unknown'>qemu64</model> <model usable='yes' vendor='unknown'>qemu64</model>

View File

@ -125,6 +125,7 @@
<feature policy='require' name='vmx-entry-ia32e-mode'/> <feature policy='require' name='vmx-entry-ia32e-mode'/>
<feature policy='require' name='vmx-entry-load-pat'/> <feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/> <feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
</mode> </mode>
<mode name='custom' supported='yes'> <mode name='custom' supported='yes'>
<model usable='yes' vendor='unknown'>qemu64</model> <model usable='yes' vendor='unknown'>qemu64</model>

View File

@ -126,6 +126,7 @@
<feature policy='require' name='vmx-entry-ia32e-mode'/> <feature policy='require' name='vmx-entry-ia32e-mode'/>
<feature policy='require' name='vmx-entry-load-pat'/> <feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/> <feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
</mode> </mode>
<mode name='custom' supported='yes'> <mode name='custom' supported='yes'>
<model usable='yes' vendor='unknown'>qemu64</model> <model usable='yes' vendor='unknown'>qemu64</model>

View File

@ -125,6 +125,7 @@
<feature policy='require' name='vmx-entry-ia32e-mode'/> <feature policy='require' name='vmx-entry-ia32e-mode'/>
<feature policy='require' name='vmx-entry-load-pat'/> <feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/> <feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
</mode> </mode>
<mode name='custom' supported='yes'> <mode name='custom' supported='yes'>
<model usable='yes' vendor='unknown'>qemu64</model> <model usable='yes' vendor='unknown'>qemu64</model>

View 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 \ -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 \ -machine pc-q35-4.2,usb=off,dump-guest-core=off \
-accel kvm \ -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 \ -m size=219136k \
-overcommit mem-lock=off \ -overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

View 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 \ -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 \ -machine pc-q35-5.0,usb=off,dump-guest-core=off \
-accel kvm \ -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 \ -m size=219136k \
-overcommit mem-lock=off \ -overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \