From: Joel Fernandes <joe...@google.com>

Use cond_resched_lock to avoid holding the vmap_area_lock for a
potentially long time.

Signed-off-by: Joel Fernandes <joe...@google.com>
[hch: split from a larger patch by Joel, wrote the crappy changelog]
Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 mm/vmalloc.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 6c7eb8d..98b19ea 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -628,7 +628,7 @@ static bool __purge_vmap_area_lazy(unsigned long start, 
unsigned long end)
        struct llist_node *valist;
        struct vmap_area *va;
        struct vmap_area *n_va;
-       int nr = 0;
+       bool do_free = false;
 
        lockdep_assert_held(&vmap_purge_lock);
 
@@ -638,18 +638,22 @@ static bool __purge_vmap_area_lazy(unsigned long start, 
unsigned long end)
                        start = va->va_start;
                if (va->va_end > end)
                        end = va->va_end;
-               nr += (va->va_end - va->va_start) >> PAGE_SHIFT;
+               do_free = true;
        }
 
-       if (!nr)
+       if (!do_free)
                return false;
 
-       atomic_sub(nr, &vmap_lazy_nr);
        flush_tlb_kernel_range(start, end);
 
        spin_lock(&vmap_area_lock);
-       llist_for_each_entry_safe(va, n_va, valist, purge_list)
+       llist_for_each_entry_safe(va, n_va, valist, purge_list) {
+               int nr = (va->va_end - va->va_start) >> PAGE_SHIFT;
+
                __free_vmap_area(va);
+               atomic_sub(nr, &vmap_lazy_nr);
+               cond_resched_lock(&vmap_area_lock);
+       }
        spin_unlock(&vmap_area_lock);
        return true;
 }
-- 
2.1.4

Reply via email to