From nobody Sun Feb 8 08:27:34 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 1C0C63033D8; Tue, 3 Feb 2026 17:24:32 +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=1770139474; cv=none; b=VRt72vmup9qzKGmSTk1bE9jjjXLGlwGui1o6pM/eJPvg3a/Y/N71jMQtMQ95/FUUPb1J5qjdopgcOiRA6xZmWCoLO96c6bhnu0sgARNJ/YaZooUIvE92qVGt6LblqoRzuL++cUMhdFq6W2heiDww+QqLPIXGJic7t4DCKXxq9k4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770139474; c=relaxed/simple; bh=YW6T6corvYXvJqvQzvitkQL9TeapEvUtc5oj+Na3RSM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TdCHDEMIV0X1EAxj0zSEmsw99Usu4F/sOG01wcWm9zhNgw0vacT6WpAqXHFwamfnvyeFyokdfLz6Y3SRbeFxU+a8dH55WbJAmjoN11melEGjTEEO1Q8hh/wfXyWbK+ZKWEeyt+PHOy/4a1FI6tfkpZrRMjmKjsm2Z26ho/aKy4c= 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=sUpKgjq/; 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="sUpKgjq/" 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=pSKJ1yzY2SZrxK97G6vs4bf2Lq4Zd0Es8GeF/sYwarA=; b=sUpKgjq//r9Gf7s7gaknDGxSPk rlpafCZvCaek5Ky2nxYYVP4fxFFC0OzQDK/jblOr6P2rgKt3fZsBYO5WLSOLYzDH+GWma3CLS09Eb DB/KnFmf0xcOuso7+vJYutMH8du8VsciAUUprRTt6t6DwDetWPe3ai6DzqmEG2woguuhYbMOYosS9 xEtmYFGRX2Kd3fT7rtVbnjKxECDimJ1qAexPBCkaP1H0tKGiGl3lO8Naa85R0UEsi7HlBZcZlxioS JRHjcUIZfDO8u4s+SOGVemw5qdZ057txIDdRGhYTtqStEnNM1nf+CnEZf3MRCid165MWePczij5xF ckDmH61w==; 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 1vnK8b-004z5K-Lz; Tue, 03 Feb 2026 17:24:30 +0000 From: Breno Leitao Date: Tue, 03 Feb 2026 09:23:52 -0800 Subject: [PATCH net-next v6 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: <20260203-nbcon-v6-1-985f3bdb3267@debian.org> References: <20260203-nbcon-v6-0-985f3bdb3267@debian.org> In-Reply-To: <20260203-nbcon-v6-0-985f3bdb3267@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=9303; i=leitao@debian.org; h=from:subject:message-id; bh=YW6T6corvYXvJqvQzvitkQL9TeapEvUtc5oj+Na3RSM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpgi9CwrgWmI9d3eZ/H8D5M+9wn5slujvfBb3H7 Is7PTPc5FqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaYIvQgAKCRA1o5Of/Hh3 bTmBD/94iveYF3y7pbFIj2sEnyVKo/wHnjNU+pkDyoAd73ami9Mx/Y6ULUIHJIG/LXDHX+XhSGb mKm3JJIG/dy6PWEfalDdaDIx70mfxQ+Wu3JJHNljpSLkICUhFE2+GaO3dgzgyzN4ub13xrkEiAx qR4r+HaBLsiqaD5Hnn+pkp821mKdJBsPv5rghqgCF+sgvsVPZ24twPndcpV7zROGDZnLu8wm0Fp lVwAsebF3mqW5oyOho5vEPmWDL4XAV2hTlymgwG3ymmMk1VoCbIS9wsGUng9ArYcDkE8PF3r9T4 9ql8XJFpFQNGbH/FY0aZxsbPNAutrhIJqeSimZuoS6FHnWFYAz9wxfWP/oKHNeaJWcNbCAeefbK w9H6jK0YeOqqitJda5GbCy9b1ueyVUgawd7relGCoD5P8BJM9GRWbfktsTbeLEbYwFB1wZB+UqK xPGmyx02MHlLIakzVlbWR//yordQLUuL2kFvcicEokx03gBUT0u4W4y5ovRzWuEz1HNnBim6A0m 2vKPAUD5mBVwS55WyVcNq4vYZmiFum7WEz0dYUYJ+PXkkCfeVnkwyh2zjOZ4rHy+smLAMwotf+i 5ad2ZYbs1jDFb1E5anWZ1C5LLE488dl/22oVWcZfDxs4k3LUO1ZcyjssJgNSCXBl/Rs8jpY+mOi lga4KLF8bdVudrw== 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: Petr Mladek --- drivers/net/Kconfig | 1 + 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, 111 insertions(+), 1 deletion(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9c7953f8e6377..2af4d2ef5437c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -341,6 +341,7 @@ config NETCONSOLE_DYNAMIC bool "Dynamic reconfiguration of logging targets" depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \ !(NETCONSOLE=3Dy && CONFIGFS_FS=3Dm) + 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..fd54b54dc2230 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 + 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 Sun Feb 8 08:27:34 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 A1BED35FF68; Tue, 3 Feb 2026 17:24:37 +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=1770139479; cv=none; b=dl52HOEI5CYUKeR1UyHKCzIvIjrd/xofkwQ5HL790hkCQ3U+koi6Hh3jmVUOifeh39GG3RfiLlwr1mjOjRH3iI0r/KdvNP0m+ouWp8WBp/OZzTrRgsSUUZiqjHw5SJ22R+9KxIK2XXPn+SU3XDI1189ykTroRzfnTixorcC8ZXs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770139479; c=relaxed/simple; bh=fIda/bwvjdKiEcurZB7NMHmZxg40yG9eI3grk0yk8oU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X8dgxwQ7TjeLS35IuGhLZr9JMSRnWzVVZriNaJefyHS6xicmRhDRHyxntBIkD43x367YNOuP8kWucunKR9HpluekiU85ivRi505zI+LXStNxQgsNlDcrCI8hOW4PRa7VQFL+mZJ0c03ANcbS3IovojTLtK3QCmiykDNMYedYzts= 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=bsqN4RRc; 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="bsqN4RRc" 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=MENmtyopKyio3Fbzyv4qcPtKKWl29QukHQsDDkeHm08=; b=bsqN4RRcxRcLEcFV63RAjG7Hqe az+gV+o2PTxGu48EdCpP6A+NfkKqvzqdS9K3x7JKa696cPcKt8WkMc1Wa26mnvh7BXI5H3+ZN5L3U VNxgItw26JGdCsj/kj7ge29+BmRpFYWAkfNrlGVNz/9p7msvBbLuuJiWCYl85kFoMEvcL7Uh8MkT5 WauRlpIaA9NDqJpSLgWwRMB0NWvjdS19Y5IEQKiE00XIz/PD2U5luwDTh7RjYA79kBQqSlK1W738E bu9ofXFg1my7W3Majdo404MFaAbDDfI9IEdgfWinnXf6S9bPnlYawiKFaPjHBAChej3nHj/DLRhSS f+tT4+Xw==; 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 1vnK8h-004z5P-5h; Tue, 03 Feb 2026 17:24:35 +0000 From: Breno Leitao Date: Tue, 03 Feb 2026 09:23:53 -0800 Subject: [PATCH net-next v6 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: <20260203-nbcon-v6-2-985f3bdb3267@debian.org> References: <20260203-nbcon-v6-0-985f3bdb3267@debian.org> In-Reply-To: <20260203-nbcon-v6-0-985f3bdb3267@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=2151; i=leitao@debian.org; h=from:subject:message-id; bh=fIda/bwvjdKiEcurZB7NMHmZxg40yG9eI3grk0yk8oU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpgi9COE3x6BRCzJ03ljpFPNNvtZQc1igJd25Bq 6ouKiv4hhCJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaYIvQgAKCRA1o5Of/Hh3 bfe5D/9lah+lwTsp3aCl6nlkEOOOHmVuQvkVqGyiMnT2pXOd36x6bw+r+/qXGqzvsx6DIwSPwhC jjcNKnOfkeE2zRj+qC0w6hn38pfIAGiGbgyWrVQY7zDkBCQAH4DotD97fHRl4D9IP5Ec3/Lln7t tydHWlZ3/T3+UyvoNEBePKG6bPZJzMmxKcLXkWjHqw78qKW/JfYjyFc9Qb5jxYQoUiB27qC95jZ YYRUdpdMc6YR2smdLZuxR3aDmYQSbkZ6vTVWKy2V40Gmyo0W7JPTAwpbzGPG1g+890uMMLQ44L+ IL6ZyuE1no6Te0BHaGVvAvUsjcew1aGDTkJCQvy9p0RShjr8M/oE7ICDflNQs7QKNz1gjzZ9xhP S9o+qKMZQ0wr5p4J8MEeq1dnLecvZPA+2/VMFxTOS7ZV/0MKRSVYqU2NNoVjcif77OMdU5RjwYH Zbc8yIDjLrZTF7+9050C/cQEMYgoEhAZxL5grZkdkRg1TTcXD5sbYWvBMSuxuzlc3a7eRATt9lE UsF5F8Iux8XmZJf84GxYSjoX6pjXSb+DONjg80cQhDhNv7IV7KAHhkwXRMBXInL7NgRiCfUVqzS 34Z+b1lFkWCZemFzGME2bziQr5pY2D5jKZgl0+9JK/UcDvNSU4Q2twfV8mmSS7zfqYPOIKYUKKJ KtVwINfK2WKNgwA== 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 Reviewed-by: John Ogness Signed-off-by: Breno Leitao --- 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 Sun Feb 8 08:27:34 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 0B7A52F39A1; Tue, 3 Feb 2026 17:24:42 +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=1770139484; cv=none; b=AHlYBQLNn80Z/80Wg2Cy8HaPV/fpdiiP+ISE4iRT3jVWKrQ/S33eMv5YaaaJ7QIng/jvL1G4n8N18w5H06Moy+0/uu9tCzNRm2qLlj+eZbW+Ca31J+Q9eux4y7oZCmlpshdKrrh/NP5RigUwp5IuUVcYf0nfrYgaaVAx8jA6BlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770139484; c=relaxed/simple; bh=LqN9na1qd1i+ro0yk4N3s39b6Cz9o+HafVLFwLUiQMc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u6cDHMBj2Ygqk8tMkWr+dq3yf29gN6qUB2Ja2oApo6MVdJVSMjYoy/LvtZLErGVXW91znnMlGFb4dTI006v1xqa0GlrJ79RLatCuWsDCoM87QDTlvxwLUabedIy9DXSJMdxUdjHgyGRtqo9oaHs2hGGKHKj5kT6lyDwvOdGc9uM= 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=Cl66yKVg; 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="Cl66yKVg" 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=YB9D715bAwbjNab2XlaCMy48nfwohP5BzppeRgyMIQw=; b=Cl66yKVg2T17+k2gaiXGX9CEUD 83Oq+2NpYV86PK6qh3LDSAG9jaUOQb/mpdRczCesd422tNcQa+iJ33Ah3njZ9ouCnCK6F7HDuGLLz 8vy78Y9M0YAIbSpTS3J5h4GK9nXBgLKQWZPYWnhQ72pJ8n9fIn0RKNenmhuEALkyCcGFGVlP6GmLO Xm00BwMSFCTzs8ivVYv0ZWN6YxvflWjGQUN5mXbFedezvVw7w0Br435FrBexjW9I2VZskvxw1mrBK WTRM5ht5RIwTo3EFVY7ASS+3cgtQ2nXmn1Ra3g5xzI1ZrI2ZQTnMMPjbpL1XWeGVflnA9rLnYHR8g LuRH20yA==; 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 1vnK8m-004z5k-8c; Tue, 03 Feb 2026 17:24:40 +0000 From: Breno Leitao Date: Tue, 03 Feb 2026 09:23:54 -0800 Subject: [PATCH net-next v6 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: <20260203-nbcon-v6-3-985f3bdb3267@debian.org> References: <20260203-nbcon-v6-0-985f3bdb3267@debian.org> In-Reply-To: <20260203-nbcon-v6-0-985f3bdb3267@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=5682; i=leitao@debian.org; h=from:subject:message-id; bh=LqN9na1qd1i+ro0yk4N3s39b6Cz9o+HafVLFwLUiQMc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpgi9CWIQwlkkTeQIiCRFb8cKHMtsx33vDeeq14 oGcyDTmstaJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaYIvQgAKCRA1o5Of/Hh3 bUKvD/45YvMgBb5Q/qVfGyU1eFqpGt7wAbaBiUGMQkTSlIw9/N2H51SQzIpZzKTihT8tPMrD4Z2 gKidS66Q6qqUyxIWoLuEKnSJpkyhmp4lyPfHQLqecd13duFWww5Iie7aWM1KJ9sPEyGXOHKQFm2 GI2z77lEANMSHNqsAZpz4RJcyE4+AFoQ9YbEqWNOUTMwL2BOVvxrgXWVezCM7T1RwCS5X6jy4XM o2J8W26POtEPtgPg/+PhAPsRLldq+rOAypboHBw4i/xxVy2bsYRfBrvuI8paqbep05oYiQaFo7n 6JFVubrE8e+QLu61NMlAOVMxrPINUtR/IGQ6OXO/l1oqhuG4irStHWUmvqo1DGFB/Rbl04q7+Dc XrhCj8iep0JqR31o/CwXTueyMmW2t0dOTnImSfLnQJaawfLYmU7K9ZRCLAp8Ck1o7kfcnZcv/zm 5N08TMnbB+1fDcfDe3fAExOruS2UfNRnYTKQfxALyMajELwf4ql42btWekJMkQo1ZhmxEfABmTT a3YEbKLz0z5CzhbnD1Ad7v3q+xIBc0dbEyL+gUIfi2V7ul5jK4yAkD1bP3YnLZi9nDdjd6vnpuu 4lwU+TD4rUTWZb7Juk3tQoUuK3lG6F6qBOWjMHHaXwjazuvUH8X68jlAzSxpY0z3+kf+5bfhzQV rPMhgqs7jvHlyKA== 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] Reviewed-by: John Ogness Reviewed-by: Petr Mladek Signed-off-by: Breno Leitao --- 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 Sun Feb 8 08:27:34 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 4739431D37B; Tue, 3 Feb 2026 17:24:48 +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=1770139489; cv=none; b=Gus5VHRSBLki2YCu5DYtGLR4XBAmzPOdFDwNZazadvBJ0YJ/NM9q3heGVCgZPspAzhGjlWsZuzWnZ0w9Hm427jv37TFQW6EcIT2hdekHkwk9jpo2BJ/1cTxdSIgNT2UlU6H7WZRk/p2dF5MCWWrpGnLTU971LPGX5tJp19Y7PMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770139489; c=relaxed/simple; bh=OmeG44rKgyBKxyORuh8V0/p6i8lhDoFG7ZQ9oEafjoE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Nmrpn6QWyVJqHLrXL/T0pSp7BZpf/vYbEaFfykDxyt5rl1juKl5HR/rvnFw0W0yEi0J/+hxJBbDARTP2AG3lSBhOZ/gtVKYhcZFVSdwJgg8SUMaCahNuOTdLMwdkGHM2KPyzKbgZraruiJwnJtgNTjSf2OI6vjTjngz08GMAlS0= 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=gvRI65f2; 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="gvRI65f2" 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=NOP0zvwBDzRaeuaCcbKzyT5NMRYIeO5b3qJSQLlYOAE=; b=gvRI65f21quzrM1XtkczJoXNFD kKLF/R6fT+4+ru5BxXevAVjvJsYSUD1roGzX1xjiotrI97O9f21Nf4gZUJm621SEJcs0UNp8uyK72 44210lv6dMUPNC4AvEN/0epN+ExI4vyVZmmsb8se0VbowkYWx7BJCuq2BoMXcS5UgwfQwwP6hO+tl YYZ27Z+MEE24ZnbUBiboYUIDcT7CeWt0lww2uCi4C6eW2IATYzBGGacRbfWSLm3ahXwBSUdDQLaNk mawdnfyZxfsA7TbTNKELdDWTGfABs2kdzl0UUdcxWwtayRRZDN6tU3v0gfBshVrROZO9RfmEqRLW+ BWu593iw==; 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 1vnK8r-004z6I-IX; Tue, 03 Feb 2026 17:24:45 +0000 From: Breno Leitao Date: Tue, 03 Feb 2026 09:23:55 -0800 Subject: [PATCH net-next v6 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: <20260203-nbcon-v6-4-985f3bdb3267@debian.org> References: <20260203-nbcon-v6-0-985f3bdb3267@debian.org> In-Reply-To: <20260203-nbcon-v6-0-985f3bdb3267@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=4958; i=leitao@debian.org; h=from:subject:message-id; bh=OmeG44rKgyBKxyORuh8V0/p6i8lhDoFG7ZQ9oEafjoE=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpgi9C9TjbwH9w/25/iMSIrFYq4SO4EmttgncGk 4bfTIuHln6JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaYIvQgAKCRA1o5Of/Hh3 bSSlEACAjJLScr4+jdfDmtjpshnG3+sTBIWuysPaQO4/SXqA09C6q5lMANG15yzDl1TkbSkORM7 YO45ntFkkIJKYv7QhFazeVorNx36CKxhY/Q4lV22kU2tXwC8+ep+WNOpwNF1FNDw7xxrYmu4Y9/ A78plDqn3/qeh7aqYSv05SW1V1uo9sR8WhBLne91uOB5JS1WjXcrWVoPUDxa795Avpv57fHNxkc FE7L+HD8tUUdVmYWyvJlp6aqUj+iWqM+ZCjoItYMMVGBOKIsbpXlijSjtlpmwA10pB3olNP72AU rehoCmtWbCvfRYuvnJZI1qxpKCi6REwGfREifpqzYqisGHHLVu/r61owqpSB7bhYCh9CgdPFrJ2 HysbaR1GyzhPNSbfh+jOu1e5LKhmljBep5soBtwM969j3gWx3YPj1ixwNCI+xNxu6mY/t3kmMiq 6KwAKkOtc6fWAHaQaZ9TbNIweKs4f6hLf3S/ResGWIHh0EkkCH227WkknEf/UuJWAdgLUVz80XN 3TPHRJP3vDw8qIe4mNDKcOY3HelZgdG8PdmQ8OY1HhyU8atpSDKtp5JrrdAI7py7+ByirscORIq aixxPH9m1W8kWq0xmYogMRy8GXhjCmAQLW4xx+PP4sxlm++RT0+0BE5l7taKmnB/o9UjvOd0tB6 VTyygQ6FnQY/6JQ== 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. Reviewed-by: John Ogness Reviewed-by: Petr Mladek Signed-off-by: Breno Leitao --- 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