KVM: x86/mmu: Rename MMU_WARN_ON() to KVM_MMU_WARN_ON()

Rename MMU_WARN_ON() to make it super obvious that the assertions are
all about KVM's MMU, not the primary MMU.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/r/20230729004722.1056172-7-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index cb3adaa6935097fe294151898ee4d86b28103676..8dc40d023742c3c3058a739b3e6eb254679d9c52 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -1251,7 +1251,7 @@ static bool spte_clear_dirty(u64 *sptep)
 {
        u64 spte = *sptep;
 
-       MMU_WARN_ON(!spte_ad_enabled(spte));
+       KVM_MMU_WARN_ON(!spte_ad_enabled(spte));
        spte &= ~shadow_dirty_mask;
        return mmu_spte_update(sptep, spte);
 }
@@ -1695,7 +1695,7 @@ static void kvm_mmu_check_sptes_at_free(struct kvm_mmu_page *sp)
        int i;
 
        for (i = 0; i < SPTE_ENT_PER_PAGE; i++) {
-               if (MMU_WARN_ON(is_shadow_present_pte(sp->spt[i])))
+               if (KVM_MMU_WARN_ON(is_shadow_present_pte(sp->spt[i])))
                        pr_err_ratelimited("SPTE %llx (@ %p) for gfn %llx shadow-present at free",
                                           sp->spt[i], &sp->spt[i],
                                           kvm_mmu_page_get_gfn(sp, i));

diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h
index 9599e7eb6d85afeaf743f5aa68f5b7356cf66ffe..d5ef61635b94d1d44b9185b52bb3bf87ac0ac5e7 100644 (file)
--- a/arch/x86/kvm/mmu/mmu_internal.h
+++ b/arch/x86/kvm/mmu/mmu_internal.h
@@ -9,9 +9,9 @@
 #undef MMU_DEBUG
 
 #ifdef MMU_DEBUG
-#define MMU_WARN_ON(x) WARN_ON(x)
+#define KVM_MMU_WARN_ON(x) WARN_ON(x)
 #else
-#define MMU_WARN_ON(x) do { } while (0)
+#define KVM_MMU_WARN_ON(x) do { } while (0)
 #endif
 
 /* Page table builder macros common to shadow (host) PTEs and guest PTEs. */

diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h
index 1279db2eab44c7887f09d40ab2c895bf409122eb..83e6614f3720cdd9127a13fce1ed1d46d004bb72 100644 (file)
--- a/arch/x86/kvm/mmu/spte.h
+++ b/arch/x86/kvm/mmu/spte.h
@@ -265,13 +265,13 @@ static inline bool sp_ad_disabled(struct kvm_mmu_page *sp)
 
 static inline bool spte_ad_enabled(u64 spte)
 {
-       MMU_WARN_ON(!is_shadow_present_pte(spte));
+       KVM_MMU_WARN_ON(!is_shadow_present_pte(spte));
        return (spte & SPTE_TDP_AD_MASK) != SPTE_TDP_AD_DISABLED;
 }
 
 static inline bool spte_ad_need_write_protect(u64 spte)
 {
-       MMU_WARN_ON(!is_shadow_present_pte(spte));
+       KVM_MMU_WARN_ON(!is_shadow_present_pte(spte));
        /*
         * This is benign for non-TDP SPTEs as SPTE_TDP_AD_ENABLED is '0',
         * and non-TDP SPTEs will never set these bits.  Optimize for 64-bit
@@ -282,13 +282,13 @@ static inline bool spte_ad_need_write_protect(u64 spte)
 
 static inline u64 spte_shadow_accessed_mask(u64 spte)
 {
-       MMU_WARN_ON(!is_shadow_present_pte(spte));
+       KVM_MMU_WARN_ON(!is_shadow_present_pte(spte));
        return spte_ad_enabled(spte) ? shadow_accessed_mask : 0;
 }
 
 static inline u64 spte_shadow_dirty_mask(u64 spte)
 {
-       MMU_WARN_ON(!is_shadow_present_pte(spte));
+       KVM_MMU_WARN_ON(!is_shadow_present_pte(spte));
        return spte_ad_enabled(spte) ? shadow_dirty_mask : 0;
 }
 

diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
index 639c5f2c88f8f2adbdc9b5b4b061090794b879e4..e54d5f442426abfe01a3f28872a16e0ef30d7e59 100644 (file)
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -1548,8 +1548,8 @@ retry:
                if (!is_shadow_present_pte(iter.old_spte))
                        continue;
 
-               MMU_WARN_ON(kvm_ad_enabled() &&
-                           spte_ad_need_write_protect(iter.old_spte));
+               KVM_MMU_WARN_ON(kvm_ad_enabled() &&
+                               spte_ad_need_write_protect(iter.old_spte));
 
                if (!(iter.old_spte & dbit))
                        continue;
@@ -1609,8 +1609,8 @@ static void clear_dirty_pt_masked(struct kvm *kvm, struct kvm_mmu_page *root,
                if (!mask)
                        break;
 
-               MMU_WARN_ON(kvm_ad_enabled() &&
-                           spte_ad_need_write_protect(iter.old_spte));
+               KVM_MMU_WARN_ON(kvm_ad_enabled() &&
+                               spte_ad_need_write_protect(iter.old_spte));
 
                if (iter.level > PG_LEVEL_4K ||
                    !(mask & (1UL << (iter.gfn - gfn))))