Patchwork [net-next,1/2] mlxsw: spectrum: Use a stable ECMP/LAG seed

login
register
mail settings
Submitter Ido Schimmel
Date April 21, 2019, 7:18 a.m.
Message ID <20190421071735.15721-2-idosch@mellanox.com>
Download mbox | patch
Permalink /patch/777737/
State New
Headers show

Comments

Ido Schimmel - April 21, 2019, 7:18 a.m.
In order to get a consistent behavior of traffic flows across reboots /
module unload, we need to use the same ECMP/LAG seed.

Calculate the seed by hashing the base MAC of the device. This results
in a seed that is both unique (to avoid polarization) and consistent.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>

Acked-by: Jiri Pirko <jiri@mellanox.com>

---
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c        | 4 ++--
 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.20.1

Patch

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c

index fc325f1213fb..a1c2b117a2b3 100644

--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c

@@ -21,7 +21,7 @@ 

 #include <linux/dcbnl.h>
 #include <linux/inetdevice.h>
 #include <linux/netlink.h>
-#include <linux/random.h>

+#include <linux/jhash.h>

 #include <net/switchdev.h>
 #include <net/pkt_cls.h>
 #include <net/tc_act/tc_mirred.h>
@@ -4227,7 +4227,7 @@  static int mlxsw_sp_lag_init(struct mlxsw_sp *mlxsw_sp)

 	u32 seed;
 	int err;
 
-	get_random_bytes(&seed, sizeof(seed));

+	seed = jhash(mlxsw_sp->base_mac, sizeof(mlxsw_sp->base_mac), 0);

 	mlxsw_reg_slcr_pack(slcr_pl, MLXSW_REG_SLCR_LAG_HASH_SMAC |
 				     MLXSW_REG_SLCR_LAG_HASH_DMAC |
 				     MLXSW_REG_SLCR_LAG_HASH_ETHERTYPE |
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

index 64498c9f55ab..6c73400b1508 100644

--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

@@ -13,9 +13,9 @@ 

 #include <linux/socket.h>
 #include <linux/route.h>
 #include <linux/gcd.h>
-#include <linux/random.h>

 #include <linux/if_macvlan.h>
 #include <linux/refcount.h>
+#include <linux/jhash.h>

 #include <net/netevent.h>
 #include <net/neighbour.h>
 #include <net/arp.h>
@@ -7831,7 +7831,7 @@  static int mlxsw_sp_mp_hash_init(struct mlxsw_sp *mlxsw_sp)

 	char recr2_pl[MLXSW_REG_RECR2_LEN];
 	u32 seed;
 
-	get_random_bytes(&seed, sizeof(seed));

+	seed = jhash(mlxsw_sp->base_mac, sizeof(mlxsw_sp->base_mac), 0);

 	mlxsw_reg_recr2_pack(recr2_pl, seed);
 	mlxsw_sp_mp4_hash_init(recr2_pl);
 	mlxsw_sp_mp6_hash_init(recr2_pl);