From nobody Sat Sep 13 22:29:23 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E686EB64DD for ; Sun, 9 Jul 2023 21:18:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229948AbjGIVSH (ORCPT ); Sun, 9 Jul 2023 17:18:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbjGIVSG (ORCPT ); Sun, 9 Jul 2023 17:18:06 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C7BD118; Sun, 9 Jul 2023 14:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1688937483; bh=WXEkw13RV61a6X752/mXvKkvA9bWqyILNC1f+dwJRBk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=FLoAhU8/CEkJZE6yW4YBbhWeRgct9Nw4/c6y7zJvf5G6iTIwA1ee92P0qarFx7pAE 5uwXFvaf6Lm71n+QosRp/H2XYWEBrOZVUKFdDbDTcdzC5eftfU1PJ/lcUok4MNvTTN BQeMEXZ/Pjgrzgj2zqXkeTqGpzQqym9vnRO8SEk4= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 09 Jul 2023 23:17:58 +0200 Subject: [PATCH v2 1/3] dyndbg: constify opt_array MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230709-dyndbg-filename-v2-1-fd83beef0925@weissschuh.net> References: <20230709-dyndbg-filename-v2-0-fd83beef0925@weissschuh.net> In-Reply-To: <20230709-dyndbg-filename-v2-0-fd83beef0925@weissschuh.net> To: Jason Baron , Jim Cromie , Jonathan Corbet , Luis Chamberlain , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1688937480; l=714; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=WXEkw13RV61a6X752/mXvKkvA9bWqyILNC1f+dwJRBk=; b=1EveoNxSWocT/JvcCYMCkWLZELFPlTyvQJh/Gptn44acX2ghh09fk62hWml+DdBPa89Nq+4tM +Wqmripd92OADMsO+8xdaW2M7B2OG2A/4SbBWZi5b11pYoZ9zidgdbY X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is never modified, so mark it const. Signed-off-by: Thomas Wei=C3=9Fschuh Reviewed-by: Luis Chamberlain --- lib/dynamic_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index fdd6d9800a70..71b22d206a1b 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -88,7 +88,7 @@ static inline const char *trim_prefix(const char *path) return path + skip; } =20 -static struct { unsigned flag:8; char opt_char; } opt_array[] =3D { +static const struct { unsigned flag:8; char opt_char; } opt_array[] =3D { { _DPRINTK_FLAGS_PRINT, 'p' }, { _DPRINTK_FLAGS_INCL_MODNAME, 'm' }, { _DPRINTK_FLAGS_INCL_FUNCNAME, 'f' }, --=20 2.41.0 From nobody Sat Sep 13 22:29:23 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 922E6EB64DD for ; Sun, 9 Jul 2023 21:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229983AbjGIVSN (ORCPT ); Sun, 9 Jul 2023 17:18:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229481AbjGIVSG (ORCPT ); Sun, 9 Jul 2023 17:18:06 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0CC811C; Sun, 9 Jul 2023 14:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1688937483; bh=J+Xea2ihWP8J7/RiQgrqlVFiwt7iwUc6uaPbB3lfgT0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=I8RxAsQg62HQ66sqqhmhr+oK3L/xaZmqwwluFr0cdP4PfwPVeX966Bqn+lB5XDLq/ B8WWhRhkkUMo+LMzWiMJpatVc6K1vPVEoSLt77EcX3VrD41JChigvM3/qGCzuQuEop U3if3wAq2698rY8f46z9E3v4NLhdZ5hh53c1+ZHk= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 09 Jul 2023 23:17:59 +0200 Subject: [PATCH v2 2/3] dyndbg: increase PREFIX_SIZE to 128 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230709-dyndbg-filename-v2-2-fd83beef0925@weissschuh.net> References: <20230709-dyndbg-filename-v2-0-fd83beef0925@weissschuh.net> In-Reply-To: <20230709-dyndbg-filename-v2-0-fd83beef0925@weissschuh.net> To: Jason Baron , Jim Cromie , Jonathan Corbet , Luis Chamberlain , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1688937480; l=677; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=J+Xea2ihWP8J7/RiQgrqlVFiwt7iwUc6uaPbB3lfgT0=; b=IXJ1KgkRmSd+BA8ncaDY1B60bjM00KbTjufQhsm5yV3ZJ51bqklliktBMrjZUeewGJe9i5P8e roTWGcweoZoAMs1s0au8A+jrH8gmbjRYrZ0PT88it9P52pFdquJ3teN X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A follow-up patch will add the possibility to print the filename as part of the prefix. Increase the maximum prefix size to accommodate this. Signed-off-by: Thomas Wei=C3=9Fschuh Reviewed-by: Luis Chamberlain --- lib/dynamic_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 71b22d206a1b..166229dfe171 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -808,7 +808,7 @@ const struct kernel_param_ops param_ops_dyndbg_classes = =3D { }; EXPORT_SYMBOL(param_ops_dyndbg_classes); =20 -#define PREFIX_SIZE 64 +#define PREFIX_SIZE 128 =20 static int remaining(int wrote) { --=20 2.41.0 From nobody Sat Sep 13 22:29:23 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18A79C001B0 for ; Sun, 9 Jul 2023 21:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230128AbjGIVSO (ORCPT ); Sun, 9 Jul 2023 17:18:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229895AbjGIVSH (ORCPT ); Sun, 9 Jul 2023 17:18:07 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E74C3124; Sun, 9 Jul 2023 14:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1688937483; bh=kUuLnBpZagTGgZtfp6+QNMKvlzerXhW/GswEr/rGnGU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oQJndrWXNLPFkfEsbCL20lQD4wIQAtsXltvpk2M1oDAu91Vhs/CgoEFb/LiQWtiWu tREFnKhizlmZM6UoZFXx2d37OZpm6dxxLwv9cFHl+0a0Wn/nnM0bpOpD3p9UkEyej3 eF0q5GAd7UqtqL+UeDEi1ohKdwcVWmNJKrA3p1y0= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 09 Jul 2023 23:18:00 +0200 Subject: [PATCH v2 3/3] dyndbg: add source filename to prefix MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230709-dyndbg-filename-v2-3-fd83beef0925@weissschuh.net> References: <20230709-dyndbg-filename-v2-0-fd83beef0925@weissschuh.net> In-Reply-To: <20230709-dyndbg-filename-v2-0-fd83beef0925@weissschuh.net> To: Jason Baron , Jim Cromie , Jonathan Corbet , Luis Chamberlain , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1688937480; l=3618; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=kUuLnBpZagTGgZtfp6+QNMKvlzerXhW/GswEr/rGnGU=; b=0WOHyfoM7dB2NU4GYhRWg43mpN/12HWhB5REzdPm0u9Kq+9flHZjYLLM2bPyiaoJWhqhq4z6h UJaqZ/JjgUaCuXm9GZ0N2ZF4xKcciDn6lFz9CJ9jrI4i1u0tplDQoRF X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Printing the line number without the file is of limited usefulness. Knowing the filename also makes it also easier to relate the logged information to the controlfile. Example: # modprobe test_dynamic_debug # echo 'file test_dynamic_debug.c =3Dpfsl' > /proc/dynamic_debug/control # echo 1 > /sys/module/test_dynamic_debug/parameters/do_prints # dmesg | tail -2 [ 71.802212] do_cats:lib/test_dynamic_debug.c:103: test_dd: doing cat= egories [ 71.802227] do_levels:lib/test_dynamic_debug.c:123: test_dd: doing l= evels Signed-off-by: Thomas Wei=C3=9Fschuh Acked-by: Jim Cromie Acked-by: Jason Baron Reviewed-by: Luis Chamberlain --- Documentation/admin-guide/dynamic-debug-howto.rst | 5 +++-- include/linux/dynamic_debug.h | 4 +++- lib/dynamic_debug.c | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentat= ion/admin-guide/dynamic-debug-howto.rst index 8dc668cc1216..0b3d39c610d9 100644 --- a/Documentation/admin-guide/dynamic-debug-howto.rst +++ b/Documentation/admin-guide/dynamic-debug-howto.rst @@ -216,13 +216,14 @@ The flags are:: t Include thread ID, or m Include module name f Include the function name + s Include the source file name l Include line number =20 For ``print_hex_dump_debug()`` and ``print_hex_dump_bytes()``, only the ``p`` flag has meaning, other flags are ignored. =20 -Note the regexp ``^[-+=3D][flmpt_]+$`` matches a flags specification. -To clear all flags at once, use ``=3D_`` or ``-flmpt``. +Note the regexp ``^[-+=3D][fslmpt_]+$`` matches a flags specification. +To clear all flags at once, use ``=3D_`` or ``-fslmpt``. =20 =20 Debug messages during Boot Process diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 061dd84d09f3..4fcbf4d4fd0a 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -37,10 +37,12 @@ struct _ddebug { #define _DPRINTK_FLAGS_INCL_FUNCNAME (1<<2) #define _DPRINTK_FLAGS_INCL_LINENO (1<<3) #define _DPRINTK_FLAGS_INCL_TID (1<<4) +#define _DPRINTK_FLAGS_INCL_SOURCENAME (1<<5) =20 #define _DPRINTK_FLAGS_INCL_ANY \ (_DPRINTK_FLAGS_INCL_MODNAME | _DPRINTK_FLAGS_INCL_FUNCNAME |\ - _DPRINTK_FLAGS_INCL_LINENO | _DPRINTK_FLAGS_INCL_TID) + _DPRINTK_FLAGS_INCL_LINENO | _DPRINTK_FLAGS_INCL_TID |\ + _DPRINTK_FLAGS_INCL_SOURCENAME) =20 #if defined DEBUG #define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINT diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 166229dfe171..6fba6423cc10 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -92,6 +92,7 @@ static const struct { unsigned flag:8; char opt_char; } o= pt_array[] =3D { { _DPRINTK_FLAGS_PRINT, 'p' }, { _DPRINTK_FLAGS_INCL_MODNAME, 'm' }, { _DPRINTK_FLAGS_INCL_FUNCNAME, 'f' }, + { _DPRINTK_FLAGS_INCL_SOURCENAME, 's' }, { _DPRINTK_FLAGS_INCL_LINENO, 'l' }, { _DPRINTK_FLAGS_INCL_TID, 't' }, { _DPRINTK_FLAGS_NONE, '_' }, @@ -836,6 +837,9 @@ static char *__dynamic_emit_prefix(const struct _ddebug= *desc, char *buf) if (desc->flags & _DPRINTK_FLAGS_INCL_FUNCNAME) pos +=3D snprintf(buf + pos, remaining(pos), "%s:", desc->function); + if (desc->flags & _DPRINTK_FLAGS_INCL_SOURCENAME) + pos +=3D snprintf(buf + pos, remaining(pos), "%s:", + trim_prefix(desc->filename)); if (desc->flags & _DPRINTK_FLAGS_INCL_LINENO) pos +=3D snprintf(buf + pos, remaining(pos), "%d:", desc->lineno); --=20 2.41.0