All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zizhuang Deng <sunsetdzz@gmail.com>
To: saeedm@nvidia.com, leon@kernel.org, davem@davemloft.net, kuba@kernel.org
Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org,
	linux-kernel@vger.kernel.org, Zizhuang Deng <sunsetdzz@gmail.com>
Subject: [PATCH] net/mlx5: Add vport return value checks
Date: Thu, 30 Dec 2021 13:25:58 +0800	[thread overview]
Message-ID: <20211230052558.959617-1-sunsetdzz@gmail.com> (raw)

add missing vport return value checks for recent code, as in [1].

Ref:
[1] https://lkml.org/lkml/2020/11/1/315

Signed-off-by: Zizhuang Deng <sunsetdzz@gmail.com>
---
 .../mellanox/mlx5/core/eswitch_offloads.c     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index f4eaa5893886..fda214021738 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -1230,6 +1230,8 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,
 
 	if (mlx5_core_is_ecpf_esw_manager(esw->dev)) {
 		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_PF);
+		if (IS_ERR(vport))
+			return PTR_ERR(vport);
 		esw_set_peer_miss_rule_source_port(esw, peer_dev->priv.eswitch,
 						   spec, MLX5_VPORT_PF);
 
@@ -1244,6 +1246,8 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,
 
 	if (mlx5_ecpf_vport_exists(esw->dev)) {
 		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_ECPF);
+		if (IS_ERR(vport))
+			return PTR_ERR(vport);
 		MLX5_SET(fte_match_set_misc, misc, source_port, MLX5_VPORT_ECPF);
 		flow = mlx5_add_flow_rules(esw->fdb_table.offloads.slow_fdb,
 					   spec, &flow_act, &dest, 1);
@@ -1281,11 +1285,15 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,
 	}
 	if (mlx5_ecpf_vport_exists(esw->dev)) {
 		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_ECPF);
+		if (IS_ERR(vport))
+			return PTR_ERR(vport);
 		mlx5_del_flow_rules(flows[vport->index]);
 	}
 add_ecpf_flow_err:
 	if (mlx5_core_is_ecpf_esw_manager(esw->dev)) {
 		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_PF);
+		if (IS_ERR(vport))
+			return PTR_ERR(vport);
 		mlx5_del_flow_rules(flows[vport->index]);
 	}
 add_pf_flow_err:
@@ -1309,11 +1317,15 @@ static void esw_del_fdb_peer_miss_rules(struct mlx5_eswitch *esw)
 
 	if (mlx5_ecpf_vport_exists(esw->dev)) {
 		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_ECPF);
+		if (IS_ERR(vport))
+			return;
 		mlx5_del_flow_rules(flows[vport->index]);
 	}
 
 	if (mlx5_core_is_ecpf_esw_manager(esw->dev)) {
 		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_PF);
+		if (IS_ERR(vport))
+			return;
 		mlx5_del_flow_rules(flows[vport->index]);
 	}
 	kvfree(flows);
@@ -2385,6 +2397,9 @@ static int esw_set_uplink_slave_ingress_root(struct mlx5_core_dev *master,
 	if (master) {
 		esw = master->priv.eswitch;
 		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_UPLINK);
+		if (IS_ERR(vport))
+			return PTR_ERR(vport);
+
 		MLX5_SET(set_flow_table_root_in, in, table_of_other_vport, 1);
 		MLX5_SET(set_flow_table_root_in, in, table_vport_number,
 			 MLX5_VPORT_UPLINK);
@@ -2405,6 +2420,9 @@ static int esw_set_uplink_slave_ingress_root(struct mlx5_core_dev *master,
 	} else {
 		esw = slave->priv.eswitch;
 		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_UPLINK);
+		if (IS_ERR(vport))
+			return PTR_ERR(vport);
+
 		ns = mlx5_get_flow_vport_acl_namespace(slave,
 						       MLX5_FLOW_NAMESPACE_ESW_INGRESS,
 						       vport->index);
@@ -2590,6 +2608,8 @@ static void esw_unset_master_egress_rule(struct mlx5_core_dev *dev)
 
 	vport = mlx5_eswitch_get_vport(dev->priv.eswitch,
 				       dev->priv.eswitch->manager_vport);
+	if (IS_ERR(vport))
+		return;
 
 	esw_acl_egress_ofld_cleanup(vport);
 }
-- 
2.25.1


             reply	other threads:[~2021-12-30  5:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-30  5:25 Zizhuang Deng [this message]
2021-12-31 22:46 ` [PATCH] net/mlx5: Add vport return value checks Saeed Mahameed

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=20211230052558.959617-1-sunsetdzz@gmail.com \
    --to=sunsetdzz@gmail.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=leon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=saeedm@nvidia.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.