public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Breno Leitao <leitao@debian.org>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
	 "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	 Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>,  Simon Horman <horms@kernel.org>,
	Jonathan Corbet <corbet@lwn.net>,  Shuah Khan <shuah@kernel.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	 linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org,
	 Breno Leitao <leitao@debian.org>,
	kernel-team@meta.com
Subject: [PATCH net-next 2/7] netconsole: refactor CPU number formatting into separate function
Date: Fri, 21 Feb 2025 05:52:07 -0800	[thread overview]
Message-ID: <20250221-netcons_current-v1-2-21c86ae8fc0d@debian.org> (raw)
In-Reply-To: <20250221-netcons_current-v1-0-21c86ae8fc0d@debian.org>

Extract CPU number formatting logic from prepare_extradata() into a new
append_cpu_nr() function.

This refactoring improves code organization by isolating CPU number
formatting into its own function while reducing the complexity of
prepare_extradata().

The change prepares the codebase for the upcoming taskname feature by
establishing a consistent pattern for handling sysdata features.

The CPU number formatting logic itself remains unchanged; only its
location has moved to improve maintainability.

Signed-off-by: Breno Leitao <leitao@debian.org>
---
 drivers/net/netconsole.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index c086e2fe51f874812379e6f89c421d7d32980f91..26ff2ed4de16bce58e9eeaf8b5b362dfaafaca0a 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -1117,13 +1117,21 @@ static void populate_configfs_item(struct netconsole_target *nt,
 	init_target_config_group(nt, target_name);
 }
 
+static int append_cpu_nr(struct netconsole_target *nt, int offset)
+{
+	/* Append cpu=%d at extradata_complete after userdata str */
+	return scnprintf(&nt->extradata_complete[offset],
+			 MAX_EXTRADATA_ENTRY_LEN, " cpu=%u\n",
+			 raw_smp_processor_id());
+}
+
 /*
  * prepare_extradata - append sysdata at extradata_complete in runtime
  * @nt: target to send message to
  */
 static int prepare_extradata(struct netconsole_target *nt)
 {
-	int sysdata_len, extradata_len;
+	int extradata_len;
 
 	/* userdata was appended when configfs write helper was called
 	 * by update_userdata().
@@ -1133,12 +1141,8 @@ static int prepare_extradata(struct netconsole_target *nt)
 	if (!(nt->sysdata_fields & SYSDATA_CPU_NR))
 		goto out;
 
-	/* Append cpu=%d at extradata_complete after userdata str */
-	sysdata_len = scnprintf(&nt->extradata_complete[nt->userdata_length],
-				MAX_EXTRADATA_ENTRY_LEN, " cpu=%u\n",
-				raw_smp_processor_id());
-
-	extradata_len += sysdata_len;
+	if (nt->sysdata_fields & SYSDATA_CPU_NR)
+		extradata_len += append_cpu_nr(nt, nt->userdata_length);
 
 	WARN_ON_ONCE(extradata_len >
 		     MAX_EXTRADATA_ENTRY_LEN * MAX_EXTRADATA_ITEMS);

-- 
2.43.5


  parent reply	other threads:[~2025-02-21 13:52 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-21 13:52 [PATCH net-next 0/7] netconsole: Add taskname sysdata support Breno Leitao
2025-02-21 13:52 ` [PATCH net-next 1/7] netconsole: prefix CPU_NR sysdata feature with SYSDATA_ Breno Leitao
2025-02-25 10:19   ` Simon Horman
2025-02-21 13:52 ` Breno Leitao [this message]
2025-02-25 10:17   ` [PATCH net-next 2/7] netconsole: refactor CPU number formatting into separate function Simon Horman
2025-02-25 11:09     ` Breno Leitao
2025-02-25 14:08       ` Simon Horman
2025-02-21 13:52 ` [PATCH net-next 3/7] netconsole: add taskname to extradata entry count Breno Leitao
2025-02-25 10:20   ` Simon Horman
2025-02-21 13:52 ` [PATCH net-next 4/7] netconsole: add configfs controls for taskname sysdata feature Breno Leitao
2025-02-25 10:20   ` Simon Horman
2025-02-25 11:41   ` Paolo Abeni
2025-02-25 13:12     ` Breno Leitao
2025-02-21 13:52 ` [PATCH net-next 5/7] netconsole: add task name to extra data fields Breno Leitao
2025-02-25 10:19   ` Simon Horman
2025-02-25 11:17     ` Breno Leitao
2025-02-25 11:53       ` Paolo Abeni
2025-02-25 13:11         ` Breno Leitao
2025-03-04 14:23           ` Paolo Abeni
2025-02-25 14:10       ` Simon Horman
2025-02-21 13:52 ` [PATCH net-next 6/7] netconsole: docs: document the task name feature Breno Leitao
2025-02-25 10:20   ` Simon Horman
2025-02-21 13:52 ` [PATCH net-next 7/7] netconsole: selftest: add task name append testing Breno Leitao
2025-02-25 10:21   ` Simon Horman

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=20250221-netcons_current-v1-2-21c86ae8fc0d@debian.org \
    --to=leitao@debian.org \
    --cc=andrew+netdev@lunn.ch \
    --cc=corbet@lwn.net \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=horms@kernel.org \
    --cc=kernel-team@meta.com \
    --cc=kuba@kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=shuah@kernel.org \
    /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