kvm: use KVM_{GET|SET}_SREGS2 when available
cover kvm: use KVM_{GET|SET}_SREGS2 when available
clone of "starship_unstable"
Maxim Levitsky (2):
kvm: update kernel headers for KVM_{GET|SET}_SREGS2
KVM: use KVM_{GET|SET}_SREGS2 when supported by kvm.
accel/kvm/kvm-all.c | 4 ++ include/sysemu/kvm.h | 4 ++ linux-headers/asm-x86/kvm.h | 13 +++++ linux-headers/linux/kvm.h | 5 ++ target/i386/cpu.h | 1 + target/i386/kvm/kvm.c | 101 +++++++++++++++++++++++++++++++++++- target/i386/machine.c | 33 ++++++++++++ 7 files changed, 159 insertions(+), 2 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/2 kvm: update kernel headers for KVM_{GET|SET}_SREGS2
--- linux-headers/asm-x86/kvm.h | 13 +++++++++++++ linux-headers/linux/kvm.h | 5 +++++ 2 files changed, 18 insertions(+)
linux-headers/asm-x86/kvm.h +13 -0
@@ -158,6 +158,19 @@ struct kvm_sregs {__u64 interrupt_bitmap[(KVM_NR_INTERRUPTS +63 ) /64 ]; }; +struct kvm_sregs2 { +/* out (KVM_GET_SREGS2) / in (KVM_SET_SREGS2) */ +struct kvm_segment cs, ds, es, fs, gs, ss; +struct kvm_segment tr, ldt; +struct kvm_dtable gdt, idt; +__u64 cr0, cr2, cr3, cr4, cr8; +__u64 efer; +__u64 apic_base; +__u64 flags;/* must be zero*/ +__u64 pdptrs[4 ]; +__u64 padding; +}; +/* for KVM_GET_FPU and KVM_SET_FPU */ struct kvm_fpu {__u8 fpr[8 ][16 ];
linux-headers/linux/kvm.h +5 -0
@@ -1056,6 +1056,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_ENFORCE_PV_FEATURE_CPUID 190#define KVM_CAP_SYS_HYPERV_CPUID 191#define KVM_CAP_DIRTY_LOG_RING 192 +#define KVM_CAP_SREGS2 196#ifdef KVM_CAP_IRQ_ROUTING
@@ -1563,6 +1564,10 @@ struct kvm_pv_cmd {/* Available with KVM_CAP_DIRTY_LOG_RING */ #define KVM_RESET_DIRTY_RINGS _IO(KVMIO, 0xc7) + +#define KVM_GET_SREGS2 _IOR(KVMIO, 0xca, struct kvm_sregs2) +#define KVM_SET_SREGS2 _IOW(KVMIO, 0xcb, struct kvm_sregs2) +/* Secure Encrypted Virtualization command */ enum sev_cmd_id {/* Guest initialization commands */
Signature · 1 line
2.26.2
PATCH 2/2 KVM: use KVM_{GET|SET}_SREGS2 when supported by kvm.
In reply to Maxim LevitskyThis allows qemu to make PDPTRs be part of the migration stream and thus not reload them after a migration which is against X86 spec.
--- accel/kvm/kvm-all.c | 4 ++ include/sysemu/kvm.h | 4 ++ target/i386/cpu.h | 1 + target/i386/kvm/kvm.c | 101 +++++++++++++++++++++++++++++++++++++++++- target/i386/machine.c | 33 ++++++++++++++ 5 files changed, 141 insertions(+), 2 deletions(-)
accel/kvm/kvm-all.c +4 -0
@@ -142,6 +142,7 @@ bool kvm_msi_via_irqfd_allowed;bool kvm_gsi_routing_allowed;bool kvm_gsi_direct_mapping;bool kvm_allowed; +bool kvm_sregs2;bool kvm_readonly_mem_allowed;bool kvm_vm_attributes_allowed;bool kvm_direct_msi_allowed;
@@ -2186,6 +2187,9 @@ static int kvm_init(MachineState *ms) kvm_ioeventfd_any_length_allowed = (kvm_check_extension (s,KVM_CAP_IOEVENTFD_ANY_LENGTH ) >0 ); + kvm_sregs2 = + (kvm_check_extension (s,KVM_CAP_SREGS2 ) >0 ); + kvm_state = s; ret =kvm_arch_init (ms, s);
include/sysemu/kvm.h +4 -0
@@ -32,6 +32,7 @@#ifdef CONFIG_KVM_IS_POSSIBLE extern bool kvm_allowed; +extern bool kvm_sregs2;extern bool kvm_kernel_irqchip;extern bool kvm_split_irqchip;extern bool kvm_async_interrupts_allowed;
@@ -139,6 +140,9 @@ extern bool kvm_msi_use_devid;*/ #define kvm_gsi_direct_mapping () (kvm_gsi_direct_mapping) + +#define kvm_supports_sregs2 () (kvm_sregs2) +/** * kvm_readonly_mem_enabled: *
target/i386/cpu.h +1 -0
@@ -1422,6 +1422,7 @@ typedef struct CPUX86State {SegmentCache idt;/* only base and limit are used */ target_ulong cr[5 ];/* NOTE: cr1 is unused */ +uint64_t pdptrs[4 ];int32_t a20_mask;BNDReg bnd_regs[4 ];
target/i386/kvm/kvm.c +99 -2
125 lines not on this page · raw message
target/i386/machine.c +33 -0
@@ -1396,6 +1396,38 @@ static const VMStateDescription vmstate_msr_tsx_ctrl = { } }; +static bool pdptrs_needed (void *opaque) +{ +X86CPU *cpu = opaque; +CPUX86State *env = &cpu->env; + +if (!kvm_supports_sregs2 ()) { +return false; + } + +if (!(env->cr[0 ] &CR0_PG_MASK )) { +return false; + } + +if (env->efer &MSR_EFER_LMA ) { +return false; + } + +return env->cr[4 ] &CR4_PAE_MASK ; +} + +static const VMStateDescription vmstate_pdptrs = { + .name ="cpu/pdptrs" , + .version_id =1 , + .minimum_version_id =1 , + .needed = pdptrs_needed, + .fields = (VMStateField []) { +VMSTATE_UINT64_ARRAY (env.pdptrs,X86CPU ,4 ), +VMSTATE_END_OF_LIST () + } +}; + +VMStateDescription vmstate_x86_cpu = { .name ="cpu" , .version_id =12 ,
@@ -1531,6 +1563,7 @@ VMStateDescription vmstate_x86_cpu = { &vmstate_nested_state, #endif &vmstate_msr_tsx_ctrl, + &vmstate_pdptrs,NULL } };
Signature · 1 line
2.26.2
Paolo Bonzini
maintainerRe: [PATCH 2/2] KVM: use KVM_{GET|SET}_SREGS2 when supported by kvm.
target/i386/kvm/kvm.c static int kvm_put_sregs(X86CPU *cpu) · line 2568
Quoted 11 lines · Maxim Levitsky
target/i386/kvm/kvm.c +11
-0+ +for (i =0 ; i <4 ; i++) { + sregs.pdptrs[i] = env->pdptrs[i]; + } + + sregs.flags =0 ; + sregs.padding =0 ; + +return kvm_vcpu_ioctl (CPU (cpu),KVM_SET_SREGS2 , &sregs); +} +
This breaks when migrating from old to new kernel, because in that case the PDPTRs are not initialized.
Paolo
Re: [PATCH 2/2] KVM: use KVM_{GET|SET}_SREGS2 when supported by kvm.
Quoted 15 lines · Paolo Bonzini
target/i386/kvm/kvm.c static int kvm_put_sregs(X86CPU *cpu) · line 2568
Quoted 11 lines · Maxim Levitsky
target/i386/kvm/kvm.c +11
-0+ +for (i =0 ; i <4 ; i++) { + sregs.pdptrs[i] = env->pdptrs[i]; + } + + sregs.flags =0 ; + sregs.padding =0 ; + +return kvm_vcpu_ioctl (CPU (cpu),KVM_SET_SREGS2 , &sregs); +} +This breaks when migrating from old to new kernel, because in that case the PDPTRs are not initialized.
True, I haven't thought about it!
I'll fix this in the next version.
Best regards,
Maxim Levitsky
Quoted 3 lines
Paolo