From 4a6b5314d6bd9093dcc3c0c8e185af7df9a0fe34 Mon Sep 17 00:00:00 2001
From: Andrey Konovalov <andreyknvl@google.com>
Date: Fri, 10 Feb 2023 22:15:50 +0100
Subject: [PATCH] lib/stackdepot: use pr_fmt to define message format
Use pr_fmt to define the format for printing stack depot messages instead
of duplicating the "Stack Depot" prefix in each message.
Link: https://lkml.kernel.org/r/3d09db0171a0e92ff3eb0ee74de74558bc9b56c4.1676063693.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
lib/stackdepot.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index 4bfaf3bce619c..83787e46a3ab3 100644
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -19,6 +19,8 @@
* Based on code by Dmitry Chernenkov.
*/
+#define pr_fmt(fmt) "stackdepot: " fmt
+
#include <linux/gfp.h>
#include <linux/jhash.h>
#include <linux/kernel.h>
@@ -98,7 +100,7 @@ static int __init is_stack_depot_disabled(char *str)
ret = kstrtobool(str, &stack_depot_disable);
if (!ret && stack_depot_disable) {
- pr_info("Stack Depot is disabled\n");
+ pr_info("disabled\n");
stack_table = NULL;
}
return 0;
@@ -142,7 +144,7 @@ int __init stack_depot_early_init(void)
1UL << STACK_HASH_ORDER_MAX);
if (!stack_table) {
- pr_err("Stack Depot hash table allocation failed, disabling\n");
+ pr_err("hash table allocation failed, disabling\n");
stack_depot_disable = true;
return -ENOMEM;
}
@@ -177,11 +179,11 @@ int stack_depot_init(void)
if (entries > 1UL << STACK_HASH_ORDER_MAX)
entries = 1UL << STACK_HASH_ORDER_MAX;
- pr_info("Stack Depot allocating hash table of %lu entries with kvcalloc\n",
+ pr_info("allocating hash table of %lu entries with kvcalloc\n",
entries);
stack_table = kvcalloc(entries, sizeof(struct stack_record *), GFP_KERNEL);
if (!stack_table) {
- pr_err("Stack Depot hash table allocation failed, disabling\n");
+ pr_err("hash table allocation failed, disabling\n");
stack_depot_disable = true;
ret = -ENOMEM;
}
--
GitLab