target/i386: Return right size value after dynamic xfeature enabled
PATCH 1/1 target/i386: Return right size value after dynamic xfeature enabled
The kvm_arch_get_supported_cpuid() only call KVM_GET_SUPPORTED_CPUID one time, so the cpuid buffer information still keep older value. Once Qemu enable new dynamic xfeature, like XTILEDATA, the cpuid[0D,0].{EBX,ECX} still return older value.
This patch can return right size value in kvm_init_xsave() if XTILEDATA has been enabled by arch_prctl.
assert(kvm_arch_get_supported_cpuid(kvm_state, 0xd, 0, R_ECX) <=
env->xsave_buf_len);
--- target/i386/cpu.h | 3 +++ target/i386/kvm/kvm.c | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)
target/i386/cpu.h +3 -0
@@ -565,6 +565,9 @@ typedef enum X86Seg {#define ESA_FEATURE_ALIGN64_MASK (1U << ESA_FEATURE_ALIGN64_BIT)#define ESA_FEATURE_XFD_MASK (1U << ESA_FEATURE_XFD_BIT) +#define ARCH_GET_XCOMP_GUEST_PERM 0x1024 +#define ARCH_REQ_XCOMP_GUEST_PERM 0x1025 +/* CPUID feature words */ typedef enum FeatureWord {
target/i386/kvm/kvm.c +13 -2
@@ -46,6 +46,7 @@#include "hw/i386/intel_iommu.h" #include "hw/i386/x86-iommu.h" #include "hw/i386/e820_memory_layout.h" +#include "target/i386/cpu.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h"
@@ -437,6 +438,18 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,return ret; } ret = (reg ==R_EAX ) ? bitmask : bitmask >>32 ; + }else if (function ==0xd && index ==0 && + (reg ==R_EBX || reg ==R_ECX )) { +/* +* The value returned by KVM_GET_SUPPORTED_CPUID does not include +* features that already be enabled with the arch_prctl system call. +*/ +int rc =syscall (SYS_arch_prctl,ARCH_GET_XCOMP_GUEST_PERM , &bitmask); +if (rc) { +warn_report ("prctl(ARCH_GET_XCOMP_GUEST_PERM) error: %d" , rc); + }else if (bitmask &XSTATE_XTILE_DATA_MASK ) { + ret +=sizeof (XSaveXTILEDATA); + } }else if (function ==0x80000001 && reg ==R_ECX ) {/* * It's safe to enable TOPOEXT even if it's not returned by
@@ -5214,8 +5227,6 @@ bool kvm_arch_cpu_check_are_resettable(void)return !sev_es_enabled (); } -#define ARCH_REQ_XCOMP_GUEST_PERM 0x1025 -void kvm_request_xsave_components (X86CPU *cpu,uint64_t mask) {KVMState *s = kvm_state;
Quoted 5 lines · Yang Zhong
The
kvm_arch_get_supported_cpuid()only callKVM_GET_SUPPORTED_CPUIDone time, so the cpuid buffer information still keep older value. Once Qemu enable new dynamic xfeature, like XTILEDATA, the cpuid[0D,0].{EBX,ECX} still return older value.
Quoted 7 lines
This patch can return right size value in
kvm_init_xsave()if XTILEDATA has been enabled byarch_prctl.assert(kvm_arch_get_supported_cpuid(kvm_state,
0xd, 0,R_ECX) <=env->xsave_buf_len);Signed-off-by Yang Zhong <[email protected]>
I don't understand, is this a bugfix for an assertion failure or just a cleanup?
Either way, while I like the idea of modifying kvm_arch_get_supported_cpuid, I think the right thing to do is to just use has_xsave2 as the return value if it is nonzero. And then kvm_init_xsave can just do
if (!has_xsave) {
return;
}env->xsave_buf_len = kvm_arch_get_supported_cpuid(kvm_state, 0xd, 0, R_ECX);
without the assertion that is now obvious.
Paolo
Quoted 60 lines
--- target/i386/cpu.h | 3 +++ target/i386/kvm/kvm.c | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)target/i386/cpu.h +3
-0@@ -565,6 +565,9 @@ typedef enum X86Seg {#define ESA_FEATURE_ALIGN64_MASK (1U << ESA_FEATURE_ALIGN64_BIT)#define ESA_FEATURE_XFD_MASK (1U << ESA_FEATURE_XFD_BIT) +#define ARCH_GET_XCOMP_GUEST_PERM 0x1024 +#define ARCH_REQ_XCOMP_GUEST_PERM 0x1025 +/* CPUID feature words */ typedef enum FeatureWord {target/i386/kvm/kvm.c +13
-2@@ -46,6 +46,7 @@#include "hw/i386/intel_iommu.h" #include "hw/i386/x86-iommu.h" #include "hw/i386/e820_memory_layout.h" +#include "target/i386/cpu.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" @@ -437,6 +438,18 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,return ret; } ret = (reg ==R_EAX ) ? bitmask : bitmask >>32 ; + }else if (function ==0xd && index ==0 && + (reg ==R_EBX || reg ==R_ECX )) { +/* +* The value returned by KVM_GET_SUPPORTED_CPUID does not include +* features that already be enabled with the arch_prctl system call. +*/ +int rc =syscall (SYS_arch_prctl,ARCH_GET_XCOMP_GUEST_PERM , &bitmask); +if (rc) { +warn_report ("prctl(ARCH_GET_XCOMP_GUEST_PERM) error: %d" , rc); + }else if (bitmask &XSTATE_XTILE_DATA_MASK ) { + ret +=sizeof (XSaveXTILEDATA); + } }else if (function ==0x80000001 && reg ==R_ECX ) {/* * It's safe to enable TOPOEXT even if it's not returned by @@ -5214,8 +5227,6 @@ bool kvm_arch_cpu_check_are_resettable(void)return !sev_es_enabled (); } -#define ARCH_REQ_XCOMP_GUEST_PERM 0x1025 -void kvm_request_xsave_components (X86CPU *cpu,uint64_t mask) {KVMState *s = kvm_state;
Quoted 9 lines · Paolo Bonzini
Quoted 8 lines · Yang Zhong
The
kvm_arch_get_supported_cpuid()only callKVM_GET_SUPPORTED_CPUIDone time, so the cpuid buffer information still keep older value. Once Qemu enable new dynamic xfeature, like XTILEDATA, the cpuid[0D,0].{EBX,ECX} still return older value.This patch can return right size value in
kvm_init_xsave()if XTILEDATA has been enabled byarch_prctl.
Quoted 8 lines
Quoted 4 lines
assert(kvm_arch_get_supported_cpuid(kvm_state,
0xd, 0,R_ECX) <=env->xsave_buf_len);Signed-off-by Yang Zhong <[email protected]>I don't understand, is this a bugfix for an assertion failure or just a cleanup?
In fact, no assert issue here.
The issue is after we enable dynamic xfeature, and if we still use kvm_arch_get_supported_cpuid(kvm_state, 0xd, 0, R_ECX) to get size, the size is older value(size:2816), not the size(11008) we expected.
The code for cpuid[0D,0].{EBX,ECX} by kvm_arch_get_supported_cpuid() need cleanup here, or we can't get the real value here. thanks!
Yang
Quoted 70 lines
Either way, while I like the idea of modifying
kvm_arch_get_supported_cpuid, I think the right thing to do is to just usehas_xsave2as the return value if it is nonzero. And thenkvm_init_xsavecan just doif (!has_xsave) { return; }
env->xsave_buf_len=kvm_arch_get_supported_cpuid(kvm_state, 0xd, 0, R_ECX);without the assertion that is now obvious.
Paolo
Quoted 56 lines
--- target/i386/cpu.h | 3 +++ target/i386/kvm/kvm.c | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)target/i386/cpu.h +3
-0@@ -565,6 +565,9 @@ typedef enum X86Seg {#define ESA_FEATURE_ALIGN64_MASK (1U << ESA_FEATURE_ALIGN64_BIT)#define ESA_FEATURE_XFD_MASK (1U << ESA_FEATURE_XFD_BIT) +#define ARCH_GET_XCOMP_GUEST_PERM 0x1024 +#define ARCH_REQ_XCOMP_GUEST_PERM 0x1025 +/* CPUID feature words */ typedef enum FeatureWord {target/i386/kvm/kvm.c +13
-2@@ -46,6 +46,7 @@#include "hw/i386/intel_iommu.h" #include "hw/i386/x86-iommu.h" #include "hw/i386/e820_memory_layout.h" +#include "target/i386/cpu.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" @@ -437,6 +438,18 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,return ret; } ret = (reg ==R_EAX ) ? bitmask : bitmask >>32 ; + }else if (function ==0xd && index ==0 && + (reg ==R_EBX || reg ==R_ECX )) { +/* +* The value returned by KVM_GET_SUPPORTED_CPUID does not include +* features that already be enabled with the arch_prctl system call. +*/ +int rc =syscall (SYS_arch_prctl,ARCH_GET_XCOMP_GUEST_PERM , &bitmask); +if (rc) { +warn_report ("prctl(ARCH_GET_XCOMP_GUEST_PERM) error: %d" , rc); + }else if (bitmask &XSTATE_XTILE_DATA_MASK ) { + ret +=sizeof (XSaveXTILEDATA); + } }else if (function ==0x80000001 && reg ==R_ECX ) {/* * It's safe to enable TOPOEXT even if it's not returned by @@ -5214,8 +5227,6 @@ bool kvm_arch_cpu_check_are_resettable(void)return !sev_es_enabled (); } -#define ARCH_REQ_XCOMP_GUEST_PERM 0x1025 -void kvm_request_xsave_components (X86CPU *cpu,uint64_t mask) {KVMState *s = kvm_state;