2023-10-05 14:36:58

by Breno Leitao

Subject: [PATCH net-next v2 1/3] netconsole: Initialize configfs_item for default targets

For netconsole targets allocated during the boot time (passing
netconsole=... argument), netconsole_target->item is not initialized.
That is not a problem because it is not used inside configfs.

An upcoming patch will be using it, thus, initialize the targets with
the name 'cmdline' plus a counter starting from 0. This name will match
entries in the configfs later.

Suggested-by: Joel Becker <[email protected]>
Signed-off-by: Breno Leitao <[email protected]>
---
drivers/net/netconsole.c | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 3111e1648592..7c46cf1c923e 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -53,6 +53,8 @@ static bool oops_only = false;
module_param(oops_only, bool, 0600);
MODULE_PARM_DESC(oops_only, "Only log oops messages");

+#define NETCONSOLE_PARAM_TARGET_NAME "cmdline"
+
#ifndef MODULE
static int __init option_setup(char *opt)
{
@@ -108,6 +110,8 @@ struct netconsole_target {
struct netpoll np;
};

+static void populate_configfs_item(struct netconsole_target *nt,
+ int cmdline_count);
#ifdef CONFIG_NETCONSOLE_DYNAMIC

static struct configfs_subsystem netconsole_subsys;
@@ -165,6 +169,10 @@ static void netconsole_target_put(struct netconsole_target *nt)
{
}

+static void populate_configfs_item(struct netconsole_target *nt,
+ int cmdline_count)
+{
+}
#endif /* CONFIG_NETCONSOLE_DYNAMIC */

/* Allocate and initialize with defaults.
@@ -193,7 +201,8 @@ static struct netconsole_target *alloc_and_init(void)
}

/* Allocate new target (from boot/module param) and setup netpoll for it */
-static struct netconsole_target *alloc_param_target(char *target_config)
+static struct netconsole_target *alloc_param_target(char *target_config,
+ int cmdline_count)
{
struct netconsole_target *nt;
int err;
@@ -228,6 +237,7 @@ static struct netconsole_target *alloc_param_target(char *target_config)
if (err)
goto fail;

+ populate_configfs_item(nt, cmdline_count);
nt->enabled = true;

return nt;
@@ -740,6 +750,17 @@ static struct configfs_subsystem netconsole_subsys = {
},
};

+static void populate_configfs_item(struct netconsole_target *nt,
+ int cmdline_count)
+{
+ char target_name[16];
+
+ snprintf(target_name, sizeof(target_name), "%s%d",
+ NETCONSOLE_PARAM_TARGET_NAME, cmdline_count);
+ config_item_init_type_name(&nt->item, target_name,
+ &netconsole_target_type);
+}
+
#endif /* CONFIG_NETCONSOLE_DYNAMIC */

/* Handle network interface device notifications */
@@ -954,6 +975,7 @@ static int __init init_netconsole(void)
{
int err;
struct netconsole_target *nt, *tmp;
+ unsigned int count = 0;
bool extended = false;
unsigned long flags;
char *target_config;
@@ -961,7 +983,7 @@ static int __init init_netconsole(void)

if (strnlen(input, MAX_PARAM_LENGTH)) {
while ((target_config = strsep(&input, ";"))) {
- nt = alloc_param_target(target_config);
+ nt = alloc_param_target(target_config, count);
if (IS_ERR(nt)) {
err = PTR_ERR(nt);
goto fail;
@@ -977,6 +999,7 @@ static int __init init_netconsole(void)
spin_lock_irqsave(&target_list_lock, flags);
list_add(&nt->list, &target_list);
spin_unlock_irqrestore(&target_list_lock, flags);
+ count++;
}
}

--
2.34.1

2023-10-10 02:32:18

by Jakub Kicinski

Subject: Re: [PATCH net-next v2 1/3] netconsole: Initialize configfs_item for default targets

On Thu, 5 Oct 2023 05:36:34 -0700 Breno Leitao wrote:
> +static void populate_configfs_item(struct netconsole_target *nt,
> + int cmdline_count);

Could you move alloc / free_param_target() to avoid the forward
declaration? (separate patch)

2023-10-10 09:37:23

by Breno Leitao

Subject: Re: [PATCH net-next v2 1/3] netconsole: Initialize configfs_item for default targets

On Mon, Oct 09, 2023 at 07:31:58PM -0700, Jakub Kicinski wrote:
> On Thu, 5 Oct 2023 05:36:34 -0700 Breno Leitao wrote:
> > +static void populate_configfs_item(struct netconsole_target *nt,
> > + int cmdline_count);
>
> Could you move alloc / free_param_target() to avoid the forward
> declaration? (separate patch)

Yes, this is a good idea. I tried to avoid the forward declaration, but
I didn't find this solution. Sending a v3 with this change.

Thanks for the review!