Commit 9a02c9eb authored by David Matlack's avatar David Matlack Committed by Yu Zhang
Browse files

KVM: x86/mmu: Refactor is_tdp_mmu_root into is_tdp_mmu 

mainline inclusion
from mainline-v5.14-rc1
commit 63c0cac9
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I7S3VQ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=63c0cac938edfa5d72bfbe8f1eeb9d47b397829c



----------------------------------------------------------------------

This change simplifies the call sites slightly and also abstracts away
the implementation detail of looking at root_hpa as the mechanism for
determining if the mmu is the TDP MMU.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Message-Id: <20210617231948.2591431-4-dmatlack@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarYu Zhang <yu.c.zhang@linux.intel.com>
parent 13e6eacc

arch/x86/kvm/mmu/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -3581,7 +3581,7 @@ static bool get_mmio_spte(struct kvm_vcpu *vcpu, u64 addr, u64 *sptep) 
		return reserved;

	}



	if (is_tdp_mmu_root(vcpu->arch.mmu->root_hpa))

	if (is_tdp_mmu(vcpu->arch.mmu))

		leaf = kvm_tdp_mmu_get_walk(vcpu, addr, sptes, &root);

	else

		leaf = get_walk(vcpu, addr, sptes, &root);
@@ -3759,7 +3759,7 @@ static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn, 
static int direct_page_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code,

			     bool prefault, int max_level, bool is_tdp)

{

	bool is_tdp_mmu_fault = is_tdp_mmu_root(vcpu->arch.mmu->root_hpa);

	bool is_tdp_mmu_fault = is_tdp_mmu(vcpu->arch.mmu);

	bool write = error_code & PFERR_WRITE_MASK;

	bool map_writable;

arch/x86/kvm/mmu/tdp_mmu.h

+3 −2
Original line number Diff line number Diff line
@@ -81,9 +81,10 @@ void kvm_mmu_uninit_tdp_mmu(struct kvm *kvm); 
static inline bool is_tdp_mmu_enabled(struct kvm *kvm) { return kvm->arch.tdp_mmu_enabled; }

static inline bool is_tdp_mmu_page(struct kvm_mmu_page *sp) { return sp->tdp_mmu_page; }



static inline bool is_tdp_mmu_root(hpa_t hpa)

static inline bool is_tdp_mmu(struct kvm_mmu *mmu)

{

	struct kvm_mmu_page *sp;

	hpa_t hpa = mmu->root_hpa;



	if (WARN_ON(!VALID_PAGE(hpa)))

		return false;
@@ -99,7 +100,7 @@ static inline bool kvm_mmu_init_tdp_mmu(struct kvm *kvm) { return false; } 
static inline void kvm_mmu_uninit_tdp_mmu(struct kvm *kvm) {}

static inline bool is_tdp_mmu_enabled(struct kvm *kvm) { return false; }

static inline bool is_tdp_mmu_page(struct kvm_mmu_page *sp) { return false; }

static inline bool is_tdp_mmu_root(hpa_t hpa) { return false; }

static inline bool is_tdp_mmu(struct kvm_mmu *mmu) { return false; }

#endif



#endif /* __KVM_X86_MMU_TDP_MMU_H */