Skip to contentSkip to conversation

KVM: x86/mmu: kvm_faultin_pfn has to return false if pfh is returned

PATCH In review Andrei Vagin 2 participants 2 messages Oct 15, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Paolo Bonzini <[email protected]>
---
 arch/x86/kvm/mmu/mmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/mmu/mmu.c +1 -1
index 1a64ba5b9437..5dce77b45476 100644
@@ -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;
Signature · 1 line
2.31.1
maintainer
#1 lore raw
Quoted 19 lines · Andrei Vagin

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 <[email protected]>
Cc Paolo Bonzini <[email protected]>
---
  arch/x86/kvm/mmu/mmu.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/mmu/mmu.c +0 -0
index 1a64ba5b9437..5dce77b45476 100644

arch/x86/kvm/mmu/mmu.c static bool kvm_faultin_pfn(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn, · line 3962

Quoted 8 lines
arch/x86/kvm/mmu/mmu.c +1 -1
@@ -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