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

Commit 07a9748c authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Marc Zyngier
Browse files

arm/arm64: kvm: drop inappropriate use of kvm_is_mmio_pfn() 



Instead of using kvm_is_mmio_pfn() to decide whether a host region
should be stage 2 mapped with device attributes, add a new static
function kvm_is_device_pfn() that disregards RAM pages with the
reserved bit set, as those should usually not be mapped as device
memory.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 7d39f9e3

arch/arm/kvm/mmu.c

+6 −1
Original line number Diff line number Diff line
@@ -834,6 +834,11 @@ static bool kvm_is_write_fault(struct kvm_vcpu *vcpu) 
	return kvm_vcpu_dabt_iswrite(vcpu);

}



static bool kvm_is_device_pfn(unsigned long pfn)

{

	return !pfn_valid(pfn);

}



static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,

			  struct kvm_memory_slot *memslot, unsigned long hva,

			  unsigned long fault_status)
@@ -904,7 +909,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
	if (is_error_pfn(pfn))

		return -EFAULT;



	if (kvm_is_mmio_pfn(pfn))

	if (kvm_is_device_pfn(pfn))

		mem_type = PAGE_S2_DEVICE;



	spin_lock(&kvm->mmu_lock);