From: andrey.konovalov@linux.dev
To: Marco Elver <elver@google.com>, Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>,
Dmitry Vyukov <dvyukov@google.com>,
Vlastimil Babka <vbabka@suse.cz>,
kasan-dev@googlegroups.com, Evgenii Stepanov <eugenis@google.com>,
Oscar Salvador <osalvador@suse.de>,
Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH v3 19/19] kasan: use stack_depot_put for tag-based modes
Date: Mon, 23 Oct 2023 18:22:50 +0200 [thread overview]
Message-ID: <c4219b3f0a193b224a93a6dffb191f212c4eee4d.1698077459.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1698077459.git.andreyknvl@google.com>
From: Andrey Konovalov <andreyknvl@google.com>
Make tag-based KASAN modes evict stack traces from the stack depot once
they are evicted from the stack ring.
Internally, pass STACK_DEPOT_FLAG_GET to stack_depot_save_flags (via
kasan_save_stack) to increment the refcount when saving a new entry
to stack ring and call stack_depot_put when removing an entry from
stack ring.
Reviewed-by: Alexander Potapenko <glider@google.com>
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
Changes v1->v2:
- Adapt to the stack depot API change.
- Drop READ_ONCE when reading entry->stack.
---
mm/kasan/tags.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c
index b6c017e670d8..739ae997463d 100644
--- a/mm/kasan/tags.c
+++ b/mm/kasan/tags.c
@@ -97,12 +97,13 @@ static void save_stack_info(struct kmem_cache *cache, void *object,
gfp_t gfp_flags, bool is_free)
{
unsigned long flags;
- depot_stack_handle_t stack;
+ depot_stack_handle_t stack, old_stack;
u64 pos;
struct kasan_stack_ring_entry *entry;
void *old_ptr;
- stack = kasan_save_stack(gfp_flags, STACK_DEPOT_FLAG_CAN_ALLOC);
+ stack = kasan_save_stack(gfp_flags,
+ STACK_DEPOT_FLAG_CAN_ALLOC | STACK_DEPOT_FLAG_GET);
/*
* Prevent save_stack_info() from modifying stack ring
@@ -121,6 +122,8 @@ static void save_stack_info(struct kmem_cache *cache, void *object,
if (!try_cmpxchg(&entry->ptr, &old_ptr, STACK_RING_BUSY_PTR))
goto next; /* Busy slot. */
+ old_stack = entry->stack;
+
entry->size = cache->object_size;
entry->pid = current->pid;
entry->stack = stack;
@@ -129,6 +132,9 @@ static void save_stack_info(struct kmem_cache *cache, void *object,
entry->ptr = object;
read_unlock_irqrestore(&stack_ring.lock, flags);
+
+ if (old_stack)
+ stack_depot_put(old_stack);
}
void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags)
--
2.25.1
next prev parent reply other threads:[~2023-10-23 16:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 16:22 [PATCH v3 00/19] stackdepot: allow evicting stack traces andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 01/19] lib/stackdepot: check disabled flag when fetching andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 02/19] lib/stackdepot: simplify __stack_depot_save andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 03/19] lib/stackdepot: drop valid bit from handles andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 04/19] lib/stackdepot: add depot_fetch_stack helper andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 05/19] lib/stackdepot: use fixed-sized slots for stack records andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 06/19] lib/stackdepot: fix and clean-up atomic annotations andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 07/19] lib/stackdepot: rework helpers for depot_alloc_stack andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 08/19] lib/stackdepot: rename next_pool_required to new_pool_required andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 09/19] lib/stackdepot: store next pool pointer in new_pool andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 10/19] lib/stackdepot: store free stack records in a freelist andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 11/19] lib/stackdepot: use read/write lock andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 12/19] lib/stackdepot: use list_head for stack record links andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 13/19] kmsan: use stack_depot_save instead of __stack_depot_save andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 14/19] lib/stackdepot, kasan: add flags to __stack_depot_save and rename andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 15/19] lib/stackdepot: add refcount for records andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 16/19] lib/stackdepot: allow users to evict stack traces andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 17/19] kasan: remove atomic accesses to stack ring entries andrey.konovalov
2023-10-23 16:22 ` [PATCH v3 18/19] kasan: check object_size in kasan_complete_mode_report_info andrey.konovalov
2023-10-23 16:22 ` andrey.konovalov [this message]
2023-10-24 9:32 ` [PATCH v3 00/19] stackdepot: allow evicting stack traces Anders Roxell
2023-10-24 13:13 ` Marco Elver
2023-11-03 21:37 ` Andrey Konovalov
2023-11-06 17:41 ` Andrey Konovalov
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=c4219b3f0a193b224a93a6dffb191f212c4eee4d.1698077459.git.andreyknvl@google.com \
--to=andrey.konovalov@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=andreyknvl@google.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=eugenis@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=osalvador@suse.de \
--cc=vbabka@suse.cz \
/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