Merge tag 'docs-5.6-2' of git://git.lwn.net/linux

[linux.git] / virt / kvm / async_pf.c

diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c
index 35305d6e68cc6c14e0ed92a97b82f7bafde145b1..15e5b037f92d88c992c450b232602b751efdddf7 100644 (file)
--- a/virt/kvm/async_pf.c
+++ b/virt/kvm/async_pf.c
@@ -17,21 +17,6 @@
 #include "async_pf.h"
 #include <trace/events/kvm.h>
 
-static inline void kvm_async_page_present_sync(struct kvm_vcpu *vcpu,
-                                              struct kvm_async_pf *work)
-{
-#ifdef CONFIG_KVM_ASYNC_PF_SYNC
-       kvm_arch_async_page_present(vcpu, work);
-#endif
-}
-static inline void kvm_async_page_present_async(struct kvm_vcpu *vcpu,
-                                               struct kvm_async_pf *work)
-{
-#ifndef CONFIG_KVM_ASYNC_PF_SYNC
-       kvm_arch_async_page_present(vcpu, work);
-#endif
-}
-
 static struct kmem_cache *async_pf_cache;
 
 int kvm_async_pf_init(void)
@@ -64,7 +49,7 @@ static void async_pf_execute(struct work_struct *work)
        struct mm_struct *mm = apf->mm;
        struct kvm_vcpu *vcpu = apf->vcpu;
        unsigned long addr = apf->addr;
-       gva_t gva = apf->gva;
+       gpa_t cr2_or_gpa = apf->cr2_or_gpa;
        int locked = 1;
 
        might_sleep();
@@ -80,7 +65,8 @@ static void async_pf_execute(struct work_struct *work)
        if (locked)
                up_read(&mm->mmap_sem);
 
-       kvm_async_page_present_sync(vcpu, apf);
+       if (IS_ENABLED(CONFIG_KVM_ASYNC_PF_SYNC))
+               kvm_arch_async_page_present(vcpu, apf);
 
        spin_lock(&vcpu->async_pf.lock);
        list_add_tail(&apf->link, &vcpu->async_pf.done);
@@ -92,7 +78,7 @@ static void async_pf_execute(struct work_struct *work)
         * this point
         */
 
-       trace_kvm_async_pf_completed(addr, gva);
+       trace_kvm_async_pf_completed(addr, cr2_or_gpa);
 
        if (swq_has_sleeper(&vcpu->wq))
                swake_up_one(&vcpu->wq);
@@ -157,7 +143,8 @@ void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu)
                spin_unlock(&vcpu->async_pf.lock);
 
                kvm_arch_async_page_ready(vcpu, work);
-               kvm_async_page_present_async(vcpu, work);
+               if (!IS_ENABLED(CONFIG_KVM_ASYNC_PF_SYNC))
+                       kvm_arch_async_page_present(vcpu, work);
 
                list_del(&work->queue);
                vcpu->async_pf.queued--;
@@ -165,8 +152,8 @@ void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu)
        }
 }
 
-int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, unsigned long hva,
-                      struct kvm_arch_async_pf *arch)
+int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
+                      unsigned long hva, struct kvm_arch_async_pf *arch)
 {
        struct kvm_async_pf *work;
 
@@ -185,7 +172,7 @@ int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, unsigned long hva,
 
        work->wakeup_all = false;
        work->vcpu = vcpu;
-       work->gva = gva;
+       work->cr2_or_gpa = cr2_or_gpa;
        work->addr = hva;
        work->arch = *arch;
        work->mm = current->mm;