From patchwork Sun Jul 9 21:17:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 117534 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp4636862vqx; Sun, 9 Jul 2023 14:34:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlEHsM0xw8AwT8mChETk35C9FXu8HvWpGxw4BmO1qiLK7or37DTjAKIp5PLRTJDjcywvW+af X-Received: by 2002:adf:e842:0:b0:314:a3f:9c08 with SMTP id d2-20020adfe842000000b003140a3f9c08mr9559882wrn.39.1688938471235; Sun, 09 Jul 2023 14:34:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688938471; cv=none; d=google.com; s=arc-20160816; b=auWRHBNje+IkTdtbC8mnoxIBL+G+urBVdIQtlHYbDk0r2QC0n/CRwYqxQL2GbCLbz7 VIzD+ySs9+NDts0BMKOs6AqfWYdqo3+wUYpiyMdAKG4e23E9C8YAf8g9EkFvUz3HnaC0 WgM2nTNCwW47EljvFt/Kv6k2jIT5LXyNTNjfaAmxwkM5YLvOxwjiHnzNqGBpzGyfRCWy 7B3gNPZik8OH7FRDOSHb7XzoXbo/gnfcP6K0G6ypg5xsD9FdsLO6HQqCwMPYKuuXFQTq tApiTW2c8uNBZUJDH91zToIJl0S3bSqXxaUeNoH995cbCU81/C2TbZvO59pe4/Bo+RAb Az0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=n2ZV+arsl4Sq2NldK+fsExbAPWhb56kbg7d4yrXlxV8=; fh=wXcZQlffSzV2rFzu9yvBJZxeeF3pBCyVS0GsP2GQFT0=; b=scCy71F7/Vv4AqqFSFIP5sNZ8uKzYwl5W5HImpdpSGSTmgu2QTN6RohlfpfF0PcRMA MSDXnEv90qw0lGTjG428v/h0Uk8EuNjgVpXUaAA3D+1QUtwRBzH3OCIWyAujmdDPR0ph U9mI6cC9EoD0CVs/QQiFRuk369Mag4Ac93i37lwk+L2yQe74lp9N8EIkWWRL8y+5qdIC OYowihbbSfYPLKwfXt/wkh6RNhVEwEfIW8h4JQBDhEML62HSiOw8LgY3iZ0X8r4lF92n 6kslPqy8CC9Jjg2CKkxgRiB+STPbim7MsSljlPO/5cIWfK+q0jj3U72u60RG49aRdLy8 HAqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b="FLoAhU8/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e4-20020aa7d7c4000000b0051e1560cc03si5891976eds.219.2023.07.09.14.34.02; Sun, 09 Jul 2023 14:34:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b="FLoAhU8/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229924AbjGIVSH (ORCPT + 99 others); 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 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?Thoma?= =?utf-8?q?s_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= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1770980346597513171 X-GMAIL-MSGID: 1770980346597513171 It is never modified, so mark it const. Signed-off-by: Thomas Weißschuh 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; } -static struct { unsigned flag:8; char opt_char; } opt_array[] = { +static const struct { unsigned flag:8; char opt_char; } opt_array[] = { { _DPRINTK_FLAGS_PRINT, 'p' }, { _DPRINTK_FLAGS_INCL_MODNAME, 'm' }, { _DPRINTK_FLAGS_INCL_FUNCNAME, 'f' }, From patchwork Sun Jul 9 21:17:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 117531 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp4632318vqx; Sun, 9 Jul 2023 14:20:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlGUiu600z1jLju4gnlXluuPRQmuXr/meFzO2v67aVYvqVyixV0onzoi9I+QzYojpzlwcyO/ X-Received: by 2002:a05:6a20:94:b0:12d:d615:9279 with SMTP id 20-20020a056a20009400b0012dd6159279mr9046781pzg.25.1688937611366; Sun, 09 Jul 2023 14:20:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688937611; cv=none; d=google.com; s=arc-20160816; b=V45DlvSZvAynRSCQe501uWH8OXgIt8CdCGqicMXJ2Fn48lmb7egnv2BX+h2Q+UxJk2 cMAU0Wz6LN6X8XV5piKsUEavKUiXbX9ZiD85QUTJCU37uxuAZa4ZSjM3xfLl/U0m+6qH rX1SOugcHL0V/qth7BWVudB/n6uZSCEc/jWq2Fy8drr1yH0TpEXg6Y/RTVATUY5ao+BM WsZKt4WGfQqq8UD6hKkgMefMZgwYguUsmBj13+Z3nyhnKfd0bmRWbpWW5hlU8u5Zm6R1 9YMR4L6OfI+hibOWleK6mx5ctP3BWl75VpqZ1R4wjGSKXiPn3h8muALtiEBipJC4/kQI tCSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=1WZMjo//sh1t1e513RlFAxKi55ET6PH0DskWb1mHZ/g=; fh=wXcZQlffSzV2rFzu9yvBJZxeeF3pBCyVS0GsP2GQFT0=; b=woH2XGriZm7hKfycRH7+LP4DOT3SK+TcPc+2hEkzgP9Q1BI8uhFwyVl84vMj+l2uZv IXGeIMNApGHXHYRIdN7jYiChAkxdEEDRCBgEg2uyyAmKEiLpU1kJBgKRyWymeMucTzEi kIynlOAluw2LEP5sYBuG0OAwjr9/M5ot3DbJya7pp0CqpsoDMPV2fJgwXBextvN2FTbO mZniNbBzjJM7QnrR4YIrUh8AWJ6rNIyccf+IVvweOo5F7HWrz3wMNXXHztGLahLlODCA U0rPJilLuRXJahgqxTWzTPqSvVt0u4WMOJp9wMpdqOvIpxQFjrAZA6gtbA5qOTTO3xDz GF7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=I8RxAsQg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ce11-20020a056a002a0b00b0064d3e1db254si2268326pfb.347.2023.07.09.14.19.59; Sun, 09 Jul 2023 14:20:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=I8RxAsQg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230064AbjGIVSL (ORCPT + 99 others); Sun, 9 Jul 2023 17:18:11 -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 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?Thoma?= =?utf-8?q?s_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= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1770979445142042722 X-GMAIL-MSGID: 1770979445142042722 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ßschuh 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 = { }; EXPORT_SYMBOL(param_ops_dyndbg_classes); -#define PREFIX_SIZE 64 +#define PREFIX_SIZE 128 static int remaining(int wrote) { From patchwork Sun Jul 9 21:18:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 117532 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp4632353vqx; Sun, 9 Jul 2023 14:20:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlFOk7R2a26XND2nZOKef4WCQDSTp5xDSsd54mubjS4/xe3QEMFRCq2DXldOnNsQdg3Q4uKt X-Received: by 2002:a05:6a21:32a2:b0:130:d596:61bf with SMTP id yt34-20020a056a2132a200b00130d59661bfmr7033872pzb.62.1688937618195; Sun, 09 Jul 2023 14:20:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688937618; cv=none; d=google.com; s=arc-20160816; b=DABM/+vuZXZWZ9cYTW2rSN4vmpKP/S93L7EYDfiB0r+PFTZjPldba5lLYd6r5xZEjn FK80xzFmKzbAKveeiEn29yyhWe9UL/YZNj2cLr6SyUa0YQdTrjveXuQ4SyvBjPLZAaUD YlSThWKTM0BGwJBFDcIjwOVh2RyMjTHJi0KfnaKsKWme5EQ/lwyKzsknaz/czeXNFDn9 THpwnE8mmJzmThR+WBPLRLeH/KZIn6pf4oqAv7VzXVCncH804wyTt5k1oLsyTbTa/1iB z4fNVJhr9Lkzl7NFZUDKOfhUPQLEagHQH6KQ+6LHVBrRjGymqa5WXk3tzO9DQNInkpaf SMsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=QVQp/9QL4HjsY7eR/RJmjSRvO/iXrueLL7jQmhDTSJ8=; fh=wXcZQlffSzV2rFzu9yvBJZxeeF3pBCyVS0GsP2GQFT0=; b=KRnqj27FlrqcGaXFRQwaKHrRBgfGadNMdxD8Xc9UJ4Tp1OquSDKvqr1mEcyxoxqsiS cd9CPogNADnuLNs/Dz4qXyIapXQ1muClQV+xBU+nNrK1Iy0WShJLyR1MA1meigO5RbPp CmZGHWSJsoMLnRSqPyK1kJuxLqTvD5kNXirp9TJtL+X2lYmMFkUhhUxVT6QUIWlt4H8X 9gDD3z2eWJg6Gu6RPc2SCsbXR888+pANQkyNLUrR2xbsqhiC5A6HZXALFDaLiku0AvBp sE8cF14pI3ZNEufsME0IUnHexvZPzA9HwJ4jnx0AaOSHJe3crpJIKAgcqXXAH5HhHiYW qMjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=oQJndrWX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 1-20020a630201000000b00553800fe4dcsi7787449pgc.583.2023.07.09.14.20.05; Sun, 09 Jul 2023 14:20:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=oQJndrWX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230119AbjGIVSO (ORCPT + 99 others); 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 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?Thoma?= =?utf-8?q?s_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= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1770979451684718545 X-GMAIL-MSGID: 1770979451684718545 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 =pfsl' > /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 categories [ 71.802227] do_levels:lib/test_dynamic_debug.c:123: test_dd: doing levels Signed-off-by: Thomas Weißschuh 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/Documentation/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 For ``print_hex_dump_debug()`` and ``print_hex_dump_bytes()``, only the ``p`` flag has meaning, other flags are ignored. -Note the regexp ``^[-+=][flmpt_]+$`` matches a flags specification. -To clear all flags at once, use ``=_`` or ``-flmpt``. +Note the regexp ``^[-+=][fslmpt_]+$`` matches a flags specification. +To clear all flags at once, use ``=_`` or ``-fslmpt``. 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) #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) #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; } opt_array[] = { { _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 += snprintf(buf + pos, remaining(pos), "%s:", desc->function); + if (desc->flags & _DPRINTK_FLAGS_INCL_SOURCENAME) + pos += snprintf(buf + pos, remaining(pos), "%s:", + trim_prefix(desc->filename)); if (desc->flags & _DPRINTK_FLAGS_INCL_LINENO) pos += snprintf(buf + pos, remaining(pos), "%d:", desc->lineno);