mm, kasan: add GFP flags to KASAN API

Add GFP flags to KASAN hooks for future patches to use.

This patch is based on the "mm: kasan: unified support for SLUB and SLAB
allocators" patch originally prepared by Dmitry Chernenkov.

Signed-off-by: Alexander Potapenko <glider@google.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Andrey Konovalov <adech.fo@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Konstantin Serebryany <kcc@google.com>
Cc: Dmitry Chernenkov <dmitryc@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/mm/mempool.c b/mm/mempool.c
index 07c383ddbbab..9b7a14a791cc 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -112,12 +112,12 @@ static void kasan_poison_element(mempool_t *pool, void *element)
                 kasan_free_pages(element, (unsigned long)pool->pool_data);
 }
 
-static void kasan_unpoison_element(mempool_t *pool, void *element)
+static void kasan_unpoison_element(mempool_t *pool, void *element, gfp_t flags)
 {
         if (pool->alloc == mempool_alloc_slab)
-                kasan_slab_alloc(pool->pool_data, element);
+                kasan_slab_alloc(pool->pool_data, element, flags);
         if (pool->alloc == mempool_kmalloc)
-                kasan_krealloc(element, (size_t)pool->pool_data);
+                kasan_krealloc(element, (size_t)pool->pool_data, flags);
         if (pool->alloc == mempool_alloc_pages)
                 kasan_alloc_pages(element, (unsigned long)pool->pool_data);
 }
@@ -130,12 +130,12 @@ static void add_element(mempool_t *pool, void *element)
         pool->elements[pool->curr_nr++] = element;
 }
 
-static void *remove_element(mempool_t *pool)
+static void *remove_element(mempool_t *pool, gfp_t flags)
 {
         void *element = pool->elements[--pool->curr_nr];
 
         BUG_ON(pool->curr_nr < 0);
-        kasan_unpoison_element(pool, element);
+        kasan_unpoison_element(pool, element, flags);
         check_element(pool, element);
         return element;
 }
@@ -154,7 +154,7 @@ void mempool_destroy(mempool_t *pool)
                 return;
 
         while (pool->curr_nr) {
-                void *element = remove_element(pool);
+                void *element = remove_element(pool, GFP_KERNEL);
                 pool->free(element, pool->pool_data);
         }
         kfree(pool->elements);
@@ -250,7 +250,7 @@ int mempool_resize(mempool_t *pool, int new_min_nr)
         spin_lock_irqsave(&pool->lock, flags);
         if (new_min_nr <= pool->min_nr) {
                 while (new_min_nr < pool->curr_nr) {
-                        element = remove_element(pool);
+                        element = remove_element(pool, GFP_KERNEL);
                         spin_unlock_irqrestore(&pool->lock, flags);
                         pool->free(element, pool->pool_data);
                         spin_lock_irqsave(&pool->lock, flags);
@@ -347,7 +347,7 @@ repeat_alloc:
 
         spin_lock_irqsave(&pool->lock, flags);
         if (likely(pool->curr_nr)) {
-                element = remove_element(pool);
+                element = remove_element(pool, gfp_temp);
                 spin_unlock_irqrestore(&pool->lock, flags);
                 /* paired with rmb in mempool_free(), read comment there */
                 smp_wmb();