Commit dc1ae59f authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Sean Christopherson
Browse files

kvm: x86/mmu: Rename SPTE_TDP_AD_ENABLED_MASK to SPTE_TDP_AD_ENABLED 



SPTE_TDP_AD_ENABLED_MASK, SPTE_TDP_AD_DISABLED_MASK and
SPTE_TDP_AD_WRPROT_ONLY_MASK are actual value, not mask.

Remove "MASK" from their names.

Signed-off-by: default avatarLai Jiangshan <jiangshan.ljs@antgroup.com>
Link: https://lore.kernel.org/r/20230105100204.6521-1-jiangshanlai@gmail.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 7cb79f43

arch/x86/kvm/mmu/spte.c

+3 −3
Original line number Diff line number Diff line
@@ -147,9 +147,9 @@ bool make_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, 
	WARN_ON_ONCE(!pte_access && !shadow_present_mask);



	if (sp->role.ad_disabled)

		spte |= SPTE_TDP_AD_DISABLED_MASK;

		spte |= SPTE_TDP_AD_DISABLED;

	else if (kvm_mmu_page_ad_need_write_protect(sp))

		spte |= SPTE_TDP_AD_WRPROT_ONLY_MASK;

		spte |= SPTE_TDP_AD_WRPROT_ONLY;



	/*

	 * For the EPT case, shadow_present_mask is 0 if hardware
@@ -317,7 +317,7 @@ u64 make_nonleaf_spte(u64 *child_pt, bool ad_disabled) 
		shadow_user_mask | shadow_x_mask | shadow_me_value;



	if (ad_disabled)

		spte |= SPTE_TDP_AD_DISABLED_MASK;

		spte |= SPTE_TDP_AD_DISABLED;

	else

		spte |= shadow_accessed_mask;

arch/x86/kvm/mmu/spte.h

+8 −8
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
 */

#define SPTE_TDP_AD_SHIFT		52

#define SPTE_TDP_AD_MASK		(3ULL << SPTE_TDP_AD_SHIFT)

#define SPTE_TDP_AD_ENABLED_MASK	(0ULL << SPTE_TDP_AD_SHIFT)

#define SPTE_TDP_AD_DISABLED_MASK	(1ULL << SPTE_TDP_AD_SHIFT)

#define SPTE_TDP_AD_WRPROT_ONLY_MASK	(2ULL << SPTE_TDP_AD_SHIFT)

static_assert(SPTE_TDP_AD_ENABLED_MASK == 0);

#define SPTE_TDP_AD_ENABLED		(0ULL << SPTE_TDP_AD_SHIFT)

#define SPTE_TDP_AD_DISABLED		(1ULL << SPTE_TDP_AD_SHIFT)

#define SPTE_TDP_AD_WRPROT_ONLY		(2ULL << SPTE_TDP_AD_SHIFT)

static_assert(SPTE_TDP_AD_ENABLED == 0);



#ifdef CONFIG_DYNAMIC_PHYSICAL_MASK

#define SPTE_BASE_ADDR_MASK (physical_mask & ~(u64)(PAGE_SIZE-1))
@@ -164,7 +164,7 @@ extern u64 __read_mostly shadow_me_value; 
extern u64 __read_mostly shadow_me_mask;



/*

 * SPTEs in MMUs without A/D bits are marked with SPTE_TDP_AD_DISABLED_MASK;

 * SPTEs in MMUs without A/D bits are marked with SPTE_TDP_AD_DISABLED;

 * shadow_acc_track_mask is the set of bits to be cleared in non-accessed

 * pages.

 */
@@ -266,18 +266,18 @@ 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));

	return (spte & SPTE_TDP_AD_MASK) != SPTE_TDP_AD_DISABLED_MASK;

	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));

	/*

	 * This is benign for non-TDP SPTEs as SPTE_TDP_AD_ENABLED_MASK is '0',

	 * 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

	 * TDP and do the A/D type check unconditionally.

	 */

	return (spte & SPTE_TDP_AD_MASK) != SPTE_TDP_AD_ENABLED_MASK;

	return (spte & SPTE_TDP_AD_MASK) != SPTE_TDP_AD_ENABLED;

}



static inline u64 spte_shadow_accessed_mask(u64 spte)