Commit f080815f 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:
 "ARM64:

   - Fix constant sign extension affecting TCR_EL2 and preventing
     running on ARMv8.7 models due to spurious bits being set

   - Fix use of helpers using PSTATE early on exit by always sampling it
     as soon as the exit takes place

   - Move pkvm's 32bit handling into a common helper

  RISC-V:

   - Fix incorrect KVM_MAX_VCPUS value

   - Unmap stage2 mapping when deleting/moving a memslot

  x86:

   - Fix and downgrade BUG_ON due to uninitialized cache

   - Many APICv and MOVE_ENC_CONTEXT_FROM fixes

   - Correctly emulate TLB flushes around nested vmentry/vmexit and when
     the nested hypervisor uses VPID

   - Prevent modifications to CPUID after the VM has run

   - Other smaller bugfixes

  Generic:

   - Memslot handling bugfixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (44 commits)
  KVM: fix avic_set_running for preemptable kernels
  KVM: VMX: clear vmx_x86_ops.sync_pir_to_irr if APICv is disabled
  KVM: SEV: accept signals in sev_lock_two_vms
  KVM: SEV: do not take kvm->lock when destroying
  KVM: SEV: Prohibit migration of a VM that has mirrors
  KVM: SEV: Do COPY_ENC_CONTEXT_FROM with both VMs locked
  selftests: sev_migrate_tests: add tests for KVM_CAP_VM_COPY_ENC_CONTEXT_FROM
  KVM: SEV: move mirror status to destination of KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM
  KVM: SEV: initialize regions_list of a mirror VM
  KVM: SEV: cleanup locking for KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM
  KVM: SEV: do not use list_replace_init on an empty list
  KVM: x86: Use a stable condition around all VT-d PI paths
  KVM: x86: check PIR even for vCPUs with disabled APICv
  KVM: VMX: prepare sync_pir_to_irr for running with APICv disabled
  KVM: selftests: page_table_test: fix calculation of guest_test_phys_mem
  KVM: x86/mmu: Handle "default" period when selectively waking kthread
  KVM: MMU: shadow nested paging does not have PKU
  KVM: x86/mmu: Remove spurious TLB flushes in TDP MMU zap collapsible path
  KVM: x86/mmu: Use yield-safe TDP MMU root iter in MMU notifier unmapping
  KVM: X86: Use vcpu->arch.walk_mmu for kvm_mmu_invlpg()
  ...
parents d6e6a27d 7cfc5c65

arch/arm64/include/asm/kvm_arm.h

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H)



/* TCR_EL2 Registers bits */

#define TCR_EL2_RES1		((1 << 31) | (1 << 23))

#define TCR_EL2_RES1		((1U << 31) | (1 << 23))

#define TCR_EL2_TBI		(1 << 20)

#define TCR_EL2_PS_SHIFT	16

#define TCR_EL2_PS_MASK		(7 << TCR_EL2_PS_SHIFT)
@@ -276,7 +276,7 @@ 
#define CPTR_EL2_TFP_SHIFT 10



/* Hyp Coprocessor Trap Register */

#define CPTR_EL2_TCPAC	(1 << 31)

#define CPTR_EL2_TCPAC	(1U << 31)

#define CPTR_EL2_TAM	(1 << 30)

#define CPTR_EL2_TTA	(1 << 20)

#define CPTR_EL2_TFP	(1 << CPTR_EL2_TFP_SHIFT)

arch/arm64/kvm/hyp/include/hyp/switch.h

+14 −0
Original line number Diff line number Diff line
@@ -403,6 +403,8 @@ typedef bool (*exit_handler_fn)(struct kvm_vcpu *, u64 *); 


static const exit_handler_fn *kvm_get_exit_handler_array(struct kvm_vcpu *vcpu);



static void early_exit_filter(struct kvm_vcpu *vcpu, u64 *exit_code);



/*

 * Allow the hypervisor to handle the exit with an exit handler if it has one.

 *
@@ -429,6 +431,18 @@ static inline bool kvm_hyp_handle_exit(struct kvm_vcpu *vcpu, u64 *exit_code) 
 */

static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code)

{

	/*

	 * Save PSTATE early so that we can evaluate the vcpu mode

	 * early on.

	 */

	vcpu->arch.ctxt.regs.pstate = read_sysreg_el2(SYS_SPSR);



	/*

	 * Check whether we want to repaint the state one way or

	 * another.

	 */

	early_exit_filter(vcpu, exit_code);



	if (ARM_EXCEPTION_CODE(*exit_code) != ARM_EXCEPTION_IRQ)

		vcpu->arch.fault.esr_el2 = read_sysreg_el2(SYS_ESR);

arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h

+6 −1
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt) 
static inline void __sysreg_save_el2_return_state(struct kvm_cpu_context *ctxt)

{

	ctxt->regs.pc			= read_sysreg_el2(SYS_ELR);

	/*

	 * Guest PSTATE gets saved at guest fixup time in all

	 * cases. We still need to handle the nVHE host side here.

	 */

	if (!has_vhe() && ctxt->__hyp_running_vcpu)

		ctxt->regs.pstate	= read_sysreg_el2(SYS_SPSR);



	if (cpus_have_final_cap(ARM64_HAS_RAS_EXTN))

arch/arm64/kvm/hyp/nvhe/switch.c

+1 −7
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static const exit_handler_fn *kvm_get_exit_handler_array(struct kvm_vcpu *vcpu) 
 * Returns false if the guest ran in AArch32 when it shouldn't have, and

 * thus should exit to the host, or true if a the guest run loop can continue.

 */

static bool handle_aarch32_guest(struct kvm_vcpu *vcpu, u64 *exit_code)

static void early_exit_filter(struct kvm_vcpu *vcpu, u64 *exit_code)

{

	struct kvm *kvm = kern_hyp_va(vcpu->kvm);
@@ -248,10 +248,7 @@ static bool handle_aarch32_guest(struct kvm_vcpu *vcpu, u64 *exit_code) 
		vcpu->arch.target = -1;

		*exit_code &= BIT(ARM_EXIT_WITH_SERROR_BIT);

		*exit_code |= ARM_EXCEPTION_IL;

		return false;

	}



	return true;

}



/* Switch to the guest for legacy non-VHE systems */
@@ -316,9 +313,6 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) 
		/* Jump in the fire! */

		exit_code = __guest_enter(vcpu);



		if (unlikely(!handle_aarch32_guest(vcpu, &exit_code)))

			break;



		/* And we're baaack! */

	} while (fixup_guest_exit(vcpu, &exit_code));

arch/arm64/kvm/hyp/vhe/switch.c

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,10 @@ static const exit_handler_fn *kvm_get_exit_handler_array(struct kvm_vcpu *vcpu) 
	return hyp_exit_handlers;

}



static void early_exit_filter(struct kvm_vcpu *vcpu, u64 *exit_code)

{

}



/* Switch to the guest for VHE systems running in EL2 */

static int __kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu)

{