From: Andrei Vagin Date: Fri, 15 Oct 2021 16:32:21 +0000 (-0700) Subject: KVM: x86/mmu: kvm_faultin_pfn has to return false if pfh is returned X-Git-Tag: accepted/tizen/unified/20230118.172025~1622 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a633bc01333352975157c87fa7edc2542375e2e2;p=platform%2Fkernel%2Flinux-rpi.git KVM: x86/mmu: kvm_faultin_pfn has to return false if pfh is returned commit a7cc099f2ec3117678adeb69749bef7e9dde3148 upstream. 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 Cc: Paolo Bonzini Signed-off-by: Andrei Vagin Message-Id: <20211015163221.472508-1-avagin@gmail.com> Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 2297dd9..d6579ba 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3967,6 +3967,7 @@ static bool kvm_faultin_pfn(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn, *pfn = __gfn_to_pfn_memslot(slot, gfn, false, NULL, write, writable, hva); + return false; out_retry: *r = RET_PF_RETRY;