Commit 3bc3ffb6 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum: Rename acl_block to flow_block 



The acl_block structure is going to be used for non-acl case - matchall
offload. So rename it accordingly.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 49c958cc

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

+36 −35
Original line number Diff line number Diff line
@@ -1544,23 +1544,23 @@ static int mlxsw_sp_setup_tc_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port, 
}



static int

mlxsw_sp_setup_tc_cls_flower(struct mlxsw_sp_acl_block *acl_block,

mlxsw_sp_setup_tc_cls_flower(struct mlxsw_sp_flow_block *flow_block,

			     struct flow_cls_offload *f)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_acl_block_mlxsw_sp(acl_block);

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_flow_block_mlxsw_sp(flow_block);



	switch (f->command) {

	case FLOW_CLS_REPLACE:

		return mlxsw_sp_flower_replace(mlxsw_sp, acl_block, f);

		return mlxsw_sp_flower_replace(mlxsw_sp, flow_block, f);

	case FLOW_CLS_DESTROY:

		mlxsw_sp_flower_destroy(mlxsw_sp, acl_block, f);

		mlxsw_sp_flower_destroy(mlxsw_sp, flow_block, f);

		return 0;

	case FLOW_CLS_STATS:

		return mlxsw_sp_flower_stats(mlxsw_sp, acl_block, f);

		return mlxsw_sp_flower_stats(mlxsw_sp, flow_block, f);

	case FLOW_CLS_TMPLT_CREATE:

		return mlxsw_sp_flower_tmplt_create(mlxsw_sp, acl_block, f);

		return mlxsw_sp_flower_tmplt_create(mlxsw_sp, flow_block, f);

	case FLOW_CLS_TMPLT_DESTROY:

		mlxsw_sp_flower_tmplt_destroy(mlxsw_sp, acl_block, f);

		mlxsw_sp_flower_tmplt_destroy(mlxsw_sp, flow_block, f);

		return 0;

	default:

		return -EOPNOTSUPP;
@@ -1607,16 +1607,16 @@ static int mlxsw_sp_setup_tc_block_cb_matchall_eg(enum tc_setup_type type, 
static int mlxsw_sp_setup_tc_block_cb_flower(enum tc_setup_type type,

					     void *type_data, void *cb_priv)

{

	struct mlxsw_sp_acl_block *acl_block = cb_priv;

	struct mlxsw_sp_flow_block *flow_block = cb_priv;



	switch (type) {

	case TC_SETUP_CLSMATCHALL:

		return 0;

	case TC_SETUP_CLSFLOWER:

		if (mlxsw_sp_acl_block_disabled(acl_block))

		if (mlxsw_sp_flow_block_disabled(flow_block))

			return -EOPNOTSUPP;



		return mlxsw_sp_setup_tc_cls_flower(acl_block, type_data);

		return mlxsw_sp_setup_tc_cls_flower(flow_block, type_data);

	default:

		return -EOPNOTSUPP;

	}
@@ -1624,9 +1624,9 @@ static int mlxsw_sp_setup_tc_block_cb_flower(enum tc_setup_type type, 


static void mlxsw_sp_tc_block_flower_release(void *cb_priv)

{

	struct mlxsw_sp_acl_block *acl_block = cb_priv;

	struct mlxsw_sp_flow_block *flow_block = cb_priv;



	mlxsw_sp_acl_block_destroy(acl_block);

	mlxsw_sp_flow_block_destroy(flow_block);

}



static LIST_HEAD(mlxsw_sp_block_cb_list);
@@ -1636,7 +1636,7 @@ mlxsw_sp_setup_tc_block_flower_bind(struct mlxsw_sp_port *mlxsw_sp_port, 
			            struct flow_block_offload *f, bool ingress)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct mlxsw_sp_acl_block *acl_block;

	struct mlxsw_sp_flow_block *flow_block;

	struct flow_block_cb *block_cb;

	bool register_block = false;

	int err;
@@ -1645,31 +1645,31 @@ mlxsw_sp_setup_tc_block_flower_bind(struct mlxsw_sp_port *mlxsw_sp_port, 
					mlxsw_sp_setup_tc_block_cb_flower,

					mlxsw_sp);

	if (!block_cb) {

		acl_block = mlxsw_sp_acl_block_create(mlxsw_sp, f->net);

		if (!acl_block)

		flow_block = mlxsw_sp_flow_block_create(mlxsw_sp, f->net);

		if (!flow_block)

			return -ENOMEM;

		block_cb = flow_block_cb_alloc(mlxsw_sp_setup_tc_block_cb_flower,

					       mlxsw_sp, acl_block,

					       mlxsw_sp, flow_block,

					       mlxsw_sp_tc_block_flower_release);

		if (IS_ERR(block_cb)) {

			mlxsw_sp_acl_block_destroy(acl_block);

			mlxsw_sp_flow_block_destroy(flow_block);

			err = PTR_ERR(block_cb);

			goto err_cb_register;

		}

		register_block = true;

	} else {

		acl_block = flow_block_cb_priv(block_cb);

		flow_block = flow_block_cb_priv(block_cb);

	}

	flow_block_cb_incref(block_cb);

	err = mlxsw_sp_acl_block_bind(mlxsw_sp, acl_block,

	err = mlxsw_sp_flow_block_bind(mlxsw_sp, flow_block,

				       mlxsw_sp_port, ingress, f->extack);

	if (err)

		goto err_block_bind;



	if (ingress)

		mlxsw_sp_port->ing_acl_block = acl_block;

		mlxsw_sp_port->ing_flow_block = flow_block;

	else

		mlxsw_sp_port->eg_acl_block = acl_block;

		mlxsw_sp_port->eg_flow_block = flow_block;



	if (register_block) {

		flow_block_cb_add(block_cb, f);
@@ -1687,10 +1687,11 @@ err_cb_register: 


static void

mlxsw_sp_setup_tc_block_flower_unbind(struct mlxsw_sp_port *mlxsw_sp_port,

				      struct flow_block_offload *f, bool ingress)

				      struct flow_block_offload *f,

				      bool ingress)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct mlxsw_sp_acl_block *acl_block;

	struct mlxsw_sp_flow_block *flow_block;

	struct flow_block_cb *block_cb;

	int err;
@@ -1701,12 +1702,12 @@ mlxsw_sp_setup_tc_block_flower_unbind(struct mlxsw_sp_port *mlxsw_sp_port, 
		return;



	if (ingress)

		mlxsw_sp_port->ing_acl_block = NULL;

		mlxsw_sp_port->ing_flow_block = NULL;

	else

		mlxsw_sp_port->eg_acl_block = NULL;

		mlxsw_sp_port->eg_flow_block = NULL;



	acl_block = flow_block_cb_priv(block_cb);

	err = mlxsw_sp_acl_block_unbind(mlxsw_sp, acl_block,

	flow_block = flow_block_cb_priv(block_cb);

	err = mlxsw_sp_flow_block_unbind(mlxsw_sp, flow_block,

					 mlxsw_sp_port, ingress);

	if (!err && !flow_block_cb_decref(block_cb)) {

		flow_block_cb_remove(block_cb, f);
@@ -1797,17 +1798,17 @@ static int mlxsw_sp_feature_hw_tc(struct net_device *dev, bool enable) 
	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);



	if (!enable) {

		if (mlxsw_sp_acl_block_rule_count(mlxsw_sp_port->ing_acl_block) ||

		    mlxsw_sp_acl_block_rule_count(mlxsw_sp_port->eg_acl_block) ||

		if (mlxsw_sp_flow_block_rule_count(mlxsw_sp_port->ing_flow_block) ||

		    mlxsw_sp_flow_block_rule_count(mlxsw_sp_port->eg_flow_block) ||

		    !list_empty(&mlxsw_sp_port->mall_tc_list)) {

			netdev_err(dev, "Active offloaded tc filters, can't turn hw_tc_offload off\n");

			return -EINVAL;

		}

		mlxsw_sp_acl_block_disable_inc(mlxsw_sp_port->ing_acl_block);

		mlxsw_sp_acl_block_disable_inc(mlxsw_sp_port->eg_acl_block);

		mlxsw_sp_flow_block_disable_inc(mlxsw_sp_port->ing_flow_block);

		mlxsw_sp_flow_block_disable_inc(mlxsw_sp_port->eg_flow_block);

	} else {

		mlxsw_sp_acl_block_disable_dec(mlxsw_sp_port->ing_acl_block);

		mlxsw_sp_acl_block_disable_dec(mlxsw_sp_port->eg_acl_block);

		mlxsw_sp_flow_block_disable_dec(mlxsw_sp_port->ing_flow_block);

		mlxsw_sp_flow_block_disable_dec(mlxsw_sp_port->eg_flow_block);

	}

	return 0;

}

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

+32 −32
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ struct mlxsw_sp_port { 
	struct mlxsw_sp_port_vlan *default_vlan;

	struct mlxsw_sp_qdisc_state *qdisc;

	unsigned acl_rule_count;

	struct mlxsw_sp_acl_block *ing_acl_block;

	struct mlxsw_sp_acl_block *eg_acl_block;

	struct mlxsw_sp_flow_block *ing_flow_block;

	struct mlxsw_sp_flow_block *eg_flow_block;

	struct {

		struct delayed_work shaper_dw;

		struct hwtstamp_config hwtstamp_config;
@@ -654,7 +654,7 @@ struct mlxsw_sp_acl_rule_info { 
	unsigned int counter_index;

};



struct mlxsw_sp_acl_block;

struct mlxsw_sp_flow_block;

struct mlxsw_sp_acl_ruleset;



/* spectrum_acl.c */
@@ -663,7 +663,7 @@ enum mlxsw_sp_acl_profile { 
	MLXSW_SP_ACL_PROFILE_MR,

};



struct mlxsw_sp_acl_block {

struct mlxsw_sp_flow_block {

	struct list_head binding_list;

	struct mlxsw_sp_acl_ruleset *ruleset_zero;

	struct mlxsw_sp *mlxsw_sp;
@@ -679,74 +679,74 @@ struct mlxsw_sp_acl_block { 
struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl);



static inline struct mlxsw_sp *

mlxsw_sp_acl_block_mlxsw_sp(struct mlxsw_sp_acl_block *block)

mlxsw_sp_flow_block_mlxsw_sp(struct mlxsw_sp_flow_block *block)

{

	return block->mlxsw_sp;

}



static inline unsigned int

mlxsw_sp_acl_block_rule_count(const struct mlxsw_sp_acl_block *block)

mlxsw_sp_flow_block_rule_count(const struct mlxsw_sp_flow_block *block)

{

	return block ? block->rule_count : 0;

}



static inline void

mlxsw_sp_acl_block_disable_inc(struct mlxsw_sp_acl_block *block)

mlxsw_sp_flow_block_disable_inc(struct mlxsw_sp_flow_block *block)

{

	if (block)

		block->disable_count++;

}



static inline void

mlxsw_sp_acl_block_disable_dec(struct mlxsw_sp_acl_block *block)

mlxsw_sp_flow_block_disable_dec(struct mlxsw_sp_flow_block *block)

{

	if (block)

		block->disable_count--;

}



static inline bool

mlxsw_sp_acl_block_disabled(const struct mlxsw_sp_acl_block *block)

mlxsw_sp_flow_block_disabled(const struct mlxsw_sp_flow_block *block)

{

	return block->disable_count;

}



static inline bool

mlxsw_sp_acl_block_is_egress_bound(const struct mlxsw_sp_acl_block *block)

mlxsw_sp_flow_block_is_egress_bound(const struct mlxsw_sp_flow_block *block)

{

	return block->egress_binding_count;

}



static inline bool

mlxsw_sp_acl_block_is_ingress_bound(const struct mlxsw_sp_acl_block *block)

mlxsw_sp_flow_block_is_ingress_bound(const struct mlxsw_sp_flow_block *block)

{

	return block->ingress_binding_count;

}



static inline bool

mlxsw_sp_acl_block_is_mixed_bound(const struct mlxsw_sp_acl_block *block)

mlxsw_sp_flow_block_is_mixed_bound(const struct mlxsw_sp_flow_block *block)

{

	return block->ingress_binding_count && block->egress_binding_count;

}



struct mlxsw_sp_acl_block *mlxsw_sp_acl_block_create(struct mlxsw_sp *mlxsw_sp,

struct mlxsw_sp_flow_block *mlxsw_sp_flow_block_create(struct mlxsw_sp *mlxsw_sp,

						       struct net *net);

void mlxsw_sp_acl_block_destroy(struct mlxsw_sp_acl_block *block);

int mlxsw_sp_acl_block_bind(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_acl_block *block,

void mlxsw_sp_flow_block_destroy(struct mlxsw_sp_flow_block *block);

int mlxsw_sp_flow_block_bind(struct mlxsw_sp *mlxsw_sp,

			     struct mlxsw_sp_flow_block *block,

			     struct mlxsw_sp_port *mlxsw_sp_port,

			     bool ingress,

			     struct netlink_ext_ack *extack);

int mlxsw_sp_acl_block_unbind(struct mlxsw_sp *mlxsw_sp,

			      struct mlxsw_sp_acl_block *block,

int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp,

			       struct mlxsw_sp_flow_block *block,

			       struct mlxsw_sp_port *mlxsw_sp_port,

			       bool ingress);

struct mlxsw_sp_acl_ruleset *

mlxsw_sp_acl_ruleset_lookup(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_acl_block *block, u32 chain_index,

			    struct mlxsw_sp_flow_block *block, u32 chain_index,

			    enum mlxsw_sp_acl_profile profile);

struct mlxsw_sp_acl_ruleset *

mlxsw_sp_acl_ruleset_get(struct mlxsw_sp *mlxsw_sp,

			 struct mlxsw_sp_acl_block *block, u32 chain_index,

			 struct mlxsw_sp_flow_block *block, u32 chain_index,

			 enum mlxsw_sp_acl_profile profile,

			 struct mlxsw_afk_element_usage *tmplt_elusage);

void mlxsw_sp_acl_ruleset_put(struct mlxsw_sp *mlxsw_sp,
@@ -778,7 +778,7 @@ int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei, 
int mlxsw_sp_acl_rulei_act_trap(struct mlxsw_sp_acl_rule_info *rulei);

int mlxsw_sp_acl_rulei_act_mirror(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_acl_rule_info *rulei,

				  struct mlxsw_sp_acl_block *block,

				  struct mlxsw_sp_flow_block *block,

				  struct net_device *out_dev,

				  struct netlink_ext_ack *extack);

int mlxsw_sp_acl_rulei_act_fwd(struct mlxsw_sp *mlxsw_sp,
@@ -901,19 +901,19 @@ extern const struct mlxsw_afk_ops mlxsw_sp2_afk_ops; 


/* spectrum_flower.c */

int mlxsw_sp_flower_replace(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_acl_block *block,

			    struct mlxsw_sp_flow_block *block,

			    struct flow_cls_offload *f);

void mlxsw_sp_flower_destroy(struct mlxsw_sp *mlxsw_sp,

			     struct mlxsw_sp_acl_block *block,

			     struct mlxsw_sp_flow_block *block,

			     struct flow_cls_offload *f);

int mlxsw_sp_flower_stats(struct mlxsw_sp *mlxsw_sp,

			  struct mlxsw_sp_acl_block *block,

			  struct mlxsw_sp_flow_block *block,

			  struct flow_cls_offload *f);

int mlxsw_sp_flower_tmplt_create(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_acl_block *block,

				 struct mlxsw_sp_flow_block *block,

				 struct flow_cls_offload *f);

void mlxsw_sp_flower_tmplt_destroy(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_acl_block *block,

				   struct mlxsw_sp_flow_block *block,

				   struct flow_cls_offload *f);



/* spectrum_qdisc.c */

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

+7 −7
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


struct mlxsw_sp2_mr_tcam {

	struct mlxsw_sp *mlxsw_sp;

	struct mlxsw_sp_acl_block *acl_block;

	struct mlxsw_sp_flow_block *flow_block;

	struct mlxsw_sp_acl_ruleset *ruleset4;

	struct mlxsw_sp_acl_ruleset *ruleset6;

};
@@ -61,7 +61,7 @@ static int mlxsw_sp2_mr_tcam_ipv4_init(struct mlxsw_sp2_mr_tcam *mr_tcam) 
				     mlxsw_sp2_mr_tcam_usage_ipv4,

				     ARRAY_SIZE(mlxsw_sp2_mr_tcam_usage_ipv4));

	mr_tcam->ruleset4 = mlxsw_sp_acl_ruleset_get(mr_tcam->mlxsw_sp,

						     mr_tcam->acl_block,

						     mr_tcam->flow_block,

						     MLXSW_SP_L3_PROTO_IPV4,

						     MLXSW_SP_ACL_PROFILE_MR,

						     &elusage);
@@ -111,7 +111,7 @@ static int mlxsw_sp2_mr_tcam_ipv6_init(struct mlxsw_sp2_mr_tcam *mr_tcam) 
				     mlxsw_sp2_mr_tcam_usage_ipv6,

				     ARRAY_SIZE(mlxsw_sp2_mr_tcam_usage_ipv6));

	mr_tcam->ruleset6 = mlxsw_sp_acl_ruleset_get(mr_tcam->mlxsw_sp,

						     mr_tcam->acl_block,

						     mr_tcam->flow_block,

						     MLXSW_SP_L3_PROTO_IPV6,

						     MLXSW_SP_ACL_PROFILE_MR,

						     &elusage);
@@ -289,8 +289,8 @@ static int mlxsw_sp2_mr_tcam_init(struct mlxsw_sp *mlxsw_sp, void *priv) 
	int err;



	mr_tcam->mlxsw_sp = mlxsw_sp;

	mr_tcam->acl_block = mlxsw_sp_acl_block_create(mlxsw_sp, NULL);

	if (!mr_tcam->acl_block)

	mr_tcam->flow_block = mlxsw_sp_flow_block_create(mlxsw_sp, NULL);

	if (!mr_tcam->flow_block)

		return -ENOMEM;



	err = mlxsw_sp2_mr_tcam_ipv4_init(mr_tcam);
@@ -306,7 +306,7 @@ static int mlxsw_sp2_mr_tcam_init(struct mlxsw_sp *mlxsw_sp, void *priv) 
err_ipv6_init:

	mlxsw_sp2_mr_tcam_ipv4_fini(mr_tcam);

err_ipv4_init:

	mlxsw_sp_acl_block_destroy(mr_tcam->acl_block);

	mlxsw_sp_flow_block_destroy(mr_tcam->flow_block);

	return err;

}
@@ -316,7 +316,7 @@ static void mlxsw_sp2_mr_tcam_fini(void *priv) 


	mlxsw_sp2_mr_tcam_ipv6_fini(mr_tcam);

	mlxsw_sp2_mr_tcam_ipv4_fini(mr_tcam);

	mlxsw_sp_acl_block_destroy(mr_tcam->acl_block);

	mlxsw_sp_flow_block_destroy(mr_tcam->flow_block);

}



const struct mlxsw_sp_mr_tcam_ops mlxsw_sp2_mr_tcam_ops = {

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

+41 −41
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl) 
	return acl->afk;

}



struct mlxsw_sp_acl_block_binding {

struct mlxsw_sp_flow_block_binding {

	struct list_head list;

	struct net_device *dev;

	struct mlxsw_sp_port *mlxsw_sp_port;
@@ -48,7 +48,7 @@ struct mlxsw_sp_acl_block_binding { 
};



struct mlxsw_sp_acl_ruleset_ht_key {

	struct mlxsw_sp_acl_block *block;

	struct mlxsw_sp_flow_block *block;

	u32 chain_index;

	const struct mlxsw_sp_acl_profile_ops *ops;

};
@@ -103,8 +103,8 @@ mlxsw_sp_acl_ruleset_is_singular(const struct mlxsw_sp_acl_ruleset *ruleset) 


static int

mlxsw_sp_acl_ruleset_bind(struct mlxsw_sp *mlxsw_sp,

			  struct mlxsw_sp_acl_block *block,

			  struct mlxsw_sp_acl_block_binding *binding)

			  struct mlxsw_sp_flow_block *block,

			  struct mlxsw_sp_flow_block_binding *binding)

{

	struct mlxsw_sp_acl_ruleset *ruleset = block->ruleset_zero;

	const struct mlxsw_sp_acl_profile_ops *ops = ruleset->ht_key.ops;
@@ -115,8 +115,8 @@ 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_block *block,

			    struct mlxsw_sp_acl_block_binding *binding)

			    struct mlxsw_sp_flow_block *block,

			    struct mlxsw_sp_flow_block_binding *binding)

{

	struct mlxsw_sp_acl_ruleset *ruleset = block->ruleset_zero;

	const struct mlxsw_sp_acl_profile_ops *ops = ruleset->ht_key.ops;
@@ -126,7 +126,7 @@ mlxsw_sp_acl_ruleset_unbind(struct mlxsw_sp *mlxsw_sp, 
}



static bool

mlxsw_sp_acl_ruleset_block_bound(const struct mlxsw_sp_acl_block *block)

mlxsw_sp_acl_ruleset_block_bound(const struct mlxsw_sp_flow_block *block)

{

	return block->ruleset_zero;

}
@@ -134,9 +134,9 @@ mlxsw_sp_acl_ruleset_block_bound(const struct mlxsw_sp_acl_block *block) 
static int

mlxsw_sp_acl_ruleset_block_bind(struct mlxsw_sp *mlxsw_sp,

				struct mlxsw_sp_acl_ruleset *ruleset,

				struct mlxsw_sp_acl_block *block)

				struct mlxsw_sp_flow_block *block)

{

	struct mlxsw_sp_acl_block_binding *binding;

	struct mlxsw_sp_flow_block_binding *binding;

	int err;



	block->ruleset_zero = ruleset;
@@ -159,19 +159,19 @@ rollback: 
static void

mlxsw_sp_acl_ruleset_block_unbind(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_acl_ruleset *ruleset,

				  struct mlxsw_sp_acl_block *block)

				  struct mlxsw_sp_flow_block *block)

{

	struct mlxsw_sp_acl_block_binding *binding;

	struct mlxsw_sp_flow_block_binding *binding;



	list_for_each_entry(binding, &block->binding_list, list)

		mlxsw_sp_acl_ruleset_unbind(mlxsw_sp, block, binding);

	block->ruleset_zero = NULL;

}



struct mlxsw_sp_acl_block *mlxsw_sp_acl_block_create(struct mlxsw_sp *mlxsw_sp,

						     struct net *net)

struct mlxsw_sp_flow_block *

mlxsw_sp_flow_block_create(struct mlxsw_sp *mlxsw_sp, struct net *net)

{

	struct mlxsw_sp_acl_block *block;

	struct mlxsw_sp_flow_block *block;



	block = kzalloc(sizeof(*block), GFP_KERNEL);

	if (!block)
@@ -182,17 +182,17 @@ struct mlxsw_sp_acl_block *mlxsw_sp_acl_block_create(struct mlxsw_sp *mlxsw_sp, 
	return block;

}



void mlxsw_sp_acl_block_destroy(struct mlxsw_sp_acl_block *block)

void mlxsw_sp_flow_block_destroy(struct mlxsw_sp_flow_block *block)

{

	WARN_ON(!list_empty(&block->binding_list));

	kfree(block);

}



static struct mlxsw_sp_acl_block_binding *

mlxsw_sp_acl_block_lookup(struct mlxsw_sp_acl_block *block,

static struct mlxsw_sp_flow_block_binding *

mlxsw_sp_flow_block_lookup(struct mlxsw_sp_flow_block *block,

			   struct mlxsw_sp_port *mlxsw_sp_port, bool ingress)

{

	struct mlxsw_sp_acl_block_binding *binding;

	struct mlxsw_sp_flow_block_binding *binding;



	list_for_each_entry(binding, &block->binding_list, list)

		if (binding->mlxsw_sp_port == mlxsw_sp_port &&
@@ -201,16 +201,16 @@ mlxsw_sp_acl_block_lookup(struct mlxsw_sp_acl_block *block, 
	return NULL;

}



int mlxsw_sp_acl_block_bind(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_acl_block *block,

int mlxsw_sp_flow_block_bind(struct mlxsw_sp *mlxsw_sp,

			     struct mlxsw_sp_flow_block *block,

			     struct mlxsw_sp_port *mlxsw_sp_port,

			     bool ingress,

			     struct netlink_ext_ack *extack)

{

	struct mlxsw_sp_acl_block_binding *binding;

	struct mlxsw_sp_flow_block_binding *binding;

	int err;



	if (WARN_ON(mlxsw_sp_acl_block_lookup(block, mlxsw_sp_port, ingress)))

	if (WARN_ON(mlxsw_sp_flow_block_lookup(block, mlxsw_sp_port, ingress)))

		return -EEXIST;



	if (ingress && block->ingress_blocker_rule_count) {
@@ -247,14 +247,14 @@ err_ruleset_bind: 
	return err;

}



int mlxsw_sp_acl_block_unbind(struct mlxsw_sp *mlxsw_sp,

			      struct mlxsw_sp_acl_block *block,

int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp,

			       struct mlxsw_sp_flow_block *block,

			       struct mlxsw_sp_port *mlxsw_sp_port,

			       bool ingress)

{

	struct mlxsw_sp_acl_block_binding *binding;

	struct mlxsw_sp_flow_block_binding *binding;



	binding = mlxsw_sp_acl_block_lookup(block, mlxsw_sp_port, ingress);

	binding = mlxsw_sp_flow_block_lookup(block, mlxsw_sp_port, ingress);

	if (!binding)

		return -ENOENT;
@@ -274,7 +274,7 @@ int mlxsw_sp_acl_block_unbind(struct mlxsw_sp *mlxsw_sp, 


static struct mlxsw_sp_acl_ruleset *

mlxsw_sp_acl_ruleset_create(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_acl_block *block, u32 chain_index,

			    struct mlxsw_sp_flow_block *block, u32 chain_index,

			    const struct mlxsw_sp_acl_profile_ops *ops,

			    struct mlxsw_afk_element_usage *tmplt_elusage)

{
@@ -345,7 +345,7 @@ static void mlxsw_sp_acl_ruleset_ref_dec(struct mlxsw_sp *mlxsw_sp, 


static struct mlxsw_sp_acl_ruleset *

__mlxsw_sp_acl_ruleset_lookup(struct mlxsw_sp_acl *acl,

			      struct mlxsw_sp_acl_block *block, u32 chain_index,

			      struct mlxsw_sp_flow_block *block, u32 chain_index,

			      const struct mlxsw_sp_acl_profile_ops *ops)

{

	struct mlxsw_sp_acl_ruleset_ht_key ht_key;
@@ -360,7 +360,7 @@ __mlxsw_sp_acl_ruleset_lookup(struct mlxsw_sp_acl *acl, 


struct mlxsw_sp_acl_ruleset *

mlxsw_sp_acl_ruleset_lookup(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_acl_block *block, u32 chain_index,

			    struct mlxsw_sp_flow_block *block, u32 chain_index,

			    enum mlxsw_sp_acl_profile profile)

{

	const struct mlxsw_sp_acl_profile_ops *ops;
@@ -378,7 +378,7 @@ mlxsw_sp_acl_ruleset_lookup(struct mlxsw_sp *mlxsw_sp, 


struct mlxsw_sp_acl_ruleset *

mlxsw_sp_acl_ruleset_get(struct mlxsw_sp *mlxsw_sp,

			 struct mlxsw_sp_acl_block *block, u32 chain_index,

			 struct mlxsw_sp_flow_block *block, u32 chain_index,

			 enum mlxsw_sp_acl_profile profile,

			 struct mlxsw_afk_element_usage *tmplt_elusage)

{
@@ -541,11 +541,11 @@ int mlxsw_sp_acl_rulei_act_fwd(struct mlxsw_sp *mlxsw_sp, 


int mlxsw_sp_acl_rulei_act_mirror(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_acl_rule_info *rulei,

				  struct mlxsw_sp_acl_block *block,

				  struct mlxsw_sp_flow_block *block,

				  struct net_device *out_dev,

				  struct netlink_ext_ack *extack)

{

	struct mlxsw_sp_acl_block_binding *binding;

	struct mlxsw_sp_flow_block_binding *binding;

	struct mlxsw_sp_port *in_port;



	if (!list_is_singular(&block->binding_list)) {
@@ -553,7 +553,7 @@ int mlxsw_sp_acl_rulei_act_mirror(struct mlxsw_sp *mlxsw_sp, 
		return -EOPNOTSUPP;

	}

	binding = list_first_entry(&block->binding_list,

				   struct mlxsw_sp_acl_block_binding, list);

				   struct mlxsw_sp_flow_block_binding, list);

	in_port = binding->mlxsw_sp_port;



	return mlxsw_afa_block_append_mirror(rulei->act_block,
@@ -775,7 +775,7 @@ int mlxsw_sp_acl_rule_add(struct mlxsw_sp *mlxsw_sp, 
{

	struct mlxsw_sp_acl_ruleset *ruleset = rule->ruleset;

	const struct mlxsw_sp_acl_profile_ops *ops = ruleset->ht_key.ops;

	struct mlxsw_sp_acl_block *block = ruleset->ht_key.block;

	struct mlxsw_sp_flow_block *block = ruleset->ht_key.block;

	int err;



	err = ops->rule_add(mlxsw_sp, ruleset->priv, rule->priv, rule->rulei);
@@ -819,7 +819,7 @@ void mlxsw_sp_acl_rule_del(struct mlxsw_sp *mlxsw_sp, 
{

	struct mlxsw_sp_acl_ruleset *ruleset = rule->ruleset;

	const struct mlxsw_sp_acl_profile_ops *ops = ruleset->ht_key.ops;

	struct mlxsw_sp_acl_block *block = ruleset->ht_key.block;

	struct mlxsw_sp_flow_block *block = ruleset->ht_key.block;



	block->egress_blocker_rule_count -= rule->rulei->egress_bind_blocker;

	block->ingress_blocker_rule_count -= rule->rulei->ingress_bind_blocker;

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

+12 −12
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "core_acl_flex_keys.h"



static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp,

					 struct mlxsw_sp_acl_block *block,

					 struct mlxsw_sp_flow_block *block,

					 struct mlxsw_sp_acl_rule_info *rulei,

					 struct flow_action *flow_action,

					 struct netlink_ext_ack *extack)
@@ -53,11 +53,11 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, 
		case FLOW_ACTION_DROP: {

			bool ingress;



			if (mlxsw_sp_acl_block_is_mixed_bound(block)) {

			if (mlxsw_sp_flow_block_is_mixed_bound(block)) {

				NL_SET_ERR_MSG_MOD(extack, "Drop action is not supported when block is bound to ingress and egress");

				return -EOPNOTSUPP;

			}

			ingress = mlxsw_sp_acl_block_is_ingress_bound(block);

			ingress = mlxsw_sp_flow_block_is_ingress_bound(block);

			err = mlxsw_sp_acl_rulei_act_drop(rulei, ingress,

							  act->cookie, extack);

			if (err) {
@@ -106,7 +106,7 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, 
			struct mlxsw_sp_fid *fid;

			u16 fid_index;



			if (mlxsw_sp_acl_block_is_egress_bound(block)) {

			if (mlxsw_sp_flow_block_is_egress_bound(block)) {

				NL_SET_ERR_MSG_MOD(extack, "Redirect action is not supported on egress");

				return -EOPNOTSUPP;

			}
@@ -190,7 +190,7 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, 


static int mlxsw_sp_flower_parse_meta(struct mlxsw_sp_acl_rule_info *rulei,

				      struct flow_cls_offload *f,

				      struct mlxsw_sp_acl_block *block)

				      struct mlxsw_sp_flow_block *block)

{

	struct flow_rule *rule = flow_cls_offload_flow_rule(f);

	struct mlxsw_sp_port *mlxsw_sp_port;
@@ -371,7 +371,7 @@ static int mlxsw_sp_flower_parse_ip(struct mlxsw_sp *mlxsw_sp, 
}



static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_acl_block *block,

				 struct mlxsw_sp_flow_block *block,

				 struct mlxsw_sp_acl_rule_info *rulei,

				 struct flow_cls_offload *f)

{
@@ -460,7 +460,7 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, 
		struct flow_match_vlan match;



		flow_rule_match_vlan(rule, &match);

		if (mlxsw_sp_acl_block_is_egress_bound(block)) {

		if (mlxsw_sp_flow_block_is_egress_bound(block)) {

			NL_SET_ERR_MSG_MOD(f->common.extack, "vlan_id key is not supported on egress");

			return -EOPNOTSUPP;

		}
@@ -505,7 +505,7 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, 
}



int mlxsw_sp_flower_replace(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_acl_block *block,

			    struct mlxsw_sp_flow_block *block,

			    struct flow_cls_offload *f)

{

	struct mlxsw_sp_acl_rule_info *rulei;
@@ -552,7 +552,7 @@ err_rule_create: 
}



void mlxsw_sp_flower_destroy(struct mlxsw_sp *mlxsw_sp,

			     struct mlxsw_sp_acl_block *block,

			     struct mlxsw_sp_flow_block *block,

			     struct flow_cls_offload *f)

{

	struct mlxsw_sp_acl_ruleset *ruleset;
@@ -574,7 +574,7 @@ void mlxsw_sp_flower_destroy(struct mlxsw_sp *mlxsw_sp, 
}



int mlxsw_sp_flower_stats(struct mlxsw_sp *mlxsw_sp,

			  struct mlxsw_sp_acl_block *block,

			  struct mlxsw_sp_flow_block *block,

			  struct flow_cls_offload *f)

{

	enum flow_action_hw_stats used_hw_stats = FLOW_ACTION_HW_STATS_DISABLED;
@@ -611,7 +611,7 @@ err_rule_get_stats: 
}



int mlxsw_sp_flower_tmplt_create(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_acl_block *block,

				 struct mlxsw_sp_flow_block *block,

				 struct flow_cls_offload *f)

{

	struct mlxsw_sp_acl_ruleset *ruleset;
@@ -632,7 +632,7 @@ int mlxsw_sp_flower_tmplt_create(struct mlxsw_sp *mlxsw_sp, 
}



void mlxsw_sp_flower_tmplt_destroy(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_acl_block *block,

				   struct mlxsw_sp_flow_block *block,

				   struct flow_cls_offload *f)

{

	struct mlxsw_sp_acl_ruleset *ruleset;

CRA Git | Maintained and supported by SUSTech CRA and CCSE