KVM: x86/mmu: Drop the "p is for pointer" from rmap helpers

Drop the trailing "p" from rmap helpers, i.e. rename functions to simply
be kvm_<action>_rmap().  Declaring that a function takes a pointer is
completely unnecessary and goes against kernel style.

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220715224226.3749507-4-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 92fcffec022791ada50ab9ffecfe6895105c34e3..fec999d2fc13359ad511b0f6b3db49812fa1204a 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -403,7 +403,7 @@ static u64 __update_clear_spte_slow(u64 *sptep, u64 spte)
  * The idea using the light way get the spte on x86_32 guest is from
  * gup_get_pte (mm/gup.c).
  *
- * An spte tlb flush may be pending, because kvm_set_pte_rmapp
+ * An spte tlb flush may be pending, because kvm_set_pte_rmap
  * coalesces them and we are running out of the MMU lock.  Therefore
  * we need to protect against in-progress updates of the spte.
  *
@@ -1383,22 +1383,22 @@ static bool kvm_vcpu_write_protect_gfn(struct kvm_vcpu *vcpu, u64 gfn)
        return kvm_mmu_slot_gfn_write_protect(vcpu->kvm, slot, gfn, PG_LEVEL_4K);
 }
 
-static bool kvm_zap_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
-                         const struct kvm_memory_slot *slot)
+static bool kvm_zap_rmap(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
+                        const struct kvm_memory_slot *slot)
 {
        return pte_list_destroy(kvm, rmap_head);
 }
 
-static bool kvm_unmap_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
-                           struct kvm_memory_slot *slot, gfn_t gfn, int level,
-                           pte_t unused)
+static bool kvm_unmap_rmap(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
+                          struct kvm_memory_slot *slot, gfn_t gfn, int level,
+                          pte_t unused)
 {
-       return kvm_zap_rmapp(kvm, rmap_head, slot);
+       return kvm_zap_rmap(kvm, rmap_head, slot);
 }
 
-static bool kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
-                             struct kvm_memory_slot *slot, gfn_t gfn, int level,
-                             pte_t pte)
+static bool kvm_set_pte_rmap(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
+                            struct kvm_memory_slot *slot, gfn_t gfn, int level,
+                            pte_t pte)
 {
        u64 *sptep;
        struct rmap_iterator iter;
@@ -1529,7 +1529,7 @@ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range)
        bool flush = false;
 
        if (kvm_memslots_have_rmaps(kvm))
-               flush = kvm_handle_gfn_range(kvm, range, kvm_unmap_rmapp);
+               flush = kvm_handle_gfn_range(kvm, range, kvm_unmap_rmap);
 
        if (is_tdp_mmu_enabled(kvm))
                flush = kvm_tdp_mmu_unmap_gfn_range(kvm, range, flush);
@@ -1542,7 +1542,7 @@ bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range)
        bool flush = false;
 
        if (kvm_memslots_have_rmaps(kvm))
-               flush = kvm_handle_gfn_range(kvm, range, kvm_set_pte_rmapp);
+               flush = kvm_handle_gfn_range(kvm, range, kvm_set_pte_rmap);
 
        if (is_tdp_mmu_enabled(kvm))
                flush |= kvm_tdp_mmu_set_spte_gfn(kvm, range);
@@ -1550,9 +1550,9 @@ bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range)
        return flush;
 }
 
-static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
-                         struct kvm_memory_slot *slot, gfn_t gfn, int level,
-                         pte_t unused)
+static bool kvm_age_rmap(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
+                        struct kvm_memory_slot *slot, gfn_t gfn, int level,
+                        pte_t unused)
 {
        u64 *sptep;
        struct rmap_iterator iter;
@@ -1564,9 +1564,9 @@ static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
        return young;
 }
 
-static bool kvm_test_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
-                              struct kvm_memory_slot *slot, gfn_t gfn,
-                              int level, pte_t unused)
+static bool kvm_test_age_rmap(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
+                             struct kvm_memory_slot *slot, gfn_t gfn,
+                             int level, pte_t unused)
 {
        u64 *sptep;
        struct rmap_iterator iter;
@@ -1615,7 +1615,7 @@ bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)
        bool young = false;
 
        if (kvm_memslots_have_rmaps(kvm))
-               young = kvm_handle_gfn_range(kvm, range, kvm_age_rmapp);
+               young = kvm_handle_gfn_range(kvm, range, kvm_age_rmap);
 
        if (is_tdp_mmu_enabled(kvm))
                young |= kvm_tdp_mmu_age_gfn_range(kvm, range);
@@ -1628,7 +1628,7 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)
        bool young = false;
 
        if (kvm_memslots_have_rmaps(kvm))
-               young = kvm_handle_gfn_range(kvm, range, kvm_test_age_rmapp);
+               young = kvm_handle_gfn_range(kvm, range, kvm_test_age_rmap);
 
        if (is_tdp_mmu_enabled(kvm))
                young |= kvm_tdp_mmu_test_age_gfn(kvm, range);
@@ -6004,8 +6004,7 @@ static bool __kvm_zap_rmaps(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end)
                        if (WARN_ON_ONCE(start >= end))
                                continue;
 
-                       flush = slot_handle_level_range(kvm, memslot, kvm_zap_rmapp,
-
+                       flush = slot_handle_level_range(kvm, memslot, kvm_zap_rmap,
                                                        PG_LEVEL_4K, KVM_MAX_HUGEPAGE_LEVEL,
                                                        start, end - 1, true, flush);
                }