On Thu, Oct 22, 2020 at 3:19 PM Andrey Konovalov <andreyknvl@xxxxxxxxxx> wrote: > > Move get_free_info() call into quarantine_put() to simplify the call site. > > No functional changes. > > Signed-off-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx> > Link: https://linux-review.googlesource.com/id/Iab0f04e7ebf8d83247024b7190c67c3c34c7940f Reviewed-by: Dmitry Vyukov <dvyukov@xxxxxxxxxx> > --- > 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 2bb0ef6da6bd..5712c66c11c1 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -308,7 +308,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 6850308c798a..5c0116c70579 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -214,12 +214,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.0.rc1.297.gfa9743e501-goog >
