Commit 0fe6370e authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

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: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/r/20230729004722.1056172-7-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 58da926c

arch/x86/kvm/mmu/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

arch/x86/kvm/mmu/mmu_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -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. */

arch/x86/kvm/mmu/spte.h

+4 −4
Original line number Diff line number Diff line
@@ -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;

}

arch/x86/kvm/mmu/tdp_mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ static bool clear_dirty_gfn_range(struct kvm *kvm, struct kvm_mmu_page *root, 
		if (!is_shadow_present_pte(iter.old_spte))

			continue;



		MMU_WARN_ON(kvm_ad_enabled() &&

		KVM_MMU_WARN_ON(kvm_ad_enabled() &&

				spte_ad_need_write_protect(iter.old_spte));



		if (!(iter.old_spte & dbit))
@@ -1609,7 +1609,7 @@ static void clear_dirty_pt_masked(struct kvm *kvm, struct kvm_mmu_page *root, 
		if (!mask)

			break;



		MMU_WARN_ON(kvm_ad_enabled() &&

		KVM_MMU_WARN_ON(kvm_ad_enabled() &&

				spte_ad_need_write_protect(iter.old_spte));



		if (iter.level > PG_LEVEL_4K ||