From: Breno Leitao <leitao@debian.org>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Jonathan Corbet <corbet@lwn.net>, Shuah Khan <shuah@kernel.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org,
rdunlap@infradead.org, Breno Leitao <leitao@debian.org>,
kernel-team@meta.com
Subject: [PATCH net-next v4 5/8] netconsole: Include sysdata in extradata entry count
Date: Tue, 04 Feb 2025 03:35:13 -0800 [thread overview]
Message-ID: <20250204-netcon_cpu-v4-5-9480266ef556@debian.org> (raw)
In-Reply-To: <20250204-netcon_cpu-v4-0-9480266ef556@debian.org>
Modify count_extradata_entries() to include sysdata fields when
calculating the total number of extradata entries. This change ensures
that the sysdata feature, specifically the CPU number field, is
correctly counted against the MAX_EXTRADATA_ITEMS limit.
The modification adds a simple check for the CPU_NR flag in the
sysdata_fields, incrementing the entry count accordingly.
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Simon Horman <horms@kernel.org>
---
drivers/net/netconsole.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index c3f31b15ab8108f6be80d747ffc64a1eeb59a5a9..4255f547bdecfbdaf02ccfb28360ba6fc8b58bed 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -694,7 +694,15 @@ static ssize_t remote_ip_store(struct config_item *item, const char *buf,
*/
static size_t count_extradata_entries(struct netconsole_target *nt)
{
- return list_count_nodes(&nt->userdata_group.cg_children);
+ size_t entries;
+
+ /* Userdata entries */
+ entries = list_count_nodes(&nt->userdata_group.cg_children);
+ /* Plus sysdata entries */
+ if (nt->sysdata_fields & CPU_NR)
+ entries += 1;
+
+ return entries;
}
static ssize_t remote_mac_store(struct config_item *item, const char *buf,
--
2.43.5
next prev parent reply other threads:[~2025-02-04 11:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-04 11:35 [PATCH net-next v4 0/8] netconsole: Add support for CPU population Breno Leitao
2025-02-04 11:35 ` [PATCH net-next v4 1/8] netconsole: consolidate send buffers into netconsole_target struct Breno Leitao
2025-02-05 13:34 ` Simon Horman
2025-02-06 11:00 ` Breno Leitao
2025-02-04 11:35 ` [PATCH net-next v4 2/8] netconsole: Rename userdata to extradata Breno Leitao
2025-02-04 11:35 ` [PATCH net-next v4 3/8] netconsole: Helper to count number of used entries Breno Leitao
2025-02-04 11:35 ` [PATCH net-next v4 4/8] netconsole: Introduce configfs helpers for sysdata features Breno Leitao
2025-02-04 11:35 ` Breno Leitao [this message]
2025-02-04 11:35 ` [PATCH net-next v4 6/8] netconsole: add support for sysdata and CPU population Breno Leitao
2025-02-04 11:35 ` [PATCH net-next v4 7/8] netconsole: selftest: test for sysdata CPU Breno Leitao
2025-02-04 11:35 ` [PATCH net-next v4 8/8] netconsole: docs: Add documentation for CPU number auto-population Breno Leitao
2025-02-05 13:35 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250204-netcon_cpu-v4-5-9480266ef556@debian.org \
--to=leitao@debian.org \
--cc=andrew+netdev@lunn.ch \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kernel-team@meta.com \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rdunlap@infradead.org \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox