summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJianbo Liu <jianbol@nvidia.com>2023-10-12 02:00:44 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-12-20 17:01:44 +0100
commit4a95f412b7ee000b279df4842ad227a6eadec89c (patch)
tree85d3c045b2ec318e41fe4cb9e393685b05295117
parent594a306461de8617a4b497b88a0c7670c4d93f2e (diff)
downloadlinux-stable-4a95f412b7ee000b279df4842ad227a6eadec89c.tar.gz
linux-stable-4a95f412b7ee000b279df4842ad227a6eadec89c.tar.bz2
linux-stable-4a95f412b7ee000b279df4842ad227a6eadec89c.zip
net/mlx5e: Check the number of elements before walk TC rhashtable
[ Upstream commit 4e25b661f484df54b6751b65f9ea2434a3b67539 ] After IPSec TX tables are destroyed, the flow rules in TC rhashtable, which have the destination to IPSec, are restored to the original one, the uplink. However, when the device is in switchdev mode and unload driver with IPSec rules configured, TC rhashtable cleanup is done before IPSec cleanup, which means tc_ht->tbl is already freed when walking TC rhashtable, in order to restore the destination. So add the checking before walking to avoid unexpected behavior. Fixes: d1569537a837 ("net/mlx5e: Modify and restore TC rules for IPSec TX rules") Signed-off-by: Jianbo Liu <jianbol@nvidia.com> Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c
index 13b5916b64e2..d5d33c3b3aa2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c
@@ -152,7 +152,7 @@ void mlx5_esw_ipsec_restore_dest_uplink(struct mlx5_core_dev *mdev)
xa_for_each(&esw->offloads.vport_reps, i, rep) {
rpriv = rep->rep_data[REP_ETH].priv;
- if (!rpriv || !rpriv->netdev)
+ if (!rpriv || !rpriv->netdev || !atomic_read(&rpriv->tc_ht.nelems))
continue;
rhashtable_walk_enter(&rpriv->tc_ht, &iter);