diff mbox series

[net,1/6] net/mlx5: Lag, fix multipath lag activation

Message ID 20210826221810.215968-2-saeed@kernel.org
State New
Headers show
Series [net,1/6] net/mlx5: Lag, fix multipath lag activation | expand

Commit Message

Saeed Mahameed Aug. 26, 2021, 10:18 p.m. UTC 
From: Dima Chumak <dchumak@nvidia.com>

When handling FIB_EVENT_ENTRY_REPLACE event for a new multipath route,
lag activation can be missed if a stale (struct lag_mp)->mfi pointer
exists, which was associated with an older multipath route that had been
removed.

Normally, when a route is removed, it triggers mlx5_lag_fib_event(),
which handles FIB_EVENT_ENTRY_DEL and clears mfi pointer. But, if
mlx5_lag_check_prereq() condition isn't met, for example when eswitch is
in legacy mode, the fib event is skipped and mfi pointer becomes stale.

Fix by resetting mfi pointer to NULL in mlx5_deactivate_lag().

Fixes: 8a66e4585979 ("net/mlx5: Change ownership model for lag")
Signed-off-by: Dima Chumak <dchumak@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/lag.c    | 1 +
 drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 8 ++++++++
 drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h | 2 ++
 3 files changed, 11 insertions(+)

Comments

patchwork-bot+netdevbpf@kernel.org Aug. 27, 2021, 9:10 a.m. UTC | #1 
Hello:

This series was applied to netdev/net.git (refs/heads/master):

On Thu, 26 Aug 2021 15:18:05 -0700 you wrote:
> From: Dima Chumak <dchumak@nvidia.com>

> 

> When handling FIB_EVENT_ENTRY_REPLACE event for a new multipath route,

> lag activation can be missed if a stale (struct lag_mp)->mfi pointer

> exists, which was associated with an older multipath route that had been

> removed.

> 

> [...]


Here is the summary with links:
  - [net,1/6] net/mlx5: Lag, fix multipath lag activation
    https://git.kernel.org/netdev/net/c/2f8b6161cca5
  - [net,2/6] net/mlx5: Remove all auxiliary devices at the unregister event
    https://git.kernel.org/netdev/net/c/8e7e2e8ed0e2
  - [net,3/6] net/mlx5e: Fix possible use-after-free deleting fdb rule
    https://git.kernel.org/netdev/net/c/9a5f9cc794e1
  - [net,4/6] net/mlx5: E-Switch, Set vhca id valid flag when creating indir fwd group
    https://git.kernel.org/netdev/net/c/ca6891f9b27d
  - [net,5/6] net/mlx5e: Use correct eswitch for stack devices with lag
    https://git.kernel.org/netdev/net/c/f9d196bd632b
  - [net,6/6] net/mlx5: DR, fix a potential use-after-free bug
    https://git.kernel.org/netdev/net/c/6cc64770fb38

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag.c
index 5c043c5cc403..40ef60f562b4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag.c
@@ -277,6 +277,7 @@  static int mlx5_deactivate_lag(struct mlx5_lag *ldev)
 	int err;
 
 	ldev->flags &= ~MLX5_LAG_MODE_FLAGS;
+	mlx5_lag_mp_reset(ldev);
 
 	MLX5_SET(destroy_lag_in, in, opcode, MLX5_CMD_OP_DESTROY_LAG);
 	err = mlx5_cmd_exec_in(dev0, destroy_lag, in);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c b/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
index c4bf8b679541..516bfc2bd797 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
@@ -302,6 +302,14 @@  static int mlx5_lag_fib_event(struct notifier_block *nb,
 	return NOTIFY_DONE;
 }
 
+void mlx5_lag_mp_reset(struct mlx5_lag *ldev)
+{
+	/* Clear mfi, as it might become stale when a route delete event
+	 * has been missed, see mlx5_lag_fib_route_event().
+	 */
+	ldev->lag_mp.mfi = NULL;
+}
+
 int mlx5_lag_mp_init(struct mlx5_lag *ldev)
 {
 	struct lag_mp *mp = &ldev->lag_mp;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h b/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h
index 258ac7b2964e..729c839397a8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h
@@ -21,11 +21,13 @@  struct lag_mp {
 
 #ifdef CONFIG_MLX5_ESWITCH
 
+void mlx5_lag_mp_reset(struct mlx5_lag *ldev);
 int mlx5_lag_mp_init(struct mlx5_lag *ldev);
 void mlx5_lag_mp_cleanup(struct mlx5_lag *ldev);
 
 #else /* CONFIG_MLX5_ESWITCH */
 
+static inline void mlx5_lag_mp_reset(struct mlx5_lag *ldev) {};
 static inline int mlx5_lag_mp_init(struct mlx5_lag *ldev) { return 0; }
 static inline void mlx5_lag_mp_cleanup(struct mlx5_lag *ldev) {}