77#include "eswitch.h"
88#include "lib/mlx5.h"
99
10- void mlx5_mpesw_work (struct work_struct * work )
10+ static int add_mpesw_rule (struct mlx5_lag * ldev )
1111{
12- struct mlx5_lag * ldev = container_of (work , struct mlx5_lag , mpesw_work );
12+ struct mlx5_core_dev * dev = ldev -> pf [MLX5_LAG_P1 ].dev ;
13+ int err ;
1314
14- mutex_lock (& ldev -> lock );
15- mlx5_disable_lag (ldev );
16- mutex_unlock (& ldev -> lock );
17- }
15+ if (atomic_add_return (1 , & ldev -> lag_mpesw .mpesw_rule_count ) != 1 )
16+ return 0 ;
1817
19- static void mlx5_lag_disable_mpesw (struct mlx5_core_dev * dev )
20- {
21- struct mlx5_lag * ldev = dev -> priv .lag ;
18+ if (ldev -> mode != MLX5_LAG_MODE_NONE ) {
19+ err = - EINVAL ;
20+ goto out_err ;
21+ }
2222
23- if (!queue_work (ldev -> wq , & ldev -> mpesw_work ))
24- mlx5_core_warn (dev , "failed to queue work\n" );
23+ err = mlx5_activate_lag (ldev , NULL , MLX5_LAG_MODE_MPESW , false);
24+ if (err ) {
25+ mlx5_core_warn (dev , "Failed to create LAG in MPESW mode (%d)\n" , err );
26+ goto out_err ;
27+ }
28+
29+ return 0 ;
30+
31+ out_err :
32+ atomic_dec (& ldev -> lag_mpesw .mpesw_rule_count );
33+ return err ;
2534}
2635
27- void mlx5_lag_del_mpesw_rule (struct mlx5_core_dev * dev )
36+ static void del_mpesw_rule (struct mlx5_lag * ldev )
2837{
29- struct mlx5_lag * ldev = dev -> priv .lag ;
38+ if (!atomic_dec_return (& ldev -> lag_mpesw .mpesw_rule_count ) &&
39+ ldev -> mode == MLX5_LAG_MODE_MPESW )
40+ mlx5_disable_lag (ldev );
41+ }
3042
31- if (!ldev )
32- return ;
43+ static void mlx5_mpesw_work (struct work_struct * work )
44+ {
45+ struct mlx5_mpesw_work_st * mpesww = container_of (work , struct mlx5_mpesw_work_st , work );
46+ struct mlx5_lag * ldev = mpesww -> lag ;
3347
3448 mutex_lock (& ldev -> lock );
35- if (!atomic_dec_return (& ldev -> lag_mpesw .mpesw_rule_count ) &&
36- ldev -> mode == MLX5_LAG_MODE_MPESW )
37- mlx5_lag_disable_mpesw (dev );
49+ if (mpesww -> op == MLX5_MPESW_OP_ENABLE )
50+ mpesww -> result = add_mpesw_rule (ldev );
51+ else if (mpesww -> op == MLX5_MPESW_OP_DISABLE )
52+ del_mpesw_rule (ldev );
3853 mutex_unlock (& ldev -> lock );
54+
55+ complete (& mpesww -> comp );
3956}
4057
41- int mlx5_lag_add_mpesw_rule (struct mlx5_core_dev * dev )
58+ static int mlx5_lag_mpesw_queue_work (struct mlx5_core_dev * dev ,
59+ enum mpesw_op op )
4260{
4361 struct mlx5_lag * ldev = dev -> priv .lag ;
62+ struct mlx5_mpesw_work_st * work ;
4463 int err = 0 ;
4564
4665 if (!ldev )
4766 return 0 ;
4867
49- mutex_lock ( & ldev -> lock );
50- if (atomic_add_return ( 1 , & ldev -> lag_mpesw . mpesw_rule_count ) != 1 )
51- goto out ;
68+ work = kzalloc ( sizeof ( * work ), GFP_KERNEL );
69+ if (! work )
70+ return - ENOMEM ;
5271
53- if (ldev -> mode != MLX5_LAG_MODE_NONE ) {
72+ INIT_WORK (& work -> work , mlx5_mpesw_work );
73+ init_completion (& work -> comp );
74+ work -> op = op ;
75+ work -> lag = ldev ;
76+
77+ if (!queue_work (ldev -> wq , & work -> work )) {
78+ mlx5_core_warn (dev , "failed to queue mpesw work\n" );
5479 err = - EINVAL ;
5580 goto out ;
5681 }
57-
58- err = mlx5_activate_lag (ldev , NULL , MLX5_LAG_MODE_MPESW , false);
59- if (err )
60- mlx5_core_warn (dev , "Failed to create LAG in MPESW mode (%d)\n" , err );
61-
82+ wait_for_completion (& work -> comp );
83+ err = work -> result ;
6284out :
63- mutex_unlock ( & ldev -> lock );
85+ kfree ( work );
6486 return err ;
6587}
6688
89+ void mlx5_lag_del_mpesw_rule (struct mlx5_core_dev * dev )
90+ {
91+ mlx5_lag_mpesw_queue_work (dev , MLX5_MPESW_OP_DISABLE );
92+ }
93+
94+ int mlx5_lag_add_mpesw_rule (struct mlx5_core_dev * dev )
95+ {
96+ return mlx5_lag_mpesw_queue_work (dev , MLX5_MPESW_OP_ENABLE );
97+ }
98+
6799int mlx5_lag_do_mirred (struct mlx5_core_dev * mdev , struct net_device * out_dev )
68100{
69101 struct mlx5_lag * ldev = mdev -> priv .lag ;
70102
71103 if (!netif_is_bond_master (out_dev ) || !ldev )
72104 return 0 ;
73105
74- mutex_lock (& ldev -> lock );
75- if (ldev -> mode == MLX5_LAG_MODE_MPESW ) {
76- mutex_unlock (& ldev -> lock );
106+ if (ldev -> mode == MLX5_LAG_MODE_MPESW )
77107 return - EOPNOTSUPP ;
78- }
79- mutex_unlock (& ldev -> lock );
108+
80109 return 0 ;
81110}
82111
@@ -90,11 +119,10 @@ bool mlx5_lag_mpesw_is_activated(struct mlx5_core_dev *dev)
90119
91120void mlx5_lag_mpesw_init (struct mlx5_lag * ldev )
92121{
93- INIT_WORK (& ldev -> mpesw_work , mlx5_mpesw_work );
94122 atomic_set (& ldev -> lag_mpesw .mpesw_rule_count , 0 );
95123}
96124
97125void mlx5_lag_mpesw_cleanup (struct mlx5_lag * ldev )
98126{
99- cancel_delayed_work_sync ( & ldev -> bond_work );
127+ WARN_ON ( atomic_read ( & ldev -> lag_mpesw . mpesw_rule_count ) );
100128}
0 commit comments