lkml.org 
[lkml]   [2020]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH mm v3 01/19] kasan: simplify quarantine_put call site
    From
    Move get_free_info() call into quarantine_put() to simplify the call site.

    No functional changes.

    Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
    Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
    Reviewed-by: Marco Elver <elver@google.com>
    Link: https://linux-review.googlesource.com/id/Iab0f04e7ebf8d83247024b7190c67c3c34c7940f
    ---
    mm/kasan/common.c | 2 +-
    mm/kasan/kasan.h | 5 ++---
    mm/kasan/quarantine.c | 3 ++-
    3 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/mm/kasan/common.c b/mm/kasan/common.c
    index 998aede4d172..e11fac2ee30c 100644
    --- a/mm/kasan/common.c
    +++ b/mm/kasan/common.c
    @@ -317,7 +317,7 @@ static bool __kasan_slab_free(struct kmem_cache *cache, void *object,

    kasan_set_free_info(cache, object, tag);

    - quarantine_put(get_free_info(cache, object), cache);
    + quarantine_put(cache, object);

    return IS_ENABLED(CONFIG_KASAN_GENERIC);
    }
    diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
    index 64560cc71191..13c511e85d5f 100644
    --- a/mm/kasan/kasan.h
    +++ b/mm/kasan/kasan.h
    @@ -216,12 +216,11 @@ struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,

    #if defined(CONFIG_KASAN_GENERIC) && \
    (defined(CONFIG_SLAB) || defined(CONFIG_SLUB))
    -void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache);
    +void quarantine_put(struct kmem_cache *cache, void *object);
    void quarantine_reduce(void);
    void quarantine_remove_cache(struct kmem_cache *cache);
    #else
    -static inline void quarantine_put(struct kasan_free_meta *info,
    - struct kmem_cache *cache) { }
    +static inline void quarantine_put(struct kmem_cache *cache, void *object) { }
    static inline void quarantine_reduce(void) { }
    static inline void quarantine_remove_cache(struct kmem_cache *cache) { }
    #endif
    diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c
    index 580ff5610fc1..a0792f0d6d0f 100644
    --- a/mm/kasan/quarantine.c
    +++ b/mm/kasan/quarantine.c
    @@ -161,11 +161,12 @@ static void qlist_free_all(struct qlist_head *q, struct kmem_cache *cache)
    qlist_init(q);
    }

    -void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache)
    +void quarantine_put(struct kmem_cache *cache, void *object)
    {
    unsigned long flags;
    struct qlist_head *q;
    struct qlist_head temp = QLIST_INIT;
    + struct kasan_free_meta *info = get_free_info(cache, object);

    /*
    * Note: irq must be disabled until after we move the batch to the
    --
    2.29.2.299.gdc1121823c-goog
    \
     
     \ /
      Last update: 2020-11-13 23:23    [W:3.816 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site