summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrei Vagin <avagin@gmail.com>2021-10-15 18:32:21 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2021-10-18 14:19:18 +0200
commita7cc099f2ec3117678adeb69749bef7e9dde3148 (patch)
tree2f186a6f7483a486841458e9df3c6c58f4431a6f /arch
parentMerge tag 'kvm-riscv-5.16-1' of git://github.com/kvm-riscv/linux into HEAD (diff)
downloadlinux-a7cc099f2ec3117678adeb69749bef7e9dde3148.tar.xz
linux-a7cc099f2ec3117678adeb69749bef7e9dde3148.zip
KVM: x86/mmu: kvm_faultin_pfn has to return false if pfh is returned
This looks like a typo in 8f32d5e563cb. This change didn't intend to do any functional changes. The problem was caught by gVisor tests. Fixes: 8f32d5e563cb ("KVM: x86/mmu: allow kvm_faultin_pfn to return page fault handling code") Cc: Maxim Levitsky <mlevitsk@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Andrei Vagin <avagin@gmail.com> Message-Id: <20211015163221.472508-1-avagin@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/mmu/mmu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 24a9f4c3f5e7..29e7a4bb26e9 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -3879,6 +3879,7 @@ static bool kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
fault->pfn = __gfn_to_pfn_memslot(slot, fault->gfn, false, NULL,
fault->write, &fault->map_writable,
&fault->hva);
+ return false;
out_retry:
*r = RET_PF_RETRY;