diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-11-10 08:33:55 +0000 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-30 11:15:12 +0200 |
| commit | 529ad12b779bb522563156ba02fa67ec55c0de99 (patch) | |
| tree | 417c996b06547c04348587f045041a8d97decac0 /arch | |
| parent | 5030e3c059fbcf6223a1d386f9b7a1aa940f140e (diff) | |
| download | lwn-529ad12b779bb522563156ba02fa67ec55c0de99.tar.gz lwn-529ad12b779bb522563156ba02fa67ec55c0de99.zip | |
arm/arm64: kvm: drop inappropriate use of kvm_is_mmio_pfn()
commit 07a9748c78cfc39b54f06125a216b67b9c8f09ed upstream.
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: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kvm/mmu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 90422a536083..5c31e3fff597 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -644,6 +644,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, gfn_t gfn, struct kvm_memory_slot *memslot, unsigned long fault_status) @@ -684,7 +689,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; new_pte = pfn_pte(pfn, mem_type); |