From: andrey.konovalov@linux.dev
To: Marco Elver <elver@google.com>, Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>,
Vlastimil Babka <vbabka@suse.cz>,
kasan-dev@googlegroups.com, Evgenii Stepanov <eugenis@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH 16/18] lib/stackdepot: annotate racy slab_index accesses
Date: Mon, 30 Jan 2023 21:49:40 +0100 [thread overview]
Message-ID: <19512bb03eed27ced5abeb5bd03f9a8381742cb1.1675111415.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1675111415.git.andreyknvl@google.com>
From: Andrey Konovalov <andreyknvl@google.com>
Accesses to slab_index are protected by slab_lock everywhere except
in a sanity check in stack_depot_fetch. The read access there can race
with the write access in depot_alloc_stack.
Use WRITE/READ_ONCE() to annotate the racy accesses.
As the sanity check is only used to print a warning in case of a
violation of the stack depot interface usage, it does not make a lot
of sense to use proper synchronization.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
lib/stackdepot.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index f291ad6a4e72..cc2fe8563af4 100644
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -269,8 +269,11 @@ depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc)
return NULL;
}
- /* Move on to the next slab. */
- slab_index++;
+ /*
+ * Move on to the next slab.
+ * WRITE_ONCE annotates a race with stack_depot_fetch.
+ */
+ WRITE_ONCE(slab_index, slab_index + 1);
slab_offset = 0;
/*
* smp_store_release() here pairs with smp_load_acquire() in
@@ -492,6 +495,8 @@ unsigned int stack_depot_fetch(depot_stack_handle_t handle,
unsigned long **entries)
{
union handle_parts parts = { .handle = handle };
+ /* READ_ONCE annotates a race with depot_alloc_stack. */
+ int slab_index_cached = READ_ONCE(slab_index);
void *slab;
size_t offset = parts.offset << DEPOT_STACK_ALIGN;
struct stack_record *stack;
@@ -500,9 +505,9 @@ unsigned int stack_depot_fetch(depot_stack_handle_t handle,
if (!handle)
return 0;
- if (parts.slab_index > slab_index) {
+ if (parts.slab_index > slab_index_cached) {
WARN(1, "slab index %d out of bounds (%d) for stack id %08x\n",
- parts.slab_index, slab_index, handle);
+ parts.slab_index, slab_index_cached, handle);
return 0;
}
slab = stack_slabs[parts.slab_index];
--
2.25.1
next prev parent reply other threads:[~2023-01-30 20:52 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 20:49 [PATCH 00/18] lib/stackdepot: fixes and clean-ups andrey.konovalov
2023-01-30 20:49 ` [PATCH 01/18] lib/stackdepot: fix setting next_slab_inited in init_stack_slab andrey.konovalov
2023-01-31 0:18 ` Andrew Morton
2023-01-31 19:00 ` Andrey Konovalov
2023-01-31 9:07 ` Alexander Potapenko
2023-01-31 9:29 ` Alexander Potapenko
2023-01-31 18:59 ` Andrey Konovalov
2023-02-01 11:51 ` Alexander Potapenko
2023-01-30 20:49 ` [PATCH 02/18] lib/stackdepot: put functions in logical order andrey.konovalov
2023-01-31 10:20 ` Alexander Potapenko
2023-01-30 20:49 ` [PATCH 03/18] lib/stackdepot: use pr_fmt to define message format andrey.konovalov
2023-01-31 10:24 ` Alexander Potapenko
2023-01-30 20:49 ` [PATCH 04/18] lib/stackdepot, mm: rename stack_depot_want_early_init andrey.konovalov
2023-01-31 10:26 ` Alexander Potapenko
2023-02-08 16:40 ` Vlastimil Babka
2023-01-30 20:49 ` [PATCH 05/18] lib/stackdepot: rename stack_depot_disable andrey.konovalov
2023-01-31 10:28 ` Alexander Potapenko
2023-01-30 20:49 ` [PATCH 06/18] lib/stackdepot: annotate init and early init functions andrey.konovalov
2023-01-31 10:30 ` Alexander Potapenko
2023-01-31 19:01 ` Andrey Konovalov
2023-01-30 20:49 ` [PATCH 07/18] lib/stackdepot: lower the indentation in stack_depot_init andrey.konovalov
2023-01-31 10:37 ` Alexander Potapenko
2023-01-30 20:49 ` [PATCH 08/18] lib/stackdepot: reorder and annotate global variables andrey.konovalov
2023-01-31 10:42 ` Alexander Potapenko
2023-01-31 19:01 ` Andrey Konovalov
2023-01-30 20:49 ` [PATCH 09/18] lib/stackdepot: rename hash table constants and variables andrey.konovalov
2023-01-31 11:33 ` Alexander Potapenko
2023-01-31 19:01 ` Andrey Konovalov
2023-02-07 15:56 ` Alexander Potapenko
2023-01-30 20:49 ` [PATCH 10/18] lib/stackdepot: rename init_stack_slab andrey.konovalov
2023-01-31 11:34 ` Alexander Potapenko
2023-01-30 20:49 ` [PATCH 11/18] lib/stackdepot: rename slab variables andrey.konovalov
2023-01-31 11:59 ` Alexander Potapenko
2023-01-31 19:05 ` Andrey Konovalov
2023-02-01 12:38 ` Marco Elver
2023-02-08 16:43 ` Vlastimil Babka
2023-01-30 20:49 ` [PATCH 12/18] lib/stackdepot: rename handle and slab constants andrey.konovalov
2023-01-31 12:11 ` Alexander Potapenko
2023-01-30 20:49 ` [PATCH 13/18] lib/stacktrace: drop impossible WARN_ON for depot_init_slab andrey.konovalov
2023-01-30 20:49 ` [PATCH 14/18] lib/stackdepot: annotate depot_init_slab and depot_alloc_stack andrey.konovalov
2023-01-30 20:49 ` [PATCH 15/18] lib/stacktrace, kasan, kmsan: rework extra_bits interface andrey.konovalov
2023-01-31 8:53 ` Marco Elver
2023-01-31 18:58 ` Andrey Konovalov
2023-02-02 10:04 ` Alexander Potapenko
2023-02-02 10:03 ` Alexander Potapenko
2023-01-30 20:49 ` andrey.konovalov [this message]
2023-01-31 8:40 ` [PATCH 16/18] lib/stackdepot: annotate racy slab_index accesses Marco Elver
2023-01-31 18:57 ` Andrey Konovalov
2023-01-31 21:14 ` Andrew Morton
2023-01-30 20:49 ` [PATCH 17/18] lib/stackdepot: various comments clean-ups andrey.konovalov
2023-01-30 20:49 ` [PATCH 18/18] lib/stackdepot: move documentation comments to stackdepot.h 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=19512bb03eed27ced5abeb5bd03f9a8381742cb1.1675111415.git.andreyknvl@google.com \
--to=andrey.konovalov@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=andreyknvl@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=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