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

KVM: x86/mmu: Rename 'mask' to 'spte' in MMIO SPTE helpers 



The value returned by make_mmio_spte() is a SPTE, it is not a mask.
Name it accordingly.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210225204749.1512652-10-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3849e092

arch/x86/kvm/mmu/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -215,10 +215,10 @@ bool is_nx_huge_page_enabled(void) 
static void mark_mmio_spte(struct kvm_vcpu *vcpu, u64 *sptep, u64 gfn,

			   unsigned int access)

{

	u64 mask = make_mmio_spte(vcpu, gfn, access);

	u64 spte = make_mmio_spte(vcpu, gfn, access);



	trace_mark_mmio_spte(sptep, gfn, mask);

	mmu_spte_set(sptep, mask);

	trace_mark_mmio_spte(sptep, gfn, spte);

	mmu_spte_set(sptep, spte);

}



static gfn_t get_mmio_spte_gfn(u64 spte)

arch/x86/kvm/mmu/spte.c

+5 −5
Original line number Diff line number Diff line
@@ -48,18 +48,18 @@ static u64 generation_mmio_spte_mask(u64 gen) 
u64 make_mmio_spte(struct kvm_vcpu *vcpu, u64 gfn, unsigned int access)

{

	u64 gen = kvm_vcpu_memslots(vcpu)->generation & MMIO_SPTE_GEN_MASK;

	u64 mask = generation_mmio_spte_mask(gen);

	u64 spte = generation_mmio_spte_mask(gen);

	u64 gpa = gfn << PAGE_SHIFT;



	WARN_ON_ONCE(!shadow_mmio_value);



	access &= shadow_mmio_access_mask;

	mask |= shadow_mmio_value | access;

	mask |= gpa | shadow_nonpresent_or_rsvd_mask;

	mask |= (gpa & shadow_nonpresent_or_rsvd_mask)

	spte |= shadow_mmio_value | access;

	spte |= gpa | shadow_nonpresent_or_rsvd_mask;

	spte |= (gpa & shadow_nonpresent_or_rsvd_mask)

		<< SHADOW_NONPRESENT_OR_RSVD_MASK_LEN;



	return mask;

	return spte;

}



static bool kvm_is_mmio_pfn(kvm_pfn_t pfn)