From nobody Sat Feb 7 18:20:51 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49A901E572F; Wed, 28 Jan 2026 14:18:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769609908; cv=none; b=HYGKeEeLxUCUv24u8KgypN2pR9yvODsDRfn3NgQRnAAxwIx7ufMNDJCeXEJdTumml/ev8wxesd3KrjaeADiErrCtVfGmZnylr2BLFW4+Y8wLtDGkgDau4dGDyLDO+8xomqLz8cjNHnpXssDReAfiioYpYVE6bLLZY+9SUBb4ypU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769609908; c=relaxed/simple; bh=+UDy0Ut5lpA1o86RmQCgIgSIAs3v+ZlcIYBHPaLMstU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hjsMk6qVMbdpUClAbi1mJdOmQzVv1OsFLRleXVa2/3jacvy3gS7GiTa7CS/yqjiL+X8DA30vaT7g6p0fy1676WYLTdBswz6yuLMKfaI4JGAYCyWaAmrbOa6b0BpVvEO24TqMlwx2/S2B+TxmlNQv7Jws8ORwhWgwABUGvnKP7Fg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=FiMu4ZZB; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="FiMu4ZZB" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=lpUV4NGYXCzLSMSVCDeIeWCOp0RF9RfACM8b9pewVJI=; b=FiMu4ZZBchLOGSPEm7pcqiqroB MK9eQT3cNFv20T07Kuw4AiXbzZ3tkKR32q8tniQ7kJavy3Tn1C4kMoyeneha1LvnXhHssglsSz8ST wAiJMqYwLysqY7dCnEUY9PUtTP+tI162d8xC+/HKXOGVQMrkl8oAUO3i7r0ScKKWkkbVAtPbabAiA gdYaT7gNFH3e6W/oDIw0z6JKhkXIZNyg+7TG/2QI6r38LWuuzrZu0PFsFaV4+LsJ61J+3c/b/Q70w 9pz16cZtI4nTpcziMDt1//HmTCuRAtJp4nCb8+NnOx6W7shZzwTTrbuSOYqpNNWRgaje1DbTNkWTD 5H7rdI+w==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vl6N9-000Dt1-Mn; Wed, 28 Jan 2026 14:18:20 +0000 From: Breno Leitao Date: Wed, 28 Jan 2026 06:17:37 -0800 Subject: [PATCH net-next v5 1/4] printk: Add execution context (task name/CPU) to printk_info Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260128-nbcon-v5-1-93b4ddbc181a@debian.org> References: <20260128-nbcon-v5-0-93b4ddbc181a@debian.org> In-Reply-To: <20260128-nbcon-v5-0-93b4ddbc181a@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , pmladek@suse.com, john.ogness@linutronix.de Cc: Greg Kroah-Hartman , Steven Rostedt , Sergey Senozhatsky , Andrew Morton , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, asantostc@gmail.com, efault@gmx.de, gustavold@gmail.com, calvin@wbinvd.org, jv@jvosburgh.net, mpdesouza@suse.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-f4305 X-Developer-Signature: v=1; a=openpgp-sha256; l=9393; i=leitao@debian.org; h=from:subject:message-id; bh=+UDy0Ut5lpA1o86RmQCgIgSIAs3v+ZlcIYBHPaLMstU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpehqezEX8zPLJTdGaf+sR7NQM1NMEm9bfC8iZz hbk2bErY4WJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXoangAKCRA1o5Of/Hh3 bXYJD/9BcbpVFIJW3q8f+PpL9b7o5ACiBpxfBZCqRISupW6Mpl98eGCkC8fgrlXmnhhfMsKQdGc qzSSM7b0Bp/8t65EduB1fOrh3r/dWIyOiyc8pU7poUng/QzYuBnxKfNu9oJBDA2gSoBjvDOp877 5C7QwrRNZzT5fG139d4L+AB4QJhECMy7B3krLsS97CCeOCEcdWi/dwNz2JrzcRrwj/M8gF/GdGg a6lKuB+ftSUiiJ7iMXsN7WpMiKXBnIymmLwF3sXmYXXPf3bQQLo59+ZgqM5XrSU8sj6T0OX9JB3 KioRR+NJiZCCcBo4Nwx8OfaNCE7HWW2i6CXcqcLrdGS8gpO50pvn1b/er5k7dnSYDOEocz60j2A lKgggOulmUQQZo/DYgyusfXMS7NuYZ0E9OzUVrvI9SRmjQ3vuMs6wFvuUa4PiqH6iEApIOzmMtY 4si8DCQhXXYkbNKf5WHfXdHZQ49XTefdBCCpU26xYJiFgBDRMDoG6ON5cJjQhb2mpzrbu/gHKMi GZKWg9oIbf6z9m/EUIAuQd+NJucZazOTBdPTyTOds5LXZ+Jk7VjZRGsqxst3+C7gyzNKyIzKzc2 4z/6hTXezmrUmuHpzx+c0Z9l1tCwi+jA6a6UHL1PBormi9X4kmSg13Z1qAN6A9RoCMPa5DfRFuT 85W0skFCNE5Yp2g== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Extend struct printk_info to include the task name, pid, and CPU number where printk messages originate. This information is captured at vprintk_store() time and propagated through printk_message to nbcon_write_context, making it available to nbcon console drivers. This is useful for consoles like netconsole that want to include execution context in their output, allowing correlation of messages with specific tasks and CPUs regardless of where the console driver actually runs. The feature is controlled by CONFIG_PRINTK_EXECUTION_CTX, which is automatically selected by CONFIG_NETCONSOLE_DYNAMIC. When disabled, the helper functions compile to no-ops with no overhead. Suggested-by: John Ogness Signed-off-by: Breno Leitao Signed-off-by: Petr Mladek Reviewed-by: John Ogness --- drivers/net/Kconfig | 2 ++ include/linux/console.h | 8 ++++++ kernel/printk/internal.h | 8 ++++++ kernel/printk/nbcon.c | 16 ++++++++++++ kernel/printk/printk.c | 54 +++++++++++++++++++++++++++++++++++= +++- kernel/printk/printk_ringbuffer.h | 5 ++++ lib/Kconfig.debug | 20 +++++++++++++++ 7 files changed, 112 insertions(+), 1 deletion(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9c7953f8e6377..356c70be868ff 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -341,6 +341,8 @@ config NETCONSOLE_DYNAMIC bool "Dynamic reconfiguration of logging targets" depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \ !(NETCONSOLE=3Dy && CONFIGFS_FS=3Dm) + select PRINTK_EXECUTION_CTX + select CONSOLE_HAS_EXECUTION_CTX help This option enables the ability to dynamically reconfigure target parameters (interface, IP addresses, port numbers, MAC addresses) diff --git a/include/linux/console.h b/include/linux/console.h index fc9f5c5c1b04c..cc5dc3bf58b60 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -298,12 +298,20 @@ struct nbcon_context { * @outbuf: Pointer to the text buffer for output * @len: Length to write * @unsafe_takeover: If a hostile takeover in an unsafe state has occurred + * @cpu: CPU on which the message was generated + * @pid: PID of the task that generated the message + * @comm: Name of the task that generated the message */ struct nbcon_write_context { struct nbcon_context __private ctxt; char *outbuf; unsigned int len; bool unsafe_takeover; +#ifdef CONFIG_PRINTK_EXECUTION_CTX + int cpu; + pid_t pid; + char comm[TASK_COMM_LEN]; +#endif }; =20 /** diff --git a/kernel/printk/internal.h b/kernel/printk/internal.h index 5f5f626f42794..5fdea56827564 100644 --- a/kernel/printk/internal.h +++ b/kernel/printk/internal.h @@ -281,12 +281,20 @@ struct printk_buffers { * nothing to output and this record should be skipped. * @seq: The sequence number of the record used for @pbufs->outbuf. * @dropped: The number of dropped records from reading @seq. + * @cpu: CPU on which the message was generated. + * @pid: PID of the task that generated the message + * @comm: Name of the task that generated the message. */ struct printk_message { struct printk_buffers *pbufs; unsigned int outbuf_len; u64 seq; unsigned long dropped; +#ifdef CONFIG_PRINTK_EXECUTION_CTX + int cpu; + pid_t pid; + char comm[TASK_COMM_LEN]; +#endif }; =20 bool printk_get_next_message(struct printk_message *pmsg, u64 seq, diff --git a/kernel/printk/nbcon.c b/kernel/printk/nbcon.c index 32fc12e536752..f6d22510fdc3a 100644 --- a/kernel/printk/nbcon.c +++ b/kernel/printk/nbcon.c @@ -946,6 +946,20 @@ void nbcon_reacquire_nobuf(struct nbcon_write_context = *wctxt) } EXPORT_SYMBOL_GPL(nbcon_reacquire_nobuf); =20 +#ifdef CONFIG_PRINTK_EXECUTION_CTX +static void wctxt_load_execution_ctx(struct nbcon_write_context *wctxt, + struct printk_message *pmsg) +{ + wctxt->cpu =3D pmsg->cpu; + wctxt->pid =3D pmsg->pid; + memcpy(wctxt->comm, pmsg->comm, sizeof(wctxt->comm)); + static_assert(sizeof(wctxt->comm) =3D=3D sizeof(pmsg->comm)); +} +#else +static void wctxt_load_execution_ctx(struct nbcon_write_context *wctxt, + struct printk_message *pmsg) {} +#endif + /** * nbcon_emit_next_record - Emit a record in the acquired context * @wctxt: The write context that will be handed to the write function @@ -1048,6 +1062,8 @@ static bool nbcon_emit_next_record(struct nbcon_write= _context *wctxt, bool use_a /* Initialize the write context for driver callbacks. */ nbcon_write_context_set_buf(wctxt, &pmsg.pbufs->outbuf[0], pmsg.outbuf_le= n); =20 + wctxt_load_execution_ctx(wctxt, &pmsg); + if (use_atomic) con->write_atomic(con, wctxt); else diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 1d765ad242b82..cf6b528610366 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2131,11 +2131,39 @@ static inline void printk_delay(int level) } } =20 +#define CALLER_ID_MASK 0x80000000 + static inline u32 printk_caller_id(void) { return in_task() ? task_pid_nr(current) : - 0x80000000 + smp_processor_id(); + CALLER_ID_MASK + smp_processor_id(); +} + +#ifdef CONFIG_PRINTK_EXECUTION_CTX +/* Store the opposite info than caller_id. */ +static u32 printk_caller_id2(void) +{ + return !in_task() ? task_pid_nr(current) : + CALLER_ID_MASK + smp_processor_id(); +} + +static pid_t printk_info_get_pid(const struct printk_info *info) +{ + u32 caller_id =3D info->caller_id; + u32 caller_id2 =3D info->caller_id2; + + return caller_id & CALLER_ID_MASK ? caller_id2 : caller_id; +} + +static int printk_info_get_cpu(const struct printk_info *info) +{ + u32 caller_id =3D info->caller_id; + u32 caller_id2 =3D info->caller_id2; + + return ((caller_id & CALLER_ID_MASK ? + caller_id : caller_id2) & ~CALLER_ID_MASK); } +#endif =20 /** * printk_parse_prefix - Parse level and control flags. @@ -2213,6 +2241,28 @@ static u16 printk_sprint(char *text, u16 size, int f= acility, return text_len; } =20 +#ifdef CONFIG_PRINTK_EXECUTION_CTX +static void printk_store_execution_ctx(struct printk_info *info) +{ + info->caller_id2 =3D printk_caller_id2(); + get_task_comm(info->comm, current); +} + +static void pmsg_load_execution_ctx(struct printk_message *pmsg, + const struct printk_info *info) +{ + pmsg->cpu =3D printk_info_get_cpu(info); + pmsg->pid =3D printk_info_get_pid(info); + memcpy(pmsg->comm, info->comm, sizeof(pmsg->comm)); + static_assert(sizeof(pmsg->comm) =3D=3D sizeof(info->comm)); +} +#else +static void printk_store_execution_ctx(struct printk_info *info) {} + +static void pmsg_load_execution_ctx(struct printk_message *pmsg, + const struct printk_info *info) {} +#endif + __printf(4, 0) int vprintk_store(int facility, int level, const struct dev_printk_info *dev_info, @@ -2320,6 +2370,7 @@ int vprintk_store(int facility, int level, r.info->caller_id =3D caller_id; if (dev_info) memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info)); + printk_store_execution_ctx(r.info); =20 /* A message without a trailing newline can be continued. */ if (!(flags & LOG_NEWLINE)) @@ -3002,6 +3053,7 @@ bool printk_get_next_message(struct printk_message *p= msg, u64 seq, pmsg->seq =3D r.info->seq; pmsg->dropped =3D r.info->seq - seq; force_con =3D r.info->flags & LOG_FORCE_CON; + pmsg_load_execution_ctx(pmsg, r.info); =20 /* * Skip records that are not forced to be printed on consoles and that diff --git a/kernel/printk/printk_ringbuffer.h b/kernel/printk/printk_ringb= uffer.h index 4ef81349d9fbe..1651b53ece34f 100644 --- a/kernel/printk/printk_ringbuffer.h +++ b/kernel/printk/printk_ringbuffer.h @@ -23,6 +23,11 @@ struct printk_info { u8 flags:5; /* internal record flags */ u8 level:3; /* syslog level */ u32 caller_id; /* thread id or processor id */ +#ifdef CONFIG_PRINTK_EXECUTION_CTX + u32 caller_id2; /* caller_id complement */ + /* name of the task that generated the message */ + char comm[TASK_COMM_LEN]; +#endif =20 struct dev_printk_info dev_info; }; diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index ba36939fda79b..57f91ee10b8e6 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -35,6 +35,26 @@ config PRINTK_CALLER no option to enable/disable at the kernel command line parameter or sysfs interface. =20 +config CONSOLE_HAS_EXECUTION_CTX + bool + help + Selected by console drivers that support execution context + (task name/CPU) in their output. This enables PRINTK_EXECUTION_CTX + to provide the necessary infrastructure. + +config PRINTK_EXECUTION_CTX + bool "Include execution context (task/CPU) in printk messages" + depends on PRINTK && CONSOLE_HAS_EXECUTION_CTX + default CONSOLE_HAS_EXECUTION_CTX + help + This option extends struct printk_info to include extra execution + context in printk, such as task name and CPU number from where the + message originated. This is useful for correlating printk messages + with specific execution contexts. + + This is automatically enabled when a console driver that supports + execution context is selected. + config STACKTRACE_BUILD_ID bool "Show build ID information in stacktraces" depends on PRINTK --=20 2.47.3 From nobody Sat Feb 7 18:20:51 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC01027AC28; Wed, 28 Jan 2026 14:18:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769609912; cv=none; b=PatNachbz1o/YKnLhxw+6+/v1vCiu3Ml7Nn3nFdNkCayFWMqICE2X+9JqAVyqMY1/GsKthR9Vgf55tlj7i1HFZIxr8LQUrjUzjlM6MYv2/FMh78JWud4E11dD37r9GypLraoASzQjt5LEdDWZgRXAkr47I7gvGeXuU+LX/qJtYw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769609912; c=relaxed/simple; bh=sM4MmBb2STkbv+3RBVIqkeR0mqGw9WVKg1AHc37unH8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jcN0p7yzzdgAtYEmTtcB4VrY4NHKbJYsu5MCXOW7Wo/mQKAkSJSnfZ9IH+EEh7mnuW2XIMtCOa9vydv8iiGnOsCwjQ7nt1arQZ0lbD7nFcDo7G8lkReELR79QxeTzMUwIuRsSE9Bj2k40zEClbKmpdXzhHDWKCuApo3F562M3hA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=ZlL60zL5; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="ZlL60zL5" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=46Q3/PMzTu+WOHkGQb8g4PO/Yj+7Lf8peeoI+CL66Uo=; b=ZlL60zL5U3zUpeQev0hKmOzhXn M4otWdck83lEYSfNzswzDgo5rGcTZKHlBl3vqujd7oepVayR+9tb5W6N/y597tvc5BAF6+0BkEwQE n7NHU1spo1AQ5oOjECtnHx64oMt1Lei7j8uhgLdfGyE+xj3VSKXd3Q9NBPzRquVSsUpRb8HtCXVab Q1QkdP77lmeonUB2guGX6KAdXC4svpBVe2xORv7Gxm5d6trazR8V5GSfJW2XAyRpqBsj4wXL3sibW rE3rbFamfrUEoPPRdd2SABjoXQlUBTIYUj9ND8rTG+cRE4XTvbeqMBYMXvDvjivGokTkkmwBbshxZ mFOIDc7Q==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vl6NF-000Dt6-Lb; Wed, 28 Jan 2026 14:18:25 +0000 From: Breno Leitao Date: Wed, 28 Jan 2026 06:17:38 -0800 Subject: [PATCH net-next v5 2/4] netconsole: extract message fragmentation into send_msg_udp() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260128-nbcon-v5-2-93b4ddbc181a@debian.org> References: <20260128-nbcon-v5-0-93b4ddbc181a@debian.org> In-Reply-To: <20260128-nbcon-v5-0-93b4ddbc181a@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , pmladek@suse.com, john.ogness@linutronix.de Cc: Greg Kroah-Hartman , Steven Rostedt , Sergey Senozhatsky , Andrew Morton , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, asantostc@gmail.com, efault@gmx.de, gustavold@gmail.com, calvin@wbinvd.org, jv@jvosburgh.net, mpdesouza@suse.com, kernel-team@meta.com, Simon Horman X-Mailer: b4 0.15-dev-f4305 X-Developer-Signature: v=1; a=openpgp-sha256; l=2097; i=leitao@debian.org; h=from:subject:message-id; bh=sM4MmBb2STkbv+3RBVIqkeR0mqGw9WVKg1AHc37unH8=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpehqe/qc/esljZnVRyApFSwh0tA2WhmmltFI7K J9WjKLLE6OJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXoangAKCRA1o5Of/Hh3 bRtkEACYaLBPtotngJ3/dE9p8HTSSSQZnUa0ex7WqLteFUbb1DZ44j3QTek5nrFk6sS3vodSGEs 0Jue2acjwZ04VKDsEHumvaCrXFCNH6E66hbZWjY3Z5Fx+jU39rdX8HgiRl8JhEG7LoX7WnECgc8 njVCIDACpLCq7NZ3v3M8C+TW3pz75ZZ0FV8UH5VLVnhK4oMPlSlZVH/YCC65PlMaRjZObrFEQFT p1YbxDZIZCM+fCbJ9A26tMV5wBRIUlJNVfXLRwtKLXihpHKfp4SoG6r7lQweSMpqt1XP299LA9Y qnoJwrI6jgpO7wMr2X2oB16Dwg3c8xb87KOhr1sfEZ+BJiX+g48fZf8wE4nUYAZxmB9I8lXPZf+ psaDusbG3n5dPx6+E6WBo8pii37z9T97oDcTgz6FR1rpnETtZS8VF+XgjDH63/zJ7tIEI/JJjsd tII9RWoL4Ir3l8cJoky3eGV92ldv/L9xU/42n9u1Rq7J0Km3IFPEk6nGc3XE7nv67ap4WE4v147 DOuUnq+9abzXMTX4vYanZLDPJV6DO5R29MgztY9YUwPwOrUTirOTMm6MBxpYh1utNfjl4Wrem2L T9cXUThJJ30fTEwBXz7VC/YBYER8jB72PzMDsX+l7eIHX0mbb7hUFeKELjMT21XKYgUIoPTzSxE V5UsWVZE5D2jG4g== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Extract the message fragmentation logic from write_msg() into a dedicated send_msg_udp() function. This improves code readability and prepares for future enhancements. The new send_msg_udp() function handles splitting messages that exceed MAX_PRINT_CHUNK into smaller fragments and sending them sequentially. This function is placed before send_ext_msg_udp() to maintain a logical ordering of related functions. No functional changes - this is purely a refactoring commit. Reviewed-by: Petr Mladek Reviewed-by: Simon Horman Signed-off-by: Breno Leitao Reviewed-by: John Ogness --- drivers/net/netconsole.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 82c232f9ede24..e37250bf495fa 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1876,12 +1876,24 @@ static void write_ext_msg(struct console *con, cons= t char *msg, spin_unlock_irqrestore(&target_list_lock, flags); } =20 +static void send_msg_udp(struct netconsole_target *nt, const char *msg, + unsigned int len) +{ + const char *tmp =3D msg; + int frag, left =3D len; + + while (left > 0) { + frag =3D min(left, MAX_PRINT_CHUNK); + send_udp(nt, tmp, frag); + tmp +=3D frag; + left -=3D frag; + } +} + static void write_msg(struct console *con, const char *msg, unsigned int l= en) { - int frag, left; unsigned long flags; struct netconsole_target *nt; - const char *tmp; =20 if (oops_only && !oops_in_progress) return; @@ -1899,13 +1911,7 @@ static void write_msg(struct console *con, const cha= r *msg, unsigned int len) * at least one target if we die inside here, instead * of unnecessarily keeping all targets in lock-step. */ - tmp =3D msg; - for (left =3D len; left;) { - frag =3D min(left, MAX_PRINT_CHUNK); - send_udp(nt, tmp, frag); - tmp +=3D frag; - left -=3D frag; - } + send_msg_udp(nt, msg, len); } } spin_unlock_irqrestore(&target_list_lock, flags); --=20 2.47.3 From nobody Sat Feb 7 18:20:51 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE006221DAE; Wed, 28 Jan 2026 14:18:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769609917; cv=none; b=SRlJOFZlVAghrrP8AKLV49o29FpWF+dK7JPRX73mdKvFmKSuYiJdCK5YaPNkQSEVQuBd4Xl9Ez8Kp+A8ZlCLY4kKSUJ2MA7roKZfZgUrR8l0EnfzMwxUK+oRwmRhlBq3ICFGFR2Lz6EB5QAUnnZcgNJHIVn0qi/BPVGIsgXd+kI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769609917; c=relaxed/simple; bh=JFP0hdML0vErS40bsyhMRJZeTqHHd/Fr+2NgT22nVIk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Wdt3+rRE8/Pp1OErZX9XMty+C9hlE17NYRoRhMyP7No68xIcmSlBYiPCFYoJ5xFTLFc2W+NFggvP6Ut9KKvb6Q9zciSoupAwVmv8Ax0uov/fcDImxg+Im6qSPNIJi5WgQKYAWgv7+5uaK50OldT+ns2Hp8S0/RkdSlx+i+aWHNg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=CHz7Gp4r; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="CHz7Gp4r" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=KqTfxsd77ZKen+IFl12f2Tf+pPtsAXfqOix6fnP6cK4=; b=CHz7Gp4rj/5S0hwdGABQIiKUzm 8xk5LLXtc3uTYmTuH+oV10XTVbSMnqnC51rDwQoXNKRITBqHoRWUsICIvRt+RtcQe9yHqNLsThV0s M7R7mwZJlGWKdM0cX1qaCcJFNkFJO+Hkl7Va4RWY1jA7iTx0OufV7RKWFjritrZp27lFSPP+l5oNd qq4ggjgxSPCZkztp+TkB+6gY7dDyZXbBVHNq3Arf332X4LLACT2BK+u08qhQYwxVrZyOtMCRkOqvI 4UNCel9PW6p5BWT4Z2IH0hCneXvkwWF+4kWt5lejZXPTsMIwBSRRsatM7Iv/rMgO8E2wKgz2EYYNS Ta69RwDA==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vl6NK-000DtO-Ty; Wed, 28 Jan 2026 14:18:31 +0000 From: Breno Leitao Date: Wed, 28 Jan 2026 06:17:39 -0800 Subject: [PATCH net-next v5 3/4] netconsole: convert to NBCON console infrastructure Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260128-nbcon-v5-3-93b4ddbc181a@debian.org> References: <20260128-nbcon-v5-0-93b4ddbc181a@debian.org> In-Reply-To: <20260128-nbcon-v5-0-93b4ddbc181a@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , pmladek@suse.com, john.ogness@linutronix.de Cc: Greg Kroah-Hartman , Steven Rostedt , Sergey Senozhatsky , Andrew Morton , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, asantostc@gmail.com, efault@gmx.de, gustavold@gmail.com, calvin@wbinvd.org, jv@jvosburgh.net, mpdesouza@suse.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-f4305 X-Developer-Signature: v=1; a=openpgp-sha256; l=5583; i=leitao@debian.org; h=from:subject:message-id; bh=JFP0hdML0vErS40bsyhMRJZeTqHHd/Fr+2NgT22nVIk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpehqeRWxnF3jRS01M95hZODUWB/b4wtZmpFpqi FwvOAskdQGJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXoangAKCRA1o5Of/Hh3 bTWTEACOPgrBiwKRgnawigKueIdFrnE3gs9qZVZmRmGE/VlaElldwJvcqE/hfY/KMYfla2u7zrz CZz8XoRc7u9Wfq1nRMI6n6mN6hYHJCpQVLRyfoYOTN0whtbpQ+SuL4gE/ks6Qz4Ui0dYj6jhKj5 8+sFxp2XnzLAxNl/oEiKsM5tabxKTiymaCtFqaHQmr/J/mVxkjDiGOmGH3TJtJO9K8IHUxZshuC +/gccKq02E/r9K1mq/eSbThBoyzYDc/Ca/pRVLf43/cDmnc7dEEFJKpQiE8Pj+ZgY8fLViOgWGp CG9c8/wC9fc50Pw1FTjo2NHnHU/FOyJtv1XM71KvuRBMjfg7hussd+wjSVLMqcRgVLCLy+eeOq3 l6xOffFnOWZrHpGLm4qGM2+YDyNV+EX6k8rqokjYgNEIKFggW+JQaGztR0lua9xGkZZEgFnQixW n/SJ3/zGKR57+3Q+k1ebLXaVkgf0qJFBYvlMAGactpXV2S3JiIjazEUpisxsfBTcHQgZEndIcBB lLEyV+hQyHr0tkx14fbry1MT0BlAYikpM8H+IWGrrwi2557LQbW5HOqt/rRn+1L+KyJKsC9Ov1W O7vvg7trDPz91piWdyHqZ69vT9xAiBjX5WZ3YV8ZsOthlmZzpFKfGmm6mmuR8+4wkgjbpWzJqzC hsOyiatnSsYCPjQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert netconsole from the legacy console API to the NBCON framework. NBCON provides threaded printing which unblocks printk()s and flushes in a thread, decoupling network TX from printk() when netconsole is in use. Since netconsole relies on the network stack which cannot safely operate from all atomic contexts, mark both consoles with CON_NBCON_ATOMIC_UNSAFE. (See discussion in [1]) CON_NBCON_ATOMIC_UNSAFE restricts write_atomic() usage to emergency scenarios (panic) where regular messages are sent in threaded mode. Implementation changes: - Unify write_ext_msg() and write_msg() into netconsole_write() - Add device_lock/device_unlock callbacks to manage target_list_lock - Use nbcon_enter_unsafe()/nbcon_exit_unsafe() around network operations. - If nbcon_enter_unsafe() fails, just return given netconsole lost the ownership of the console. - Set write_thread and write_atomic callbacks (both use same function) Link: https://lore.kernel.org/all/b2qps3uywhmjaym4mht2wpxul4yqtuuayeoq4iv4k= 3zf5wdgh3@tocu6c7mj4lt/ [1] Signed-off-by: Breno Leitao Reviewed-by: John Ogness Reviewed-by: Petr Mladek --- drivers/net/netconsole.c | 101 +++++++++++++++++++++++++++++--------------= ---- 1 file changed, 62 insertions(+), 39 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index e37250bf495fa..ec000f477c2a8 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1859,23 +1859,6 @@ static void send_ext_msg_udp(struct netconsole_targe= t *nt, const char *msg, sysdata_len); } =20 -static void write_ext_msg(struct console *con, const char *msg, - unsigned int len) -{ - struct netconsole_target *nt; - unsigned long flags; - - if ((oops_only && !oops_in_progress) || list_empty(&target_list)) - return; - - spin_lock_irqsave(&target_list_lock, flags); - list_for_each_entry(nt, &target_list, list) - if (nt->extended && nt->state =3D=3D STATE_ENABLED && - netif_running(nt->np.dev)) - send_ext_msg_udp(nt, msg, len); - spin_unlock_irqrestore(&target_list_lock, flags); -} - static void send_msg_udp(struct netconsole_target *nt, const char *msg, unsigned int len) { @@ -1890,30 +1873,64 @@ static void send_msg_udp(struct netconsole_target *= nt, const char *msg, } } =20 -static void write_msg(struct console *con, const char *msg, unsigned int l= en) +/** + * netconsole_write - Generic function to send a msg to all targets + * @wctxt: nbcon write context + * @extended: "true" for extended console mode + * + * Given an nbcon write context, send the message to the netconsole targets + */ +static void netconsole_write(struct nbcon_write_context *wctxt, bool exten= ded) { - unsigned long flags; struct netconsole_target *nt; =20 if (oops_only && !oops_in_progress) return; - /* Avoid taking lock and disabling interrupts unnecessarily */ - if (list_empty(&target_list)) - return; =20 - spin_lock_irqsave(&target_list_lock, flags); list_for_each_entry(nt, &target_list, list) { - if (!nt->extended && nt->state =3D=3D STATE_ENABLED && - netif_running(nt->np.dev)) { - /* - * We nest this inside the for-each-target loop above - * so that we're able to get as much logging out to - * at least one target if we die inside here, instead - * of unnecessarily keeping all targets in lock-step. - */ - send_msg_udp(nt, msg, len); - } + if (nt->extended !=3D extended || nt->state !=3D STATE_ENABLED || + !netif_running(nt->np.dev)) + continue; + + /* If nbcon_enter_unsafe() fails, just return given netconsole + * lost the ownership, and iterating over the targets will not + * be able to re-acquire. + */ + if (!nbcon_enter_unsafe(wctxt)) + return; + + if (extended) + send_ext_msg_udp(nt, wctxt->outbuf, wctxt->len); + else + send_msg_udp(nt, wctxt->outbuf, wctxt->len); + + nbcon_exit_unsafe(wctxt); } +} + +static void netconsole_write_ext(struct console *con __always_unused, + struct nbcon_write_context *wctxt) +{ + netconsole_write(wctxt, true); +} + +static void netconsole_write_basic(struct console *con __always_unused, + struct nbcon_write_context *wctxt) +{ + netconsole_write(wctxt, false); +} + +static void netconsole_device_lock(struct console *con __always_unused, + unsigned long *flags) +__acquires(&target_list_lock) +{ + spin_lock_irqsave(&target_list_lock, *flags); +} + +static void netconsole_device_unlock(struct console *con __always_unused, + unsigned long flags) +__releases(&target_list_lock) +{ spin_unlock_irqrestore(&target_list_lock, flags); } =20 @@ -2077,15 +2094,21 @@ static void free_param_target(struct netconsole_tar= get *nt) } =20 static struct console netconsole_ext =3D { - .name =3D "netcon_ext", - .flags =3D CON_ENABLED | CON_EXTENDED, - .write =3D write_ext_msg, + .name =3D "netcon_ext", + .flags =3D CON_ENABLED | CON_EXTENDED | CON_NBCON | CON_NBCON_ATOMIC_UNSA= FE, + .write_thread =3D netconsole_write_ext, + .write_atomic =3D netconsole_write_ext, + .device_lock =3D netconsole_device_lock, + .device_unlock =3D netconsole_device_unlock, }; =20 static struct console netconsole =3D { - .name =3D "netcon", - .flags =3D CON_ENABLED, - .write =3D write_msg, + .name =3D "netcon", + .flags =3D CON_ENABLED | CON_NBCON | CON_NBCON_ATOMIC_UNSAFE, + .write_thread =3D netconsole_write_basic, + .write_atomic =3D netconsole_write_basic, + .device_lock =3D netconsole_device_lock, + .device_unlock =3D netconsole_device_unlock, }; =20 static int __init init_netconsole(void) --=20 2.47.3 From nobody Sat Feb 7 18:20:51 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C406279DC3; Wed, 28 Jan 2026 14:18:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769609921; cv=none; b=XZC9EWCtPiAkSCB0aR3vBd3yOTNTSeCaiLAt86WWGemoEug13AGMN/z/s21jAbLNCzbBOymjUAgnEseWWoO2WiX/6d6fmKKoHLlLL+hZAwhnXDLzX9msIrlWG0cbkE5xbQchO3HHZRjVgYDih9o8C6gf1HbVKWW2AaY4/75l+Ko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769609921; c=relaxed/simple; bh=836B/rxD2lUW0GeGAux4FVApdOXS1I6GKcBB00j3jSU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VI78b/oHPssUsjhAmoMwAEDITGpoKa5w2SIN85nL3W+2xw0pY20MoqMc754wQlvfX+6tD+S0DmcVOREj3kIaoO+7TS6kodgSNr6ZP1KUo+61DY2jzLPgixGIub6Or+r/sAC3vMVopPEhfOicPK01eSqKLtcaTtbnO67Bb0Ae1PI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=ugwOpqv4; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="ugwOpqv4" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=SVQdYhNhZkjnMcKdvs7TsBVf0DPXFlB8N7xeGZuEaBw=; b=ugwOpqv4GR89BgOmeg0NkhHQS4 0ck3Bo8IUo6UipYq4coTln0AO4oYX1Ge/Cwjq6lWWsMbg/pY8db1OZPErqXIfygTYuyOEAsb7OmSh vhK/twalx9kES16lIRr6GuyIAfCfOnXKI6xLqh0LmsTwbjaqhatzPvf6TusR08iVf31rjoEYghwMa bZQ2WdD7ECoEoN/XZ04BRy5O4oOrVNBD6NPmIdXhYsKv1Pau6LV/4kIjt+nfTCQ/ptbXn9V+bMrNE bQfGSekFqCcvmgrzXIs3yHaMj6RvigdPY3rnTiMGzi3yq1jl3MLV/ShJhEjzNknlAwfkjdZd06B8p fkr8St4w==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vl6NQ-000DuM-9x; Wed, 28 Jan 2026 14:18:36 +0000 From: Breno Leitao Date: Wed, 28 Jan 2026 06:17:40 -0800 Subject: [PATCH net-next v5 4/4] netconsole: Use printk context for CPU and task information Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260128-nbcon-v5-4-93b4ddbc181a@debian.org> References: <20260128-nbcon-v5-0-93b4ddbc181a@debian.org> In-Reply-To: <20260128-nbcon-v5-0-93b4ddbc181a@debian.org> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , pmladek@suse.com, john.ogness@linutronix.de Cc: Greg Kroah-Hartman , Steven Rostedt , Sergey Senozhatsky , Andrew Morton , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, asantostc@gmail.com, efault@gmx.de, gustavold@gmail.com, calvin@wbinvd.org, jv@jvosburgh.net, mpdesouza@suse.com, kernel-team@meta.com X-Mailer: b4 0.15-dev-f4305 X-Developer-Signature: v=1; a=openpgp-sha256; l=4859; i=leitao@debian.org; h=from:subject:message-id; bh=836B/rxD2lUW0GeGAux4FVApdOXS1I6GKcBB00j3jSU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpehqeiV3lDU9f8hOTn1ryjodJGHd7p813fBro6 F8NAwus8MiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXoangAKCRA1o5Of/Hh3 bR4BD/4/53eRvLZ3+MRD+7DXe13PtVsGCmK2cqOspfsSqxst/FePSMgyeMsfB2GX09nnTybTD/0 qbWdrsYpNj61XWEGpYn8+kY6LOPQ5dNFPOgjCKulNAmXfKeSqw7mVlh8Et6XtcN78z4uTtSLVD1 M7b/USnP1V7RtjNuUrnvjoWcs1YBBL60kkJ3yf0xpW0SaIYd+cskRmidKr7bC0SxX8nlM5dkUmJ X4gVjpQtpSbX7AqfxcvCsEp/DsSLjTSI5dzNdoCaDCxZX7l83eHTY/sEgObWdto/Bm6nDCXSjXR qQtrN9YxiGSJPPmD9D7+s9cY7SZ6b5Qq0Fo9AtsDlOevV5GcSzbmkj8MnV3uJ4DBr2ikEANb+ZD uHPpwGsNMVmyJWliEf7PGenVXYQn2pX4dOnwOOI1TiGfZH8vdHW6y1OjSCsSIE116V2THooPl7A PSBd4AxCfncpwyuv+TeQI9HNQ19fmAS2Kn5NTPeuldVOjqCgIvk+VuQsY5SIWNkyYd1BwkZQsJZ nteadWJY0fitE+Ai0kvWIfInSkHjQcbolpywpLv14t/i4DLdLREwo2OX/PObbc7nF7OyVifewrz rhRSIKjO6k6I/fqFL/shlDba/2Pv7tlQxguX1O3WD1b580am7DJjQQEV0C2G3/qmKuIaPVWIGBO anhC/u754K/Hdwg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao 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. Signed-off-by: Breno Leitao Reviewed-by: John Ogness Reviewed-by: Petr Mladek --- drivers/net/netconsole.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index ec000f477c2a8..0f44ce5ccc0ab 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1490,18 +1490,20 @@ static void populate_configfs_item(struct netconsol= e_target *nt, init_target_config_group(nt, target_name); } =20 -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=3D%u\n", - raw_smp_processor_id()); + wctxt->cpu); } =20 -static int sysdata_append_taskname(struct netconsole_target *nt, int offse= t) +static int sysdata_append_taskname(struct netconsole_target *nt, int offse= t, + struct nbcon_write_context *wctxt) { return scnprintf(&nt->sysdata[offset], MAX_EXTRADATA_ENTRY_LEN, " taskname=3D%s\n", - current->comm); + wctxt->comm); } =20 static int sysdata_append_release(struct netconsole_target *nt, int offset) @@ -1522,8 +1524,10 @@ static int sysdata_append_msgid(struct netconsole_ta= rget *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 =3D 0; =20 @@ -1531,9 +1535,9 @@ static int prepare_sysdata(struct netconsole_target *= nt) goto out; =20 if (nt->sysdata_fields & SYSDATA_CPU_NR) - sysdata_len +=3D sysdata_append_cpu_nr(nt, sysdata_len); + sysdata_len +=3D sysdata_append_cpu_nr(nt, sysdata_len, wctxt); if (nt->sysdata_fields & SYSDATA_TASKNAME) - sysdata_len +=3D sysdata_append_taskname(nt, sysdata_len); + sysdata_len +=3D sysdata_append_taskname(nt, sysdata_len, wctxt); if (nt->sysdata_fields & SYSDATA_RELEASE) sysdata_len +=3D sysdata_append_release(nt, sysdata_len); if (nt->sysdata_fields & SYSDATA_MSGID) @@ -1831,31 +1835,33 @@ static void send_msg_fragmented(struct netconsole_t= arget *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 =3D 0; int release_len =3D 0; int sysdata_len =3D 0; + int len; =20 #ifdef CONFIG_NETCONSOLE_DYNAMIC - sysdata_len =3D prepare_sysdata(nt); + sysdata_len =3D prepare_sysdata(nt, wctxt); userdata_len =3D nt->userdata_length; #endif if (nt->release) release_len =3D strlen(init_utsname()->release) + 1; =20 - if (msg_len + release_len + sysdata_len + userdata_len <=3D MAX_PRINT_CHU= NK) - return send_msg_no_fragmentation(nt, msg, msg_len, release_len); + len =3D wctxt->len + release_len + sysdata_len + userdata_len; + if (len <=3D MAX_PRINT_CHUNK) + return send_msg_no_fragmentation(nt, wctxt->outbuf, + wctxt->len, release_len); =20 - return send_msg_fragmented(nt, msg, msg_len, release_len, + return send_msg_fragmented(nt, wctxt->outbuf, wctxt->len, release_len, sysdata_len); } =20 @@ -1900,7 +1906,7 @@ static void netconsole_write(struct nbcon_write_conte= xt *wctxt, bool extended) return; =20 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); =20 --=20 2.47.3