From patchwork Mon Jan 30 02:01:18 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: 50089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1965972wrn; Sun, 29 Jan 2023 18:04:21 -0800 (PST) X-Google-Smtp-Source: AK7set9E5DZso2jRynkeW/T4HEsGSHQkqhgavxsk4WqRpy1Ub+ONRLdGLDTNqpiW3tX9wGTyNvLr X-Received: by 2002:a05:6a20:4421:b0:bc:9007:e53 with SMTP id ce33-20020a056a20442100b000bc90070e53mr9797310pzb.0.1675044260966; Sun, 29 Jan 2023 18:04:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675044260; cv=none; d=google.com; s=arc-20160816; b=uFO8dpenSGVh4ggfDmM2TjrlKhMKVKX+9PlCt4bz7K6Z8bBtiEu567tnK6KtJA7HOW MmBP/ljx5yreAlDrLkf2hLjLqtgsyLgVSnOg4HtpKS+FUlkIPYEqIRomHT25dM8tJBTn z5OV/F1+NIr8Liu+DBFhNFZEushLrbtWK2xvqeaQQNpkHRyrDxrS9bBfW+yVvJVTwl3B Gmnxj3aPj4cVCDQcs4ovpkYyxpPSy5jaihoSXNj8bxqug5eXuGzxP8n74+ucGGci+Jog aqqeDOxcwte8yJTgV6QazjPnfmEKmBmoZGHGT4liblaqDNFKGB3871MebhFxJROzAZJk /HGA== 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:dkim-signature :from; bh=j2ivMA5U9FznBG0CxFKr4cYzkltu4bvXizqMW0WuUTU=; b=rGKkxfqQ6aEXiZDALzyzUO7a5FvQXzXRRkd5UqA+d+1M/yTwSt7g4S7HX5yZf4mWqX 8uFWRl3mAegSA73hv+M0fHmzVj3ZzNsZygrJHTXWXGOOQ8HNDdH9Iuk0suI242gzC10a mjX+QJ1MWzvb5E8Q2elKmKaBilx6H2OVvi5A8/QNBuOH7IHHgvtuVZHU5cNx9GIqNFMM LKa0o+CI9eUkPp3LyX3bTbt8TApaiMpVRUjHxzxM8rqjPV8583MM5wXhjBloHvRZkW6n 1oRMA4BqvSh/bb7TVO4hxJC3S15o2VTxJFs/8Xd/MVZZ27A77Zc08EjdYwmCd/L73QFJ A1qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=bUTofwUY; 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 l18-20020a170902d05200b001964122ab23si10437901pll.49.2023.01.29.18.04.08; Sun, 29 Jan 2023 18:04:20 -0800 (PST) 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=fail header.i=@weissschuh.net header.s=mail header.b=bUTofwUY; 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 S235379AbjA3CBj (ORCPT + 99 others); Sun, 29 Jan 2023 21:01:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235345AbjA3CB2 (ORCPT ); Sun, 29 Jan 2023 21:01:28 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39DCB1CAC3; Sun, 29 Jan 2023 18:01:24 -0800 (PST) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1675044081; bh=vszqxSH91EE5mncd+gKKGfi1eFcrVSvkglPY0MNqyPk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bUTofwUYm3FX/jUiFs0II2wPYPsNOGq44L4Q3ak/pRCTqeyQcSsl6QbBUPNkVmjl9 Gi34ESVbNaWK2kz6L3QexWJbq+8hS5Hjnqji810JvDmIIwqQMpT/1mqqySWSavPHL1 Kd4oqWX//k6h+dxUSMSs0OtZq6REM6eQ7HDwFciA= Date: Mon, 30 Jan 2023 02:01:18 +0000 Subject: [PATCH 1/3] dyndbg: constify opt_array MIME-Version: 1.0 Message-Id: <20221223-dyndbg-filename-v1-1-cbf8543009a1@weissschuh.net> References: <20221223-dyndbg-filename-v1-0-cbf8543009a1@weissschuh.net> In-Reply-To: <20221223-dyndbg-filename-v1-0-cbf8543009a1@weissschuh.net> To: Jason Baron , Jim Cromie , Jonathan Corbet 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.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1675044079; l=714; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=vszqxSH91EE5mncd+gKKGfi1eFcrVSvkglPY0MNqyPk=; b=IBMq3PGz9Qksnzc5M4ZrloHLssDarvdTSs+Er71Nx5cjPoKIDzd+VWnJbz8+qoIleLhqGqLS91JR gapDI4CtAp0ynPvnaZCGFYUCCN3YkESUXGM07vnJxvR5H0T1Gih4 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 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756411211322605383?= X-GMAIL-MSGID: =?utf-8?q?1756411211322605383?= It is never modified, so mark it const. Signed-off-by: Thomas Weißschuh --- 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 009f2ead09c1..6915e088bed6 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 Mon Jan 30 02:01:19 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: 50090 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1965977wrn; Sun, 29 Jan 2023 18:04:22 -0800 (PST) X-Google-Smtp-Source: AK7set/wKbab60FsbdOeugfRuTEZNIqMEQ0RC7sVjDFw7mL5BLeFSSHd3WqQ9FoV0OcskQ9cQMqw X-Received: by 2002:a17:90b:3811:b0:22c:3eca:2bbc with SMTP id mq17-20020a17090b381100b0022c3eca2bbcmr12649749pjb.47.1675044261987; Sun, 29 Jan 2023 18:04:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675044261; cv=none; d=google.com; s=arc-20160816; b=d8pJKaKXx9LDgRwUR7+4aJhdhzQsLq+LBQOZIiQnoZZV0qDUwXtqKpTVEi76sva8Tu 0mHC+2uU8Vb3PtP7vhCNZL8jLrzrEOP6724XJ50CnveGXtqLEnSO6qY6Z43/6VZ7zsw7 0YK5Md84mRNmPdQRTGWmFD+tL7t+sdzgkIbt+QFOuPYJVe3ONnS1Csi/HiPaaq7/b6B0 E2sy6zhcf53kRVRP2qnciB9sWkl93tUzKhDTqWz3pp9FiuOgAKcThHybE9o9KH1o7GpC s2Tb7dnYIMKO19I0pUt24MJXn9Ph4uYtNKBm3j4cBFTw4X1UA+Mi7AnWuW2+gqBiTKme gYUQ== 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:dkim-signature :from; bh=2jzhL0pty+7ftzyaoWCiETDcKasgLLhH79PzAcBfDEE=; b=Kja6uoN7M5afMVWBljHfSUtBPBIm20bZ9Hzoc8xqfd4VIYSki1F8stRU/k8p9dnrr4 sL8YasdpeBAOs+3v/ckImuEh2OyK2Oe2rKYJnUYAKgCKVJ4Mx0TkkXbNfEPudUYRYU6Y iLZeeni1k8w3R70Ozzq8QCpqOarj/vHAjrBdsj9LAKBL2cxefpIwfze+rFl21bhq7RFA snjCoS3v5L3+sH8jtS2gxpGxxdoN/GUuO/DcJ4gKRv8V9bswy3wdZPZmO9bgTfjDRJHS YNhO+z5PvsWHR6mfl5GG2z0WE6mD90oW/vtlJ02jYq41rsMbtO3qgnMYe+4TGpIx2btq H4eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=YrqnAX5U; 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 q11-20020a17090aa00b00b0022c4ddf8413si9417454pjp.8.2023.01.29.18.04.09; Sun, 29 Jan 2023 18:04:21 -0800 (PST) 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=fail header.i=@weissschuh.net header.s=mail header.b=YrqnAX5U; 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 S235393AbjA3CBm (ORCPT + 99 others); Sun, 29 Jan 2023 21:01:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235343AbjA3CB2 (ORCPT ); Sun, 29 Jan 2023 21:01:28 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 054261C5BF; Sun, 29 Jan 2023 18:01:24 -0800 (PST) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1675044082; bh=4N4nvguOlNTE34sqbnvTE3IRMGoOqGvhLDtXDoYx+EQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YrqnAX5UI6esPR0SyGBZgj+o2uTccq6DO7LWjru1yhYYkRw2qjvraL7kIgpoaxS18 iRlLy7/OVRQ6igFNUHpi2EZaMAMK0/CCA5EERWWefYvcX4ju/bTZlMouPIBroPKFLX nQ2vZViHjyl4mAmaybm/McooOk6ZCth5pc1VOnlg= Date: Mon, 30 Jan 2023 02:01:19 +0000 Subject: [PATCH 2/3] dyndbg: increase PREFIX_SIZE to 128 MIME-Version: 1.0 Message-Id: <20221223-dyndbg-filename-v1-2-cbf8543009a1@weissschuh.net> References: <20221223-dyndbg-filename-v1-0-cbf8543009a1@weissschuh.net> In-Reply-To: <20221223-dyndbg-filename-v1-0-cbf8543009a1@weissschuh.net> To: Jason Baron , Jim Cromie , Jonathan Corbet 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.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1675044079; l=677; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=4N4nvguOlNTE34sqbnvTE3IRMGoOqGvhLDtXDoYx+EQ=; b=NoRY/Q6NrNgmOBCHx6uCF9rcwE3r5EsreIlcD5BTd3Z5nYv/tim0IL23AkIXmwgbt3F2tx2byg5h GIYvB9UsC/YNHv9kXuaD6Zn5mTO+1M3QxAGMdcJ0Ahz3EXePlA8x 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 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756411212026364896?= X-GMAIL-MSGID: =?utf-8?q?1756411212026364896?= 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 --- 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 6915e088bed6..e96ea427d8af 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 Mon Jan 30 02:01:20 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: 50088 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1965931wrn; Sun, 29 Jan 2023 18:04:12 -0800 (PST) X-Google-Smtp-Source: AK7set+ps+qoBJlo+SaauWaADz4ciOozth+kx6yo8cOwopDnJC4am/zDhunLf4sxPU3lwIjm90J9 X-Received: by 2002:a17:90b:3a81:b0:225:e88c:33c2 with SMTP id om1-20020a17090b3a8100b00225e88c33c2mr8133446pjb.7.1675044252582; Sun, 29 Jan 2023 18:04:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675044252; cv=none; d=google.com; s=arc-20160816; b=m6l5KSiXvycv8Fv/qGyTdrnJgu88koDMPEkR+4mzIL1kGW9QWWyrAjE1rN/qzOeO+R kv4G4Wx9FMcYDCKCu15Jp/C2/zIglIIpQMN44+poZXYv8MFZYaUJ4hiJHTKF0XQwIolr k2YR6N75VGc1MLaz+eaK2rzMJPCYOEj7U0CaCqim6u9OpNnf74WJ6mHsd5adICPtrmAn RYcPsm1iYlsl3MwDX9uoPR/bFj06cH8fhcsmp4vbjv2yVnj3ivhp21v2x71PHhRy7gFt Ri3d68J5tnQOw9uKnsvVYeup2OarOkbQot6F0zxYf82TEb3QU8nmf1UWOEk7P91Pj0bo cmUQ== 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:dkim-signature :from; bh=Ex3uvMU7UvZbpfs76XvCq/dmn6MkuUTpzWQ7+2hg0ws=; b=jp2qGFZO+BVeonevt3nawzq0L9T5jU52o87s17esWLB7ti4d4OZl3sX8MPrRyHgAgP cDaLH3jaG4Co2y+LI+JIJzLYP59Bep2E1GUt+joY4xfXHv042hzjp+MbjGz/sokIZRfU 5tjzH5dqhwvGy6maZFfW6Q6s/S0Umolst3q1gUhWwPhp2P51/WLt8hOTWLFjb60AGzeO 8itHjCaOK2vs4JVrB6KMETaGyadfEVzgEkr3jYLnEiad0m8vqnDtg8KThnonJu99W5LU U/f2MWMzZ1D0mMquSeNlKo9gP0ocJ4133BWs7cBpIWNku3TIQPKijCz7Wj16kAmqz2Jq iyhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=MIpOIVAb; 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 j3-20020a17090ac48300b002292b12217dsi12026792pjt.112.2023.01.29.18.04.00; Sun, 29 Jan 2023 18:04:12 -0800 (PST) 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=fail header.i=@weissschuh.net header.s=mail header.b=MIpOIVAb; 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 S235334AbjA3CBh (ORCPT + 99 others); Sun, 29 Jan 2023 21:01:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235344AbjA3CB2 (ORCPT ); Sun, 29 Jan 2023 21:01:28 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0B3A1C5BC; Sun, 29 Jan 2023 18:01:23 -0800 (PST) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1675044082; bh=vYyMbUasWdCcvNPaIYP2QI+GHBd2HKwQKJ5zNSkk/nQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MIpOIVAbYklI+C6pMxe3MqlL57ZzePhpgZKCp/eLM979qOdBQrjfuc88TArxS3Plr YnWnntrqhbSo5+2t4Ql+bUTmfZFLQjD2DeFCsC8AKBnhj52aer2wU+XHoBTtlROYPF rmhHR40vmd/3gXfseDay+TOU16M5nkfe6Fd5DZ+Q= Date: Mon, 30 Jan 2023 02:01:20 +0000 Subject: [PATCH 3/3] dyndbg: add source filename to prefix MIME-Version: 1.0 Message-Id: <20221223-dyndbg-filename-v1-3-cbf8543009a1@weissschuh.net> References: <20221223-dyndbg-filename-v1-0-cbf8543009a1@weissschuh.net> In-Reply-To: <20221223-dyndbg-filename-v1-0-cbf8543009a1@weissschuh.net> To: Jason Baron , Jim Cromie , Jonathan Corbet 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.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1675044079; l=3530; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=vYyMbUasWdCcvNPaIYP2QI+GHBd2HKwQKJ5zNSkk/nQ=; b=Ic4BdYeIZIuB1IAlAnRTvv0I8Xq5+adDWvwdrjCGK62ROXHMF17kYJXayQl+UfVPErSjcmgeEyUs YYsNYTPDCOQPK6c/m0RAk/WhydWf00V2psJBmFkTWIVMQEpmomth 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 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756411172564788150?= X-GMAIL-MSGID: =?utf-8?q?1756411202280851514?= 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: Jason Baron Acked-by: Jim Cromie --- 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 faa22f77847a..f9fa8163fba6 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 41682278d2e8..0c77105d583c 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 e96ea427d8af..fa7418e35197 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);