net/mlx5e: Lag, Don't skip fib events on current dst

Referenced change added check to skip updating fib when new fib instance
has same or lower priority. However, new fib instance can be an update on
same dst address as existing one even though the structure is another
instance that has different address. Ignoring events on such instances
causes multipath LAG state to not be correctly updated.

Track 'dst' and 'dst_len' fields of fib event fib_entry_notifier_info
structure and don't skip events that have the same value of that fields.

Fixes: ad11c4f1d8fd ("net/mlx5e: Lag, Only handle events from highest priority multipath entry")
Signed-off-by: Vlad Buslov <vladbu@nvidia.com>
Reviewed-by: Maor Dickman <maord@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
index 9a5884e8a8bf507dacc7b8dc1f788f7f16f0c99e..d6c3e6dfd71fc0576f71f88158047b1358f33c7f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
@@ -100,10 +100,12 @@ static void mlx5_lag_fib_event_flush(struct notifier_block *nb)
        flush_workqueue(mp->wq);
 }
 
-static void mlx5_lag_fib_set(struct lag_mp *mp, struct fib_info *fi)
+static void mlx5_lag_fib_set(struct lag_mp *mp, struct fib_info *fi, u32 dst, int dst_len)
 {
        mp->fib.mfi = fi;
        mp->fib.priority = fi->fib_priority;
+       mp->fib.dst = dst;
+       mp->fib.dst_len = dst_len;
 }
 
 struct mlx5_fib_event_work {
@@ -116,10 +118,10 @@ struct mlx5_fib_event_work {
        };
 };
 
-static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,
-                                    unsigned long event,
-                                    struct fib_info *fi)
+static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev, unsigned long event,
+                                    struct fib_entry_notifier_info *fen_info)
 {
+       struct fib_info *fi = fen_info->fi;
        struct lag_mp *mp = &ldev->lag_mp;
        struct fib_nh *fib_nh0, *fib_nh1;
        unsigned int nhs;
@@ -133,7 +135,9 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,
        }
 
        /* Handle multipath entry with lower priority value */
-       if (mp->fib.mfi && mp->fib.mfi != fi && fi->fib_priority >= mp->fib.priority)
+       if (mp->fib.mfi && mp->fib.mfi != fi &&
+           (mp->fib.dst != fen_info->dst || mp->fib.dst_len != fen_info->dst_len) &&
+           fi->fib_priority >= mp->fib.priority)
                return;
 
        /* Handle add/replace event */
@@ -149,7 +153,7 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,
 
                        i++;
                        mlx5_lag_set_port_affinity(ldev, i);
-                       mlx5_lag_fib_set(mp, fi);
+                       mlx5_lag_fib_set(mp, fi, fen_info->dst, fen_info->dst_len);
                }
 
                return;
@@ -179,7 +183,7 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,
        }
 
        mlx5_lag_set_port_affinity(ldev, MLX5_LAG_NORMAL_AFFINITY);
-       mlx5_lag_fib_set(mp, fi);
+       mlx5_lag_fib_set(mp, fi, fen_info->dst, fen_info->dst_len);
 }
 
 static void mlx5_lag_fib_nexthop_event(struct mlx5_lag *ldev,
@@ -220,7 +224,7 @@ static void mlx5_lag_fib_update(struct work_struct *work)
        case FIB_EVENT_ENTRY_REPLACE:
        case FIB_EVENT_ENTRY_DEL:
                mlx5_lag_fib_route_event(ldev, fib_work->event,
-                                        fib_work->fen_info.fi);
+                                        &fib_work->fen_info);
                fib_info_put(fib_work->fen_info.fi);
                break;
        case FIB_EVENT_NH_ADD:

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h
index 143226753c3a9934af8d9b62e7b1789ac440fe54..056a066da604b2a6c5f0650111e41e2f48afe703 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h
@@ -18,6 +18,8 @@ struct lag_mp {
        struct {
                const void        *mfi; /* used in tracking fib events */
                u32               priority;
+               u32               dst;
+               int               dst_len;
        } fib;
        struct workqueue_struct   *wq;
 };