Skip to contentSkip to conversation

KVM: x86: mmu: trace kvm_mmu_set_spte after the new SPTE was set

PATCH Applied Maxim Levitsky 3 participants 3 messages Mar 2, 2022 – Mar 15, 2022

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

PATCH 1/1 KVM: x86: mmu: trace kvm_mmu_set_spte after the new SPTE was set

It makes more sense to print new SPTE value than the old value.

---
 arch/x86/kvm/mmu/mmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/mmu/mmu.c +1 -1
index 94f077722b290..0e209f0b2e1d2 100644
@@ -2690,8 +2690,8 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, struct kvm_memory_slot *slot,
 	if (*sptep == spte) {
 		ret = RET_PF_SPURIOUS;
 	} else {
-		trace_kvm_mmu_set_spte(level, gfn, sptep);
 		flush |= mmu_spte_update(sptep, spte);
+		trace_kvm_mmu_set_spte(level, gfn, sptep);
 	}
 
 	if (wrprot) {
Signature · 1 line
2.26.3
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Maxim Levitsky

It makes more sense to print new SPTE value than the old value.

Fixes d786c7783b01 ("KVM: MMU: inline set_spte in mmu_set_spte")

And arguably even Cc: [email protected], though that's unnecessary if this gets into 5.17, which it should.

Quoted 21 lines
---
 arch/x86/kvm/mmu/mmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/mmu/mmu.c +1 -1
index 94f077722b290..0e209f0b2e1d2 100644
@@ -2690,8 +2690,8 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, struct kvm_memory_slot *slot,
 	if (*sptep == spte) {
 		ret = RET_PF_SPURIOUS;
 	} else {
-		trace_kvm_mmu_set_spte(level, gfn, sptep);
 		flush |= mmu_spte_update(sptep, spte);
+		trace_kvm_mmu_set_spte(level, gfn, sptep);
 	}
 
 	if (wrprot) {
Signature · 1 line
2.26.3>