Commit 19f1f467 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-Rework-matchall-offloading-plumbing' 



Ido Schimmel says:

====================
mlxsw: Rework matchall offloading plumbing

Jiri says:

Currently the matchall and flower are handled by registering separate
callbacks in mlxsw. That leads to faulty indication "in_hw_count 2" in
filter show command for every inserted flower filter. That happens
because matchall callback just blindly returns 0 for it and it is
wrongly accounted for as "the offloader".

I inspected different ways to fix this problem. The only clean solution
is to rework handling of matchall in mlxsw a bit. The driver newely
registers one callback for bound block which is called for both matchall
and flower filter insertions.

On the way, iron out the matchall code a bit, push it into a separate
file etc.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6488f11f 075c8aa7

drivers/net/ethernet/mellanox/mlxsw/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ mlxsw_spectrum-objs := spectrum.o spectrum_buffers.o \ 
				   spectrum_acl_atcam.o spectrum_acl_erp.o \

				   spectrum1_acl_tcam.o spectrum2_acl_tcam.o \

				   spectrum_acl_bloom_filter.o spectrum_acl.o \

				   spectrum_flow.o spectrum_matchall.o \

				   spectrum_flower.o spectrum_cnt.o \

				   spectrum_fid.o spectrum_ipip.o \

				   spectrum_acl_flex_actions.o \

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

+12 −451
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ 
#include <linux/log2.h>

#include <net/switchdev.h>

#include <net/pkt_cls.h>

#include <net/tc_act/tc_mirred.h>

#include <net/netevent.h>

#include <net/tc_act/tc_sample.h>

#include <net/addrconf.h>



#include "spectrum.h"
@@ -582,16 +580,6 @@ static int mlxsw_sp_base_mac_get(struct mlxsw_sp *mlxsw_sp) 
	return 0;

}



static int mlxsw_sp_port_sample_set(struct mlxsw_sp_port *mlxsw_sp_port,

				    bool enable, u32 rate)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char mpsc_pl[MLXSW_REG_MPSC_LEN];



	mlxsw_reg_mpsc_pack(mpsc_pl, mlxsw_sp_port->local_port, enable, rate);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(mpsc), mpsc_pl);

}



static int mlxsw_sp_port_admin_status_set(struct mlxsw_sp_port *mlxsw_sp_port,

					  bool is_up)

{
@@ -1362,412 +1350,6 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev, 
	return 0;

}



static struct mlxsw_sp_port_mall_tc_entry *

mlxsw_sp_port_mall_tc_entry_find(struct mlxsw_sp_port *port,

				 unsigned long cookie) {

	struct mlxsw_sp_port_mall_tc_entry *mall_tc_entry;



	list_for_each_entry(mall_tc_entry, &port->mall_tc_list, list)

		if (mall_tc_entry->cookie == cookie)

			return mall_tc_entry;



	return NULL;

}



static int

mlxsw_sp_port_add_cls_matchall_mirror(struct mlxsw_sp_port *mlxsw_sp_port,

				      struct mlxsw_sp_port_mall_mirror_tc_entry *mirror,

				      const struct flow_action_entry *act,

				      bool ingress)

{

	enum mlxsw_sp_span_type span_type;



	if (!act->dev) {

		netdev_err(mlxsw_sp_port->dev, "Could not find requested device\n");

		return -EINVAL;

	}



	mirror->ingress = ingress;

	span_type = ingress ? MLXSW_SP_SPAN_INGRESS : MLXSW_SP_SPAN_EGRESS;

	return mlxsw_sp_span_mirror_add(mlxsw_sp_port, act->dev, span_type,

					true, &mirror->span_id);

}



static void

mlxsw_sp_port_del_cls_matchall_mirror(struct mlxsw_sp_port *mlxsw_sp_port,

				      struct mlxsw_sp_port_mall_mirror_tc_entry *mirror)

{

	enum mlxsw_sp_span_type span_type;



	span_type = mirror->ingress ?

			MLXSW_SP_SPAN_INGRESS : MLXSW_SP_SPAN_EGRESS;

	mlxsw_sp_span_mirror_del(mlxsw_sp_port, mirror->span_id,

				 span_type, true);

}



static int

mlxsw_sp_port_add_cls_matchall_sample(struct mlxsw_sp_port *mlxsw_sp_port,

				      struct tc_cls_matchall_offload *cls,

				      const struct flow_action_entry *act,

				      bool ingress)

