Skip to content

Commit 427c76a

Browse files
sean-jcbonzini
authored andcommitted
KVM: x86/mmu: Bug the VM if write-tracking is used but not enabled
Bug the VM if something attempts to write-track a gfn, but write-tracking isn't enabled. The VM is doomed (and KVM has an egregious bug) if KVM or KVMGT wants to shadow guest page tables but can't because write-tracking isn't enabled. Tested-by: Yongwei Ma <yongwei.ma@intel.com> Link: https://lore.kernel.org/r/20230729013535.1070024-27-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent e18c542 commit 427c76a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/kvm/mmu/page_track.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void kvm_write_track_add_gfn(struct kvm *kvm, struct kvm_memory_slot *slot,
9090
lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) ||
9191
srcu_read_lock_held(&kvm->srcu));
9292

93-
if (WARN_ON_ONCE(!kvm_page_track_write_tracking_enabled(kvm)))
93+
if (KVM_BUG_ON(!kvm_page_track_write_tracking_enabled(kvm), kvm))
9494
return;
9595

9696
update_gfn_write_track(slot, gfn, 1);
@@ -122,7 +122,7 @@ void kvm_write_track_remove_gfn(struct kvm *kvm,
122122
lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) ||
123123
srcu_read_lock_held(&kvm->srcu));
124124

125-
if (WARN_ON_ONCE(!kvm_page_track_write_tracking_enabled(kvm)))
125+
if (KVM_BUG_ON(!kvm_page_track_write_tracking_enabled(kvm), kvm))
126126
return;
127127

128128
update_gfn_write_track(slot, gfn, -1);

0 commit comments

Comments
 (0)