Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbedee8c authored by Sean Christopherson's avatar Sean Christopherson Committed by Greg Kroah-Hartman
Browse files

KVM: x86/mmu: Consolidate "is MMIO SPTE" code 



[ Upstream commit 26c44a63a291893e0a00f01e96b6e1d0310a79a9 ]

Replace the open-coded "is MMIO SPTE" checks in the MMU warnings
related to software-based access/dirty tracking to make the code
slightly more self-documenting.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 40202c03

arch/x86/kvm/mmu.c

+8 −8
Original line number Diff line number Diff line
@@ -299,6 +299,11 @@ void kvm_mmu_set_mmio_spte_mask(u64 mmio_mask, u64 mmio_value) 
}

EXPORT_SYMBOL_GPL(kvm_mmu_set_mmio_spte_mask);



static bool is_mmio_spte(u64 spte)

{

	return (spte & shadow_mmio_mask) == shadow_mmio_value;

}



static inline bool sp_ad_disabled(struct kvm_mmu_page *sp)

{

	return sp->role.ad_disabled;
@@ -306,7 +311,7 @@ static inline bool sp_ad_disabled(struct kvm_mmu_page *sp) 


static inline bool spte_ad_enabled(u64 spte)

{

	MMU_WARN_ON((spte & shadow_mmio_mask) == shadow_mmio_value);

	MMU_WARN_ON(is_mmio_spte(spte));

	return !(spte & shadow_acc_track_value);

}
@@ -317,13 +322,13 @@ static bool is_nx_huge_page_enabled(void) 


static inline u64 spte_shadow_accessed_mask(u64 spte)

{

	MMU_WARN_ON((spte & shadow_mmio_mask) == shadow_mmio_value);

	MMU_WARN_ON(is_mmio_spte(spte));

	return spte_ad_enabled(spte) ? shadow_accessed_mask : 0;

}



static inline u64 spte_shadow_dirty_mask(u64 spte)

{

	MMU_WARN_ON((spte & shadow_mmio_mask) == shadow_mmio_value);

	MMU_WARN_ON(is_mmio_spte(spte));

	return spte_ad_enabled(spte) ? shadow_dirty_mask : 0;

}
@@ -393,11 +398,6 @@ static void mark_mmio_spte(struct kvm_vcpu *vcpu, u64 *sptep, u64 gfn, 
	mmu_spte_set(sptep, mask);

}



static bool is_mmio_spte(u64 spte)

{

	return (spte & shadow_mmio_mask) == shadow_mmio_value;

}



static gfn_t get_mmio_spte_gfn(u64 spte)

{

	u64 gpa = spte & shadow_nonpresent_or_rsvd_lower_gfn_mask;