@@ -1067,30 +1067,32 @@ static void mlx5_ldev_add_netdev(struct mlx5_lag *ldev,
10671067 struct net_device * netdev )
10681068{
10691069 unsigned int fn = mlx5_get_dev_index (dev );
1070+ unsigned long flags ;
10701071
10711072 if (fn >= ldev -> ports )
10721073 return ;
10731074
1074- spin_lock (& lag_lock );
1075+ spin_lock_irqsave (& lag_lock , flags );
10751076 ldev -> pf [fn ].netdev = netdev ;
10761077 ldev -> tracker .netdev_state [fn ].link_up = 0 ;
10771078 ldev -> tracker .netdev_state [fn ].tx_enabled = 0 ;
1078- spin_unlock (& lag_lock );
1079+ spin_unlock_irqrestore (& lag_lock , flags );
10791080}
10801081
10811082static void mlx5_ldev_remove_netdev (struct mlx5_lag * ldev ,
10821083 struct net_device * netdev )
10831084{
1085+ unsigned long flags ;
10841086 int i ;
10851087
1086- spin_lock (& lag_lock );
1088+ spin_lock_irqsave (& lag_lock , flags );
10871089 for (i = 0 ; i < ldev -> ports ; i ++ ) {
10881090 if (ldev -> pf [i ].netdev == netdev ) {
10891091 ldev -> pf [i ].netdev = NULL ;
10901092 break ;
10911093 }
10921094 }
1093- spin_unlock (& lag_lock );
1095+ spin_unlock_irqrestore (& lag_lock , flags );
10941096}
10951097
10961098static void mlx5_ldev_add_mdev (struct mlx5_lag * ldev ,
@@ -1246,12 +1248,13 @@ void mlx5_lag_add_netdev(struct mlx5_core_dev *dev,
12461248bool mlx5_lag_is_roce (struct mlx5_core_dev * dev )
12471249{
12481250 struct mlx5_lag * ldev ;
1251+ unsigned long flags ;
12491252 bool res ;
12501253
1251- spin_lock (& lag_lock );
1254+ spin_lock_irqsave (& lag_lock , flags );
12521255 ldev = mlx5_lag_dev (dev );
12531256 res = ldev && __mlx5_lag_is_roce (ldev );
1254- spin_unlock (& lag_lock );
1257+ spin_unlock_irqrestore (& lag_lock , flags );
12551258
12561259 return res ;
12571260}
@@ -1260,12 +1263,13 @@ EXPORT_SYMBOL(mlx5_lag_is_roce);
12601263bool mlx5_lag_is_active (struct mlx5_core_dev * dev )
12611264{
12621265 struct mlx5_lag * ldev ;
1266+ unsigned long flags ;
12631267 bool res ;
12641268
1265- spin_lock (& lag_lock );
1269+ spin_lock_irqsave (& lag_lock , flags );
12661270 ldev = mlx5_lag_dev (dev );
12671271 res = ldev && __mlx5_lag_is_active (ldev );
1268- spin_unlock (& lag_lock );
1272+ spin_unlock_irqrestore (& lag_lock , flags );
12691273
12701274 return res ;
12711275}
@@ -1274,13 +1278,14 @@ EXPORT_SYMBOL(mlx5_lag_is_active);
12741278bool mlx5_lag_is_master (struct mlx5_core_dev * dev )
12751279{
12761280 struct mlx5_lag * ldev ;
1281+ unsigned long flags ;
12771282 bool res ;
12781283
1279- spin_lock (& lag_lock );
1284+ spin_lock_irqsave (& lag_lock , flags );
12801285 ldev = mlx5_lag_dev (dev );
12811286 res = ldev && __mlx5_lag_is_active (ldev ) &&
12821287 dev == ldev -> pf [MLX5_LAG_P1 ].dev ;
1283- spin_unlock (& lag_lock );
1288+ spin_unlock_irqrestore (& lag_lock , flags );
12841289
12851290 return res ;
12861291}
@@ -1289,12 +1294,13 @@ EXPORT_SYMBOL(mlx5_lag_is_master);
12891294bool mlx5_lag_is_sriov (struct mlx5_core_dev * dev )
12901295{
12911296 struct mlx5_lag * ldev ;
1297+ unsigned long flags ;
12921298 bool res ;
12931299
1294- spin_lock (& lag_lock );
1300+ spin_lock_irqsave (& lag_lock , flags );
12951301 ldev = mlx5_lag_dev (dev );
12961302 res = ldev && __mlx5_lag_is_sriov (ldev );
1297- spin_unlock (& lag_lock );
1303+ spin_unlock_irqrestore (& lag_lock , flags );
12981304
12991305 return res ;
13001306}
@@ -1303,13 +1309,14 @@ EXPORT_SYMBOL(mlx5_lag_is_sriov);
13031309bool mlx5_lag_is_shared_fdb (struct mlx5_core_dev * dev )
13041310{
13051311 struct mlx5_lag * ldev ;
1312+ unsigned long flags ;
13061313 bool res ;
13071314
1308- spin_lock (& lag_lock );
1315+ spin_lock_irqsave (& lag_lock , flags );
13091316 ldev = mlx5_lag_dev (dev );
13101317 res = ldev && __mlx5_lag_is_sriov (ldev ) &&
13111318 test_bit (MLX5_LAG_MODE_FLAG_SHARED_FDB , & ldev -> mode_flags );
1312- spin_unlock (& lag_lock );
1319+ spin_unlock_irqrestore (& lag_lock , flags );
13131320
13141321 return res ;
13151322}
@@ -1352,9 +1359,10 @@ struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev)
13521359{
13531360 struct net_device * ndev = NULL ;
13541361 struct mlx5_lag * ldev ;
1362+ unsigned long flags ;
13551363 int i ;
13561364
1357- spin_lock (& lag_lock );
1365+ spin_lock_irqsave (& lag_lock , flags );
13581366 ldev = mlx5_lag_dev (dev );
13591367
13601368 if (!(ldev && __mlx5_lag_is_roce (ldev )))
@@ -1373,7 +1381,7 @@ struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev)
13731381 dev_hold (ndev );
13741382
13751383unlock :
1376- spin_unlock (& lag_lock );
1384+ spin_unlock_irqrestore (& lag_lock , flags );
13771385
13781386 return ndev ;
13791387}
@@ -1383,10 +1391,11 @@ u8 mlx5_lag_get_slave_port(struct mlx5_core_dev *dev,
13831391 struct net_device * slave )
13841392{
13851393 struct mlx5_lag * ldev ;
1394+ unsigned long flags ;
13861395 u8 port = 0 ;
13871396 int i ;
13881397
1389- spin_lock (& lag_lock );
1398+ spin_lock_irqsave (& lag_lock , flags );
13901399 ldev = mlx5_lag_dev (dev );
13911400 if (!(ldev && __mlx5_lag_is_roce (ldev )))
13921401 goto unlock ;
@@ -1401,7 +1410,7 @@ u8 mlx5_lag_get_slave_port(struct mlx5_core_dev *dev,
14011410 port = ldev -> v2p_map [port * ldev -> buckets ];
14021411
14031412unlock :
1404- spin_unlock (& lag_lock );
1413+ spin_unlock_irqrestore (& lag_lock , flags );
14051414 return port ;
14061415}
14071416EXPORT_SYMBOL (mlx5_lag_get_slave_port );
@@ -1422,8 +1431,9 @@ struct mlx5_core_dev *mlx5_lag_get_peer_mdev(struct mlx5_core_dev *dev)
14221431{
14231432 struct mlx5_core_dev * peer_dev = NULL ;
14241433 struct mlx5_lag * ldev ;
1434+ unsigned long flags ;
14251435
1426- spin_lock (& lag_lock );
1436+ spin_lock_irqsave (& lag_lock , flags );
14271437 ldev = mlx5_lag_dev (dev );
14281438 if (!ldev )
14291439 goto unlock ;
@@ -1433,7 +1443,7 @@ struct mlx5_core_dev *mlx5_lag_get_peer_mdev(struct mlx5_core_dev *dev)
14331443 ldev -> pf [MLX5_LAG_P1 ].dev ;
14341444
14351445unlock :
1436- spin_unlock (& lag_lock );
1446+ spin_unlock_irqrestore (& lag_lock , flags );
14371447 return peer_dev ;
14381448}
14391449EXPORT_SYMBOL (mlx5_lag_get_peer_mdev );
@@ -1446,6 +1456,7 @@ int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev,
14461456 int outlen = MLX5_ST_SZ_BYTES (query_cong_statistics_out );
14471457 struct mlx5_core_dev * * mdev ;
14481458 struct mlx5_lag * ldev ;
1459+ unsigned long flags ;
14491460 int num_ports ;
14501461 int ret , i , j ;
14511462 void * out ;
@@ -1462,7 +1473,7 @@ int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev,
14621473
14631474 memset (values , 0 , sizeof (* values ) * num_counters );
14641475
1465- spin_lock (& lag_lock );
1476+ spin_lock_irqsave (& lag_lock , flags );
14661477 ldev = mlx5_lag_dev (dev );
14671478 if (ldev && __mlx5_lag_is_active (ldev )) {
14681479 num_ports = ldev -> ports ;
@@ -1472,7 +1483,7 @@ int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev,
14721483 num_ports = 1 ;
14731484 mdev [MLX5_LAG_P1 ] = dev ;
14741485 }
1475- spin_unlock (& lag_lock );
1486+ spin_unlock_irqrestore (& lag_lock , flags );
14761487
14771488 for (i = 0 ; i < num_ports ; ++ i ) {
14781489 u32 in [MLX5_ST_SZ_DW (query_cong_statistics_in )] = {};
0 commit comments