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 14/18] lib/stackdepot: annotate depot_init_slab and depot_alloc_stack
Date: Mon, 30 Jan 2023 21:49:38 +0100 [thread overview]
Message-ID: <3cf68a23da43cef0f8737f7a2c07f35ce6d841a7.1675111415.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1675111415.git.andreyknvl@google.com>
From: Andrey Konovalov <andreyknvl@google.com>
Clean up the exisiting comments and add new ones to depot_init_slab and
depot_alloc_stack.
As a part of the clean-up, remove mentions of which variable is accessed
by smp_store_release and smp_load_acquire: it is clear as is from the
code.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
lib/stackdepot.c | 35 +++++++++++++++++++++++++----------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index d6be82a5c223..7282565722f2 100644
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -218,33 +218,41 @@ int stack_depot_init(void)
}
EXPORT_SYMBOL_GPL(stack_depot_init);
+/* Uses preallocated memory to initialize a new stack depot slab. */
static void depot_init_slab(void **prealloc)
{
/*
- * This smp_load_acquire() pairs with smp_store_release() to
- * |next_slab_inited| below and in depot_alloc_stack().
+ * If the next slab is already initialized, do not use the
+ * preallocated memory.
+ * smp_load_acquire() here pairs with smp_store_release() below and
+ * in depot_alloc_stack().
*/
if (smp_load_acquire(&next_slab_inited))
return;
+
+ /* Check if the current slab is not yet allocated. */
if (stack_slabs[slab_index] == NULL) {
+ /* Use the preallocated memory for the current slab. */
stack_slabs[slab_index] = *prealloc;
*prealloc = NULL;
} else {
- /* If this is the last depot slab, do not touch the next one. */
+ /*
+ * Otherwise, use the preallocated memory for the next slab
+ * as long as we do not exceed the maximum number of slabs.
+ */
if (slab_index + 1 < DEPOT_MAX_SLABS) {
stack_slabs[slab_index + 1] = *prealloc;
*prealloc = NULL;
/*
* This smp_store_release pairs with smp_load_acquire()
- * from |next_slab_inited| above and in
- * stack_depot_save().
+ * above and in stack_depot_save().
*/
smp_store_release(&next_slab_inited, 1);
}
}
}
-/* Allocation of a new stack in raw storage */
+/* Allocates a new stack in a stack depot slab. */
static struct stack_record *
depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc)
{
@@ -253,28 +261,35 @@ depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc)
required_size = ALIGN(required_size, 1 << DEPOT_STACK_ALIGN);
+ /* Check if there is not enough space in the current slab. */
if (unlikely(slab_offset + required_size > DEPOT_SLAB_SIZE)) {
+ /* Bail out if we reached the slab limit. */
if (unlikely(slab_index + 1 >= DEPOT_MAX_SLABS)) {
WARN_ONCE(1, "Stack depot reached limit capacity");
return NULL;
}
+
+ /* Move on to the next slab. */
slab_index++;
slab_offset = 0;
/*
- * smp_store_release() here pairs with smp_load_acquire() from
- * |next_slab_inited| in stack_depot_save() and
- * depot_init_slab().
+ * smp_store_release() here pairs with smp_load_acquire() in
+ * stack_depot_save() and depot_init_slab().
*/
if (slab_index + 1 < DEPOT_MAX_SLABS)
smp_store_release(&next_slab_inited, 0);
}
+
+ /* Assign the preallocated memory to a slab if required. */
if (*prealloc)
depot_init_slab(prealloc);
+
+ /* Check if we have a slab to save the stack trace. */
if (stack_slabs[slab_index] == NULL)
return NULL;
+ /* Save the stack trace. */
stack = stack_slabs[slab_index] + slab_offset;
-
stack->hash = hash;
stack->size = size;
stack->handle.slab_index = 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 ` andrey.konovalov [this message]
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 ` [PATCH 16/18] lib/stackdepot: annotate racy slab_index accesses andrey.konovalov
2023-01-31 8:40 ` 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=3cf68a23da43cef0f8737f7a2c07f35ce6d841a7.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