2023-08-04 13:04:58

by Breno Leitao

Subject: [PATCH net-next v4 1/2] netconsole: Create a allocation helper

De-duplicate the initialization and allocation code for struct
netconsole_target.

The same allocation and initialization code is duplicated in two
different places in the netconsole subsystem, when the netconsole target
is initialized by command line parameters (alloc_param_target()), and
dynamically by sysfs (make_netconsole_target()).

Create a helper function, and call it from the two different functions.

Suggested-by: Eric Dumazet <[email protected]>
Signed-off-by: Breno Leitao <[email protected]>
---
drivers/net/netconsole.c | 41 +++++++++++++++++++---------------------
1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 87f18aedd3bd..a7df782530cf 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -167,19 +167,15 @@ static void netconsole_target_put(struct netconsole_target *nt)

#endif /* CONFIG_NETCONSOLE_DYNAMIC */

-/* Allocate new target (from boot/module param) and setup netpoll for it */
-static struct netconsole_target *alloc_param_target(char *target_config)
+/* Allocate and initialize with defaults.
+ * Note that these targets get their config_item fields zeroed-out.
+ */
+static struct netconsole_target *alloc_and_init(void)
{
- int err = -ENOMEM;
- struct netconsole_target *nt;
+ struct netconsole_target *nt = kzalloc(sizeof(*nt), GFP_KERNEL);

- /*
- * Allocate and initialize with defaults.
- * Note that these targets get their config_item fields zeroed-out.
- */
- nt = kzalloc(sizeof(*nt), GFP_KERNEL);
if (!nt)
- goto fail;
+ return nt;

nt->np.name = "netconsole";
strscpy(nt->np.dev_name, "eth0", IFNAMSIZ);
@@ -187,6 +183,18 @@ static struct netconsole_target *alloc_param_target(char *target_config)
nt->np.remote_port = 6666;
eth_broadcast_addr(nt->np.remote_mac);

+ return nt;
+}
+
+/* Allocate new target (from boot/module param) and setup netpoll for it */
+static struct netconsole_target *alloc_param_target(char *target_config)
+{
+ struct netconsole_target *nt = alloc_and_init();
+ int err = -ENOMEM;
+
+ if (!nt)
+ goto fail;
+
if (*target_config == '+') {
nt->extended = true;
target_config++;
@@ -664,23 +672,12 @@ static const struct config_item_type netconsole_target_type = {
static struct config_item *make_netconsole_target(struct config_group *group,
const char *name)
{
+ struct netconsole_target *nt = alloc_and_init();
unsigned long flags;
- struct netconsole_target *nt;

- /*
- * Allocate and initialize with defaults.
- * Target is disabled at creation (!enabled).
- */
- nt = kzalloc(sizeof(*nt), GFP_KERNEL);
if (!nt)
return ERR_PTR(-ENOMEM);

- nt->np.name = "netconsole";
- strscpy(nt->np.dev_name, "eth0", IFNAMSIZ);
- nt->np.local_port = 6665;
- nt->np.remote_port = 6666;
- eth_broadcast_addr(nt->np.remote_mac);
-
/* Initialize the config_item member */
config_item_init_type_name(&nt->item, name, &netconsole_target_type);

--
2.34.1

2023-08-08 23:48:12

by Jakub Kicinski

Subject: Re: [PATCH net-next v4 1/2] netconsole: Create a allocation helper

On Fri, 4 Aug 2023 05:43:20 -0700 Breno Leitao wrote:
> + struct netconsole_target *nt = alloc_and_init();
> + int err = -ENOMEM;
> +
> + if (!nt)
> + goto fail;

No complex code in the variable init, please.
Makes the code harder to read.

struct netconsole_target *nt;
int err;

nt = alloc_and_init();
if (!nt) {
err = -ENOMEM;
goto fail;
}
--
pw-bot: cr