Commit ca052cfd 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:
 "ARM:

   - Fix unexpected sign extension of KVM_ARM_DEVICE_ID_MASK

   - Tidy-up handling of AArch32 on asymmetric systems

  x86:

   - Fix 'missing ENDBR' BUG for fastop functions

  Generic:

   - Some cleanup and static analyzer patches

   - More fixes to KVM_CREATE_VM unwind paths"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Drop unnecessary initialization of "ops" in kvm_ioctl_create_device()
  KVM: Drop unnecessary initialization of "npages" in hva_to_pfn_slow()
  x86/kvm: Fix "missing ENDBR" BUG for fastop functions
  x86/kvm: Simplify FOP_SETCC()
  x86/ibt, objtool: Add IBT_NOSEAL()
  KVM: Rename mmu_notifier_* to mmu_invalidate_*
  KVM: Rename KVM_PRIVATE_MEM_SLOTS to KVM_INTERNAL_MEM_SLOTS
  KVM: MIPS: remove unnecessary definition of KVM_PRIVATE_MEM_SLOTS
  KVM: Move coalesced MMIO initialization (back) into kvm_create_vm()
  KVM: Unconditionally get a ref to /dev/kvm module when creating a VM
  KVM: Properly unwind VM creation if creating debugfs fails
  KVM: arm64: Reject 32bit user PSTATE on asymmetric systems
  KVM: arm64: Treat PMCR_EL1.LC as RES1 on asymmetric systems
  KVM: arm64: Fix compile error due to sign extension
parents 42c54d54 959d6c4a

arch/arm64/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -929,6 +929,10 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu); 
	(system_supports_mte() &&				\

	 test_bit(KVM_ARCH_FLAG_MTE_ENABLED, &(kvm)->arch.flags))



#define kvm_supports_32bit_el0()				\

	(system_supports_32bit_el0() &&				\

	 !static_branch_unlikely(&arm64_mismatched_32bit_el0))



int kvm_trng_call(struct kvm_vcpu *vcpu);

#ifdef CONFIG_KVM

extern phys_addr_t hyp_mem_base;

arch/arm64/include/uapi/asm/kvm.h

+4 −2
Original line number Diff line number Diff line
@@ -75,9 +75,11 @@ struct kvm_regs { 


/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */

#define KVM_ARM_DEVICE_TYPE_SHIFT	0

#define KVM_ARM_DEVICE_TYPE_MASK	(0xffff << KVM_ARM_DEVICE_TYPE_SHIFT)

#define KVM_ARM_DEVICE_TYPE_MASK	GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \

						KVM_ARM_DEVICE_TYPE_SHIFT)

#define KVM_ARM_DEVICE_ID_SHIFT		16

#define KVM_ARM_DEVICE_ID_MASK		(0xffff << KVM_ARM_DEVICE_ID_SHIFT)

#define KVM_ARM_DEVICE_ID_MASK		GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \

						KVM_ARM_DEVICE_ID_SHIFT)



/* Supported device IDs */

#define KVM_ARM_DEVICE_VGIC_V2		0

arch/arm64/kvm/arm.c

+1 −2
Original line number Diff line number Diff line
@@ -757,8 +757,7 @@ static bool vcpu_mode_is_bad_32bit(struct kvm_vcpu *vcpu) 
	if (likely(!vcpu_mode_is_32bit(vcpu)))

		return false;



	return !system_supports_32bit_el0() ||

		static_branch_unlikely(&arm64_mismatched_32bit_el0);

	return !kvm_supports_32bit_el0();

}



/**

arch/arm64/kvm/guest.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 
		u64 mode = (*(u64 *)valp) & PSR_AA32_MODE_MASK;

		switch (mode) {

		case PSR_AA32_MODE_USR:

			if (!system_supports_32bit_el0())

			if (!kvm_supports_32bit_el0())

				return -EINVAL;

			break;

		case PSR_AA32_MODE_FIQ:

arch/arm64/kvm/mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ transparent_hugepage_adjust(struct kvm *kvm, struct kvm_memory_slot *memslot, 
		 * THP doesn't start to split while we are adjusting the

		 * refcounts.

		 *

		 * We are sure this doesn't happen, because mmu_notifier_retry

		 * We are sure this doesn't happen, because mmu_invalidate_retry

		 * was successful and we are holding the mmu_lock, so if this

		 * THP is trying to split, it will be blocked in the mmu

		 * notifier before touching any of the pages, specifically
@@ -1188,9 +1188,9 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
			return ret;

	}



	mmu_seq = vcpu->kvm->mmu_notifier_seq;

	mmu_seq = vcpu->kvm->mmu_invalidate_seq;

	/*

	 * Ensure the read of mmu_notifier_seq happens before we call

	 * Ensure the read of mmu_invalidate_seq happens before we call

	 * gfn_to_pfn_prot (which calls get_user_pages), so that we don't risk

	 * the page we just got a reference to gets unmapped before we have a

	 * chance to grab the mmu_lock, which ensure that if the page gets
@@ -1246,7 +1246,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
	else

		write_lock(&kvm->mmu_lock);

	pgt = vcpu->arch.hw_mmu->pgt;

	if (mmu_notifier_retry(kvm, mmu_seq))

	if (mmu_invalidate_retry(kvm, mmu_seq))

		goto out_unlock;



	/*