{

	int err;



	if (!mlxsw_sp_port->sample)

		return -EOPNOTSUPP;

	if (rtnl_dereference(mlxsw_sp_port->sample->psample_group)) {

		netdev_err(mlxsw_sp_port->dev, "sample already active\n");

		return -EEXIST;

	}

	if (act->sample.rate > MLXSW_REG_MPSC_RATE_MAX) {

		netdev_err(mlxsw_sp_port->dev, "sample rate not supported\n");

		return -EOPNOTSUPP;

	}



	rcu_assign_pointer(mlxsw_sp_port->sample->psample_group,

			   act->sample.psample_group);

	mlxsw_sp_port->sample->truncate = act->sample.truncate;

	mlxsw_sp_port->sample->trunc_size = act->sample.trunc_size;

	mlxsw_sp_port->sample->rate = act->sample.rate;



	err = mlxsw_sp_port_sample_set(mlxsw_sp_port, true, act->sample.rate);

	if (err)

		goto err_port_sample_set;

	return 0;



err_port_sample_set:

	RCU_INIT_POINTER(mlxsw_sp_port->sample->psample_group, NULL);

	return err;

}



static void

mlxsw_sp_port_del_cls_matchall_sample(struct mlxsw_sp_port *mlxsw_sp_port)

{

	if (!mlxsw_sp_port->sample)

		return;



	mlxsw_sp_port_sample_set(mlxsw_sp_port, false, 1);

	RCU_INIT_POINTER(mlxsw_sp_port->sample->psample_group, NULL);

}



static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,

					  struct tc_cls_matchall_offload *f,

					  bool ingress)

{

	struct mlxsw_sp_port_mall_tc_entry *mall_tc_entry;

	__be16 protocol = f->common.protocol;

	struct flow_action_entry *act;

	int err;



	if (!flow_offload_has_one_action(&f->rule->action)) {

		netdev_err(mlxsw_sp_port->dev, "only singular actions are supported\n");

		return -EOPNOTSUPP;

	}



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

	if (!mall_tc_entry)

		return -ENOMEM;

	mall_tc_entry->cookie = f->cookie;



	act = &f->rule->action.entries[0];



	if (act->id == FLOW_ACTION_MIRRED && protocol == htons(ETH_P_ALL)) {

		struct mlxsw_sp_port_mall_mirror_tc_entry *mirror;



		mall_tc_entry->type = MLXSW_SP_PORT_MALL_MIRROR;

		mirror = &mall_tc_entry->mirror;

		err = mlxsw_sp_port_add_cls_matchall_mirror(mlxsw_sp_port,

							    mirror, act,

							    ingress);

	} else if (act->id == FLOW_ACTION_SAMPLE &&

		   protocol == htons(ETH_P_ALL)) {

		mall_tc_entry->type = MLXSW_SP_PORT_MALL_SAMPLE;

		err = mlxsw_sp_port_add_cls_matchall_sample(mlxsw_sp_port, f,

							    act, ingress);

	} else {

		err = -EOPNOTSUPP;

	}



	if (err)

		goto err_add_action;



	list_add_tail(&mall_tc_entry->list, &mlxsw_sp_port->mall_tc_list);

	return 0;



err_add_action:

	kfree(mall_tc_entry);

	return err;

}



static void mlxsw_sp_port_del_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,

					   struct tc_cls_matchall_offload *f)

{

	struct mlxsw_sp_port_mall_tc_entry *mall_tc_entry;



	mall_tc_entry = mlxsw_sp_port_mall_tc_entry_find(mlxsw_sp_port,

							 f->cookie);

	if (!mall_tc_entry) {

		netdev_dbg(mlxsw_sp_port->dev, "tc entry not found on port\n");

		return;

	}

	list_del(&mall_tc_entry->list);



	switch (mall_tc_entry->type) {

	case MLXSW_SP_PORT_MALL_MIRROR:

		mlxsw_sp_port_del_cls_matchall_mirror(mlxsw_sp_port,

						      &mall_tc_entry->mirror);

		break;

	case MLXSW_SP_PORT_MALL_SAMPLE:

		mlxsw_sp_port_del_cls_matchall_sample(mlxsw_sp_port);

		break;

	default:

		WARN_ON(1);

	}



	kfree(mall_tc_entry);

}



static int mlxsw_sp_setup_tc_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,

					  struct tc_cls_matchall_offload *f,

					  bool ingress)

