linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
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 07/18] lib/stackdepot: lower the indentation in stack_depot_init
Date: Mon, 30 Jan 2023 21:49:31 +0100	[thread overview]
Message-ID: <eb6f0a014b8d0bfa73a8bbd358c627dc66cf51b7.1675111415.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1675111415.git.andreyknvl@google.com>

From: Andrey Konovalov <andreyknvl@google.com>

stack_depot_init does most things inside an if check. Move them out and
use a goto statement instead.

No functional changes.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
 lib/stackdepot.c | 70 +++++++++++++++++++++++++-----------------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index b06f6a5caa83..cb098bc99286 100644
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -165,46 +165,50 @@ int __init stack_depot_early_init(void)
 int stack_depot_init(void)
 {
 	static DEFINE_MUTEX(stack_depot_init_mutex);
+	unsigned long entries;
 	int ret = 0;
 
 	mutex_lock(&stack_depot_init_mutex);
-	if (!stack_depot_disabled && !stack_table) {
-		unsigned long entries;
 
-		/*
-		 * Similarly to stack_depot_early_init, use stack_hash_order
-		 * if assigned, and rely on automatic scaling otherwise.
-		 */
-		if (stack_hash_order) {
-			entries = 1UL << stack_hash_order;
-		} else {
-			int scale = STACK_HASH_SCALE;
-
-			entries = nr_free_buffer_pages();
-			entries = roundup_pow_of_two(entries);
-
-			if (scale > PAGE_SHIFT)
-				entries >>= (scale - PAGE_SHIFT);
-			else
-				entries <<= (PAGE_SHIFT - scale);
-		}
+	if (stack_depot_disabled || stack_table)
+		goto out_unlock;
 
-		if (entries < 1UL << STACK_HASH_ORDER_MIN)
-			entries = 1UL << STACK_HASH_ORDER_MIN;
-		if (entries > 1UL << STACK_HASH_ORDER_MAX)
-			entries = 1UL << STACK_HASH_ORDER_MAX;
-
-		pr_info("allocating hash table of %lu entries via kvcalloc\n",
-				entries);
-		stack_table = kvcalloc(entries, sizeof(struct stack_record *), GFP_KERNEL);
-		if (!stack_table) {
-			pr_err("hash table allocation failed, disabling\n");
-			stack_depot_disabled = true;
-			ret = -ENOMEM;
-		}
-		stack_hash_mask = entries - 1;
+	/*
+	 * Similarly to stack_depot_early_init, use stack_hash_order
+	 * if assigned, and rely on automatic scaling otherwise.
+	 */
+	if (stack_hash_order) {
+		entries = 1UL << stack_hash_order;
+	} else {
+		int scale = STACK_HASH_SCALE;
+
+		entries = nr_free_buffer_pages();
+		entries = roundup_pow_of_two(entries);
+
+		if (scale > PAGE_SHIFT)
+			entries >>= (scale - PAGE_SHIFT);
+		else
+			entries <<= (PAGE_SHIFT - scale);
 	}
+
+	if (entries < 1UL << STACK_HASH_ORDER_MIN)
+		entries = 1UL << STACK_HASH_ORDER_MIN;
+	if (entries > 1UL << STACK_HASH_ORDER_MAX)
+		entries = 1UL << STACK_HASH_ORDER_MAX;
+
+	pr_info("allocating hash table of %lu entries via kvcalloc\n", entries);
+	stack_table = kvcalloc(entries, sizeof(struct stack_record *), GFP_KERNEL);
+	if (!stack_table) {
+		pr_err("hash table allocation failed, disabling\n");
+		stack_depot_disabled = true;
+		ret = -ENOMEM;
+		goto out_unlock;
+	}
+	stack_hash_mask = entries - 1;
+
+out_unlock:
 	mutex_unlock(&stack_depot_init_mutex);
+
 	return ret;
 }
 EXPORT_SYMBOL_GPL(stack_depot_init);
-- 
2.25.1



  parent reply	other threads:[~2023-01-30 20:50 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 ` andrey.konovalov [this message]
2023-01-31 10:37   ` [PATCH 07/18] lib/stackdepot: lower the indentation in stack_depot_init 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 ` [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=eb6f0a014b8d0bfa73a8bbd358c627dc66cf51b7.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