Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux-2.6-microblaze.git] / virt / kvm / kvm_main.c

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 9668996..001085b 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -135,6 +135,11 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm);
 static unsigned long long kvm_createvm_count;
 static unsigned long long kvm_active_vms;
 
+__weak void kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm,
+               unsigned long start, unsigned long end)
+{
+}
+
 bool kvm_is_reserved_pfn(kvm_pfn_t pfn)
 {
        if (pfn_valid(pfn))
@@ -360,6 +365,9 @@ static void kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn,
                kvm_flush_remote_tlbs(kvm);
 
        spin_unlock(&kvm->mmu_lock);
+
+       kvm_arch_mmu_notifier_invalidate_range(kvm, start, end);
+
        srcu_read_unlock(&kvm->srcu, idx);
 }
 
@@ -468,6 +476,7 @@ static void kvm_mmu_notifier_release(struct mmu_notifier *mn,
 }
 
 static const struct mmu_notifier_ops kvm_mmu_notifier_ops = {
+       .flags                  = MMU_INVALIDATE_DOES_NOT_BLOCK,
        .invalidate_range_start = kvm_mmu_notifier_invalidate_range_start,
        .invalidate_range_end   = kvm_mmu_notifier_invalidate_range_end,
        .clear_flush_young      = kvm_mmu_notifier_clear_flush_young,
@@ -1314,17 +1323,6 @@ unsigned long kvm_vcpu_gfn_to_hva_prot(struct kvm_vcpu *vcpu, gfn_t gfn, bool *w
        return gfn_to_hva_memslot_prot(slot, gfn, writable);
 }
 
-static int get_user_page_nowait(unsigned long start, int write,
-               struct page **page)
-{
-       int flags = FOLL_NOWAIT | FOLL_HWPOISON;
-
-       if (write)
-               flags |= FOLL_WRITE;
-
-       return get_user_pages(start, 1, flags, page, NULL);
-}
-
 static inline int check_user_page_hwpoison(unsigned long addr)
 {
        int rc, flags = FOLL_HWPOISON | FOLL_WRITE;
@@ -1373,7 +1371,8 @@ static bool hva_to_pfn_fast(unsigned long addr, bool atomic, bool *async,
 static int hva_to_pfn_slow(unsigned long addr, bool *async, bool write_fault,
                           bool *writable, kvm_pfn_t *pfn)
 {
-       struct page *page[1];
+       unsigned int flags = FOLL_HWPOISON;
+       struct page *page;
        int npages = 0;
 
        might_sleep();
@@ -1381,35 +1380,26 @@ static int hva_to_pfn_slow(unsigned long addr, bool *async, bool write_fault,
        if (writable)
                *writable = write_fault;
 
-       if (async) {
-               down_read(&current->mm->mmap_sem);
-               npages = get_user_page_nowait(addr, write_fault, page);
-               up_read(&current->mm->mmap_sem);
-       } else {
-               unsigned int flags = FOLL_HWPOISON;
-
-               if (write_fault)
-                       flags |= FOLL_WRITE;
+       if (write_fault)
+               flags |= FOLL_WRITE;
+       if (async)
+               flags |= FOLL_NOWAIT;
 
-               npages = get_user_pages_unlocked(addr, 1, page, flags);
-       }
+       npages = get_user_pages_unlocked(addr, 1, &page, flags);
        if (npages != 1)
                return npages;
 
        /* map read fault as writable if possible */
        if (unlikely(!write_fault) && writable) {
-               struct page *wpage[1];
+               struct page *wpage;
 
-               npages = __get_user_pages_fast(addr, 1, 1, wpage);
-               if (npages == 1) {
+               if (__get_user_pages_fast(addr, 1, 1, &wpage) == 1) {
                        *writable = true;
-                       put_page(page[0]);
-                       page[0] = wpage[0];
+                       put_page(page);
+                       page = wpage;
                }
-
-               npages = 1;
        }
-       *pfn = page_to_pfn(page[0]);
+       *pfn = page_to_pfn(page);
        return npages;
 }