netconsole: Use printk context for CPU and task information

Use the CPU and task name captured at printk() time from
nbcon_write_context instead of querying the current execution context.
This provides accurate information about where the message originated,
rather than where netconsole happens to be running.

For CPU, use wctxt->cpu instead of raw_smp_processor_id().

For taskname, use wctxt->comm directly which contains the task
name captured at printk time.

This change ensures netconsole outputs reflect the actual context that
generated the log message, which is especially important when the
console driver runs asynchronously in a dedicated thread.

Reviewed-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Breno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20260206-nbcon-v7-4-62bda69b1b41@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index ec000f477c2a8fdde867c329b524c978979747a2..0f44ce5ccc0abf886ee21e270c85590b79d5508b 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -1490,18 +1490,20 @@ static void populate_configfs_item(struct netconsole_target *nt,
        init_target_config_group(nt, target_name);
 }
 
-static int sysdata_append_cpu_nr(struct netconsole_target *nt, int offset)
+static int sysdata_append_cpu_nr(struct netconsole_target *nt, int offset,
+                                struct nbcon_write_context *wctxt)
 {
        return scnprintf(&nt->sysdata[offset],
                         MAX_EXTRADATA_ENTRY_LEN, " cpu=%u\n",
-                        raw_smp_processor_id());
+                        wctxt->cpu);
 }
 
-static int sysdata_append_taskname(struct netconsole_target *nt, int offset)
+static int sysdata_append_taskname(struct netconsole_target *nt, int offset,
+                                  struct nbcon_write_context *wctxt)
 {
        return scnprintf(&nt->sysdata[offset],
                         MAX_EXTRADATA_ENTRY_LEN, " taskname=%s\n",
-                        current->comm);
+                        wctxt->comm);
 }
 
 static int sysdata_append_release(struct netconsole_target *nt, int offset)
@@ -1522,8 +1524,10 @@ static int sysdata_append_msgid(struct netconsole_target *nt, int offset)
 /*
  * prepare_sysdata - append sysdata in runtime
  * @nt: target to send message to
+ * @wctxt: nbcon write context containing message metadata
  */
-static int prepare_sysdata(struct netconsole_target *nt)
+static int prepare_sysdata(struct netconsole_target *nt,
+                          struct nbcon_write_context *wctxt)
 {
        int sysdata_len = 0;
 
@@ -1531,9 +1535,9 @@ static int prepare_sysdata(struct netconsole_target *nt)
                goto out;
 
        if (nt->sysdata_fields & SYSDATA_CPU_NR)
-               sysdata_len += sysdata_append_cpu_nr(nt, sysdata_len);
+               sysdata_len += sysdata_append_cpu_nr(nt, sysdata_len, wctxt);
        if (nt->sysdata_fields & SYSDATA_TASKNAME)
-               sysdata_len += sysdata_append_taskname(nt, sysdata_len);
+               sysdata_len += sysdata_append_taskname(nt, sysdata_len, wctxt);
        if (nt->sysdata_fields & SYSDATA_RELEASE)
                sysdata_len += sysdata_append_release(nt, sysdata_len);
        if (nt->sysdata_fields & SYSDATA_MSGID)
@@ -1831,31 +1835,33 @@ static void send_msg_fragmented(struct netconsole_target *nt,
 /**
  * send_ext_msg_udp - send extended log message to target
  * @nt: target to send message to
- * @msg: extended log message to send
- * @msg_len: length of message
+ * @wctxt: nbcon write context containing message and metadata
  *
- * Transfer extended log @msg to @nt.  If @msg is longer than
+ * Transfer extended log message to @nt.  If message is longer than
  * MAX_PRINT_CHUNK, it'll be split and transmitted in multiple chunks with
  * ncfrag header field added to identify them.
  */
-static void send_ext_msg_udp(struct netconsole_target *nt, const char *msg,
-                            int msg_len)
+static void send_ext_msg_udp(struct netconsole_target *nt,
+                            struct nbcon_write_context *wctxt)
 {
        int userdata_len = 0;
        int release_len = 0;
        int sysdata_len = 0;
+       int len;
 
 #ifdef CONFIG_NETCONSOLE_DYNAMIC
-       sysdata_len = prepare_sysdata(nt);
+       sysdata_len = prepare_sysdata(nt, wctxt);
        userdata_len = nt->userdata_length;
 #endif
        if (nt->release)
                release_len = strlen(init_utsname()->release) + 1;
 
-       if (msg_len + release_len + sysdata_len + userdata_len <= MAX_PRINT_CHUNK)
-               return send_msg_no_fragmentation(nt, msg, msg_len, release_len);
+       len = wctxt->len + release_len + sysdata_len + userdata_len;
+       if (len <= MAX_PRINT_CHUNK)
+               return send_msg_no_fragmentation(nt, wctxt->outbuf,
+                                                wctxt->len, release_len);
 
-       return send_msg_fragmented(nt, msg, msg_len, release_len,
+       return send_msg_fragmented(nt, wctxt->outbuf, wctxt->len, release_len,
                                   sysdata_len);
 }
 
@@ -1900,7 +1906,7 @@ static void netconsole_write(struct nbcon_write_context *wctxt, bool extended)
                        return;
 
                if (extended)
-                       send_ext_msg_udp(nt, wctxt->outbuf, wctxt->len);
+                       send_ext_msg_udp(nt, wctxt);
                else
                        send_msg_udp(nt, wctxt->outbuf, wctxt->len);