Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02caf499 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fe5fdf2

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+2 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c

+6 −3
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c

+16 −17
Original line number Diff line number Diff line
@@ -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_ppbt_pack(ppbt_pl, ingress ? MLXSW_REG_PXBT_E_IACL :

					       MLXSW_REG_PXBT_E_EACL,

			    MLXSW_REG_PXBT_OP_BIND, group->bound.local_port,

			    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 :

	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, group->bound.local_port,

			    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