Commit b2d9e996 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:

 - PAE and PKU bugfixes for x86

 - selftests fix for new binutils

 - MMU notifier fix for arm64

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: arm64: Only reschedule if MMU_NOTIFIER_RANGE_BLOCKABLE is not set
  KVM: Pass MMU notifier range flags to kvm_unmap_hva_range()
  kvm: x86: Toggling CR4.PKE does not load PDPTEs in PAE mode
  kvm: x86: Toggling CR4.SMAP does not load PDPTEs in PAE mode
  KVM: x86: fix access code passed to gva_to_gpa
  selftests: kvm: Use a shorter encoding to clear RAX
parents 9e574b74 b5331379

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, 


#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

			unsigned long start, unsigned long end, unsigned flags);

int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);

int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

arch/arm64/kvm/mmu.c

+14 −5
Original line number Diff line number Diff line
@@ -343,7 +343,8 @@ static void unmap_stage2_p4ds(struct kvm_s2_mmu *mmu, pgd_t *pgd, 
 * destroying the VM), otherwise another faulting VCPU may come in and mess

 * with things behind our backs.

 */

static void unmap_stage2_range(struct kvm_s2_mmu *mmu, phys_addr_t start, u64 size)

static void __unmap_stage2_range(struct kvm_s2_mmu *mmu, phys_addr_t start, u64 size,

				 bool may_block)

{

	struct kvm *kvm = mmu->kvm;

	pgd_t *pgd;
@@ -369,11 +370,16 @@ static void unmap_stage2_range(struct kvm_s2_mmu *mmu, phys_addr_t start, u64 si 
		 * If the range is too large, release the kvm->mmu_lock

		 * to prevent starvation and lockup detector warnings.

		 */

		if (next != end)

		if (may_block && next != end)

			cond_resched_lock(&kvm->mmu_lock);

	} while (pgd++, addr = next, addr != end);

}



static void unmap_stage2_range(struct kvm_s2_mmu *mmu, phys_addr_t start, u64 size)

{

	__unmap_stage2_range(mmu, start, size, true);

}



static void stage2_flush_ptes(struct kvm_s2_mmu *mmu, pmd_t *pmd,

			      phys_addr_t addr, phys_addr_t end)

{
@@ -2208,18 +2214,21 @@ static int handle_hva_to_gpa(struct kvm *kvm, 


static int kvm_unmap_hva_handler(struct kvm *kvm, gpa_t gpa, u64 size, void *data)

{

	unmap_stage2_range(&kvm->arch.mmu, gpa, size);

	unsigned flags = *(unsigned *)data;

	bool may_block = flags & MMU_NOTIFIER_RANGE_BLOCKABLE;



	__unmap_stage2_range(&kvm->arch.mmu, gpa, size, may_block);

	return 0;

}



int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end)

			unsigned long start, unsigned long end, unsigned flags)

{

	if (!kvm->arch.mmu.pgd)

		return 0;



	trace_kvm_unmap_hva_range(start, end);

	handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL);

	handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, &flags);

	return 0;

}

arch/mips/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ enum kvm_mips_fault_result kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu, 


#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

			unsigned long start, unsigned long end, unsigned flags);

int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);

int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

arch/mips/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -486,7 +486,8 @@ static int kvm_unmap_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end, 
	return 1;

}



int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)

int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end,

			unsigned flags)

{

	handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL);

arch/powerpc/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ 
#define KVM_ARCH_WANT_MMU_NOTIFIER



extern int kvm_unmap_hva_range(struct kvm *kvm,

			       unsigned long start, unsigned long end);

			       unsigned long start, unsigned long end,

			       unsigned flags);

extern int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);

extern int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

extern int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);