{

	switch (f->command) {

	case TC_CLSMATCHALL_REPLACE:

		return mlxsw_sp_port_add_cls_matchall(mlxsw_sp_port, f,

						      ingress);

	case TC_CLSMATCHALL_DESTROY:

		mlxsw_sp_port_del_cls_matchall(mlxsw_sp_port, f);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int

mlxsw_sp_setup_tc_cls_flower(struct mlxsw_sp_acl_block *acl_block,

			     struct flow_cls_offload *f)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_acl_block_mlxsw_sp(acl_block);



	switch (f->command) {

	case FLOW_CLS_REPLACE:

		return mlxsw_sp_flower_replace(mlxsw_sp, acl_block, f);

	case FLOW_CLS_DESTROY:

		mlxsw_sp_flower_destroy(mlxsw_sp, acl_block, f);

		return 0;

	case FLOW_CLS_STATS:

		return mlxsw_sp_flower_stats(mlxsw_sp, acl_block, f);

	case FLOW_CLS_TMPLT_CREATE:

		return mlxsw_sp_flower_tmplt_create(mlxsw_sp, acl_block, f);

	case FLOW_CLS_TMPLT_DESTROY:

		mlxsw_sp_flower_tmplt_destroy(mlxsw_sp, acl_block, f);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int mlxsw_sp_setup_tc_block_cb_matchall(enum tc_setup_type type,

					       void *type_data,

					       void *cb_priv, bool ingress)

{

	struct mlxsw_sp_port *mlxsw_sp_port = cb_priv;



	switch (type) {

	case TC_SETUP_CLSMATCHALL:

		if (!tc_cls_can_offload_and_chain0(mlxsw_sp_port->dev,

						   type_data))

			return -EOPNOTSUPP;



		return mlxsw_sp_setup_tc_cls_matchall(mlxsw_sp_port, type_data,

						      ingress);

	case TC_SETUP_CLSFLOWER:

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int mlxsw_sp_setup_tc_block_cb_matchall_ig(enum tc_setup_type type,

						  void *type_data,

						  void *cb_priv)

{

	return mlxsw_sp_setup_tc_block_cb_matchall(type, type_data,

						   cb_priv, true);

}



static int mlxsw_sp_setup_tc_block_cb_matchall_eg(enum tc_setup_type type,

						  void *type_data,

						  void *cb_priv)

{

	return mlxsw_sp_setup_tc_block_cb_matchall(type, type_data,

						   cb_priv, false);

}



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;



	switch (type) {

	case TC_SETUP_CLSMATCHALL:

		return 0;

	case TC_SETUP_CLSFLOWER:

		if (mlxsw_sp_acl_block_disabled(acl_block))

			return -EOPNOTSUPP;



		return mlxsw_sp_setup_tc_cls_flower(acl_block, type_data);

	default:

		return -EOPNOTSUPP;

	}

}



static void mlxsw_sp_tc_block_flower_release(void *cb_priv)

{

	struct mlxsw_sp_acl_block *acl_block = cb_priv;



	mlxsw_sp_acl_block_destroy(acl_block);

}



static LIST_HEAD(mlxsw_sp_block_cb_list);



static int

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 flow_block_cb *block_cb;

	bool register_block = false;

	int err;



	block_cb = flow_block_cb_lookup(f->block,

					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)

			return -ENOMEM;

		block_cb = flow_block_cb_alloc(mlxsw_sp_setup_tc_block_cb_flower,

					       mlxsw_sp, acl_block,

					       mlxsw_sp_tc_block_flower_release);

		if (IS_ERR(block_cb)) {

			mlxsw_sp_acl_block_destroy(acl_block);

			err = PTR_ERR(block_cb);

			goto err_cb_register;

		}

		register_block = true;

	} else {

		acl_block = flow_block_cb_priv(block_cb);

	}

	flow_block_cb_incref(block_cb);

	err = mlxsw_sp_acl_block_bind(mlxsw_sp, acl_block,

				      mlxsw_sp_port, ingress, f->extack);

	if (err)

		goto err_block_bind;



	if (ingress)

		mlxsw_sp_port->ing_acl_block = acl_block;

	else

		mlxsw_sp_port->eg_acl_block = acl_block;



	if (register_block) {

		flow_block_cb_add(block_cb, f);

		list_add_tail(&block_cb->driver_list, &mlxsw_sp_block_cb_list);

	}



	return 0;



err_block_bind:

	if (!flow_block_cb_decref(block_cb))

		flow_block_cb_free(block_cb);

err_cb_register:

	return err;

}



static void

mlxsw_sp_setup_tc_block_flower_unbind(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 flow_block_cb *block_cb;

	int err;



	block_cb = flow_block_cb_lookup(f->block,

					mlxsw_sp_setup_tc_block_cb_flower,

					mlxsw_sp);

	if (!block_cb)

		return;



	if (ingress)

		mlxsw_sp_port->ing_acl_block = NULL;

	else

		mlxsw_sp_port->eg_acl_block = NULL;



	acl_block = flow_block_cb_priv(block_cb);

	err = mlxsw_sp_acl_block_unbind(mlxsw_sp, acl_block,

					mlxsw_sp_port, ingress);

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

		flow_block_cb_remove(block_cb, f);

		list_del(&block_cb->driver_list);

	}

}



static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,

				   struct flow_block_offload *f)

