summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorSuzuki K Poulose <suzuki.poulose@arm.com>2018-09-26 17:32:37 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-24 08:19:31 +0100
commit256a29480733bf5e1a26e779ea8982a8fe7986e5 (patch)
treebbe04276ad3b955c7cc52b846893e60825e1abc6 /virt
parentbae080e72e92a39dc77e1649be51632337f3a958 (diff)
downloadlinux-stable-256a29480733bf5e1a26e779ea8982a8fe7986e5.tar.gz
linux-stable-256a29480733bf5e1a26e779ea8982a8fe7986e5.tar.bz2
linux-stable-256a29480733bf5e1a26e779ea8982a8fe7986e5.zip
kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table
[ Upstream commit d2db7773ba864df6b4e19643dfc54838550d8049 ] So far we have only supported 3 level page table with fixed IPA of 40bits, where PUD is folded. With 4 level page tables, we need to check if the PUD entry is valid or not. Fix stage2_flush_memslot() to do this check, before walking down the table. Acked-by: Christoffer Dall <cdall@kernel.org> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/arm/mmu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c
index 1344557a7085..bf330b493c1e 100644
--- a/virt/kvm/arm/mmu.c
+++ b/virt/kvm/arm/mmu.c
@@ -412,7 +412,8 @@ static void stage2_flush_memslot(struct kvm *kvm,
pgd = kvm->arch.pgd + stage2_pgd_index(addr);
do {
next = stage2_pgd_addr_end(addr, end);
- stage2_flush_puds(kvm, pgd, addr, next);
+ if (!stage2_pgd_none(*pgd))
+ stage2_flush_puds(kvm, pgd, addr, next);
} while (pgd++, addr = next, addr != end);
}