KVM: x86/mmu: Move round_gfn_for_level() helper into mmu_internal.h

Rounding down the GFN to a huge page size is a common pattern throughout
KVM, so move round_gfn_for_level() helper in tdp_iter.c to
mmu_internal.h for common usage. Also rename it as gfn_round_for_level()
to use gfn_* prefix and clean up the other call sites.

Signed-off-by: Hou Wenlong <houwenlong.hwl@antgroup.com>
Link: https://lore.kernel.org/r/415c64782f27444898db650e21cf28eeb6441dfa.1665214747.git.houwenlong.hwl@antgroup.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index d43952fb05a60d1400877f88e43eaac23dd89c86..f3bef56a89a33dc3e9fec9bf47d52cf4108b20a3 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -3169,7 +3169,7 @@ static int direct_map(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault)
                if (fault->nx_huge_page_workaround_enabled)
                        disallowed_hugepage_adjust(fault, *it.sptep, it.level);
 
-               base_gfn = fault->gfn & ~(KVM_PAGES_PER_HPAGE(it.level) - 1);
+               base_gfn = gfn_round_for_level(fault->gfn, it.level);
                if (it.level == fault->goal_level)
                        break;
 
@@ -4440,7 +4440,8 @@ int kvm_tdp_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault)
        if (shadow_memtype_mask && kvm_arch_has_noncoherent_dma(vcpu->kvm)) {
                for ( ; fault->max_level > PG_LEVEL_4K; --fault->max_level) {
                        int page_num = KVM_PAGES_PER_HPAGE(fault->max_level);
-                       gfn_t base = fault->gfn & ~(page_num - 1);
+                       gfn_t base = gfn_round_for_level(fault->gfn,
+                                                        fault->max_level);
 
                        if (kvm_mtrr_check_gfn_range_consistency(vcpu, base, page_num))
                                break;

diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h
index ac00bfbf32f67224a71fc07619c0e9caaa72c9ab..486be0f9fe16456d04d72191dbbf4126082f74a8 100644 (file)
--- a/arch/x86/kvm/mmu/mmu_internal.h
+++ b/arch/x86/kvm/mmu/mmu_internal.h
@@ -156,6 +156,11 @@ static inline bool kvm_mmu_page_ad_need_write_protect(struct kvm_mmu_page *sp)
        return kvm_x86_ops.cpu_dirty_log_size && sp->role.guest_mode;
 }
 
+static inline gfn_t gfn_round_for_level(gfn_t gfn, int level)
+{
+       return gfn & -KVM_PAGES_PER_HPAGE(level);
+}
+
 int mmu_try_to_unsync_pages(struct kvm *kvm, const struct kvm_memory_slot *slot,
                            gfn_t gfn, bool can_unsync, bool prefetch);
 

diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h
index 0160b502784adc633459c2d9f5bc55ea7aeee469..faf193e970614b84767621f73f1e4c396dfb97d0 100644 (file)
--- a/arch/x86/kvm/mmu/paging_tmpl.h
+++ b/arch/x86/kvm/mmu/paging_tmpl.h
@@ -699,7 +699,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
                if (fault->nx_huge_page_workaround_enabled)
                        disallowed_hugepage_adjust(fault, *it.sptep, it.level);
 
-               base_gfn = fault->gfn & ~(KVM_PAGES_PER_HPAGE(it.level) - 1);
+               base_gfn = gfn_round_for_level(fault->gfn, it.level);
                if (it.level == fault->goal_level)
                        break;
 

diff --git a/arch/x86/kvm/mmu/tdp_iter.c b/arch/x86/kvm/mmu/tdp_iter.c
index e26e744df1d12b4f353ea6d5a7244d6f523596de..d2eb0d4f87108d047b539841374e416d1a6b22f3 100644 (file)
--- a/arch/x86/kvm/mmu/tdp_iter.c
+++ b/arch/x86/kvm/mmu/tdp_iter.c
@@ -16,11 +16,6 @@ static void tdp_iter_refresh_sptep(struct tdp_iter *iter)
        iter->old_spte = kvm_tdp_mmu_read_spte(iter->sptep);
 }
 
-static gfn_t round_gfn_for_level(gfn_t gfn, int level)
-{
-       return gfn & -KVM_PAGES_PER_HPAGE(level);
-}
-
 /*
  * Return the TDP iterator to the root PT and allow it to continue its
  * traversal over the paging structure from there.
@@ -31,7 +26,7 @@ void tdp_iter_restart(struct tdp_iter *iter)
        iter->yielded_gfn = iter->next_last_level_gfn;
        iter->level = iter->root_level;
 
-       iter->gfn = round_gfn_for_level(iter->next_last_level_gfn, iter->level);
+       iter->gfn = gfn_round_for_level(iter->next_last_level_gfn, iter->level);
        tdp_iter_refresh_sptep(iter);
 
        iter->valid = true;
@@ -98,7 +93,7 @@ static bool try_step_down(struct tdp_iter *iter)
 
        iter->level--;
        iter->pt_path[iter->level - 1] = child_pt;
-       iter->gfn = round_gfn_for_level(iter->next_last_level_gfn, iter->level);
+       iter->gfn = gfn_round_for_level(iter->next_last_level_gfn, iter->level);
        tdp_iter_refresh_sptep(iter);
 
        return true;
@@ -140,7 +135,7 @@ static bool try_step_up(struct tdp_iter *iter)
                return false;
 
        iter->level++;
-       iter->gfn = round_gfn_for_level(iter->gfn, iter->level);
+       iter->gfn = gfn_round_for_level(iter->gfn, iter->level);
        tdp_iter_refresh_sptep(iter);
 
        return true;