arm/arm64: kvm: drop inappropriate use of kvm_is_mmio_pfn()
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Mon, 10 Nov 2014 08:33:55 +0000 (09:33 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 26 Nov 2014 13:40:45 +0000 (14:40 +0100)
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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/arm/kvm/mmu.c

index 79d3fbfb5b0e9f0bd2ded282f816116c3de33849..8664ff17cbbeaf531b03174e1524cc00a6e86849 100644 (file)
@@ -835,6 +835,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)
@@ -905,7 +910,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);