{

	struct flow_block_cb *block_cb;

	flow_setup_cb_t *cb;

	bool ingress;

	int err;



	if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) {

		cb = mlxsw_sp_setup_tc_block_cb_matchall_ig;

		ingress = true;

	} else if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS) {

		cb = mlxsw_sp_setup_tc_block_cb_matchall_eg;

		ingress = false;

	} else {

		return -EOPNOTSUPP;

	}



	f->driver_block_list = &mlxsw_sp_block_cb_list;



	switch (f->command) {

	case FLOW_BLOCK_BIND:

		if (flow_block_cb_is_busy(cb, mlxsw_sp_port,

					  &mlxsw_sp_block_cb_list))

			return -EBUSY;



		block_cb = flow_block_cb_alloc(cb, mlxsw_sp_port,

					       mlxsw_sp_port, NULL);

		if (IS_ERR(block_cb))

			return PTR_ERR(block_cb);

		err = mlxsw_sp_setup_tc_block_flower_bind(mlxsw_sp_port, f,

							  ingress);

		if (err) {

			flow_block_cb_free(block_cb);

			return err;

		}

		flow_block_cb_add(block_cb, f);

		list_add_tail(&block_cb->driver_list, &mlxsw_sp_block_cb_list);

		return 0;

	case FLOW_BLOCK_UNBIND:

		mlxsw_sp_setup_tc_block_flower_unbind(mlxsw_sp_port,

						      f, ingress);

		block_cb = flow_block_cb_lookup(f->block, cb, mlxsw_sp_port);

		if (!block_cb)

			return -ENOENT;



		flow_block_cb_remove(block_cb, f);

		list_del(&block_cb->driver_list);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int mlxsw_sp_setup_tc(struct net_device *dev, enum tc_setup_type type,

			     void *type_data)

{
@@ -1791,23 +1373,21 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, enum tc_setup_type type, 
	}

}





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) ||

		    !list_empty(&mlxsw_sp_port->mall_tc_list)) {

		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)) {

			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;

}
@@ -3695,7 +3275,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	mlxsw_sp_port->mapping = *port_mapping;

	mlxsw_sp_port->link.autoneg = 1;

	INIT_LIST_HEAD(&mlxsw_sp_port->vlans_list);

	INIT_LIST_HEAD(&mlxsw_sp_port->mall_tc_list);



	mlxsw_sp_port->pcpu_stats =

		netdev_alloc_pcpu_stats(struct mlxsw_sp_port_pcpu_stats);
@@ -3704,13 +3283,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
		goto err_alloc_stats;

	}



	mlxsw_sp_port->sample = kzalloc(sizeof(*mlxsw_sp_port->sample),

					GFP_KERNEL);

	if (!mlxsw_sp_port->sample) {

		err = -ENOMEM;

		goto err_alloc_sample;

	}



	INIT_DELAYED_WORK(&mlxsw_sp_port->periodic_hw_stats.update_dw,

			  &update_stats_cache);
@@ -3897,8 +3469,6 @@ err_dev_addr_init: 
err_port_swid_set:

	mlxsw_sp_port_module_unmap(mlxsw_sp_port);

err_port_module_map:

	kfree(mlxsw_sp_port->sample);

err_alloc_sample:

	free_percpu(mlxsw_sp_port->pcpu_stats);

err_alloc_stats:

	free_netdev(dev);
@@ -3926,7 +3496,6 @@ static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port) 
	mlxsw_sp_port_tc_mc_mode_set(mlxsw_sp_port, false);

	mlxsw_sp_port_swid_set(mlxsw_sp_port, MLXSW_PORT_SWID_DISABLED_PORT);

	mlxsw_sp_port_module_unmap(mlxsw_sp_port);

	kfree(mlxsw_sp_port->sample);

	free_percpu(mlxsw_sp_port->pcpu_stats);

	WARN_ON_ONCE(!list_empty(&mlxsw_sp_port->vlans_list));

	free_netdev(mlxsw_sp_port->dev);
