[PATCH net-next 0/6] team: do some cleanups in team driver

[PATCH net-next 0/6] team: do some cleanups in team driver

[Zhengchao Shao]

Do some cleanups in team driver.

Zhengchao Shao (6):
  team: add __exit modifier to team_nl_fini()
  team: remove unreferenced header in activebackup/broadcast/roundrobin
    files
  team: change the init function in the team_option structure to void
  team: change the getter function in the team_option structure to void
  team: get lb_priv from team directly in lb_htpm_select_tx_port
  team: remove unused input parameters in lb_htpm_select_tx_port and
    lb_hash_select_tx_port

 drivers/net/team/team.c                   | 62 +++++++++--------------
 drivers/net/team/team_mode_activebackup.c |  9 ++--
 drivers/net/team/team_mode_broadcast.c    |  1 -
 drivers/net/team/team_mode_loadbalance.c  | 50 +++++++-----------
 drivers/net/team/team_mode_roundrobin.c   |  1 -
 include/linux/if_team.h                   |  4 +-
 6 files changed, 48 insertions(+), 79 deletions(-)

-- 
2.34.1

[PATCH net-next 1/6] team: add __exit modifier to team_nl_fini()

[Zhengchao Shao]

team_nl_fini is only called when the module exits, so add the __exit
modifier to it.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
 drivers/net/team/team.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index bc50fc3f6913..e4fe70a71b40 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2892,7 +2892,7 @@ static int __init team_nl_init(void)
 	return genl_register_family(&team_nl_family);
 }
 
-static void team_nl_fini(void)
+static void __exit team_nl_fini(void)
 {
 	genl_unregister_family(&team_nl_family);
 }
-- 
2.34.1

[PATCH net-next 2/6] team: remove unreferenced header in activebackup/broadcast/roundrobin files

[Zhengchao Shao]

Because linux/errno.h is unreferenced in activebackup/broadcast/roundrobin
files, so remove it.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
 drivers/net/team/team_mode_activebackup.c | 1 -
 drivers/net/team/team_mode_broadcast.c    | 1 -
 drivers/net/team/team_mode_roundrobin.c   | 1 -
 3 files changed, 3 deletions(-)

diff --git a/drivers/net/team/team_mode_activebackup.c b/drivers/net/team/team_mode_activebackup.c
index 3147a4fdf8d9..49d1c08d040e 100644
--- a/drivers/net/team/team_mode_activebackup.c
+++ b/drivers/net/team/team_mode_activebackup.c
@@ -8,7 +8,6 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <net/rtnetlink.h>
 #include <linux/if_team.h>
diff --git a/drivers/net/team/team_mode_broadcast.c b/drivers/net/team/team_mode_broadcast.c
index 313a3e2d68bf..61d7d79f0c36 100644
--- a/drivers/net/team/team_mode_broadcast.c
+++ b/drivers/net/team/team_mode_broadcast.c
@@ -8,7 +8,6 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/if_team.h>
 
diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c
index 3ec63de97ae3..dd405d82c6ac 100644
--- a/drivers/net/team/team_mode_roundrobin.c
+++ b/drivers/net/team/team_mode_roundrobin.c
@@ -8,7 +8,6 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/if_team.h>
 
-- 
2.34.1

[PATCH net-next 3/6] team: change the init function in the team_option structure to void

[Zhengchao Shao]

Because the init function in the team_option structure always returns 0,
so change the init function to void and remove redundant code.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
 drivers/net/team/team.c                   |  8 ++------
 drivers/net/team/team_mode_activebackup.c |  5 ++---
 drivers/net/team/team_mode_loadbalance.c  | 15 ++++++---------
 include/linux/if_team.h                   |  2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index e4fe70a71b40..b88e1c451e07 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -149,7 +149,6 @@ static int __team_option_inst_add(struct team *team, struct team_option *option,
 	struct team_option_inst *opt_inst;
 	unsigned int array_size;
 	unsigned int i;
-	int err;
 
 	array_size = option->array_size;
 	if (!array_size)
@@ -165,11 +164,8 @@ static int __team_option_inst_add(struct team *team, struct team_option *option,
 		opt_inst->changed = true;
 		opt_inst->removed = false;
 		list_add_tail(&opt_inst->list, &team->option_inst_list);
-		if (option->init) {
-			err = option->init(team, &opt_inst->info);
-			if (err)
-				return err;
-		}
+		if (option->init)
+			option->init(team, &opt_inst->info);
 
 	}
 	return 0;
diff --git a/drivers/net/team/team_mode_activebackup.c b/drivers/net/team/team_mode_activebackup.c
index 49d1c08d040e..4fd5966c9876 100644
--- a/drivers/net/team/team_mode_activebackup.c
+++ b/drivers/net/team/team_mode_activebackup.c
@@ -56,11 +56,10 @@ static void ab_port_leave(struct team *team, struct team_port *port)
 	}
 }
 
-static int ab_active_port_init(struct team *team,
-			       struct team_option_inst_info *info)
+static void ab_active_port_init(struct team *team,
+				struct team_option_inst_info *info)
 {
 	ab_priv(team)->ap_opt_inst_info = info;
-	return 0;
 }
 
 static int ab_active_port_get(struct team *team, struct team_gsetter_ctx *ctx)
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index 18d99fda997c..50c015cd0682 100644
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -361,14 +361,13 @@ static int lb_tx_method_set(struct team *team, struct team_gsetter_ctx *ctx)
 	return 0;
 }
 
-static int lb_tx_hash_to_port_mapping_init(struct team *team,
-					   struct team_option_inst_info *info)
+static void lb_tx_hash_to_port_mapping_init(struct team *team,
+					    struct team_option_inst_info *info)
 {
 	struct lb_priv *lb_priv = get_lb_priv(team);
 	unsigned char hash = info->array_index;
 
 	LB_HTPM_OPT_INST_INFO_BY_HASH(lb_priv, hash) = info;
-	return 0;
 }
 
 static int lb_tx_hash_to_port_mapping_get(struct team *team,
@@ -401,14 +400,13 @@ static int lb_tx_hash_to_port_mapping_set(struct team *team,
 	return -ENODEV;
 }
 
-static int lb_hash_stats_init(struct team *team,
-			      struct team_option_inst_info *info)
+static void lb_hash_stats_init(struct team *team,
+			       struct team_option_inst_info *info)
 {
 	struct lb_priv *lb_priv = get_lb_priv(team);
 	unsigned char hash = info->array_index;
 
 	lb_priv->ex->stats.info[hash].opt_inst_info = info;
-	return 0;
 }
 
 static int lb_hash_stats_get(struct team *team, struct team_gsetter_ctx *ctx)
@@ -421,14 +419,13 @@ static int lb_hash_stats_get(struct team *team, struct team_gsetter_ctx *ctx)
 	return 0;
 }
 
-static int lb_port_stats_init(struct team *team,
-			      struct team_option_inst_info *info)
+static void lb_port_stats_init(struct team *team,
+			       struct team_option_inst_info *info)
 {
 	struct team_port *port = info->port;
 	struct lb_port_priv *lb_port_priv = get_lb_port_priv(port);
 
 	lb_port_priv->stats_info.opt_inst_info = info;
-	return 0;
 }
 
 static int lb_port_stats_get(struct team *team, struct team_gsetter_ctx *ctx)
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 8de6b6e67829..fc01c3cfe86d 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -162,7 +162,7 @@ struct team_option {
 	bool per_port;
 	unsigned int array_size; /* != 0 means the option is array */
 	enum team_option_type type;
-	int (*init)(struct team *team, struct team_option_inst_info *info);
+	void (*init)(struct team *team, struct team_option_inst_info *info);
 	int (*getter)(struct team *team, struct team_gsetter_ctx *ctx);
 	int (*setter)(struct team *team, struct team_gsetter_ctx *ctx);
 };
-- 
2.34.1

[PATCH net-next 4/6] team: change the getter function in the team_option structure to void

[Zhengchao Shao]

Because the getter function in the team_option structure always returns 0,
so change the getter function to void and remove redundant code.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
 drivers/net/team/team.c                   | 52 ++++++++++-------------
 drivers/net/team/team_mode_activebackup.c |  3 +-
 drivers/net/team/team_mode_loadbalance.c  | 24 ++++-------
 include/linux/if_team.h                   |  2 +-
 4 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index b88e1c451e07..8243563a40f0 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -358,7 +358,9 @@ static int team_option_get(struct team *team,
 {
 	if (!opt_inst->option->getter)
 		return -EOPNOTSUPP;
-	return opt_inst->option->getter(team, ctx);
+
+	opt_inst->option->getter(team, ctx);
+	return 0;
 }
 
 static int team_option_set(struct team *team,
@@ -1373,10 +1375,9 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
  * Net device ops
  *****************/
 
-static int team_mode_option_get(struct team *team, struct team_gsetter_ctx *ctx)
+static void team_mode_option_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
 	ctx->data.str_val = team->mode->kind;
-	return 0;
 }
 
 static int team_mode_option_set(struct team *team, struct team_gsetter_ctx *ctx)
@@ -1384,11 +1385,10 @@ static int team_mode_option_set(struct team *team, struct team_gsetter_ctx *ctx)
 	return team_change_mode(team, ctx->data.str_val);
 }
 
-static int team_notify_peers_count_get(struct team *team,
-				       struct team_gsetter_ctx *ctx)
+static void team_notify_peers_count_get(struct team *team,
+					struct team_gsetter_ctx *ctx)
 {
 	ctx->data.u32_val = team->notify_peers.count;
-	return 0;
 }
 
 static int team_notify_peers_count_set(struct team *team,
@@ -1398,11 +1398,10 @@ static int team_notify_peers_count_set(struct team *team,
 	return 0;
 }
 
-static int team_notify_peers_interval_get(struct team *team,
-					  struct team_gsetter_ctx *ctx)
+static void team_notify_peers_interval_get(struct team *team,
+					   struct team_gsetter_ctx *ctx)
 {
 	ctx->data.u32_val = team->notify_peers.interval;
-	return 0;
 }
 
 static int team_notify_peers_interval_set(struct team *team,
@@ -1412,11 +1411,10 @@ static int team_notify_peers_interval_set(struct team *team,
 	return 0;
 }
 
-static int team_mcast_rejoin_count_get(struct team *team,
-				       struct team_gsetter_ctx *ctx)
+static void team_mcast_rejoin_count_get(struct team *team,
+					struct team_gsetter_ctx *ctx)
 {
 	ctx->data.u32_val = team->mcast_rejoin.count;
-	return 0;
 }
 
 static int team_mcast_rejoin_count_set(struct team *team,
@@ -1426,11 +1424,10 @@ static int team_mcast_rejoin_count_set(struct team *team,
 	return 0;
 }
 
-static int team_mcast_rejoin_interval_get(struct team *team,
-					  struct team_gsetter_ctx *ctx)
+static void team_mcast_rejoin_interval_get(struct team *team,
+					   struct team_gsetter_ctx *ctx)
 {
 	ctx->data.u32_val = team->mcast_rejoin.interval;
-	return 0;
 }
 
 static int team_mcast_rejoin_interval_set(struct team *team,
@@ -1440,13 +1437,12 @@ static int team_mcast_rejoin_interval_set(struct team *team,
 	return 0;
 }
 
-static int team_port_en_option_get(struct team *team,
-				   struct team_gsetter_ctx *ctx)
+static void team_port_en_option_get(struct team *team,
+				    struct team_gsetter_ctx *ctx)
 {
 	struct team_port *port = ctx->info->port;
 
 	ctx->data.bool_val = team_port_enabled(port);
-	return 0;
 }
 
 static int team_port_en_option_set(struct team *team,
@@ -1461,13 +1457,12 @@ static int team_port_en_option_set(struct team *team,
 	return 0;
 }
 
-static int team_user_linkup_option_get(struct team *team,
-				       struct team_gsetter_ctx *ctx)
+static void team_user_linkup_option_get(struct team *team,
+					struct team_gsetter_ctx *ctx)
 {
 	struct team_port *port = ctx->info->port;
 
 	ctx->data.bool_val = port->user.linkup;
-	return 0;
 }
 
 static void __team_carrier_check(struct team *team);
@@ -1483,13 +1478,12 @@ static int team_user_linkup_option_set(struct team *team,
 	return 0;
 }
 
-static int team_user_linkup_en_option_get(struct team *team,
-					  struct team_gsetter_ctx *ctx)
+static void team_user_linkup_en_option_get(struct team *team,
+					   struct team_gsetter_ctx *ctx)
 {
 	struct team_port *port = ctx->info->port;
 
 	ctx->data.bool_val = port->user.linkup_enabled;
-	return 0;
 }
 
 static int team_user_linkup_en_option_set(struct team *team,
@@ -1503,13 +1497,12 @@ static int team_user_linkup_en_option_set(struct team *team,
 	return 0;
 }
 
-static int team_priority_option_get(struct team *team,
-				    struct team_gsetter_ctx *ctx)
+static void team_priority_option_get(struct team *team,
+				     struct team_gsetter_ctx *ctx)
 {
 	struct team_port *port = ctx->info->port;
 
 	ctx->data.s32_val = port->priority;
-	return 0;
 }
 
 static int team_priority_option_set(struct team *team,
@@ -1525,13 +1518,12 @@ static int team_priority_option_set(struct team *team,
 	return 0;
 }
 
-static int team_queue_id_option_get(struct team *team,
-				    struct team_gsetter_ctx *ctx)
+static void team_queue_id_option_get(struct team *team,
+				     struct team_gsetter_ctx *ctx)
 {
 	struct team_port *port = ctx->info->port;
 
 	ctx->data.u32_val = port->queue_id;
-	return 0;
 }
 
 static int team_queue_id_option_set(struct team *team,
diff --git a/drivers/net/team/team_mode_activebackup.c b/drivers/net/team/team_mode_activebackup.c
index 4fd5966c9876..419b9083515e 100644
--- a/drivers/net/team/team_mode_activebackup.c
+++ b/drivers/net/team/team_mode_activebackup.c
@@ -62,7 +62,7 @@ static void ab_active_port_init(struct team *team,
 	ab_priv(team)->ap_opt_inst_info = info;
 }
 
-static int ab_active_port_get(struct team *team, struct team_gsetter_ctx *ctx)
+static void ab_active_port_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
 	struct team_port *active_port;
 
@@ -72,7 +72,6 @@ static int ab_active_port_get(struct team *team, struct team_gsetter_ctx *ctx)
 		ctx->data.u32_val = active_port->dev->ifindex;
 	else
 		ctx->data.u32_val = 0;
-	return 0;
 }
 
 static int ab_active_port_set(struct team *team, struct team_gsetter_ctx *ctx)
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index 50c015cd0682..2f1573f253ec 100644
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -242,19 +242,18 @@ static bool lb_transmit(struct team *team, struct sk_buff *skb)
 	return false;
 }
 
-static int lb_bpf_func_get(struct team *team, struct team_gsetter_ctx *ctx)
+static void lb_bpf_func_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
 	struct lb_priv *lb_priv = get_lb_priv(team);
 
 	if (!lb_priv->ex->orig_fprog) {
 		ctx->data.bin_val.len = 0;
 		ctx->data.bin_val.ptr = NULL;
-		return 0;
+		return;
 	}
 	ctx->data.bin_val.len = lb_priv->ex->orig_fprog->len *
 				sizeof(struct sock_filter);
 	ctx->data.bin_val.ptr = lb_priv->ex->orig_fprog->filter;
-	return 0;
 }
 
 static int __fprog_create(struct sock_fprog_kern **pfprog, u32 data_len,
@@ -335,7 +334,7 @@ static void lb_bpf_func_free(struct team *team)
 	bpf_prog_destroy(fp);
 }
 
-static int lb_tx_method_get(struct team *team, struct team_gsetter_ctx *ctx)
+static void lb_tx_method_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
 	struct lb_priv *lb_priv = get_lb_priv(team);
 	lb_select_tx_port_func_t *func;
@@ -346,7 +345,6 @@ static int lb_tx_method_get(struct team *team, struct team_gsetter_ctx *ctx)
 	name = lb_select_tx_port_get_name(func);
 	BUG_ON(!name);
 	ctx->data.str_val = name;
-	return 0;
 }
 
 static int lb_tx_method_set(struct team *team, struct team_gsetter_ctx *ctx)
@@ -370,8 +368,8 @@ static void lb_tx_hash_to_port_mapping_init(struct team *team,
 	LB_HTPM_OPT_INST_INFO_BY_HASH(lb_priv, hash) = info;
 }
 
-static int lb_tx_hash_to_port_mapping_get(struct team *team,
-					  struct team_gsetter_ctx *ctx)
+static void lb_tx_hash_to_port_mapping_get(struct team *team,
+					   struct team_gsetter_ctx *ctx)
 {
 	struct lb_priv *lb_priv = get_lb_priv(team);
 	struct team_port *port;
@@ -379,7 +377,6 @@ static int lb_tx_hash_to_port_mapping_get(struct team *team,
 
 	port = LB_HTPM_PORT_BY_HASH(lb_priv, hash);
 	ctx->data.u32_val = port ? port->dev->ifindex : 0;
-	return 0;
 }
 
 static int lb_tx_hash_to_port_mapping_set(struct team *team,
@@ -409,14 +406,13 @@ static void lb_hash_stats_init(struct team *team,
 	lb_priv->ex->stats.info[hash].opt_inst_info = info;
 }
 
-static int lb_hash_stats_get(struct team *team, struct team_gsetter_ctx *ctx)
+static void lb_hash_stats_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
 	struct lb_priv *lb_priv = get_lb_priv(team);
 	unsigned char hash = ctx->info->array_index;
 
 	ctx->data.bin_val.ptr = &lb_priv->ex->stats.info[hash].stats;
 	ctx->data.bin_val.len = sizeof(struct lb_stats);
-	return 0;
 }
 
 static void lb_port_stats_init(struct team *team,
@@ -428,14 +424,13 @@ static void lb_port_stats_init(struct team *team,
 	lb_port_priv->stats_info.opt_inst_info = info;
 }
 
-static int lb_port_stats_get(struct team *team, struct team_gsetter_ctx *ctx)
+static void lb_port_stats_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
 	struct team_port *port = ctx->info->port;
 	struct lb_port_priv *lb_port_priv = get_lb_port_priv(port);
 
 	ctx->data.bin_val.ptr = &lb_port_priv->stats_info.stats;
 	ctx->data.bin_val.len = sizeof(struct lb_stats);
-	return 0;
 }
 
 static void __lb_stats_info_refresh_prepare(struct lb_stats_info *s_info)
@@ -528,13 +523,12 @@ static void lb_stats_refresh(struct work_struct *work)
 	mutex_unlock(&team->lock);
 }
 
-static int lb_stats_refresh_interval_get(struct team *team,
-					 struct team_gsetter_ctx *ctx)
+static void lb_stats_refresh_interval_get(struct team *team,
+					  struct team_gsetter_ctx *ctx)
 {
 	struct lb_priv *lb_priv = get_lb_priv(team);
 
 	ctx->data.u32_val = lb_priv->ex->stats.refresh_interval;
-	return 0;
 }
 
 static int lb_stats_refresh_interval_set(struct team *team,
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index fc01c3cfe86d..1b9b15a492fa 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -163,7 +163,7 @@ struct team_option {
 	unsigned int array_size; /* != 0 means the option is array */
 	enum team_option_type type;
 	void (*init)(struct team *team, struct team_option_inst_info *info);
-	int (*getter)(struct team *team, struct team_gsetter_ctx *ctx);
+	void (*getter)(struct team *team, struct team_gsetter_ctx *ctx);
 	int (*setter)(struct team *team, struct team_gsetter_ctx *ctx);
 };
 
-- 
2.34.1

[PATCH net-next 5/6] team: get lb_priv from team directly in lb_htpm_select_tx_port

[Zhengchao Shao]

In order to delete unnecessary input parameter lb_priv, get "lb_priv" from
"team" directly in lb_htpm_select_tx_port.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
 drivers/net/team/team_mode_loadbalance.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index 2f1573f253ec..a6021ae51d0d 100644
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -129,10 +129,11 @@ static struct team_port *lb_hash_select_tx_port(struct team *team,
 
 /* Hash to port mapping select tx port */
 static struct team_port *lb_htpm_select_tx_port(struct team *team,
-						struct lb_priv *lb_priv,
+						struct lb_priv *lb__priv,
 						struct sk_buff *skb,
 						unsigned char hash)
 {
+	struct lb_priv *lb_priv = get_lb_priv(team);
 	struct team_port *port;
 
 	port = rcu_dereference_bh(LB_HTPM_PORT_BY_HASH(lb_priv, hash));
-- 
2.34.1

[PATCH net-next 6/6] team: remove unused input parameters in lb_htpm_select_tx_port and lb_hash_select_tx_port

[Zhengchao Shao]

The input parameters "lb_priv" and "skb" in lb_htpm_select_tx_port and
lb_hash_select_tx_port are unused, so remove them.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
 drivers/net/team/team_mode_loadbalance.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index a6021ae51d0d..00f8989c29c0 100644
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -30,8 +30,6 @@ static rx_handler_result_t lb_receive(struct team *team, struct team_port *port,
 struct lb_priv;
 
 typedef struct team_port *lb_select_tx_port_func_t(struct team *,
-						   struct lb_priv *,
-						   struct sk_buff *,
 						   unsigned char);
 
 #define LB_TX_HASHTABLE_SIZE 256 /* hash is a char */
@@ -118,8 +116,6 @@ static void lb_tx_hash_to_port_mapping_null_port(struct team *team,
 
 /* Basic tx selection based solely by hash */
 static struct team_port *lb_hash_select_tx_port(struct team *team,
-						struct lb_priv *lb_priv,
-						struct sk_buff *skb,
 						unsigned char hash)
 {
 	int port_index = team_num_to_port_index(team, hash);
@@ -129,8 +125,6 @@ static struct team_port *lb_hash_select_tx_port(struct team *team,
 
 /* Hash to port mapping select tx port */
 static struct team_port *lb_htpm_select_tx_port(struct team *team,
-						struct lb_priv *lb__priv,
-						struct sk_buff *skb,
 						unsigned char hash)
 {
 	struct lb_priv *lb_priv = get_lb_priv(team);
@@ -140,7 +134,7 @@ static struct team_port *lb_htpm_select_tx_port(struct team *team,
 	if (likely(port))
 		return port;
 	/* If no valid port in the table, fall back to simple hash */
-	return lb_hash_select_tx_port(team, lb_priv, skb, hash);
+	return lb_hash_select_tx_port(team, hash);
 }
 
 struct lb_select_tx_port {
@@ -230,7 +224,7 @@ static bool lb_transmit(struct team *team, struct sk_buff *skb)
 
 	hash = lb_get_skb_hash(lb_priv, skb);
 	select_tx_port_func = rcu_dereference_bh(lb_priv->select_tx_port_func);
-	port = select_tx_port_func(team, lb_priv, skb, hash);
+	port = select_tx_port_func(team, hash);
 	if (unlikely(!port))
 		goto drop;
 	if (team_dev_queue_xmit(team, port, skb))
-- 
2.34.1

Re: [PATCH net-next 6/6] team: remove unused input parameters in lb_htpm_select_tx_port and lb_hash_select_tx_port

[Jiri Pirko]

Fri, Aug 04, 2023 at 02:31:16PM CEST, shaozhengchao@huawei.com wrote:
>The input parameters "lb_priv" and "skb" in lb_htpm_select_tx_port and
>lb_hash_select_tx_port are unused, so remove them.
>
>Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
>---
> drivers/net/team/team_mode_loadbalance.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
>index a6021ae51d0d..00f8989c29c0 100644
>--- a/drivers/net/team/team_mode_loadbalance.c
>+++ b/drivers/net/team/team_mode_loadbalance.c
>@@ -30,8 +30,6 @@ static rx_handler_result_t lb_receive(struct team *team, struct team_port *port,
> struct lb_priv;
> 
> typedef struct team_port *lb_select_tx_port_func_t(struct team *,
>-						   struct lb_priv *,
>-						   struct sk_buff *,
> 						   unsigned char);
> 
> #define LB_TX_HASHTABLE_SIZE 256 /* hash is a char */
>@@ -118,8 +116,6 @@ static void lb_tx_hash_to_port_mapping_null_port(struct team *team,
> 
> /* Basic tx selection based solely by hash */
> static struct team_port *lb_hash_select_tx_port(struct team *team,
>-						struct lb_priv *lb_priv,
>-						struct sk_buff *skb,
> 						unsigned char hash)
> {
> 	int port_index = team_num_to_port_index(team, hash);
>@@ -129,8 +125,6 @@ static struct team_port *lb_hash_select_tx_port(struct team *team,
> 
> /* Hash to port mapping select tx port */
> static struct team_port *lb_htpm_select_tx_port(struct team *team,
>-						struct lb_priv *lb__priv,

Squash the previous patch in this one to avoid this odd "__" thing.

Thanks!


>-						struct sk_buff *skb,
> 						unsigned char hash)
> {
> 	struct lb_priv *lb_priv = get_lb_priv(team);
>@@ -140,7 +134,7 @@ static struct team_port *lb_htpm_select_tx_port(struct team *team,
> 	if (likely(port))
> 		return port;
> 	/* If no valid port in the table, fall back to simple hash */
>-	return lb_hash_select_tx_port(team, lb_priv, skb, hash);
>+	return lb_hash_select_tx_port(team, hash);
> }
> 
> struct lb_select_tx_port {
>@@ -230,7 +224,7 @@ static bool lb_transmit(struct team *team, struct sk_buff *skb)
> 
> 	hash = lb_get_skb_hash(lb_priv, skb);
> 	select_tx_port_func = rcu_dereference_bh(lb_priv->select_tx_port_func);
>-	port = select_tx_port_func(team, lb_priv, skb, hash);
>+	port = select_tx_port_func(team, hash);
> 	if (unlikely(!port))
> 		goto drop;
> 	if (team_dev_queue_xmit(team, port, skb))
>-- 
>2.34.1
>

Re: [PATCH net-next 6/6] team: remove unused input parameters in lb_htpm_select_tx_port and lb_hash_select_tx_port

[shaozhengchao]

On 2023/8/4 21:45, Jiri Pirko wrote:
> Fri, Aug 04, 2023 at 02:31:16PM CEST, shaozhengchao@huawei.com wrote:
>> The input parameters "lb_priv" and "skb" in lb_htpm_select_tx_port and
>> lb_hash_select_tx_port are unused, so remove them.
>>
>> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
>> ---
>> drivers/net/team/team_mode_loadbalance.c | 10 ++--------
>> 1 file changed, 2 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
>> index a6021ae51d0d..00f8989c29c0 100644
>> --- a/drivers/net/team/team_mode_loadbalance.c
>> +++ b/drivers/net/team/team_mode_loadbalance.c
>> @@ -30,8 +30,6 @@ static rx_handler_result_t lb_receive(struct team *team, struct team_port *port,
>> struct lb_priv;
>>
>> typedef struct team_port *lb_select_tx_port_func_t(struct team *,
>> -						   struct lb_priv *,
>> -						   struct sk_buff *,
>> 						   unsigned char);
>>
>> #define LB_TX_HASHTABLE_SIZE 256 /* hash is a char */
>> @@ -118,8 +116,6 @@ static void lb_tx_hash_to_port_mapping_null_port(struct team *team,
>>
>> /* Basic tx selection based solely by hash */
>> static struct team_port *lb_hash_select_tx_port(struct team *team,
>> -						struct lb_priv *lb_priv,
>> -						struct sk_buff *skb,
>> 						unsigned char hash)
>> {
>> 	int port_index = team_num_to_port_index(team, hash);
>> @@ -129,8 +125,6 @@ static struct team_port *lb_hash_select_tx_port(struct team *team,
>>
>> /* Hash to port mapping select tx port */
>> static struct team_port *lb_htpm_select_tx_port(struct team *team,
>> -						struct lb_priv *lb__priv,
> 
> Squash the previous patch in this one to avoid this odd "__" thing.
> 
> Thanks!
> 
Hi Jiri:
	Thank you for your review. I will change it and send v2.

Zhengchao Shao
> 
>> -						struct sk_buff *skb,
>> 						unsigned char hash)
>> {
>> 	struct lb_priv *lb_priv = get_lb_priv(team);
>> @@ -140,7 +134,7 @@ static struct team_port *lb_htpm_select_tx_port(struct team *team,
>> 	if (likely(port))
>> 		return port;
>> 	/* If no valid port in the table, fall back to simple hash */
>> -	return lb_hash_select_tx_port(team, lb_priv, skb, hash);
>> +	return lb_hash_select_tx_port(team, hash);
>> }
>>
>> struct lb_select_tx_port {
>> @@ -230,7 +224,7 @@ static bool lb_transmit(struct team *team, struct sk_buff *skb)
>>
>> 	hash = lb_get_skb_hash(lb_priv, skb);
>> 	select_tx_port_func = rcu_dereference_bh(lb_priv->select_tx_port_func);
>> -	port = select_tx_port_func(team, lb_priv, skb, hash);
>> +	port = select_tx_port_func(team, hash);
>> 	if (unlikely(!port))
>> 		goto drop;
>> 	if (team_dev_queue_xmit(team, port, skb))
>> -- 
>> 2.34.1
>>
> 

Re: [PATCH net-next 6/6] team: remove unused input parameters in lb_htpm_select_tx_port and lb_hash_select_tx_port

[Jiri Pirko]

Fri, Aug 04, 2023 at 04:06:39PM CEST, shaozhengchao@huawei.com wrote:
>
>
>On 2023/8/4 21:45, Jiri Pirko wrote:
>> Fri, Aug 04, 2023 at 02:31:16PM CEST, shaozhengchao@huawei.com wrote:
>> > The input parameters "lb_priv" and "skb" in lb_htpm_select_tx_port and
>> > lb_hash_select_tx_port are unused, so remove them.
>> > 
>> > Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
>> > ---
>> > drivers/net/team/team_mode_loadbalance.c | 10 ++--------
>> > 1 file changed, 2 insertions(+), 8 deletions(-)
>> > 
>> > diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
>> > index a6021ae51d0d..00f8989c29c0 100644
>> > --- a/drivers/net/team/team_mode_loadbalance.c
>> > +++ b/drivers/net/team/team_mode_loadbalance.c
>> > @@ -30,8 +30,6 @@ static rx_handler_result_t lb_receive(struct team *team, struct team_port *port,
>> > struct lb_priv;
>> > 
>> > typedef struct team_port *lb_select_tx_port_func_t(struct team *,
>> > -						   struct lb_priv *,
>> > -						   struct sk_buff *,
>> > 						   unsigned char);
>> > 
>> > #define LB_TX_HASHTABLE_SIZE 256 /* hash is a char */
>> > @@ -118,8 +116,6 @@ static void lb_tx_hash_to_port_mapping_null_port(struct team *team,
>> > 
>> > /* Basic tx selection based solely by hash */
>> > static struct team_port *lb_hash_select_tx_port(struct team *team,
>> > -						struct lb_priv *lb_priv,
>> > -						struct sk_buff *skb,
>> > 						unsigned char hash)
>> > {
>> > 	int port_index = team_num_to_port_index(team, hash);
>> > @@ -129,8 +125,6 @@ static struct team_port *lb_hash_select_tx_port(struct team *team,
>> > 
>> > /* Hash to port mapping select tx port */
>> > static struct team_port *lb_htpm_select_tx_port(struct team *team,
>> > -						struct lb_priv *lb__priv,
>> 
>> Squash the previous patch in this one to avoid this odd "__" thing.
>> 
>> Thanks!
>> 
>Hi Jiri:
>	Thank you for your review. I will change it and send v2.

Did you hear about netdev rules by any chance?

https://www.kernel.org/doc/html/v6.5-rc4/process/maintainer-netdev.html?highlight=24h

Could you please read it?


>
>Zhengchao Shao
>> 
>> > -						struct sk_buff *skb,
>> > 						unsigned char hash)
>> > {
>> > 	struct lb_priv *lb_priv = get_lb_priv(team);
>> > @@ -140,7 +134,7 @@ static struct team_port *lb_htpm_select_tx_port(struct team *team,
>> > 	if (likely(port))
>> > 		return port;
>> > 	/* If no valid port in the table, fall back to simple hash */
>> > -	return lb_hash_select_tx_port(team, lb_priv, skb, hash);
>> > +	return lb_hash_select_tx_port(team, hash);
>> > }
>> > 
>> > struct lb_select_tx_port {
>> > @@ -230,7 +224,7 @@ static bool lb_transmit(struct team *team, struct sk_buff *skb)
>> > 
>> > 	hash = lb_get_skb_hash(lb_priv, skb);
>> > 	select_tx_port_func = rcu_dereference_bh(lb_priv->select_tx_port_func);
>> > -	port = select_tx_port_func(team, lb_priv, skb, hash);
>> > +	port = select_tx_port_func(team, hash);
>> > 	if (unlikely(!port))
>> > 		goto drop;
>> > 	if (team_dev_queue_xmit(team, port, skb))
>> > -- 
>> > 2.34.1
>> > 
>> 

Re: [PATCH net-next 6/6] team: remove unused input parameters in lb_htpm_select_tx_port and lb_hash_select_tx_port

[shaozhengchao]

On 2023/8/5 0:56, Jiri Pirko wrote:
> Fri, Aug 04, 2023 at 04:06:39PM CEST, shaozhengchao@huawei.com wrote:
>>
>>
>> On 2023/8/4 21:45, Jiri Pirko wrote:
>>> Fri, Aug 04, 2023 at 02:31:16PM CEST, shaozhengchao@huawei.com wrote:
>>>> The input parameters "lb_priv" and "skb" in lb_htpm_select_tx_port and
>>>> lb_hash_select_tx_port are unused, so remove them.
>>>>
>>>> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
>>>> ---
>>>> drivers/net/team/team_mode_loadbalance.c | 10 ++--------
>>>> 1 file changed, 2 insertions(+), 8 deletions(-)
>>>>
>>>> diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
>>>> index a6021ae51d0d..00f8989c29c0 100644
>>>> --- a/drivers/net/team/team_mode_loadbalance.c
>>>> +++ b/drivers/net/team/team_mode_loadbalance.c
>>>> @@ -30,8 +30,6 @@ static rx_handler_result_t lb_receive(struct team *team, struct team_port *port,
>>>> struct lb_priv;
>>>>
>>>> typedef struct team_port *lb_select_tx_port_func_t(struct team *,
>>>> -						   struct lb_priv *,
>>>> -						   struct sk_buff *,
>>>> 						   unsigned char);
>>>>
>>>> #define LB_TX_HASHTABLE_SIZE 256 /* hash is a char */
>>>> @@ -118,8 +116,6 @@ static void lb_tx_hash_to_port_mapping_null_port(struct team *team,
>>>>
>>>> /* Basic tx selection based solely by hash */
>>>> static struct team_port *lb_hash_select_tx_port(struct team *team,
>>>> -						struct lb_priv *lb_priv,
>>>> -						struct sk_buff *skb,
>>>> 						unsigned char hash)
>>>> {
>>>> 	int port_index = team_num_to_port_index(team, hash);
>>>> @@ -129,8 +125,6 @@ static struct team_port *lb_hash_select_tx_port(struct team *team,
>>>>
>>>> /* Hash to port mapping select tx port */
>>>> static struct team_port *lb_htpm_select_tx_port(struct team *team,
>>>> -						struct lb_priv *lb__priv,
>>>
>>> Squash the previous patch in this one to avoid this odd "__" thing.
>>>
>>> Thanks!
>>>
>> Hi Jiri:
>> 	Thank you for your review. I will change it and send v2.
> 
> Did you hear about netdev rules by any chance?
> 
> https://www.kernel.org/doc/html/v6.5-rc4/process/maintainer-netdev.html?highlight=24h
> 
> Could you please read it?
> 
Thank you. I will read it.

Zhengchao Shao
> 
>>
>> Zhengchao Shao
>>>
>>>> -						struct sk_buff *skb,
>>>> 						unsigned char hash)
>>>> {
>>>> 	struct lb_priv *lb_priv = get_lb_priv(team);
>>>> @@ -140,7 +134,7 @@ static struct team_port *lb_htpm_select_tx_port(struct team *team,
>>>> 	if (likely(port))
>>>> 		return port;
>>>> 	/* If no valid port in the table, fall back to simple hash */
>>>> -	return lb_hash_select_tx_port(team, lb_priv, skb, hash);
>>>> +	return lb_hash_select_tx_port(team, hash);
>>>> }
>>>>
>>>> struct lb_select_tx_port {
>>>> @@ -230,7 +224,7 @@ static bool lb_transmit(struct team *team, struct sk_buff *skb)
>>>>
>>>> 	hash = lb_get_skb_hash(lb_priv, skb);
>>>> 	select_tx_port_func = rcu_dereference_bh(lb_priv->select_tx_port_func);
>>>> -	port = select_tx_port_func(team, lb_priv, skb, hash);
>>>> +	port = select_tx_port_func(team, hash);
>>>> 	if (unlikely(!port))
>>>> 		goto drop;
>>>> 	if (team_dev_queue_xmit(team, port, skb))
>>>> -- 
>>>> 2.34.1
>>>>
>>>
> 

Re: [PATCH net-next 0/6] team: do some cleanups in team driver

[Simon Horman]

On Fri, Aug 04, 2023 at 08:31:10PM +0800, Zhengchao Shao wrote:
> Do some cleanups in team driver.
> 
> Zhengchao Shao (6):
>   team: add __exit modifier to team_nl_fini()
>   team: remove unreferenced header in activebackup/broadcast/roundrobin
>     files
>   team: change the init function in the team_option structure to void
>   team: change the getter function in the team_option structure to void
>   team: get lb_priv from team directly in lb_htpm_select_tx_port
>   team: remove unused input parameters in lb_htpm_select_tx_port and
>     lb_hash_select_tx_port

Hi Zhengchao Shao,

Some of these patches appear to have been posted several times within
a few hours. Please follow the guidance that at least 24h must elapse
between posting the same patch. This is to allow time for review,
else things can get really confusing for the reviewers.

Link: https://docs.kernel.org/process/maintainer-netdev.html

Re: [PATCH net-next 0/6] team: do some cleanups in team driver

[shaozhengchao]

On 2023/8/5 19:55, Simon Horman wrote:
> On Fri, Aug 04, 2023 at 08:31:10PM +0800, Zhengchao Shao wrote:
>> Do some cleanups in team driver.
>>
>> Zhengchao Shao (6):
>>    team: add __exit modifier to team_nl_fini()
>>    team: remove unreferenced header in activebackup/broadcast/roundrobin
>>      files
>>    team: change the init function in the team_option structure to void
>>    team: change the getter function in the team_option structure to void
>>    team: get lb_priv from team directly in lb_htpm_select_tx_port
>>    team: remove unused input parameters in lb_htpm_select_tx_port and
>>      lb_hash_select_tx_port
> 
> Hi Zhengchao Shao,
> 
> Some of these patches appear to have been posted several times within
> a few hours. Please follow the guidance that at least 24h must elapse
> between posting the same patch. This is to allow time for review,
> else things can get really confusing for the reviewers.
> 
> Link: https://docs.kernel.org/process/maintainer-netdev.html

Hi Simon:
	I'll follow this rule. Thank you for reminding me.

Zhengchao Shao