From: Andrey Konovalov <andreyknvl@google.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Dmitry Vyukov <dvyukov@google.com>,
Alexander Potapenko <glider@google.com>,
Marco Elver <elver@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Branislav Rankov <Branislav.Rankov@arm.com>,
Kevin Brodsky <kevin.brodsky@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH 01/20] kasan: simplify quarantine_put call site
Date: Thu, 5 Nov 2020 01:02:11 +0100 [thread overview]
Message-ID: <e6fab9ed577dc3861c3ea0bde82bfd04df2bcce1.1604534322.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1604534322.git.andreyknvl@google.com>
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>
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 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 b0a57d8f9803..994be9979ffd 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.1.341.ge80a0c044ae-goog
next prev parent reply other threads:[~2020-11-05 0:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 0:02 [PATCH 00/20] kasan: boot parameters for hardware tag-based mode Andrey Konovalov
2020-11-05 0:02 ` Andrey Konovalov [this message]
2020-11-05 0:02 ` [PATCH 02/20] kasan: rename get_alloc/free_info Andrey Konovalov
2020-11-05 0:02 ` [PATCH 03/20] kasan: introduce set_alloc_info Andrey Konovalov
2020-11-05 0:02 ` [PATCH 04/20] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK Andrey Konovalov
2020-11-05 0:02 ` [PATCH 05/20] kasan: allow VMAP_STACK for HW_TAGS mode Andrey Konovalov
2020-11-05 0:02 ` [PATCH 06/20] kasan: remove __kasan_unpoison_stack Andrey Konovalov
2020-11-05 0:02 ` [PATCH 07/20] kasan: inline kasan_reset_tag for tag-based modes Andrey Konovalov
2020-11-05 0:02 ` [PATCH 08/20] kasan: inline random_tag for HW_TAGS Andrey Konovalov
2020-11-05 0:02 ` [PATCH 09/20] kasan: inline kasan_poison_memory and check_invalid_free Andrey Konovalov
2020-11-05 0:02 ` [PATCH 10/20] kasan: inline and rename kasan_unpoison_memory Andrey Konovalov
2020-11-05 0:02 ` [PATCH 11/20] kasan: add and integrate kasan boot parameters Andrey Konovalov
2020-11-05 0:02 ` [PATCH 12/20] kasan, mm: check kasan_enabled in annotations Andrey Konovalov
2020-11-05 0:02 ` [PATCH 13/20] kasan: simplify kasan_poison_kfree Andrey Konovalov
2020-11-05 0:02 ` [PATCH 14/20] kasan, mm: rename kasan_poison_kfree Andrey Konovalov
2020-11-05 0:02 ` [PATCH 15/20] kasan: don't round_up too much Andrey Konovalov
2020-11-05 0:02 ` [PATCH 16/20] kasan: simplify assign_tag and set_tag calls Andrey Konovalov
2020-11-05 0:02 ` [PATCH 17/20] kasan: clarify comment in __kasan_kfree_large Andrey Konovalov
2020-11-05 0:02 ` [PATCH 18/20] kasan: clean up metadata allocation and usage Andrey Konovalov
2020-11-05 0:02 ` [PATCH 19/20] kasan, mm: allow cache merging with no metadata Andrey Konovalov
2020-11-05 0:02 ` [PATCH 20/20] kasan: update documentation Andrey Konovalov
2020-11-05 20:49 ` [PATCH 00/20] kasan: boot parameters for hardware tag-based mode Evgenii Stepanov
2020-11-05 20:55 ` Andrey Konovalov
2020-11-05 22:19 ` Evgenii Stepanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e6fab9ed577dc3861c3ea0bde82bfd04df2bcce1.1604534322.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=Branislav.Rankov@arm.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=catalin.marinas@arm.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=eugenis@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=kevin.brodsky@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=vincenzo.frascino@arm.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®