All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] KVM: x86/mmu: kvm_faultin_pfn has to return false if pfh is returned
@ 2021-10-15 16:32 Andrei Vagin
  2021-10-15 16:38 ` Paolo Bonzini
  0 siblings, 1 reply; 2+ messages in thread
From: Andrei Vagin @ 2021-10-15 16:32 UTC (permalink / raw)
  To: linux-kernel, Paolo Bonzini, Sean Christopherson, kvm
  Cc: Andrei Vagin, Maxim Levitsky

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>
---
 arch/x86/kvm/mmu/mmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 1a64ba5b9437..5dce77b45476 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -3956,7 +3956,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;
 	return true;
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] KVM: x86/mmu: kvm_faultin_pfn has to return false if pfh is returned
  2021-10-15 16:32 [PATCH] KVM: x86/mmu: kvm_faultin_pfn has to return false if pfh is returned Andrei Vagin
@ 2021-10-15 16:38 ` Paolo Bonzini
  0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2021-10-15 16:38 UTC (permalink / raw)
  To: Andrei Vagin, linux-kernel, Sean Christopherson, kvm; +Cc: Maxim Levitsky

On 15/10/21 18:32, Andrei Vagin wrote:
> 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>
> ---
>   arch/x86/kvm/mmu/mmu.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
> index 1a64ba5b9437..5dce77b45476 100644
> --- a/arch/x86/kvm/mmu/mmu.c
> +++ b/arch/x86/kvm/mmu/mmu.c
> @@ -3956,7 +3956,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;
>   	return true;
> 

Ouch! Queued, thanks.

Paolo


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-10-15 16:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-15 16:32 [PATCH] KVM: x86/mmu: kvm_faultin_pfn has to return false if pfh is returned Andrei Vagin
2021-10-15 16:38 ` Paolo Bonzini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.