mm: neaten warn_alloc_failed

Add __attribute__((format (printf...) to the function to validate format
and arguments.  Use vsprintf extension %pV to avoid any possible message
interleaving.  Coalesce format string.  Convert printks/pr_warning to
pr_warn.

[akpm@linux-foundation.org: use the __printf() macro]
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7438071..3b3e3b8 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1334,7 +1334,8 @@ extern void si_meminfo(struct sysinfo * val);
 extern void si_meminfo_node(struct sysinfo *val, int nid);
 extern int after_bootmem;
 
 extern void si_meminfo_node(struct sysinfo *val, int nid);
 extern int after_bootmem;
 

-extern void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...);
+extern __printf(3, 4)
+void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...);

 
 extern void setup_per_cpu_pageset(void);
 
 
 extern void setup_per_cpu_pageset(void);
 

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 83a0205..9dd443d 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1754,7 +1754,6 @@ static DEFINE_RATELIMIT_STATE(nopage_rs,
 
 void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...)
 {
 
 void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...)
 {

-       va_list args;

        unsigned int filter = SHOW_MEM_FILTER_NODES;
 
        if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs))
        unsigned int filter = SHOW_MEM_FILTER_NODES;
 
        if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs))


@@ -1773,14 +1772,21 @@ void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...)
                filter &= ~SHOW_MEM_FILTER_NODES;
 
        if (fmt) {
                filter &= ~SHOW_MEM_FILTER_NODES;
 
        if (fmt) {

-               printk(KERN_WARNING);
+               struct va_format vaf;
+               va_list args;
+

                va_start(args, fmt);
                va_start(args, fmt);

-               vprintk(fmt, args);
+
+               vaf.fmt = fmt;
+               vaf.va = &args;
+
+               pr_warn("%pV", &vaf);
+

                va_end(args);
        }
 
                va_end(args);
        }
 

-       pr_warning("%s: page allocation failure: order:%d, mode:0x%x\n",
-                  current->comm, order, gfp_mask);
+       pr_warn("%s: page allocation failure: order:%d, mode:0x%x\n",
+               current->comm, order, gfp_mask);

 
        dump_stack();
        if (!should_suppress_show_mem())
 
        dump_stack();
        if (!should_suppress_show_mem())

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 56faf31..08ab0aa 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1593,8 +1593,8 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
        return area->addr;
 
 fail:
        return area->addr;
 
 fail:

-       warn_alloc_failed(gfp_mask, order, "vmalloc: allocation failure, "
-                         "allocated %ld of %ld bytes\n",
+       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;
                          (area->nr_pages*PAGE_SIZE), area->size);
        vfree(area->addr);
        return NULL;