Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed0a0ec9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:
 "A somewhat bigger ARM update, and the usual smattering of x86 bug
  fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: vmx: Fix entry number check for add_atomic_switch_msr()
  KVM: x86: Recompute PID.ON when clearing PID.SN
  KVM: nVMX: Restore a preemption timer consistency check
  x86/kvm/nVMX: read from MSR_IA32_VMX_PROCBASED_CTLS2 only when it is available
  KVM: arm64: Forbid kprobing of the VHE world-switch code
  KVM: arm64: Relax the restriction on using stage2 PUD huge mapping
  arm: KVM: Add missing kvm_stage2_has_pmd() helper
  KVM: arm/arm64: vgic: Always initialize the group of private IRQs
  arm/arm64: KVM: Don't panic on failure to properly reset system registers
  arm/arm64: KVM: Allow a VCPU to fully reset itself
  KVM: arm/arm64: Reset the VCPU without preemption and vcpu state loaded
  arm64: KVM: Don't generate UNDEF when LORegion feature is present
  KVM: arm/arm64: vgic: Make vgic_cpu->ap_list_lock a raw_spinlock
  KVM: arm/arm64: vgic: Make vgic_dist->lpi_list_lock a raw_spinlock
  KVM: arm/arm64: vgic: Make vgic_irq->irq_lock a raw_spinlock
parents 64c0133e 98ae70cc

arch/arm/include/asm/kvm_host.h

+10 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#define KVM_REQ_SLEEP \

	KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_IRQ_PENDING	KVM_ARCH_REQ(1)

#define KVM_REQ_VCPU_RESET	KVM_ARCH_REQ(2)



DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use);
@@ -147,6 +148,13 @@ struct kvm_cpu_context { 


typedef struct kvm_cpu_context kvm_cpu_context_t;



struct vcpu_reset_state {

	unsigned long	pc;

	unsigned long	r0;

	bool		be;

	bool		reset;

};



struct kvm_vcpu_arch {

	struct kvm_cpu_context ctxt;
@@ -186,6 +194,8 @@ struct kvm_vcpu_arch { 
	/* Cache some mmu pages needed inside spinlock regions */

	struct kvm_mmu_memory_cache mmu_page_cache;



	struct vcpu_reset_state reset_state;



	/* Detect first run of a vcpu */

	bool has_run_once;

};

arch/arm/include/asm/stage2_pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -76,4 +76,9 @@ static inline bool kvm_stage2_has_pud(struct kvm *kvm) 
#define S2_PMD_MASK				PMD_MASK

#define S2_PMD_SIZE				PMD_SIZE



static inline bool kvm_stage2_has_pmd(struct kvm *kvm)

{

	return true;

}



#endif	/* __ARM_S2_PGTABLE_H_ */

arch/arm/kvm/coproc.c

+2 −2
Original line number Diff line number Diff line
@@ -1450,6 +1450,6 @@ void kvm_reset_coprocs(struct kvm_vcpu *vcpu) 
	reset_coproc_regs(vcpu, table, num);



	for (num = 1; num < NR_CP15_REGS; num++)

		if (vcpu_cp15(vcpu, num) == 0x42424242)

			panic("Didn't reset vcpu_cp15(vcpu, %zi)", num);

		WARN(vcpu_cp15(vcpu, num) == 0x42424242,

		     "Didn't reset vcpu_cp15(vcpu, %zi)", num);

}

arch/arm/kvm/reset.c

+24 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/cputype.h>

#include <asm/kvm_arm.h>

#include <asm/kvm_coproc.h>

#include <asm/kvm_emulate.h>



#include <kvm/arm_arch_timer.h>
@@ -69,6 +70,29 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) 
	/* Reset CP15 registers */

	kvm_reset_coprocs(vcpu);



	/*

	 * Additional reset state handling that PSCI may have imposed on us.

	 * Must be done after all the sys_reg reset.

	 */

	if (READ_ONCE(vcpu->arch.reset_state.reset)) {

		unsigned long target_pc = vcpu->arch.reset_state.pc;



		/* Gracefully handle Thumb2 entry point */

		if (target_pc & 1) {

			target_pc &= ~1UL;

			vcpu_set_thumb(vcpu);

		}



		/* Propagate caller endianness */

		if (vcpu->arch.reset_state.be)

			kvm_vcpu_set_be(vcpu);



		*vcpu_pc(vcpu) = target_pc;

		vcpu_set_reg(vcpu, 0, vcpu->arch.reset_state.r0);



		vcpu->arch.reset_state.reset = false;

	}



	/* Reset arch_timer context */

	return kvm_timer_vcpu_reset(vcpu);

}

arch/arm64/include/asm/kvm_host.h

+11 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#define KVM_REQ_SLEEP \

	KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_IRQ_PENDING	KVM_ARCH_REQ(1)

#define KVM_REQ_VCPU_RESET	KVM_ARCH_REQ(2)



DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use);
@@ -208,6 +209,13 @@ struct kvm_cpu_context { 


typedef struct kvm_cpu_context kvm_cpu_context_t;



struct vcpu_reset_state {

	unsigned long	pc;

	unsigned long	r0;

	bool		be;

	bool		reset;

};



struct kvm_vcpu_arch {

	struct kvm_cpu_context ctxt;
@@ -297,6 +305,9 @@ struct kvm_vcpu_arch { 
	/* Virtual SError ESR to restore when HCR_EL2.VSE is set */

	u64 vsesr_el2;



	/* Additional reset state */

	struct vcpu_reset_state	reset_state;



	/* True when deferrable sysregs are loaded on the physical CPU,

	 * see kvm_vcpu_load_sysregs and kvm_vcpu_put_sysregs. */

	bool sysregs_loaded_on_cpu;