On Fri, Mar 11, 2022 at 12:13:33AM -0800, Andrei Vagin wrote:
> [ Upstream commit a7cc099f2ec3117678adeb69749bef7e9dde3148 ]
>
> 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@xxxxxxxxxx>
> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Signed-off-by: Andrei Vagin <avagin@xxxxxxxxx>
> Message-Id: <20211015163221.472508-1-avagin@xxxxxxxxx>
> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> ---
> arch/x86/kvm/mmu/mmu.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
> index 2297dd90fe4a..d6579bae25ca 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;
> --
> 2.35.1
>
Now queued up, thanks.
greg k-h
