From nobody Tue Dec 2 01:28:37 2025 Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50ECF3321D3 for ; Fri, 21 Nov 2025 11:26:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763724397; cv=none; b=fd8fDWRM0Iq6cr0IcFVW84ZizgUpZbDihlZ+TMipEXX/CVZAHCJvtS+Dz7/eX4qdIMLI7CTd66UwL9fmXsXY4IJTpbG502BahAR6uMkVodZgym0HJMG+UFAtIB9MIoG3PH2vqSN/y7cSJ275+upcR+SQ33yfSrBgXvHASoxBU1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763724397; c=relaxed/simple; bh=lVkterAId0pZtiHs0zzpoVow0duEjuPv9au7v95C+hs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Liysi6uFF0DeTKZeA/psEN89oSSmgZZyVEaHDdaBh/ovEx0CFLFA2QDt+kZygRrf9iXuCYJi0mFEwanjHWyYraQS0juH5G2aOmxRu29pkw8r1mHoC67u5kJHc3FVu0mgdZsjKuyDWlrlRkcbOlybX72/N8nbAqYGriD7ak09UZE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.210.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-7c6d13986f8so1243540a34.0 for ; Fri, 21 Nov 2025 03:26:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763724395; x=1764329195; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=SdjZB7D08cpEMTpXxqr4wUEPbtOidnkNlVo7PKpUQyg=; b=YL3ksDZs9mAeUMQtl8UN7YD00hLxITbGCAaBBhqSNJYAosvPXKebcZoDyOJztCoKKJ U6IxtNkGhiVlL7L6y5+52yDxgpzIfiJrcoh4r2yJTk5ZWWxRsL8U3I8+mwNJaRRjZfBT +5Ponvn1w9JHIKwGVu0JY5oZUFl73mzaxldORUtdqIpH1hrLYmqMigNillNLxje73M7h iBfLjnSHkcQAMpmJVO+4osoIttTyOmJTzp+XkFLBdGHlTEuLysfG0dMWIgTYd7rjdBv4 QZ9MiiFj55IbFzsM4+gT9BiqdZlkXhWSZ1yfQ/hAx7LMRAbEKc12kvfaApleRt2CijIr hC7g== X-Forwarded-Encrypted: i=1; AJvYcCWzV9MCEucNLsx/BZ9g0B6y+ZsA6zXPsZI7Y9RzpxiSvAmrjPLHyLa6BSNmG0n0tWOhbLzg8SbBKSrrUNo=@vger.kernel.org X-Gm-Message-State: AOJu0YxIBP/UK0oxNmTEt6pcvMyUKabsL8mINFfq2VMrbc81LdtuNN/H NbjZ0ETMNPnSlo7/mcFNkk9bs559IM2NrcEodEfciClwybFVfC8jdWgq X-Gm-Gg: ASbGncsFEoVdwmugTnUSr+CzJaRYvtDrEUWyLQ5HAYBqk/ku0sLgPJIVT6Dnop396bA +pQ1UTNmTT020m10H0yDRrB02M1mKvlswjFlfU0qpytYRNgZvmJJNDpOTndG5952Ic0A41EWws8 rOhq+TlZ8AaJ0Mu4iD+yc1hC8ZAnCaV+jO9P1xnrzeB+Mv8UzEP2UzOAIypy8mTCvAzBF3kUGvf L9CIBuJ7Y6u5v09zsXNyEtDJqzKFPEkoK64ES3g561CZwqLfqyF34j231bwT/bZ1LYBNUDenB25 AUftuIYgY4g2ZqUOtCjipr90GpvouuiUthr9yzDgsDNt0Tz4yufGW62g3P63YYoLHBGpl0MCFql WONOTlcqNNWV3xDdIYPIrzDMv3rVPQiulj5zEVVDpiDTaP7gvvSV/qvsajxdIhX2Lau078isUKc OaY/35qRKmBmwPUQ== X-Google-Smtp-Source: AGHT+IEwjUrwzMg7kt3g2ZGackcxWJ302wAVa0D7l6yCytkbxJYXnQqTOhQNiO7tRLNJYvD3venRrw== X-Received: by 2002:a05:6830:4108:b0:7c7:68d8:f70f with SMTP id 46e09a7af769-7c7989f089fmr1115747a34.3.1763724395410; Fri, 21 Nov 2025 03:26:35 -0800 (PST) Received: from localhost ([2a03:2880:10ff:4::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c78d305ccasm2094895a34.4.2025.11.21.03.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 03:26:35 -0800 (PST) From: Breno Leitao Date: Fri, 21 Nov 2025 03:26:07 -0800 Subject: [PATCH RFC net-next 1/2] netconsole: extract message fragmentation into write_msg_target() 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: <20251121-nbcon-v1-1-503d17b2b4af@debian.org> References: <20251121-nbcon-v1-0-503d17b2b4af@debian.org> In-Reply-To: <20251121-nbcon-v1-0-503d17b2b4af@debian.org> To: Breno Leitao , Jakub Kicinski , horms@kernel.org, efault@gmx.de, john.ogness@linutronix.de, pmladek@suse.com Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, calvin@wbinvd.org, asml.silence@gmail.com, kernel-team@meta.com, gustavold@gmail.com, asantostc@gmail.com X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2210; i=leitao@debian.org; h=from:subject:message-id; bh=lVkterAId0pZtiHs0zzpoVow0duEjuPv9au7v95C+hs=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpIExod16+IHaeSvyyS5/zJbZ2JeyEy3IOiZVzt oS9NdEqC4iJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSBMaAAKCRA1o5Of/Hh3 bZaCD/9sCHn7CuOXs5nhOaYQLAkb8jk5FeMhmT9BnoUmmv/PGQTX83UDsg5cyJJ5Ffn2efvM77F r8DQ32WPtc2qZdpDfOCFm9uLebGntqI09g0jB8qnXHbUDBksI3fGq7NKPZoKm1bTHx25SasYFPx yBDE++L5Jc2sJkoJx/1K1RH2mYTV/U+8R/8R6S9Yl+iUlswfxhTSorh19Rd2zN8+xuP52PIA2Pp Xb+z1YC2Q+PWYe9aqcNFzxZyim+/Gs4mk/4lhHzjYX3T6CnxfXMdRqCWnpXHZSjRP5TssgQJsea meR+1pyJYF1L0j2vkqfFZIIQSvPj05DjXVAMdrHFFcEjMTjo7dqNZEGZ6Zpj5jTf9KAJILaRLSi lPN9o9LmCTq+d2FeJSxZ3wWXYeIINYhq0grbYbYiqRCI3zXufmuAAE2SWaARwXCH4A/RPmOwCqW PUsy5rdBfNq84CkVEymagUuufxUOl6Ae+0nMTh8sweOKalDY2AfTZbbAwVGWpjtW+b+E0sVXa8i p+Aidz95efXIOcHQ5I9im9UM/81C213hekx6+zV+UA6ak3r5wSujCNZa7aDNs2Y+YxtsD1fMjV8 xfL3LuuFsVtZzDAOe21vV3fskAQF7Jia2USi++ZjDOGPVngqrKdCbqJN7ZUJLTe6ON37S0OO4gg s1prPw4GSWTVYjA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Refactor the message fragmentation logic in write_msg() by extracting it into a separate write_msg_target() helper function. This makes the code more maintainable and prepares for future reuse in nbcon support for non-extended consoles. The helper function takes a target, message, and length, then handles splitting the message into MAX_PRINT_CHUNK-sized fragments for sending via send_udp(). No functional change intended. Signed-off-by: Breno Leitao Reviewed-by: Petr Mladek --- drivers/net/netconsole.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index bb6e03a92956..f4b1706fb081 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1559,6 +1559,20 @@ static void append_release(char *buf) scnprintf(buf, MAX_PRINT_CHUNK, "%s,", release); } =20 +static void write_msg_target(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 send_fragmented_body(struct netconsole_target *nt, const char *msgbody, int header_len, int msgbody_len, int extradata_len) @@ -1728,10 +1742,8 @@ static void write_ext_msg(struct console *con, const= char *msg, =20 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; + unsigned long flags; =20 if (oops_only && !oops_in_progress) return; @@ -1748,13 +1760,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; - } + write_msg_target(nt, msg, len); } } spin_unlock_irqrestore(&target_list_lock, flags); --=20 2.47.3 From nobody Tue Dec 2 01:28:37 2025 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB4EB348468 for ; Fri, 21 Nov 2025 11:26:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763724399; cv=none; b=tyeHRh0NLyCsgnm3HgxbGrT8Z+d47KG7WbvpK5RNSekoZJI/+prnp7z7R0YTVt7l/Lbd4bAdBRILYjmDox2hpyc76N/faepw8gM2oLLwG5kG1JHyJmyPTIYs06MK7cEx36lR9HyyoI37zHss66lgkALgu67U8Yib0mE1k3IUYVA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763724399; c=relaxed/simple; bh=Up/1xSeBkB0p2W4yVcqFz2y90IusIdqbhG7Z3DkQyOM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S3qRvcbASLQpwsp+Bdito7Aw1f8IuU+tjed3+C3Eje5KvyHu9U6zQ19hETdO7cRHz1/g4Y1y8BT61ValfbYqlIw5redrKnGg+LnID0I32xjOUclpliYnhGX+uhQcoGZGS2jJj4B3C9cZEqmMlbkC/WoOeFLVOtMD6uR/m6XWsVc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.167.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-450154aa53fso771984b6e.2 for ; Fri, 21 Nov 2025 03:26:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763724397; x=1764329197; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=HeQ3fv25z6pOuPgCHIWGZAjgHMbUF84qDxUXEpKs5xA=; b=PBFVcKbadzn8iIHokjeI+vSAghXAukIluPcFdhKQLcJfYmy5+p+UiREcrOwHrwORFj oQrKjL0rqzdso7fNhzYXd60cju4zq4QrSEHvwQ1V9FrUzA+hw27pf6Y4YRRxk+7JYMkT A6mkI9LSY4k6yQIcY9uRDp0uwc3nPAeoGETVMtkM3aJV1nXE9KzLl7WVUGJYuHeP0E21 zC7BS4LGfptTKFOsz/DgHEHjKG1J+esG6QxGTr/8g8SFNiUS1UOn9f2JksgeVBm4CpBM rBeYwcnbw3UZgiC3yQsUnpd9Pd2kvsp32rR3w3K1XoUXHJ/+5NBWqYW9V7Hd47Tacfeb CcoQ== X-Forwarded-Encrypted: i=1; AJvYcCVI9bTRapiC1POfrMUWmkyqsZr/o7yX/BE/uRSrHQ5cAfgHLiuZ4ifwNTzmZPTVyj1izwFAh06c9QTYfpM=@vger.kernel.org X-Gm-Message-State: AOJu0YxDakoLi0+bUipyVF+uM9l58P6uVh0D/No9m0fVeqAyvGFi0KMa zgrF8XVtZrhPQwgEmI2XNQ7ja9OKOuwVp/hkU1x6/tJs4Vrc+DyydMnl X-Gm-Gg: ASbGncvKosV43ndExVi8sHcea3vkWIuMc4hNvmhpmqhZGFmI9cSE1ufiObR/blBw2Zq RoLyQoSgjrI6yoJFoBeW/QphmCoUSA8EfNgxbw9rHaEFNc1F1tU9lMUrKayDQF9wO3bI2DmYE0i urN+TzXDOPSVt3IIwAxtSKIS6N//INq1/TgRMHwSvjNE1O6zesIvfauRXmlc5oTjOTXBBQRc6nu o4k362kPRSIXi2bAjKQk/OEXxPg49P8BZNqBku4OM8pnZzvwmFVBtS4VF4XSSz3+3HppwPDZYNQ bgnzBc3N74+6w+YI+Mt8twa6SRG+fsiY4xSx3tsn4pOGApiKy/uscE0pkZraw4Uo5LaHNaljCo4 Fk2J0YoxErCtwRLYcXc7YLQboF4vwvS+Hc1S6YchKWaQIduEW26iE7n0GgFSxEEZ6mDWB0Dq8en AUFbzP4INHJR9VTA== X-Google-Smtp-Source: AGHT+IFJloyur0rQ9obs1zwpoSsUNIFlCUAqnRwKRBTiMrW8I69Xl0Dp8rUnZV0AbBobB8c+GozWew== X-Received: by 2002:a05:6808:4fe5:b0:44f:6d6d:4a04 with SMTP id 5614622812f47-45112cf9e04mr777367b6e.58.1763724396661; Fri, 21 Nov 2025 03:26:36 -0800 (PST) Received: from localhost ([2a03:2880:10ff:41::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-65782a38456sm1567810eaf.3.2025.11.21.03.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 03:26:36 -0800 (PST) From: Breno Leitao Date: Fri, 21 Nov 2025 03:26:08 -0800 Subject: [PATCH RFC net-next 2/2] netconsole: add CONFIG_NETCONSOLE_NBCON for nbcon support 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: <20251121-nbcon-v1-2-503d17b2b4af@debian.org> References: <20251121-nbcon-v1-0-503d17b2b4af@debian.org> In-Reply-To: <20251121-nbcon-v1-0-503d17b2b4af@debian.org> To: Breno Leitao , Jakub Kicinski , horms@kernel.org, efault@gmx.de, john.ogness@linutronix.de, pmladek@suse.com Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, calvin@wbinvd.org, asml.silence@gmail.com, kernel-team@meta.com, gustavold@gmail.com, asantostc@gmail.com X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4833; i=leitao@debian.org; h=from:subject:message-id; bh=Up/1xSeBkB0p2W4yVcqFz2y90IusIdqbhG7Z3DkQyOM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpIExoZ2WNk6LTQhAcz9lZEqVAXeRsGFwqZGYaR 1CcayasFTKJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSBMaAAKCRA1o5Of/Hh3 bd+ZEACGDuzNg3IOH6RiePIP06/7OidbUKYcoTtMZY/n08GFE/EFxsXgvX3iJ1/5PJwz3gpLoi2 2xs0hlsJZLeBnU92MkeJJK2GcJ2XV/GzXewvnyKS048jlA9Z/FjfGL3IzR8IGeXnpJcmEPDkkyD lKZcUwc7niTGDkuwDMOHDhnH2L2NwOadwvENYdMOPtrblpYYmTYppty+7COcvPotD0Hw/uwBq65 ibcRriGq2CNxinDXa3nRbvm8BPBAsFrMggnBhhLCAceg9i+RqPCpihIzat4eBjgPxR58rqexrAt 9F7tpL0yrU2NTMtdSHK1nuJ51soZUMV81QFhbsVxZ5cxOWko89JsAHDwzRiv6b0F9UnljiMqcfx elqhJRxJofnCS8ciStv34kwFFb9aiQBITUBeTz/vXZq4IHv7A/nPnCNCTLlHyCnZ0ZMQ56M2PlG kioZXGkLLTrKAdeN2LZKzBJfCMMxgEMb6g/mmOui7T0kP5m70eqYlexNz/JvVW7QDLD9x8Au8yy GEh0TZyUUDXS5jB9V/Un6VrOAwqPEIHHNwt8YF3Us6V1Cv0Z4s4ck4ZiGJbAqZtUeVz023BbNQY /kGuSCsVSjRG8owd/mhTH0GFMtBidGXTfNL/JGZ8HXDlbNnbDUaup4vBSCrXOdgp7p0ddSX+CS8 sbihCqt0r79hccQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Add optional support for the nbcon infrastructure to netconsole via a new CONFIG_NETCONSOLE_NBCON compile-time option. The nbcon infrastructure provides a lock-free, priority-based console system that supports atomic printing from any context including NMI, with safe handover mechanisms between different priority levels. This makes it particularly suitable for crash-safe kernel logging. When disabled (default), netconsole uses the legacy console callbacks, maintaining full backward compatibility. PS: .write_atomic and .write_thread uses the same callback, given that there is no safe .write_atomic, so .write_atomic is called as the last resource. This is what CON_NBCON_ATOMIC_UNSAFE is telling nbcon. Signed-off-by: Breno Leitao --- drivers/net/Kconfig | 14 ++++++++++ drivers/net/netconsole.c | 68 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 82 insertions(+) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ac12eaf11755..aa8771b5b723 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -369,6 +369,20 @@ config NETCONSOLE_PREPEND_RELEASE message. See for details. =20 +config NETCONSOLE_NBCON + bool "Use nbcon infrastructure (EXPERIMENTAL)" + depends on NETCONSOLE + default n + help + Enable nbcon support for netconsole. This uses the new lock-free + console infrastructure which supports threaded and atomic printing. + Given that netconsole does not support atomic operations, the current + implementation focuses on threaded callbacks, unless the host is + crashing, then it uses an unsafe atomic callbacks. This feature is + available for both extended and non-extended consoles. + + If unsure, say N to use the legacy console infrastructure. + config NETPOLL def_bool NETCONSOLE =20 diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index f4b1706fb081..2943f00b83f6 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1724,6 +1724,57 @@ static void send_ext_msg_udp(struct netconsole_targe= t *nt, const char *msg, extradata_len); } =20 +#ifdef CONFIG_NETCONSOLE_NBCON +static void netcon_write_nbcon(struct console *con, + struct nbcon_write_context *wctxt, + bool extended) +{ + struct netconsole_target *nt; + + lockdep_assert_held(&target_list_lock); + + list_for_each_entry(nt, &target_list, list) { + if (nt->extended !=3D extended || !nt->enabled || + !netif_running(nt->np.dev)) + continue; + + if (!nbcon_enter_unsafe(wctxt)) + continue; + + if (extended) + send_ext_msg_udp(nt, wctxt->outbuf, wctxt->len); + else + write_msg_target(nt, wctxt->outbuf, wctxt->len); + + nbcon_exit_unsafe(wctxt); + } +} + +static void netcon_write_nbcon_ext(struct console *con, + struct nbcon_write_context *wctxt) +{ + netcon_write_nbcon(con, wctxt, true); +} + +static void netcon_write_nbcon_basic(struct console *con, + struct nbcon_write_context *wctxt) +{ + netcon_write_nbcon(con, wctxt, false); +} + +static void netconsole_device_lock(struct console *con, unsigned long *fla= gs) +{ + /* protects all the targets at the same time */ + spin_lock_irqsave(&target_list_lock, *flags); +} + +static void netconsole_device_unlock(struct console *con, unsigned long fl= ags) +{ + spin_unlock_irqrestore(&target_list_lock, flags); +} + +#else + static void write_ext_msg(struct console *con, const char *msg, unsigned int len) { @@ -1765,6 +1816,7 @@ static void write_msg(struct console *con, const char= *msg, unsigned int len) } spin_unlock_irqrestore(&target_list_lock, flags); } +#endif =20 static int netconsole_parser_cmdline(struct netpoll *np, char *opt) { @@ -1923,14 +1975,30 @@ static void free_param_target(struct netconsole_tar= get *nt) =20 static struct console netconsole_ext =3D { .name =3D "netcon_ext", +#ifdef CONFIG_NETCONSOLE_NBCON + .flags =3D CON_ENABLED | CON_EXTENDED | CON_NBCON | CON_NBCON_ATOMIC_UNSA= FE, + .write_thread =3D netcon_write_nbcon_ext, + .write_atomic =3D netcon_write_nbcon_ext, + .device_lock =3D netconsole_device_lock, + .device_unlock =3D netconsole_device_unlock, +#else .flags =3D CON_ENABLED | CON_EXTENDED, .write =3D write_ext_msg, +#endif }; =20 static struct console netconsole =3D { .name =3D "netcon", +#ifdef CONFIG_NETCONSOLE_NBCON + .flags =3D CON_ENABLED | CON_NBCON | CON_NBCON_ATOMIC_UNSAFE, + .write_thread =3D netcon_write_nbcon_basic, + .write_atomic =3D netcon_write_nbcon_basic, + .device_lock =3D netconsole_device_lock, + .device_unlock =3D netconsole_device_unlock, +#else .flags =3D CON_ENABLED, .write =3D write_msg, +#endif }; =20 static int __init init_netconsole(void) --=20 2.47.3