diff options
| author |   Santosh Shukla <sashukla@nvidia.com> | 2020-10-26 16:54:07 +0530 |
|---|---|---|
| committer |   Marc Zyngier <maz@kernel.org> | 2020-10-29 20:41:04 +0000 |
| commit | 91a2c34b7d6fadc9c5d9433c620ea4c32ee7cae8 (patch) | |
| tree | af2a3c98477885147558233c175d6368ef24c77d /arch/arm64/kvm | |
| parent | KVM: arm64: Use fallback mapping sizes for contiguous huge page sizes (diff) | |
| download | linux-dev-91a2c34b7d6fadc9c5d9433c620ea4c32ee7cae8.tar.xz linux-dev-91a2c34b7d6fadc9c5d9433c620ea4c32ee7cae8.zip | |
KVM: arm64: Force PTE mapping on fault resulting in a device mapping
VFIO allows a device driver to resolve a fault by mapping a MMIO
range. This can be subsequently result in user_mem_abort() to
try and compute a huge mapping based on the MMIO pfn, which is
a sure recipe for things to go wrong.
Instead, force a PTE mapping when the pfn faulted in has a device
mapping.
Fixes: 6d674e28f642 ("KVM: arm/arm64: Properly handle faulting of device mappings")
Suggested-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Santosh Shukla <sashukla@nvidia.com>
[maz: rewritten commit message]
Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/1603711447-11998-2-git-send-email-sashukla@nvidia.com
Diffstat (limited to 'arch/arm64/kvm')
| -rw-r--r-- | arch/arm64/kvm/mmu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index e431d2d8e368..c7c6df6309d5 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -851,6 +851,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, if (kvm_is_device_pfn(pfn)) { device = true; + force_pte = true; } else if (logging_active && !write_fault) { /* * Only actually map the page as writable if this was a write |