From: "Łukasz Bartosik" <lb@semihalf.com>
To: Jason Baron <jbaron@akamai.com>,
Jim Cromie <jim.cromie@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Kees Cook <keescook@chromium.org>,
Douglas Anderson <dianders@chromium.org>
Cc: Guenter Roeck <groeck@google.com>,
Yaniv Tzoreff <yanivt@google.com>,
Benson Leung <bleung@google.com>,
Steven Rostedt <rostedt@goodmis.org>,
Vincent Whitchurch <vincent.whitchurch@axis.com>,
Pekka Paalanen <ppaalanen@gmail.com>,
Sean Paul <seanpaul@chromium.org>,
Daniel Vetter <daniel@ffwll.ch>, Simon Ser <contact@emersion.fr>,
John Ogness <john.ogness@linutronix.de>,
Petr Mladek <pmladek@suse.com>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-kernel@vger.kernel.org, upstream@semihalf.com
Subject: [PATCH v3 01/22] dyndbg: add _DPRINTK_FLAGS_ENABLED
Date: Sat, 23 Dec 2023 02:51:10 +0100 [thread overview]
Message-ID: <20231223015131.2836090-2-lb@semihalf.com> (raw)
In-Reply-To: <20231223015131.2836090-1-lb@semihalf.com>
From: Jim Cromie <jim.cromie@gmail.com>
Distinguish the condition: _DPRINTK_FLAGS_ENABLED from the bit:
_DPRINTK_FLAGS_PRINT, and re-define former in terms of latter, in
preparation to add a 2nd bit: _DPRINTK_FLAGS_TRACE
Update JUMP_LABEL code block to check _DPRINTK_FLAGS_ENABLED symbol.
Also add a 'K' to get new symbol _DPRINTK_FLAGS_PRINTK, in order to
break any stale uses.
CC: vincent.whitchurch@axis.com
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
include/linux/dynamic_debug.h | 10 ++++++----
lib/dynamic_debug.c | 8 ++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 4fcbf4d4fd0a..7be791af7cf1 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -32,7 +32,7 @@ struct _ddebug {
* writes commands to <debugfs>/dynamic_debug/control
*/
#define _DPRINTK_FLAGS_NONE 0
-#define _DPRINTK_FLAGS_PRINT (1<<0) /* printk() a message using the format */
+#define _DPRINTK_FLAGS_PRINTK (1 << 0) /* printk() a message using the format */
#define _DPRINTK_FLAGS_INCL_MODNAME (1<<1)
#define _DPRINTK_FLAGS_INCL_FUNCNAME (1<<2)
#define _DPRINTK_FLAGS_INCL_LINENO (1<<3)
@@ -44,8 +44,10 @@ struct _ddebug {
_DPRINTK_FLAGS_INCL_LINENO | _DPRINTK_FLAGS_INCL_TID |\
_DPRINTK_FLAGS_INCL_SOURCENAME)
+#define _DPRINTK_FLAGS_ENABLED _DPRINTK_FLAGS_PRINTK
+
#if defined DEBUG
-#define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINT
+#define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINTK
#else
#define _DPRINTK_FLAGS_DEFAULT 0
#endif
@@ -199,10 +201,10 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,
#ifdef DEBUG
#define DYNAMIC_DEBUG_BRANCH(descriptor) \
- likely(descriptor.flags & _DPRINTK_FLAGS_PRINT)
+ likely(descriptor.flags & _DPRINTK_FLAGS_ENABLED)
#else
#define DYNAMIC_DEBUG_BRANCH(descriptor) \
- unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)
+ unlikely(descriptor.flags & _DPRINTK_FLAGS_ENABLED)
#endif
#endif /* CONFIG_JUMP_LABEL */
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 6fba6423cc10..ee0cb37153ef 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -89,7 +89,7 @@ static inline const char *trim_prefix(const char *path)
}
static const struct { unsigned flag:8; char opt_char; } opt_array[] = {
- { _DPRINTK_FLAGS_PRINT, 'p' },
+ { _DPRINTK_FLAGS_PRINTK, 'p' },
{ _DPRINTK_FLAGS_INCL_MODNAME, 'm' },
{ _DPRINTK_FLAGS_INCL_FUNCNAME, 'f' },
{ _DPRINTK_FLAGS_INCL_SOURCENAME, 's' },
@@ -247,10 +247,10 @@ static int ddebug_change(const struct ddebug_query *query,
if (newflags == dp->flags)
continue;
#ifdef CONFIG_JUMP_LABEL
- if (dp->flags & _DPRINTK_FLAGS_PRINT) {
- if (!(newflags & _DPRINTK_FLAGS_PRINT))
+ if (dp->flags & _DPRINTK_FLAGS_ENABLED) {
+ if (!(newflags & _DPRINTK_FLAGS_ENABLED))
static_branch_disable(&dp->key.dd_key_true);
- } else if (newflags & _DPRINTK_FLAGS_PRINT) {
+ } else if (newflags & _DPRINTK_FLAGS_ENABLED) {
static_branch_enable(&dp->key.dd_key_true);
}
#endif
--
2.43.0.472.g3155946c3a-goog
next prev parent reply other threads:[~2023-12-23 1:51 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-23 1:51 [PATCH v3 00/22] dyndbg: add support for writing debug logs to trace Łukasz Bartosik
2023-12-23 1:51 ` Łukasz Bartosik [this message]
2023-12-23 1:51 ` [PATCH v3 02/22] dyndbg: add _DPRINTK_FLAGS_TRACE Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 03/22] dyndbg: add write events to tracefs code Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 04/22] dyndbg: add 2 trace-events: prdbg, devdbg Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 05/22] tracefs: add __get_str_strip_nl - RFC Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 06/22] dyndbg: use __get_str_strip_nl in prdbg and devdbg Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 07/22] dyndbg: repack _ddebug structure Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 08/22] dyndbg: move flags field to a new structure Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 09/22] dyndbg: add trace destination field to _ddebug Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 10/22] dyndbg: add open and close commands for trace Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 11/22] dyndbg: don't close trace instance when in use Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 12/22] dyndbg: add processing of T(race) flag argument Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 13/22] dyndbg: add support for default trace destination Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 14/22] dyndbg: write debug logs to trace instance Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 15/22] dyndbg: add support for hex_dump output to trace Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 16/22] dyndbg: disambiguate quoting in a debug msg Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 17/22] dyndbg: fix old BUG_ON in >control parser Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 18/22] dyndbg: treat comma as a token separator Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 19/22] dyndbg: add skip_spaces_and_coma() Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 20/22] dyndbg: split multi-query strings with % Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 21/22] dyndbg: reduce verbose/debug clutter Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 22/22] dyndbg: id the bad word in parse-flags err msg Łukasz Bartosik
2023-12-27 4:22 ` [PATCH v3 00/22] dyndbg: add support for writing debug logs to trace jim.cromie
2023-12-27 4:44 ` jim.cromie
2023-12-29 0:05 ` Łukasz Bartosik
2023-12-29 0:00 ` Łukasz Bartosik
2024-01-02 19:13 ` jim.cromie
2024-01-03 16:27 ` Łukasz Bartosik
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=20231223015131.2836090-2-lb@semihalf.com \
--to=lb@semihalf.com \
--cc=akpm@linux-foundation.org \
--cc=bleung@google.com \
--cc=contact@emersion.fr \
--cc=daniel@ffwll.ch \
--cc=dianders@chromium.org \
--cc=groeck@google.com \
--cc=jbaron@akamai.com \
--cc=jim.cromie@gmail.com \
--cc=john.ogness@linutronix.de \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=ppaalanen@gmail.com \
--cc=rostedt@goodmis.org \
--cc=seanpaul@chromium.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=upstream@semihalf.com \
--cc=vincent.whitchurch@axis.com \
--cc=yanivt@google.com \
/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;
as well as URLs for NNTP newsgroup(s).