KVM: Shorten gfn_to_pfn_cache function names

Formalize "gpc" as the acronym and use it in function names.

No functional change intended.

Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 59fd55badd7326131ac22a5e8a59d29b333dbb69..246bdc9a915472b97ffbe50405d6d39d7864977b 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3037,12 +3037,12 @@ static void kvm_setup_guest_pvclock(struct kvm_vcpu *v,
        unsigned long flags;
 
        read_lock_irqsave(&gpc->lock, flags);
-       while (!kvm_gfn_to_pfn_cache_check(v->kvm, gpc, gpc->gpa,
-                                          offset + sizeof(*guest_hv_clock))) {
+       while (!kvm_gpc_check(v->kvm, gpc, gpc->gpa,
+                             offset + sizeof(*guest_hv_clock))) {
                read_unlock_irqrestore(&gpc->lock, flags);
 
-               if (kvm_gfn_to_pfn_cache_refresh(v->kvm, gpc, gpc->gpa,
-                                                offset + sizeof(*guest_hv_clock)))
+               if (kvm_gpc_refresh(v->kvm, gpc, gpc->gpa,
+                                   offset + sizeof(*guest_hv_clock)))
                        return;
 
                read_lock_irqsave(&gpc->lock, flags);

diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index 60a9bdd4199fcb763ae145176a9e3f842e89dab2..9187d024d006678e8d33ad8c1960099b5f9e5f8e 100644 (file)
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -273,14 +273,14 @@ static void kvm_xen_update_runstate_guest(struct kvm_vcpu *v, bool atomic)
         * gfn_to_pfn caches that cover the region.
         */
        read_lock_irqsave(&gpc1->lock, flags);
-       while (!kvm_gfn_to_pfn_cache_check(v->kvm, gpc1, gpc1->gpa, user_len1)) {
+       while (!kvm_gpc_check(v->kvm, gpc1, gpc1->gpa, user_len1)) {
                read_unlock_irqrestore(&gpc1->lock, flags);
 
                /* When invoked from kvm_sched_out() we cannot sleep */
                if (atomic)
                        return;
 
-               if (kvm_gfn_to_pfn_cache_refresh(v->kvm, gpc1, gpc1->gpa, user_len1))
+               if (kvm_gpc_refresh(v->kvm, gpc1, gpc1->gpa, user_len1))
                        return;
 
                read_lock_irqsave(&gpc1->lock, flags);
@@ -309,7 +309,7 @@ static void kvm_xen_update_runstate_guest(struct kvm_vcpu *v, bool atomic)
                 */
                read_lock(&gpc2->lock);
 
-               if (!kvm_gfn_to_pfn_cache_check(v->kvm, gpc2, gpc2->gpa, user_len2)) {
+               if (!kvm_gpc_check(v->kvm, gpc2, gpc2->gpa, user_len2)) {
                        read_unlock(&gpc2->lock);
                        read_unlock_irqrestore(&gpc1->lock, flags);
 
@@ -489,12 +489,12 @@ void kvm_xen_inject_pending_events(struct kvm_vcpu *v)
         * little more honest about it.
         */
        read_lock_irqsave(&gpc->lock, flags);
-       while (!kvm_gfn_to_pfn_cache_check(v->kvm, gpc, gpc->gpa,
-                                          sizeof(struct vcpu_info))) {
+       while (!kvm_gpc_check(v->kvm, gpc, gpc->gpa,
+                             sizeof(struct vcpu_info))) {
                read_unlock_irqrestore(&gpc->lock, flags);
 
-               if (kvm_gfn_to_pfn_cache_refresh(v->kvm, gpc, gpc->gpa,
-                                                sizeof(struct vcpu_info)))
+               if (kvm_gpc_refresh(v->kvm, gpc, gpc->gpa,
+                                   sizeof(struct vcpu_info)))
                        return;
 
                read_lock_irqsave(&gpc->lock, flags);
@@ -554,8 +554,8 @@ int __kvm_xen_has_interrupt(struct kvm_vcpu *v)
                     sizeof_field(struct compat_vcpu_info, evtchn_upcall_pending));
 
        read_lock_irqsave(&gpc->lock, flags);
-       while (!kvm_gfn_to_pfn_cache_check(v->kvm, gpc, gpc->gpa,
-                                          sizeof(struct vcpu_info))) {
+       while (!kvm_gpc_check(v->kvm, gpc, gpc->gpa,
+                             sizeof(struct vcpu_info))) {
                read_unlock_irqrestore(&gpc->lock, flags);
 
                /*
@@ -569,8 +569,8 @@ int __kvm_xen_has_interrupt(struct kvm_vcpu *v)
                if (in_atomic() || !task_is_running(current))
                        return 1;
 
-               if (kvm_gfn_to_pfn_cache_refresh(v->kvm, gpc, gpc->gpa,
-                                                sizeof(struct vcpu_info))) {
+               if (kvm_gpc_refresh(v->kvm, gpc, gpc->gpa,
+                                   sizeof(struct vcpu_info))) {
                        /*
                         * If this failed, userspace has screwed up the
                         * vcpu_info mapping. No interrupts for you.
@@ -1167,7 +1167,7 @@ static bool wait_pending_event(struct kvm_vcpu *vcpu, int nr_ports,
 
        read_lock_irqsave(&gpc->lock, flags);
        idx = srcu_read_lock(&kvm->srcu);
-       if (!kvm_gfn_to_pfn_cache_check(kvm, gpc, gpc->gpa, PAGE_SIZE))
+       if (!kvm_gpc_check(kvm, gpc, gpc->gpa, PAGE_SIZE))
                goto out_rcu;
 
        ret = false;
@@ -1564,7 +1564,7 @@ int kvm_xen_set_evtchn_fast(struct kvm_xen_evtchn *xe, struct kvm *kvm)
        idx = srcu_read_lock(&kvm->srcu);
 
        read_lock_irqsave(&gpc->lock, flags);
-       if (!kvm_gfn_to_pfn_cache_check(kvm, gpc, gpc->gpa, PAGE_SIZE))
+       if (!kvm_gpc_check(kvm, gpc, gpc->gpa, PAGE_SIZE))
                goto out_rcu;
 
        if (IS_ENABLED(CONFIG_64BIT) && kvm->arch.xen.long_mode) {
@@ -1598,7 +1598,7 @@ int kvm_xen_set_evtchn_fast(struct kvm_xen_evtchn *xe, struct kvm *kvm)
                gpc = &vcpu->arch.xen.vcpu_info_cache;
 
                read_lock_irqsave(&gpc->lock, flags);
-               if (!kvm_gfn_to_pfn_cache_check(kvm, gpc, gpc->gpa, sizeof(struct vcpu_info))) {
+               if (!kvm_gpc_check(kvm, gpc, gpc->gpa, sizeof(struct vcpu_info))) {
                        /*
                         * Could not access the vcpu_info. Set the bit in-kernel
                         * and prod the vCPU to deliver it for itself.
@@ -1696,7 +1696,7 @@ static int kvm_xen_set_evtchn(struct kvm_xen_evtchn *xe, struct kvm *kvm)
                        break;
 
                idx = srcu_read_lock(&kvm->srcu);
-               rc = kvm_gfn_to_pfn_cache_refresh(kvm, gpc, gpc->gpa, PAGE_SIZE);
+               rc = kvm_gpc_refresh(kvm, gpc, gpc->gpa, PAGE_SIZE);
                srcu_read_unlock(&kvm->srcu, idx);
        } while(!rc);
 

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index b8d12356f015fb634d8dd5fcc152a2d16281c98a..8f874a96431393eade801da1ddbc727cbb6eb0c1 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1288,16 +1288,15 @@ void kvm_gpc_init(struct gfn_to_pfn_cache *gpc);
  *                 -EFAULT for an untranslatable guest physical address.
  *
  * This primes a gfn_to_pfn_cache and links it into the @kvm's list for
- * invalidations to be processed.  Callers are required to use
- * kvm_gfn_to_pfn_cache_check() to ensure that the cache is valid before
- * accessing the target page.
+ * invalidations to be processed.  Callers are required to use kvm_gpc_check()
+ * to ensure that the cache is valid before accessing the target page.
  */
 int kvm_gpc_activate(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
                     struct kvm_vcpu *vcpu, enum pfn_cache_usage usage,
                     gpa_t gpa, unsigned long len);
 
 /**
- * kvm_gfn_to_pfn_cache_check - check validity of a gfn_to_pfn_cache.
+ * kvm_gpc_check - check validity of a gfn_to_pfn_cache.
  *
  * @kvm:          pointer to kvm instance.
  * @gpc:          struct gfn_to_pfn_cache object.
@@ -1314,11 +1313,11 @@ int kvm_gpc_activate(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
  * Callers in IN_GUEST_MODE may do so without locking, although they should
  * still hold a read lock on kvm->scru for the memslot checks.
  */
-bool kvm_gfn_to_pfn_cache_check(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
-                               gpa_t gpa, unsigned long len);
+bool kvm_gpc_check(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, gpa_t gpa,
+                  unsigned long len);
 
 /**
- * kvm_gfn_to_pfn_cache_refresh - update a previously initialized cache.
+ * kvm_gpc_refresh - update a previously initialized cache.
  *
  * @kvm:          pointer to kvm instance.
  * @gpc:          struct gfn_to_pfn_cache object.
@@ -1335,11 +1334,11 @@ bool kvm_gfn_to_pfn_cache_check(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
  * still lock and check the cache status, as this function does not return
  * with the lock still held to permit access.
  */
-int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
-                                gpa_t gpa, unsigned long len);
+int kvm_gpc_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, gpa_t gpa,
+                   unsigned long len);
 
 /**
- * kvm_gfn_to_pfn_cache_unmap - temporarily unmap a gfn_to_pfn_cache.
+ * kvm_gpc_unmap - temporarily unmap a gfn_to_pfn_cache.
  *
  * @kvm:          pointer to kvm instance.
  * @gpc:          struct gfn_to_pfn_cache object.
@@ -1348,7 +1347,7 @@ int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
  * but at least the mapping from GPA to userspace HVA will remain cached
  * and can be reused on a subsequent refresh.
  */
-void kvm_gfn_to_pfn_cache_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc);
+void kvm_gpc_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc);
 
 /**
  * kvm_gpc_deactivate - deactivate and unlink a gfn_to_pfn_cache.

diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c
index 5f83321bfd2a03bc424b9122f2ccd784ab67a110..8c4db3dcaf6d5791512010a7c7e69a76ec2a6df4 100644 (file)
--- a/virt/kvm/pfncache.c
+++ b/virt/kvm/pfncache.c
@@ -76,8 +76,8 @@ void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm, unsigned long start,
        }
 }
 
-bool kvm_gfn_to_pfn_cache_check(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
-                               gpa_t gpa, unsigned long len)
+bool kvm_gpc_check(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, gpa_t gpa,
+                  unsigned long len)
 {
        struct kvm_memslots *slots = kvm_memslots(kvm);
 
@@ -96,7 +96,7 @@ bool kvm_gfn_to_pfn_cache_check(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
 
        return true;
 }
-EXPORT_SYMBOL_GPL(kvm_gfn_to_pfn_cache_check);
+EXPORT_SYMBOL_GPL(kvm_gpc_check);
 
 static void gpc_unmap_khva(struct kvm *kvm, kvm_pfn_t pfn, void *khva)
 {
@@ -238,8 +238,8 @@ out_error:
        return -EFAULT;
 }
 
-int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
-                                gpa_t gpa, unsigned long len)
+int kvm_gpc_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, gpa_t gpa,
+                   unsigned long len)
 {
        struct kvm_memslots *slots = kvm_memslots(kvm);
        unsigned long page_offset = gpa & ~PAGE_MASK;
@@ -333,9 +333,9 @@ out_unlock:
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(kvm_gfn_to_pfn_cache_refresh);
+EXPORT_SYMBOL_GPL(kvm_gpc_refresh);
 
-void kvm_gfn_to_pfn_cache_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc)
+void kvm_gpc_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc)
 {
        void *old_khva;
        kvm_pfn_t old_pfn;
@@ -360,7 +360,7 @@ void kvm_gfn_to_pfn_cache_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc)
 
        gpc_unmap_khva(kvm, old_pfn, old_khva);
 }
-EXPORT_SYMBOL_GPL(kvm_gfn_to_pfn_cache_unmap);
+EXPORT_SYMBOL_GPL(kvm_gpc_unmap);
 
 void kvm_gpc_init(struct gfn_to_pfn_cache *gpc)
 {
@@ -396,7 +396,7 @@ int kvm_gpc_activate(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
                gpc->active = true;
                write_unlock_irq(&gpc->lock);
        }
-       return kvm_gfn_to_pfn_cache_refresh(kvm, gpc, gpa, len);
+       return kvm_gpc_refresh(kvm, gpc, gpa, len);
 }
 EXPORT_SYMBOL_GPL(kvm_gpc_activate);
 
@@ -416,7 +416,7 @@ void kvm_gpc_deactivate(struct kvm *kvm, struct gfn_to_pfn_cache *gpc)
                list_del(&gpc->list);
                spin_unlock(&kvm->gpc_lock);
 
-               kvm_gfn_to_pfn_cache_unmap(kvm, gpc);
+               kvm_gpc_unmap(kvm, gpc);
        }
 }
 EXPORT_SYMBOL_GPL(kvm_gpc_deactivate);