diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-11-10 08:33:55 +0000 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-05-20 13:25:49 +0100 |
| commit | 8cd08171f09ddf116f9d9bfa56678cb5a52f2a6f (patch) | |
| tree | f9ab891f832ca8a533883fa84b95bd569d66419b /arch/arm/kvm/mmu.c | |
| parent | a9a7b0e863951e237ebae32bc18050545ad14c6c (diff) | |
| download | linux-stable-8cd08171f09ddf116f9d9bfa56678cb5a52f2a6f.tar.gz linux-stable-8cd08171f09ddf116f9d9bfa56678cb5a52f2a6f.tar.bz2 linux-stable-8cd08171f09ddf116f9d9bfa56678cb5a52f2a6f.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: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'arch/arm/kvm/mmu.c')
| -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 222e59918d28..8cfb491776a9 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -755,6 +755,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 fault_status) @@ -825,7 +830,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); |