KVM: arm64: nv: Release faulted-in VNCR page from mmu_lock critical section

Marc Zyngier · Marc Zyngier · commit 538fbac74019 · 2025-05-21T11:40:12.000+01:00
The conversion to kvm_release_faultin_page() missed the requirement for this to be called within a critical section with mmu_lock held for write. Move this call up to satisfy this requirement. Fixes: 069a05e ("KVM: arm64: nv: Handle VNCR_EL2-triggered faults") Signed-off-by: Marc Zyngier <maz@kernel.org>
diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
@@ -1228,9 +1228,9 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu)
 		vt->cpu = -1;
 
 		kvm_make_request(KVM_REQ_MAP_L1_VNCR_EL2, vcpu);
+		kvm_release_faultin_page(vcpu->kvm, page, false, vt->wr.pw);
 	}
 
-	kvm_release_faultin_page(vcpu->kvm, page, false, vt->wr.pw);
 	if (vt->wr.pw)
 		mark_page_dirty(vcpu->kvm, gfn);
 

Original file line number	Diff line number	Diff line change
`@@ -1228,9 +1228,9 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu)`
`1228`	`1228`	`vt->cpu = -1;`
`1229`	`1229`
`1230`	`1230`	`kvm_make_request(KVM_REQ_MAP_L1_VNCR_EL2, vcpu);`
	`1231`	`+ kvm_release_faultin_page(vcpu->kvm, page, false, vt->wr.pw);`
`1231`	`1232`	`}`
`1232`	`1233`
`1233`		`- kvm_release_faultin_page(vcpu->kvm, page, false, vt->wr.pw);`
`1234`	`1234`	`if (vt->wr.pw)`
`1235`	`1235`	`mark_page_dirty(vcpu->kvm, gfn);`
`1236`	`1236`