@@ -691,30 +691,32 @@ static void mlx5_ldev_add_netdev(struct mlx5_lag *ldev,
691691 struct net_device * netdev )
692692{
693693 unsigned int fn = PCI_FUNC (dev -> pdev -> devfn );
694+ unsigned long flags ;
694695
695696 if (fn >= MLX5_MAX_PORTS )
696697 return ;
697698
698- spin_lock (& lag_lock );
699+ spin_lock_irqsave (& lag_lock , flags );
699700 ldev -> pf [fn ].netdev = netdev ;
700701 ldev -> tracker .netdev_state [fn ].link_up = 0 ;
701702 ldev -> tracker .netdev_state [fn ].tx_enabled = 0 ;
702- spin_unlock (& lag_lock );
703+ spin_unlock_irqrestore (& lag_lock , flags );
703704}
704705
705706static void mlx5_ldev_remove_netdev (struct mlx5_lag * ldev ,
706707 struct net_device * netdev )
707708{
709+ unsigned long flags ;
708710 int i ;
709711
710- spin_lock (& lag_lock );
712+ spin_lock_irqsave (& lag_lock , flags );
711713 for (i = 0 ; i < MLX5_MAX_PORTS ; i ++ ) {
712714 if (ldev -> pf [i ].netdev == netdev ) {
713715 ldev -> pf [i ].netdev = NULL ;
714716 break ;
715717 }
716718 }
717- spin_unlock (& lag_lock );
719+ spin_unlock_irqrestore (& lag_lock , flags );
718720}
719721
720722static void mlx5_ldev_add_mdev (struct mlx5_lag * ldev ,
@@ -855,12 +857,13 @@ void mlx5_lag_add_netdev(struct mlx5_core_dev *dev,
855857bool mlx5_lag_is_roce (struct mlx5_core_dev * dev )
856858{
857859 struct mlx5_lag * ldev ;
860+ unsigned long flags ;
858861 bool res ;
859862
860- spin_lock (& lag_lock );
863+ spin_lock_irqsave (& lag_lock , flags );
861864 ldev = mlx5_lag_dev (dev );
862865 res = ldev && __mlx5_lag_is_roce (ldev );
863- spin_unlock (& lag_lock );
866+ spin_unlock_irqrestore (& lag_lock , flags );
864867
865868 return res ;
866869}
@@ -869,12 +872,13 @@ EXPORT_SYMBOL(mlx5_lag_is_roce);
869872bool mlx5_lag_is_active (struct mlx5_core_dev * dev )
870873{
871874 struct mlx5_lag * ldev ;
875+ unsigned long flags ;
872876 bool res ;
873877
874- spin_lock (& lag_lock );
878+ spin_lock_irqsave (& lag_lock , flags );
875879 ldev = mlx5_lag_dev (dev );
876880 res = ldev && __mlx5_lag_is_active (ldev );
877- spin_unlock (& lag_lock );
881+ spin_unlock_irqrestore (& lag_lock , flags );
878882
879883 return res ;
880884}
@@ -883,13 +887,14 @@ EXPORT_SYMBOL(mlx5_lag_is_active);
883887bool mlx5_lag_is_master (struct mlx5_core_dev * dev )
884888{
885889 struct mlx5_lag * ldev ;
890+ unsigned long flags ;
886891 bool res ;
887892
888- spin_lock (& lag_lock );
893+ spin_lock_irqsave (& lag_lock , flags );
889894 ldev = mlx5_lag_dev (dev );
890895 res = ldev && __mlx5_lag_is_active (ldev ) &&
891896 dev == ldev -> pf [MLX5_LAG_P1 ].dev ;
892- spin_unlock (& lag_lock );
897+ spin_unlock_irqrestore (& lag_lock , flags );
893898
894899 return res ;
895900}
@@ -898,12 +903,13 @@ EXPORT_SYMBOL(mlx5_lag_is_master);
898903bool mlx5_lag_is_sriov (struct mlx5_core_dev * dev )
899904{
900905 struct mlx5_lag * ldev ;
906+ unsigned long flags ;
901907 bool res ;
902908
903- spin_lock (& lag_lock );
909+ spin_lock_irqsave (& lag_lock , flags );
904910 ldev = mlx5_lag_dev (dev );
905911 res = ldev && __mlx5_lag_is_sriov (ldev );
906- spin_unlock (& lag_lock );
912+ spin_unlock_irqrestore (& lag_lock , flags );
907913
908914 return res ;
909915}
@@ -912,12 +918,13 @@ EXPORT_SYMBOL(mlx5_lag_is_sriov);
912918bool mlx5_lag_is_shared_fdb (struct mlx5_core_dev * dev )
913919{
914920 struct mlx5_lag * ldev ;
921+ unsigned long flags ;
915922 bool res ;
916923
917- spin_lock (& lag_lock );
924+ spin_lock_irqsave (& lag_lock , flags );
918925 ldev = mlx5_lag_dev (dev );
919926 res = ldev && __mlx5_lag_is_sriov (ldev ) && ldev -> shared_fdb ;
920- spin_unlock (& lag_lock );
927+ spin_unlock_irqrestore (& lag_lock , flags );
921928
922929 return res ;
923930}
@@ -965,8 +972,9 @@ struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev)
965972{
966973 struct net_device * ndev = NULL ;
967974 struct mlx5_lag * ldev ;
975+ unsigned long flags ;
968976
969- spin_lock (& lag_lock );
977+ spin_lock_irqsave (& lag_lock , flags );
970978 ldev = mlx5_lag_dev (dev );
971979
972980 if (!(ldev && __mlx5_lag_is_roce (ldev )))
@@ -983,7 +991,7 @@ struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev)
983991 dev_hold (ndev );
984992
985993unlock :
986- spin_unlock (& lag_lock );
994+ spin_unlock_irqrestore (& lag_lock , flags );
987995
988996 return ndev ;
989997}
@@ -993,9 +1001,10 @@ u8 mlx5_lag_get_slave_port(struct mlx5_core_dev *dev,
9931001 struct net_device * slave )
9941002{
9951003 struct mlx5_lag * ldev ;
1004+ unsigned long flags ;
9961005 u8 port = 0 ;
9971006
998- spin_lock (& lag_lock );
1007+ spin_lock_irqsave (& lag_lock , flags );
9991008 ldev = mlx5_lag_dev (dev );
10001009 if (!(ldev && __mlx5_lag_is_roce (ldev )))
10011010 goto unlock ;
@@ -1008,7 +1017,7 @@ u8 mlx5_lag_get_slave_port(struct mlx5_core_dev *dev,
10081017 port = ldev -> v2p_map [port ];
10091018
10101019unlock :
1011- spin_unlock (& lag_lock );
1020+ spin_unlock_irqrestore (& lag_lock , flags );
10121021 return port ;
10131022}
10141023EXPORT_SYMBOL (mlx5_lag_get_slave_port );
@@ -1017,8 +1026,9 @@ struct mlx5_core_dev *mlx5_lag_get_peer_mdev(struct mlx5_core_dev *dev)
10171026{
10181027 struct mlx5_core_dev * peer_dev = NULL ;
10191028 struct mlx5_lag * ldev ;
1029+ unsigned long flags ;
10201030
1021- spin_lock (& lag_lock );
1031+ spin_lock_irqsave (& lag_lock , flags );
10221032 ldev = mlx5_lag_dev (dev );
10231033 if (!ldev )
10241034 goto unlock ;
@@ -1028,7 +1038,7 @@ struct mlx5_core_dev *mlx5_lag_get_peer_mdev(struct mlx5_core_dev *dev)
10281038 ldev -> pf [MLX5_LAG_P1 ].dev ;
10291039
10301040unlock :
1031- spin_unlock (& lag_lock );
1041+ spin_unlock_irqrestore (& lag_lock , flags );
10321042 return peer_dev ;
10331043}
10341044EXPORT_SYMBOL (mlx5_lag_get_peer_mdev );
@@ -1041,6 +1051,7 @@ int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev,
10411051 int outlen = MLX5_ST_SZ_BYTES (query_cong_statistics_out );
10421052 struct mlx5_core_dev * mdev [MLX5_MAX_PORTS ];
10431053 struct mlx5_lag * ldev ;
1054+ unsigned long flags ;
10441055 int num_ports ;
10451056 int ret , i , j ;
10461057 void * out ;
@@ -1051,7 +1062,7 @@ int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev,
10511062
10521063 memset (values , 0 , sizeof (* values ) * num_counters );
10531064
1054- spin_lock (& lag_lock );
1065+ spin_lock_irqsave (& lag_lock , flags );
10551066 ldev = mlx5_lag_dev (dev );
10561067 if (ldev && __mlx5_lag_is_active (ldev )) {
10571068 num_ports = MLX5_MAX_PORTS ;
@@ -1061,7 +1072,7 @@ int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev,
10611072 num_ports = 1 ;
10621073 mdev [MLX5_LAG_P1 ] = dev ;
10631074 }
1064- spin_unlock (& lag_lock );
1075+ spin_unlock_irqrestore (& lag_lock , flags );
10651076
10661077 for (i = 0 ; i < num_ports ; ++ i ) {
10671078 u32 in [MLX5_ST_SZ_DW (query_cong_statistics_in )] = {};
0 commit comments