kvm: Faults which trigger IO release the mmap_sem

When KVM handles a tdp fault it uses FOLL_NOWAIT. If the guest memory
has been swapped out or is behind a filemap, this will trigger async
readahead and return immediately. The rationale is that KVM will kick
back the guest with an "async page fault" and allow for some other
guest process to take over.

If async PFs are enabled the fault is retried asap from an async
workqueue. If not, it's retried immediately in the same code path. In
either case the retry will not relinquish the mmap semaphore and will
block on the IO. This is a bad thing, as other mmap semaphore users
now stall as a function of swap or filemap latency.

This patch ensures both the regular and async PF path re-enter the
fault allowing for the mmap semaphore to be relinquished in the case
of IO wait.

Reviewed-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Andres Lagar-Cavilla <andreslc@google.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

2 files changed, 47 insertions, 6 deletions

diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c
index d6a3d0993d88..5ff7f7f2689a 100644
--- a/virt/kvm/async_pf.c
+++ b/virt/kvm/async_pf.c
@@ -80,9 +80,7 @@ static void async_pf_execute(struct work_struct *work)
 
         might_sleep();
 
-        down_read(&mm->mmap_sem);
-        get_user_pages(NULL, mm, addr, 1, 1, 0, NULL, NULL);
-        up_read(&mm->mmap_sem);
+        kvm_get_user_page_io(NULL, mm, addr, 1, NULL);
         kvm_async_page_present_sync(vcpu, apf);
 
         spin_lock(&vcpu->async_pf.lock);
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 499db0977f3c..1c6e8476b244 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1122,6 +1122,43 @@ static int get_user_page_nowait(struct task_struct *tsk, struct mm_struct *mm,
         return __get_user_pages(tsk, mm, start, 1, flags, page, NULL, NULL);
 }
 
+int kvm_get_user_page_io(struct task_struct *tsk, struct mm_struct *mm,
+                         unsigned long addr, bool write_fault,
+                         struct page **pagep)
+{
+        int npages;
+        int locked = 1;
+        int flags = FOLL_TOUCH | FOLL_HWPOISON |
+                    (pagep ? FOLL_GET : 0) |
+                    (write_fault ? FOLL_WRITE : 0);
+
+        /*
+         * If retrying the fault, we get here *not* having allowed the filemap
+         * to wait on the page lock. We should now allow waiting on the IO with
+         * the mmap semaphore released.
+         */
+        down_read(&mm->mmap_sem);
+        npages = __get_user_pages(tsk, mm, addr, 1, flags, pagep, NULL,
+                                  &locked);
+        if (!locked) {
+                VM_BUG_ON(npages != -EBUSY);
+
+                if (!pagep)
+                        return 0;
+
+                /*
+                 * The previous call has now waited on the IO. Now we can
+                 * retry and complete. Pass TRIED to ensure we do not re
+                 * schedule async IO (see e.g. filemap_fault).
+                 */
+                down_read(&mm->mmap_sem);
+                npages = __get_user_pages(tsk, mm, addr, 1, flags | FOLL_TRIED,
+                                          pagep, NULL, NULL);
+        }
+        up_read(&mm->mmap_sem);
+        return npages;
+}
+
 static inline int check_user_page_hwpoison(unsigned long addr)
 {
         int rc, flags = FOLL_TOUCH | FOLL_HWPOISON | FOLL_WRITE;
@@ -1184,9 +1221,15 @@ static int hva_to_pfn_slow(unsigned long addr, bool *async, bool write_fault,
                 npages = get_user_page_nowait(current, current->mm,
                                               addr, write_fault, page);
                 up_read(&current->mm->mmap_sem);
-        } else
-                npages = get_user_pages_fast(addr, 1, write_fault,
-                                             page);
+        } else {
+                /*
+                 * By now we have tried gup_fast, and possibly async_pf, and we
+                 * are certainly not atomic. Time to retry the gup, allowing
+                 * mmap semaphore to be relinquished in the case of IO.
+                 */
+                npages = kvm_get_user_page_io(current, current->mm, addr,
+                                              write_fault, page);
+        }
         if (npages != 1)
                 return npages;