mlxsw: spectrum_acl: Don't store netdev and ingress for ruleset unbind

Instead, pass netdev and ingress flag to ruleset unbind op.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 24 insertions, 21 deletions

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 237cad373dbe..a21613de094a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -469,7 +469,8 @@ struct mlxsw_sp_acl_profile_ops {
         void (*ruleset_del)(struct mlxsw_sp *mlxsw_sp, void *ruleset_priv);
         int (*ruleset_bind)(struct mlxsw_sp *mlxsw_sp, void *ruleset_priv,
                             struct net_device *dev, bool ingress);
-        void (*ruleset_unbind)(struct mlxsw_sp *mlxsw_sp, void *ruleset_priv);
+        void (*ruleset_unbind)(struct mlxsw_sp *mlxsw_sp, void *ruleset_priv,
+                               struct net_device *dev, bool ingress);
         u16 (*ruleset_group_id)(void *ruleset_priv);
         size_t rule_priv_size;
         int (*rule_add)(struct mlxsw_sp *mlxsw_sp,
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
index ead4cb8cc386..7fb41a4ef0b3 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
@@ -128,11 +128,12 @@ static int mlxsw_sp_acl_ruleset_bind(struct mlxsw_sp *mlxsw_sp,
 }
 
 static void mlxsw_sp_acl_ruleset_unbind(struct mlxsw_sp *mlxsw_sp,
-                                        struct mlxsw_sp_acl_ruleset *ruleset)
+                                        struct mlxsw_sp_acl_ruleset *ruleset,
+                                        struct net_device *dev, bool ingress)
 {
         const struct mlxsw_sp_acl_profile_ops *ops = ruleset->ht_key.ops;
 
-        ops->ruleset_unbind(mlxsw_sp, ruleset->priv);
+        ops->ruleset_unbind(mlxsw_sp, ruleset->priv, dev, ingress);
 }
 
 static struct mlxsw_sp_acl_ruleset *
@@ -200,7 +201,9 @@ static void mlxsw_sp_acl_ruleset_destroy(struct mlxsw_sp *mlxsw_sp,
         struct mlxsw_sp_acl *acl = mlxsw_sp->acl;
 
         if (!ruleset->ht_key.chain_index)
-                mlxsw_sp_acl_ruleset_unbind(mlxsw_sp, ruleset);
+                mlxsw_sp_acl_ruleset_unbind(mlxsw_sp, ruleset,
+                                            ruleset->ht_key.dev,
+                                            ruleset->ht_key.ingress);
         rhashtable_remove_fast(&acl->ruleset_ht, &ruleset->ht_node,
                                mlxsw_sp_acl_ruleset_ht_params);
         ops->ruleset_del(mlxsw_sp, ruleset->priv);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
index 7e8284b46968..50b2f9add20a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
@@ -154,10 +154,6 @@ struct mlxsw_sp_acl_tcam_group {
         struct list_head region_list;
         unsigned int region_count;
         struct rhashtable chunk_ht;
-        struct {
-                u16 local_port;
-                bool ingress;
-        } bound;
         struct mlxsw_sp_acl_tcam_group_ops *ops;
         const struct mlxsw_sp_acl_tcam_pattern *patterns;
         unsigned int patterns_count;
@@ -271,26 +267,28 @@ mlxsw_sp_acl_tcam_group_bind(struct mlxsw_sp *mlxsw_sp,
                 return -EINVAL;
 
         mlxsw_sp_port = netdev_priv(dev);
-        group->bound.local_port = mlxsw_sp_port->local_port;
-        group->bound.ingress = ingress;
-        mlxsw_reg_ppbt_pack(ppbt_pl,
-                            group->bound.ingress ? MLXSW_REG_PXBT_E_IACL :
-                                                   MLXSW_REG_PXBT_E_EACL,
-                            MLXSW_REG_PXBT_OP_BIND, group->bound.local_port,
+        mlxsw_reg_ppbt_pack(ppbt_pl, ingress ? MLXSW_REG_PXBT_E_IACL :
+                                               MLXSW_REG_PXBT_E_EACL,
+                            MLXSW_REG_PXBT_OP_BIND, mlxsw_sp_port->local_port,
                             group->id);
         return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ppbt), ppbt_pl);
 }
 
 static void
 mlxsw_sp_acl_tcam_group_unbind(struct mlxsw_sp *mlxsw_sp,
-                               struct mlxsw_sp_acl_tcam_group *group)
+                               struct mlxsw_sp_acl_tcam_group *group,
+                               struct net_device *dev, bool ingress)
 {
+        struct mlxsw_sp_port *mlxsw_sp_port;
         char ppbt_pl[MLXSW_REG_PPBT_LEN];
 
-        mlxsw_reg_ppbt_pack(ppbt_pl,
-                            group->bound.ingress ? MLXSW_REG_PXBT_E_IACL :
-                                                   MLXSW_REG_PXBT_E_EACL,
-                            MLXSW_REG_PXBT_OP_UNBIND, group->bound.local_port,
+        if (WARN_ON(!mlxsw_sp_port_dev_check(dev)))
+                return;
+
+        mlxsw_sp_port = netdev_priv(dev);
+        mlxsw_reg_ppbt_pack(ppbt_pl, ingress ? MLXSW_REG_PXBT_E_IACL :
+                                               MLXSW_REG_PXBT_E_EACL,
+                            MLXSW_REG_PXBT_OP_UNBIND, mlxsw_sp_port->local_port,
                             group->id);
         mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ppbt), ppbt_pl);
 }
@@ -1066,11 +1064,12 @@ mlxsw_sp_acl_tcam_flower_ruleset_bind(struct mlxsw_sp *mlxsw_sp,
 
 static void
 mlxsw_sp_acl_tcam_flower_ruleset_unbind(struct mlxsw_sp *mlxsw_sp,
-                                        void *ruleset_priv)
+                                        void *ruleset_priv,
+                                        struct net_device *dev, bool ingress)
 {
         struct mlxsw_sp_acl_tcam_flower_ruleset *ruleset = ruleset_priv;
 
-        mlxsw_sp_acl_tcam_group_unbind(mlxsw_sp, &ruleset->group);
+        mlxsw_sp_acl_tcam_group_unbind(mlxsw_sp, &ruleset->group, dev, ingress);
 }
 
 static u16