79a197ab18
Previous to this change, a vCPU exposed with VMX running on a kernel without KVM_CAP_NESTED_STATE or KVM_CAP_EXCEPTION_PAYLOAD resulted in adding a migration blocker. This was because when the code was written it was thought there is no way to reliably know if a vCPU is utilising VMX or not at runtime. However, it turns out that this can be known to some extent: In order for a vCPU to enter VMX operation it must have CR4.VMXE set. Since it was set, CR4.VMXE must remain set as long as the vCPU is in VMX operation. This is because CR4.VMXE is one of the bits set in MSR_IA32_VMX_CR4_FIXED1. There is one exception to the above statement when vCPU enters SMM mode. When a vCPU enters SMM mode, it temporarily exits VMX operation and may also reset CR4.VMXE during execution in SMM mode. When the vCPU exits SMM mode, vCPU state is restored to be in VMX operation and CR4.VMXE is restored to its original state of being set. Therefore, when the vCPU is not in SMM mode, we can infer whether VMX is being used by examining CR4.VMXE. Otherwise, we cannot know for certain but assume the worse that vCPU may utilise VMX. Summaring all the above, a vCPU may have enabled VMX in case CR4.VMXE is set or vCPU is in SMM mode. Therefore, remove migration blocker and check before migration (cpu_pre_save()) if the vCPU may have enabled VMX. If true, only then require relevant kernel capabilities. While at it, demand KVM_CAP_EXCEPTION_PAYLOAD only when the vCPU is in guest-mode and there is a pending/injected exception. Otherwise, this kernel capability is not required for proper migration. Reviewed-by: Joao Martins <joao.m.martins@oracle.com> Signed-off-by: Liran Alon <liran.alon@oracle.com> Reviewed-by: Maran Wilson <maran.wilson@oracle.com> Tested-by: Maran Wilson <maran.wilson@oracle.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
70 lines
2.1 KiB
C
70 lines
2.1 KiB
C
/*
|
|
* QEMU KVM support -- x86 specific functions.
|
|
*
|
|
* Copyright (c) 2012 Linaro Limited
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#ifndef QEMU_KVM_I386_H
|
|
#define QEMU_KVM_I386_H
|
|
|
|
#include "sysemu/kvm.h"
|
|
|
|
#define kvm_apic_in_kernel() (kvm_irqchip_in_kernel())
|
|
|
|
#ifdef CONFIG_KVM
|
|
|
|
#define kvm_pit_in_kernel() \
|
|
(kvm_irqchip_in_kernel() && !kvm_irqchip_is_split())
|
|
#define kvm_pic_in_kernel() \
|
|
(kvm_irqchip_in_kernel() && !kvm_irqchip_is_split())
|
|
#define kvm_ioapic_in_kernel() \
|
|
(kvm_irqchip_in_kernel() && !kvm_irqchip_is_split())
|
|
|
|
#else
|
|
|
|
#define kvm_pit_in_kernel() 0
|
|
#define kvm_pic_in_kernel() 0
|
|
#define kvm_ioapic_in_kernel() 0
|
|
|
|
#endif /* CONFIG_KVM */
|
|
|
|
bool kvm_allows_irq0_override(void);
|
|
bool kvm_has_smm(void);
|
|
bool kvm_has_adjust_clock_stable(void);
|
|
bool kvm_has_exception_payload(void);
|
|
void kvm_synchronize_all_tsc(void);
|
|
void kvm_arch_reset_vcpu(X86CPU *cs);
|
|
void kvm_arch_do_init_vcpu(X86CPU *cs);
|
|
|
|
int kvm_device_pci_assign(KVMState *s, PCIHostDeviceAddress *dev_addr,
|
|
uint32_t flags, uint32_t *dev_id);
|
|
int kvm_device_pci_deassign(KVMState *s, uint32_t dev_id);
|
|
|
|
int kvm_device_intx_assign(KVMState *s, uint32_t dev_id,
|
|
bool use_host_msi, uint32_t guest_irq);
|
|
int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked);
|
|
int kvm_device_intx_deassign(KVMState *s, uint32_t dev_id, bool use_host_msi);
|
|
|
|
int kvm_device_msi_assign(KVMState *s, uint32_t dev_id, int virq);
|
|
int kvm_device_msi_deassign(KVMState *s, uint32_t dev_id);
|
|
|
|
bool kvm_device_msix_supported(KVMState *s);
|
|
int kvm_device_msix_init_vectors(KVMState *s, uint32_t dev_id,
|
|
uint32_t nr_vectors);
|
|
int kvm_device_msix_set_vector(KVMState *s, uint32_t dev_id, uint32_t vector,
|
|
int virq);
|
|
int kvm_device_msix_assign(KVMState *s, uint32_t dev_id);
|
|
int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id);
|
|
|
|
void kvm_put_apicbase(X86CPU *cpu, uint64_t value);
|
|
|
|
bool kvm_enable_x2apic(void);
|
|
bool kvm_has_x2apic_api(void);
|
|
|
|
bool kvm_hv_vpindex_settable(void);
|
|
#endif
|