Commit 80d9ac9b authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Fix detection of shared VMAs on guest fault 



When merging the KVM MTE support, the blob that was interposed between
the chair and the keyboard experienced a neuronal accident (also known
as a brain fart), turning a check for VM_SHARED into VM_PFNMAP as it
was reshuffling some of the code.

The blob having now come back to its senses, let's restore the
initial check that the original author got right the first place.

Fixes: ea7fc1bb ("KVM: arm64: Introduce MTE VM feature")
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210713114804.594993-1-maz@kernel.org
parent e73f0f0e

arch/arm64/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
		vma_shift = get_vma_page_shift(vma, hva);

	}



	shared = (vma->vm_flags & VM_PFNMAP);

	shared = (vma->vm_flags & VM_SHARED);



	switch (vma_shift) {

#ifndef __PAGETABLE_PMD_FOLDED