From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 4D7A92E612F for ; Fri, 28 Nov 2025 22:08:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764367706; cv=none; b=TxS1K1lJG0FVeVITSdv4YMDzYv4I+3YdFLey0YbbAJDJJd77R+wBbUHHgrONJd/ChXCNuMKJrtvzz6sQVsljApqXnEXlFuJ544enSEq52f20ywkiVtItD7uQB6s9pDwYUmmp6VJd/mo2c9NqdqgRDNaNXy+eKMKkoh56gAXB9aM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764367706; c=relaxed/simple; bh=ptkTe+cYKKYMyCNyu+hE6VVzhConXnPLG7fL2BaD9jQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tj+kyGsWGx7++0MpfpbZTk5iTbYWWvuu6xVQI4qpFktRYwd3DrNOjByd4NFyWaeBA8x86pg831k5/Ypuj++fT7HQ7U4KHnQsWG+8KtpKDrdw/HIp9S+KeaR4OaSWBq25JTOAFgQbdKxGoSRL6+idu16ehOCqUaAvJhg4N4f+BxE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=g9lCEasz; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g9lCEasz" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-29568d93e87so24087615ad.2 for ; Fri, 28 Nov 2025 14:08:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764367703; x=1764972503; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=t+RTp3NdTDs9G43jfmTa4TiJRQPqbtzKxkq+h8ATOJA=; b=g9lCEaszO/pNpq3lFIzmi5aixTsMV2ACZ8W61KmeqZCn3oSldMSayTy5vDeJIGiLE0 xk/2QGs/6jJEU3+t2nwGmU4xhRAKloVtLPu01tL7ccCXC4SnbtE6Ph8o3R5trQnYv4qy fWW70tfP20K72g4lx3+/BgvOsGQevZuz7q3antVYwxSfQtV3qj8XKGYM6Z56hNtMvXmJ le7cbXz08AHMifxzgV4czvzsrT4MxsFA5fB8/rE7reUHgDke3BT5e3pxM+/NHEWZ0bIA lmZHtHIMQHWqQKk+1AYrm/EWOMO+zyD231AHeBRahAomJIbU1PdMDvRpnHCN/kbuUnnw Jk6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764367703; x=1764972503; 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=t+RTp3NdTDs9G43jfmTa4TiJRQPqbtzKxkq+h8ATOJA=; b=F0zYHy7fi92pz5NY2+exPqh3WYNbZrfO/EeSC/FL8k1OmthBxucnuNsowIhxthEAny iK0N1ItUP2WVZBig7LVWp1BlUKlfLz73ng6tGipCnfm126wHNXEyDWn3lnVgyIpjwoD/ Csf72p6y0WAbgV9euLPjSUUOMLSEDSDSIYwNMgHiHFSs3ZgwrxbHegAuO0Ur6W1oTWK2 hpe7Bjg9098mUMpJRBIj8r8ns+OtCGPQcaUvWdiuAOv9FEiSyVIllPzbPk4pZ26NE3J4 E8/WYnUHijSbaCP9ERPYX+IT3C5EFS1157PlsXyiL+DuK9jPkbSFr7SHldsJGSWurN4R mvWg== X-Forwarded-Encrypted: i=1; AJvYcCWHPCj8M9ts3UznsHCukDKnvebODaeIfQ9nF42sJTl2Z5r8BEG1fSf+VXdp3n781h3kiwk9j0mplUjR2aYdUAI=@vger.kernel.org X-Gm-Message-State: AOJu0YzgJ2ckEmBaCEH6mfx8GOriZwWZHe+jFmF5QwRRPdlGVhEjS8hB r6IEDDk9DN34lrHyd8df+zRnwkNUMIk9kH9FVaTP36Mvre4MwvV+tcfo X-Gm-Gg: ASbGnct7KkWwuOZhuz/0WdCUUz4c/S3spkVSLxapCiiVogVzMhIPMGd6OxnPusEwyuP vgMCjKodvmQLFqqFBYna71hIuJePAKk+U5+wpQekrfp010Q3LC6eeB49gRXrcx7KcLg8dqkjCwT n2IIQ46IpLBRB6LRpgdMUXAW4hYzOTNAPC+bOO+GOCJdIHBO4mN4cbPwPVuSImag0bPsJ0Ao1Cs 1wtYUbqWecxB5VzoNvXsYn/RJclAHkcbQsNUwxEfrcm0jcuYGBhvuhDXjJq32xms1T1Id9IUlwb hK/7TWFdGwgVnXY4Us2HdEr6x64/aaFlT+SByauiuLabUtQ6eqrDiDTua3DK5GH7KggxWzjy6I5 XXou0d1gLjhhbTb8XPezp2qXq85HBj6frsOVGICaCYA2KDOxo0Gvm1UB0RCBIZSOnD9XQQ5fRmm SKR/P0vPrVftZgAgPknw== X-Google-Smtp-Source: AGHT+IFCyPkXqNys6uAkZE+IJh35Rc08N/3N8vJyNWXKGWOKVH7Xr53Z83YRRQ0woDnmCyry7S9QNQ== X-Received: by 2002:a05:7022:208f:b0:11b:9e5e:1a40 with SMTP id a92af1059eb24-11cb3ef2589mr7078926c88.15.1764367702419; Fri, 28 Nov 2025 14:08:22 -0800 (PST) Received: from [192.168.15.94] ([2804:7f1:ebc3:752f:12e1:8eff:fe46:88b8]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-11dcaee660asm26824205c88.3.2025.11.28.14.08.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 14:08:21 -0800 (PST) From: Andre Carvalho Date: Fri, 28 Nov 2025 22:08:01 +0000 Subject: [PATCH net-next v8 2/5] netconsole: convert 'enabled' flag to enum for clearer state management Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251128-netcons-retrigger-v8-2-0bccbf4c6385@gmail.com> References: <20251128-netcons-retrigger-v8-0-0bccbf4c6385@gmail.com> In-Reply-To: <20251128-netcons-retrigger-v8-0-0bccbf4c6385@gmail.com> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Andre Carvalho X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764367687; l=8948; i=asantostc@gmail.com; s=20250807; h=from:subject:message-id; bh=ptkTe+cYKKYMyCNyu+hE6VVzhConXnPLG7fL2BaD9jQ=; b=N0iC28pdKpOX3PQnWuxgH4YK5Zy/KLhIszq7lgKe9xQ0sGuzSr3sPWnLAHjOcE0gqR4gPES5N 62pO073zvwUCus1qPNaaQhS+hoZxDcPxe9jH5b3U8fa/nmdQ5Z+rgfy X-Developer-Key: i=asantostc@gmail.com; a=ed25519; pk=eWre+RwFHCxkiaQrZLsjC67mZ/pZnzSM/f7/+yFXY4Q= This patch refactors the netconsole driver's target enabled state from a simple boolean to an explicit enum (`target_state`). This allow the states to be expanded to a new state in the upcoming change. Co-developed-by: Breno Leitao Signed-off-by: Breno Leitao Reviewed-by: Breno Leitao Signed-off-by: Andre Carvalho --- drivers/net/netconsole.c | 52 ++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index e2ec09f238a0..b21ecea60d52 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -135,12 +135,12 @@ enum target_state { * @sysdata_fields: Sysdata features enabled. * @msgcounter: Message sent counter. * @stats: Packet send stats for the target. Used for debugging. - * @enabled: On / off knob to enable / disable target. + * @state: State of the target. * Visible from userspace (read-write). * We maintain a strict 1:1 correspondence between this and * whether the corresponding netpoll is active or inactive. * Also, other parameters of a target may be modified at - * runtime only when it is disabled (enabled == 0). + * runtime only when it is disabled (state == STATE_DISABLED). * @extended: Denotes whether console is extended or not. * @release: Denotes whether kernel release version should be prepended * to the message. Depends on extended console. @@ -170,7 +170,7 @@ struct netconsole_target { u32 msgcounter; #endif struct netconsole_target_stats stats; - bool enabled; + enum target_state state; bool extended; bool release; struct netpoll np; @@ -262,6 +262,7 @@ static struct netconsole_target *alloc_and_init(void) nt->np.local_port = 6665; nt->np.remote_port = 6666; eth_broadcast_addr(nt->np.remote_mac); + nt->state = STATE_DISABLED; return nt; } @@ -280,7 +281,7 @@ static void netconsole_process_cleanups_core(void) mutex_lock(&target_cleanup_list_lock); list_for_each_entry_safe(nt, tmp, &target_cleanup_list, list) { /* all entries in the cleanup_list needs to be disabled */ - WARN_ON_ONCE(nt->enabled); + WARN_ON_ONCE(nt->state == STATE_ENABLED); do_netpoll_cleanup(&nt->np); /* moved the cleaned target to target_list. Need to hold both * locks @@ -403,7 +404,7 @@ static void trim_newline(char *s, size_t maxlen) static ssize_t enabled_show(struct config_item *item, char *buf) { - return sysfs_emit(buf, "%d\n", to_target(item)->enabled); + return sysfs_emit(buf, "%d\n", to_target(item)->state == STATE_ENABLED); } static ssize_t extended_show(struct config_item *item, char *buf) @@ -570,8 +571,8 @@ static ssize_t enabled_store(struct config_item *item, const char *buf, size_t count) { struct netconsole_target *nt = to_target(item); + bool enabled, current_enabled; unsigned long flags; - bool enabled; ssize_t ret; mutex_lock(&dynamic_netconsole_mutex); @@ -580,9 +581,10 @@ static ssize_t enabled_store(struct config_item *item, goto out_unlock; ret = -EINVAL; - if (enabled == nt->enabled) { + current_enabled = nt->state == STATE_ENABLED; + if (enabled == current_enabled) { pr_info("network logging has already %s\n", - nt->enabled ? "started" : "stopped"); + current_enabled ? "started" : "stopped"); goto out_unlock; } @@ -615,16 +617,16 @@ static ssize_t enabled_store(struct config_item *item, if (ret) goto out_unlock; - nt->enabled = true; + nt->state = STATE_ENABLED; pr_info("network logging started\n"); } else { /* false */ /* We need to disable the netconsole before cleaning it up * otherwise we might end up in write_msg() with - * nt->np.dev == NULL and nt->enabled == true + * nt->np.dev == NULL and nt->state == STATE_ENABLED */ mutex_lock(&target_cleanup_list_lock); spin_lock_irqsave(&target_list_lock, flags); - nt->enabled = false; + nt->state = STATE_DISABLED; /* Remove the target from the list, while holding * target_list_lock */ @@ -653,7 +655,7 @@ static ssize_t release_store(struct config_item *item, const char *buf, ssize_t ret; mutex_lock(&dynamic_netconsole_mutex); - if (nt->enabled) { + if (nt->state == STATE_ENABLED) { pr_err("target (%s) is enabled, disable to update parameters\n", config_item_name(&nt->group.cg_item)); ret = -EINVAL; @@ -680,7 +682,7 @@ static ssize_t extended_store(struct config_item *item, const char *buf, ssize_t ret; mutex_lock(&dynamic_netconsole_mutex); - if (nt->enabled) { + if (nt->state == STATE_ENABLED) { pr_err("target (%s) is enabled, disable to update parameters\n", config_item_name(&nt->group.cg_item)); ret = -EINVAL; @@ -704,7 +706,7 @@ static ssize_t dev_name_store(struct config_item *item, const char *buf, struct netconsole_target *nt = to_target(item); mutex_lock(&dynamic_netconsole_mutex); - if (nt->enabled) { + if (nt->state == STATE_ENABLED) { pr_err("target (%s) is enabled, disable to update parameters\n", config_item_name(&nt->group.cg_item)); mutex_unlock(&dynamic_netconsole_mutex); @@ -725,7 +727,7 @@ static ssize_t local_port_store(struct config_item *item, const char *buf, ssize_t ret = -EINVAL; mutex_lock(&dynamic_netconsole_mutex); - if (nt->enabled) { + if (nt->state == STATE_ENABLED) { pr_err("target (%s) is enabled, disable to update parameters\n", config_item_name(&nt->group.cg_item)); goto out_unlock; @@ -747,7 +749,7 @@ static ssize_t remote_port_store(struct config_item *item, ssize_t ret = -EINVAL; mutex_lock(&dynamic_netconsole_mutex); - if (nt->enabled) { + if (nt->state == STATE_ENABLED) { pr_err("target (%s) is enabled, disable to update parameters\n", config_item_name(&nt->group.cg_item)); goto out_unlock; @@ -770,7 +772,7 @@ static ssize_t local_ip_store(struct config_item *item, const char *buf, int ipv6; mutex_lock(&dynamic_netconsole_mutex); - if (nt->enabled) { + if (nt->state == STATE_ENABLED) { pr_err("target (%s) is enabled, disable to update parameters\n", config_item_name(&nt->group.cg_item)); goto out_unlock; @@ -795,7 +797,7 @@ static ssize_t remote_ip_store(struct config_item *item, const char *buf, int ipv6; mutex_lock(&dynamic_netconsole_mutex); - if (nt->enabled) { + if (nt->state == STATE_ENABLED) { pr_err("target (%s) is enabled, disable to update parameters\n", config_item_name(&nt->group.cg_item)); goto out_unlock; @@ -830,7 +832,7 @@ static ssize_t remote_mac_store(struct config_item *item, const char *buf, ssize_t ret = -EINVAL; mutex_lock(&dynamic_netconsole_mutex); - if (nt->enabled) { + if (nt->state == STATE_ENABLED) { pr_err("target (%s) is enabled, disable to update parameters\n", config_item_name(&nt->group.cg_item)); goto out_unlock; @@ -1326,7 +1328,7 @@ static void drop_netconsole_target(struct config_group *group, * The target may have never been enabled, or was manually disabled * before being removed so netpoll may have already been cleaned up. */ - if (nt->enabled) + if (nt->state == STATE_ENABLED) netpoll_cleanup(&nt->np); config_item_put(&nt->group.cg_item); @@ -1444,7 +1446,7 @@ static int netconsole_netdev_event(struct notifier_block *this, case NETDEV_RELEASE: case NETDEV_JOIN: case NETDEV_UNREGISTER: - nt->enabled = false; + nt->state = STATE_DISABLED; list_move(&nt->list, &target_cleanup_list); stopped = true; } @@ -1725,7 +1727,8 @@ static void write_ext_msg(struct console *con, const char *msg, spin_lock_irqsave(&target_list_lock, flags); list_for_each_entry(nt, &target_list, list) - if (nt->extended && nt->enabled && netif_running(nt->np.dev)) + if (nt->extended && nt->state == STATE_ENABLED && + netif_running(nt->np.dev)) send_ext_msg_udp(nt, msg, len); spin_unlock_irqrestore(&target_list_lock, flags); } @@ -1745,7 +1748,8 @@ static void write_msg(struct console *con, const char *msg, unsigned int len) spin_lock_irqsave(&target_list_lock, flags); list_for_each_entry(nt, &target_list, list) { - if (!nt->extended && nt->enabled && netif_running(nt->np.dev)) { + if (!nt->extended && nt->state == 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 @@ -1901,7 +1905,7 @@ static struct netconsole_target *alloc_param_target(char *target_config, */ goto fail; } else { - nt->enabled = true; + nt->state = STATE_ENABLED; } populate_configfs_item(nt, cmdline_count); -- 2.52.0