KVM: x86/mmu: Bug the VM if write-tracking is used but not enabled
authorSean Christopherson <seanjc@google.com>
Sat, 29 Jul 2023 01:35:32 +0000 (18:35 -0700)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 31 Aug 2023 18:08:17 +0000 (14:08 -0400)
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>
arch/x86/kvm/mmu/page_track.c

index 2c6b912072b7dc1b7073238096d9883dfc8e736e..9bf01311ee9cc383c471b7a5ec9736212880143b 100644 (file)
@@ -90,7 +90,7 @@ void kvm_write_track_add_gfn(struct kvm *kvm, struct kvm_memory_slot *slot,
        lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) ||
                            srcu_read_lock_held(&kvm->srcu));
 
-       if (WARN_ON_ONCE(!kvm_page_track_write_tracking_enabled(kvm)))
+       if (KVM_BUG_ON(!kvm_page_track_write_tracking_enabled(kvm), kvm))
                return;
 
        update_gfn_write_track(slot, gfn, 1);
@@ -122,7 +122,7 @@ void kvm_write_track_remove_gfn(struct kvm *kvm,
        lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) ||
                            srcu_read_lock_held(&kvm->srcu));
 
-       if (WARN_ON_ONCE(!kvm_page_track_write_tracking_enabled(kvm)))
+       if (KVM_BUG_ON(!kvm_page_track_write_tracking_enabled(kvm), kvm))
                return;
 
        update_gfn_write_track(slot, gfn, -1);