1 files changed, 10 insertions, 5 deletions

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index fdf4b1e88e53..1d34d75366a7 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -375,7 +375,7 @@ nocache:
         /* find starting point for our search */
         if (free_vmap_cache) {
                 first = rb_entry(free_vmap_cache, struct vmap_area, rb_node);
-                addr = ALIGN(first->va_end + PAGE_SIZE, align);
+                addr = ALIGN(first->va_end, align);
                 if (addr < vstart)
                         goto nocache;
                 if (addr + size - 1 < addr)
@@ -406,10 +406,10 @@ nocache:
         }
 
         /* from the starting point, walk areas until a suitable hole is found */
-        while (addr + size >= first->va_start && addr + size <= vend) {
+        while (addr + size > first->va_start && addr + size <= vend) {
                 if (addr + cached_hole_size < first->va_start)
                         cached_hole_size = first->va_start - addr;
-                addr = ALIGN(first->va_end + PAGE_SIZE, align);
+                addr = ALIGN(first->va_end, align);
                 if (addr + size - 1 < addr)
                         goto overflow;
 
@@ -1534,6 +1534,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
 static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
                                  pgprot_t prot, int node, void *caller)
 {
+        const int order = 0;
         struct page **pages;
         unsigned int nr_pages, array_size, i;
         gfp_t nested_gfp = (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO;
@@ -1560,11 +1561,12 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
 
         for (i = 0; i < area->nr_pages; i++) {
                 struct page *page;
+                gfp_t tmp_mask = gfp_mask | __GFP_NOWARN;
 
                 if (node < 0)
-                        page = alloc_page(gfp_mask);
+                        page = alloc_page(tmp_mask);
                 else
-                        page = alloc_pages_node(node, gfp_mask, 0);
+                        page = alloc_pages_node(node, tmp_mask, order);
 
                 if (unlikely(!page)) {
                         /* Successfully allocated i pages, free them in __vunmap() */
@@ -1579,6 +1581,9 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
         return area->addr;
 
 fail:
+        warn_alloc_failed(gfp_mask, order, "vmalloc: allocation failure, "
+                          "allocated %ld of %ld bytes\n",
+                          (area->nr_pages*PAGE_SIZE), area->size);
         vfree(area->addr);
         return NULL;
 }