slab: make GFP_SLAB_BUG_MASK information more human readable

printk offers %pGg for quite some time so let's use it to get a human
readable list of invalid flags.

The original output would be
  [  429.191962] gfp: 2

after the change
  [  429.191962] Unexpected gfp: 0x2 (__GFP_HIGHMEM)

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Michal Hocko <[email protected]>
Cc: Sergey Senozhatsky <[email protected]>
Cc: Christoph Lameter <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Joonsoo Kim <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/mm/slab.c b/mm/slab.c
index 763096a247f64d5532abf64693c4005625e8173e..03fb724d6e48f405afe76e025a2b208184c0af7c 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2686,7 +2686,8 @@ static struct page *cache_grow_begin(struct kmem_cache *cachep,
         * critical path in kmem_cache_alloc().
         */
        if (unlikely(flags & GFP_SLAB_BUG_MASK)) {
-               pr_emerg("gfp: %u\n", flags & GFP_SLAB_BUG_MASK);
+               gfp_t invalid_mask = flags & GFP_SLAB_BUG_MASK;
+               pr_emerg("Unexpected gfp: %#x (%pGg)\n", invalid_mask, &invalid_mask);
                BUG();
        }
        local_flags = flags & (GFP_CONSTRAINT_MASK|GFP_RECLAIM_MASK);

diff --git a/mm/slub.c b/mm/slub.c
index f5b3114b6a97871e9fd644bd7ac6af443cef0136..a2fe4edc3599d9e54581bcbca3655de6db49ebe2 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1612,7 +1612,8 @@ out:
 static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node)
 {
        if (unlikely(flags & GFP_SLAB_BUG_MASK)) {
-               pr_emerg("gfp: %u\n", flags & GFP_SLAB_BUG_MASK);
+               gfp_t invalid_mask = flags & GFP_SLAB_BUG_MASK;
+               pr_emerg("Unexpected gfp: %#x (%pGg)\n", invalid_mask, &invalid_mask);
                BUG();
        }