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: Yan Zhao <yan.y.zhao@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h
index 75f00598289d76debc0afa4185e08a2f760888de..86d6d4f82cf435a26932a5c41985d5f4e2cddb07 100644 (file)
--- a/arch/x86/kvm/mmu/mmu_internal.h
+++ b/arch/x86/kvm/mmu/mmu_internal.h
@@ -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

diff --git a/arch/x86/kvm/mmu/spte.c b/arch/x86/kvm/mmu/spte.c
index e819d16655b6ba55b512e413e04c28f2588d6075..a609d5b58b69554b4e6f9664a9cfce4ebb80556a 100644 (file)
--- a/arch/x86/kvm/mmu/spte.c
+++ b/arch/x86/kvm/mmu/spte.c
@@ -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;

diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
index 22675a5746d06f07c7df666bbaf725f3f94e7025..fd0a7792386b88fcc2a4bec2220b8a5277f4d515 100644 (file)
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -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);