Commit 361da275 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-nvmx-and-vm-teardown' into HEAD 



The immediate issue being fixed here is a nVMX bug where KVM fails to
detect that, after nested VM-Exit, L1 has a pending IRQ (or NMI).
However, checking for a pending interrupt accesses the legacy PIC, and
x86's kvm_arch_destroy_vm() currently frees the PIC before destroying
vCPUs, i.e. checking for IRQs during the forced nested VM-Exit results
in a NULL pointer deref; that's a prerequisite for the nVMX fix.

The remaining patches attempt to bring a bit of sanity to x86's VM
teardown code, which has accumulated a lot of cruft over the years.  E.g.
KVM currently unloads each vCPU's MMUs in a separate operation from
destroying vCPUs, all because when guest SMP support was added, KVM had a
kludgy MMU teardown flow that broke when a VM had more than one 1 vCPU.
And that oddity lived on, for 18 years...

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parents 0afd104f b2aba529

arch/arm64/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -1375,8 +1375,6 @@ static inline bool kvm_system_needs_idmapped_vectors(void) 
	return cpus_have_final_cap(ARM64_SPECTRE_V3A);

}



static inline void kvm_arch_sync_events(struct kvm *kvm) {}



void kvm_init_host_debug_data(void);

void kvm_vcpu_load_debug(struct kvm_vcpu *vcpu);

void kvm_vcpu_put_debug(struct kvm_vcpu *vcpu);

arch/loongarch/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ static inline bool kvm_is_ifetch_fault(struct kvm_vcpu_arch *arch) 


/* Misc */

static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen) {}

static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {}

arch/mips/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -886,7 +886,6 @@ extern unsigned long kvm_mips_get_ramsize(struct kvm *kvm); 
extern int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,

			     struct kvm_mips_interrupt *irq);



static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_free_memslot(struct kvm *kvm,

					 struct kvm_memory_slot *slot) {}

static inline void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen) {}

arch/powerpc/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -902,7 +902,6 @@ struct kvm_vcpu_arch { 
#define __KVM_HAVE_ARCH_WQP

#define __KVM_HAVE_CREATE_DEVICE



static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen) {}

static inline void kvm_arch_flush_shadow_all(struct kvm *kvm) {}

static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}

arch/riscv/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -301,8 +301,6 @@ static inline bool kvm_arch_pmi_in_guest(struct kvm_vcpu *vcpu) 
	return IS_ENABLED(CONFIG_GUEST_PERF_EVENTS) && !!vcpu;

}



static inline void kvm_arch_sync_events(struct kvm *kvm) {}



#define KVM_RISCV_GSTAGE_TLB_MIN_ORDER		12



void kvm_riscv_local_hfence_gvma_vmid_gpa(unsigned long vmid,