Linux Kernel Selftest development
 help / color / mirror / Atom feed
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 RFC net-next v3 5/8] netconsole: Include sysdata in extradata entry count
Date: Fri, 24 Jan 2025 07:16:44 -0800	[thread overview]
Message-ID: <20250124-netcon_cpu-v3-5-12a0d286ba1d@debian.org> (raw)
In-Reply-To: <20250124-netcon_cpu-v3-0-12a0d286ba1d@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>
---
 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 4cefa43555aada25769b705dd8c8c89964f51a52..2f1aecdf2a47f246e75061d09b9ca524a82ec994 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -693,7 +693,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


  parent reply	other threads:[~2025-01-24 15:17 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-24 15:16 [PATCH RFC net-next v3 0/8] netconsole: Add support for CPU population Breno Leitao
2025-01-24 15:16 ` [PATCH RFC net-next v3 1/8] netconsole: consolidate send buffers into netconsole_target struct Breno Leitao
2025-01-28 16:11   ` Simon Horman
2025-01-30 10:35     ` Simon Horman
2025-01-31 13:11       ` Breno Leitao
2025-01-24 15:16 ` [PATCH RFC net-next v3 2/8] netconsole: Rename userdata to extradata Breno Leitao
2025-01-30 10:36   ` Simon Horman
2025-01-24 15:16 ` [PATCH RFC net-next v3 3/8] netconsole: Helper to count number of used entries Breno Leitao
2025-01-30 10:37   ` Simon Horman
2025-01-24 15:16 ` [PATCH RFC net-next v3 4/8] netconsole: Introduce configfs helpers for sysdata features Breno Leitao
2025-01-28 16:12   ` Simon Horman
2025-01-30 10:37     ` Simon Horman
2025-01-24 15:16 ` Breno Leitao [this message]
2025-01-30 10:38   ` [PATCH RFC net-next v3 5/8] netconsole: Include sysdata in extradata entry count Simon Horman
2025-01-24 15:16 ` [PATCH RFC net-next v3 6/8] netconsole: add support for sysdata and CPU population Breno Leitao
2025-01-30 10:38   ` Simon Horman
2025-01-24 15:16 ` [PATCH RFC net-next v3 7/8] netconsole: selftest: test for sysdata CPU Breno Leitao
2025-01-30 10:38   ` Simon Horman
2025-01-24 15:16 ` [PATCH RFC net-next v3 8/8] netconsole: docs: Add documentation for CPU number auto-population Breno Leitao
2025-01-24 16:15   ` Andrew Lunn
2025-01-27 17:10     ` Breno Leitao
2025-01-24 16:02 ` [PATCH RFC net-next v3 0/8] netconsole: Add support for CPU population Andrew Lunn
2025-01-27  9:52   ` Breno Leitao

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=20250124-netcon_cpu-v3-5-12a0d286ba1d@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