Commit fd325257 authored by Yan Zhao's avatar Yan Zhao Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Add parameter "kvm" to kvm_mmu_page_ad_need_write_protect() 



Add a parameter "kvm" to kvm_mmu_page_ad_need_write_protect() and its
caller tdp_mmu_need_write_protect().

This is a preparation to make cpu_dirty_log_size a per-VM value rather than
a system-wide value.

No function changes expected.

Signed-off-by: default avatarYan Zhao <yan.y.zhao@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c4a92f12

arch/x86/kvm/mmu/mmu_internal.h

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ static inline gfn_t kvm_gfn_root_bits(const struct kvm *kvm, const struct kvm_mm 
	return kvm_gfn_direct_bits(kvm);

}



static inline bool kvm_mmu_page_ad_need_write_protect(struct kvm_mmu_page *sp)

static inline bool kvm_mmu_page_ad_need_write_protect(struct kvm *kvm,

						      struct kvm_mmu_page *sp)

{

	/*

	 * When using the EPT page-modification log, the GPAs in the CPU dirty

arch/x86/kvm/mmu/spte.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ bool make_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, 


	if (sp->role.ad_disabled)

		spte |= SPTE_TDP_AD_DISABLED;

	else if (kvm_mmu_page_ad_need_write_protect(sp))

	else if (kvm_mmu_page_ad_need_write_protect(vcpu->kvm, sp))

		spte |= SPTE_TDP_AD_WRPROT_ONLY;



	spte |= shadow_present_mask;

arch/x86/kvm/mmu/tdp_mmu.c

+6 −6
Original line number Diff line number Diff line
@@ -1613,21 +1613,21 @@ void kvm_tdp_mmu_try_split_huge_pages(struct kvm *kvm, 
	}

}



static bool tdp_mmu_need_write_protect(struct kvm_mmu_page *sp)

static bool tdp_mmu_need_write_protect(struct kvm *kvm, struct kvm_mmu_page *sp)

{

	/*

	 * All TDP MMU shadow pages share the same role as their root, aside

	 * from level, so it is valid to key off any shadow page to determine if

	 * write protection is needed for an entire tree.

	 */

	return kvm_mmu_page_ad_need_write_protect(sp) || !kvm_ad_enabled;

	return kvm_mmu_page_ad_need_write_protect(kvm, sp) || !kvm_ad_enabled;

}



static void clear_dirty_gfn_range(struct kvm *kvm, struct kvm_mmu_page *root,

				  gfn_t start, gfn_t end)

{

	const u64 dbit = tdp_mmu_need_write_protect(root) ? PT_WRITABLE_MASK :

							    shadow_dirty_mask;

	const u64 dbit = tdp_mmu_need_write_protect(kvm, root) ?

			 PT_WRITABLE_MASK : shadow_dirty_mask;

	struct tdp_iter iter;



	rcu_read_lock();
@@ -1672,8 +1672,8 @@ void kvm_tdp_mmu_clear_dirty_slot(struct kvm *kvm, 
static void clear_dirty_pt_masked(struct kvm *kvm, struct kvm_mmu_page *root,

				  gfn_t gfn, unsigned long mask, bool wrprot)

{

	const u64 dbit = (wrprot || tdp_mmu_need_write_protect(root)) ? PT_WRITABLE_MASK :

									shadow_dirty_mask;

	const u64 dbit = (wrprot || tdp_mmu_need_write_protect(kvm, root)) ?

			  PT_WRITABLE_MASK : shadow_dirty_mask;

	struct tdp_iter iter;



	lockdep_assert_held_write(&kvm->mmu_lock);