@@ -4413,7 +3982,7 @@ static void mlxsw_sp_rx_listener_sample_func(struct sk_buff *skb, u8 local_port, 
{

	struct mlxsw_sp *mlxsw_sp = priv;

	struct mlxsw_sp_port *mlxsw_sp_port = mlxsw_sp->ports[local_port];

	struct psample_group *psample_group;

	struct mlxsw_sp_port_sample *sample;

	u32 size;



	if (unlikely(!mlxsw_sp_port)) {
@@ -4421,22 +3990,14 @@ static void mlxsw_sp_rx_listener_sample_func(struct sk_buff *skb, u8 local_port, 
				     local_port);

		goto out;

	}

	if (unlikely(!mlxsw_sp_port->sample)) {

		dev_warn_ratelimited(mlxsw_sp->bus_info->dev, "Port %d: sample skb received on unsupported port\n",

				     local_port);

		goto out;

	}



	size = mlxsw_sp_port->sample->truncate ?

		  mlxsw_sp_port->sample->trunc_size : skb->len;



	rcu_read_lock();

	psample_group = rcu_dereference(mlxsw_sp_port->sample->psample_group);

	if (!psample_group)

	sample = rcu_dereference(mlxsw_sp_port->sample);

	if (!sample)

		goto out_unlock;

	psample_sample_packet(psample_group, skb, size,

			      mlxsw_sp_port->dev->ifindex, 0,

			      mlxsw_sp_port->sample->rate);

	size = sample->truncate ? sample->trunc_size : skb->len;

	psample_sample_packet(sample->psample_group, skb, size,

			      mlxsw_sp_port->dev->ifindex, 0, sample->rate);

out_unlock:

	rcu_read_unlock();

out:

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

+103 −64
Original line number Diff line number Diff line
@@ -109,25 +109,6 @@ struct mlxsw_sp_mid { 
	unsigned long *ports_in_mid; /* bits array */

};



enum mlxsw_sp_port_mall_action_type {

	MLXSW_SP_PORT_MALL_MIRROR,

	MLXSW_SP_PORT_MALL_SAMPLE,

};



struct mlxsw_sp_port_mall_mirror_tc_entry {

	int span_id;

	bool ingress;

};



struct mlxsw_sp_port_mall_tc_entry {

	struct list_head list;

	unsigned long cookie;

	enum mlxsw_sp_port_mall_action_type type;

	union {

		struct mlxsw_sp_port_mall_mirror_tc_entry mirror;

	};

};



struct mlxsw_sp_sb;

struct mlxsw_sp_bridge;

struct mlxsw_sp_router;
@@ -211,7 +192,7 @@ struct mlxsw_sp_port_pcpu_stats { 
};



struct mlxsw_sp_port_sample {

	struct psample_group __rcu *psample_group;

	struct psample_group *psample_group;

	u32 trunc_size;

	u32 rate;

	bool truncate;
@@ -274,21 +255,19 @@ struct mlxsw_sp_port { 
					       * the same localport can have

					       * different mapping.

					       */

	/* TC handles */

	struct list_head mall_tc_list;

	struct {

		#define MLXSW_HW_STATS_UPDATE_TIME HZ

		struct rtnl_link_stats64 stats;

		struct mlxsw_sp_port_xstats xstats;

		struct delayed_work update_dw;

	} periodic_hw_stats;

	struct mlxsw_sp_port_sample *sample;

	struct mlxsw_sp_port_sample __rcu *sample;

	struct list_head vlans_list;

	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,17 +633,10 @@ struct mlxsw_sp_acl_rule_info { 
	unsigned int counter_index;

};



struct mlxsw_sp_acl_block;

struct mlxsw_sp_acl_ruleset;



/* spectrum_acl.c */

enum mlxsw_sp_acl_profile {

	MLXSW_SP_ACL_PROFILE_FLOWER,

	MLXSW_SP_ACL_PROFILE_MR,

};



struct mlxsw_sp_acl_block {

/* spectrum_flow.c */

struct mlxsw_sp_flow_block {

	struct list_head binding_list;

	struct list_head mall_list;

	struct mlxsw_sp_acl_ruleset *ruleset_zero;

	struct mlxsw_sp *mlxsw_sp;

	unsigned int rule_count;
@@ -676,35 +648,92 @@ struct mlxsw_sp_acl_block { 
	struct net *net;

};



struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl);

struct mlxsw_sp *mlxsw_sp_acl_block_mlxsw_sp(struct mlxsw_sp_acl_block *block);

unsigned int

mlxsw_sp_acl_block_rule_count(const struct mlxsw_sp_acl_block *block);

void mlxsw_sp_acl_block_disable_inc(struct mlxsw_sp_acl_block *block);

void mlxsw_sp_acl_block_disable_dec(struct mlxsw_sp_acl_block *block);

bool mlxsw_sp_acl_block_disabled(const struct mlxsw_sp_acl_block *block);

struct mlxsw_sp_acl_block *mlxsw_sp_acl_block_create(struct mlxsw_sp *mlxsw_sp,

struct mlxsw_sp_flow_block_binding {

	struct list_head list;

	struct net_device *dev;

	struct mlxsw_sp_port *mlxsw_sp_port;

	bool ingress;

};



static inline struct mlxsw_sp *

mlxsw_sp_flow_block_mlxsw_sp(struct mlxsw_sp_flow_block *block)

{

	return block->mlxsw_sp;

}



static inline unsigned int

mlxsw_sp_flow_block_rule_count(const struct mlxsw_sp_flow_block *block)

{

	return block ? block->rule_count : 0;

}



static inline void

mlxsw_sp_flow_block_disable_inc(struct mlxsw_sp_flow_block *block)

{

	if (block)

		block->disable_count++;

}



static inline void

mlxsw_sp_flow_block_disable_dec(struct mlxsw_sp_flow_block *block)

{

	if (block)

		block->disable_count--;

}



static inline bool

mlxsw_sp_flow_block_disabled(const struct mlxsw_sp_flow_block *block)

{

	return block->disable_count;

}



static inline bool

mlxsw_sp_flow_block_is_egress_bound(const struct mlxsw_sp_flow_block *block)

{

	return block->egress_binding_count;

}



static inline bool

mlxsw_sp_flow_block_is_ingress_bound(const struct mlxsw_sp_flow_block *block)

{

	return block->ingress_binding_count;

}



static inline bool

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_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,

			    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,

			      struct mlxsw_sp_port *mlxsw_sp_port,

			      bool ingress);

bool mlxsw_sp_acl_block_is_egress_bound(const struct mlxsw_sp_acl_block *block);

bool mlxsw_sp_acl_block_is_ingress_bound(const struct mlxsw_sp_acl_block *block);

bool mlxsw_sp_acl_block_is_mixed_bound(const struct mlxsw_sp_acl_block *block);

void mlxsw_sp_flow_block_destroy(struct mlxsw_sp_flow_block *block);

int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,

			    struct flow_block_offload *f);



/* spectrum_acl.c */

struct mlxsw_sp_acl_ruleset;



enum mlxsw_sp_acl_profile {

	MLXSW_SP_ACL_PROFILE_FLOWER,

	MLXSW_SP_ACL_PROFILE_MR,

};



struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl);



int mlxsw_sp_acl_ruleset_bind(struct mlxsw_sp *mlxsw_sp,

			      struct mlxsw_sp_flow_block *block,

			      struct mlxsw_sp_flow_block_binding *binding);

void mlxsw_sp_acl_ruleset_unbind(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_flow_block *block,

				 struct mlxsw_sp_flow_block_binding *binding);

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,
@@ -736,7 +765,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,
@@ -857,21 +886,31 @@ extern const struct mlxsw_afa_ops mlxsw_sp2_act_afa_ops; 
extern const struct mlxsw_afk_ops mlxsw_sp1_afk_ops;

extern const struct mlxsw_afk_ops mlxsw_sp2_afk_ops;



/* spectrum_matchall.c */

int mlxsw_sp_mall_replace(struct mlxsw_sp_flow_block *block,

			  struct tc_cls_matchall_offload *f);

void mlxsw_sp_mall_destroy(struct mlxsw_sp_flow_block *block,

			   struct tc_cls_matchall_offload *f);

int mlxsw_sp_mall_port_bind(struct mlxsw_sp_flow_block *block,

			    struct mlxsw_sp_port *mlxsw_sp_port);

void mlxsw_sp_mall_port_unbind(struct mlxsw_sp_flow_block *block,

			       struct mlxsw_sp_port *mlxsw_sp_port);



/* 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

+22 −185

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE