Commit e7e3f514 authored by Steen Hegelund's avatar Steen Hegelund Committed by David S. Miller
Browse files

net: microchip: sparx5: Add ingress information to VCAP instance 



This allows the check of the goto action to be specific to the ingress and
egress VCAP instances.

The debugfs support is also updated to show this information.

Signed-off-by: default avatarSteen Hegelund <steen.hegelund@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b95d9e2c

drivers/net/ethernet/microchip/lan966x/lan966x_main.h

+2 −1
Original line number Diff line number Diff line
@@ -603,7 +603,8 @@ int lan966x_vcap_init(struct lan966x *lan966x); 
void lan966x_vcap_deinit(struct lan966x *lan966x);



int lan966x_tc_flower(struct lan966x_port *port,

		      struct flow_cls_offload *f);

		      struct flow_cls_offload *f,

		      bool ingress);



int lan966x_goto_port_add(struct lan966x_port *port,

			  int from_cid, int to_cid,

drivers/net/ethernet/microchip/lan966x/lan966x_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int lan966x_tc_block_cb(enum tc_setup_type type, void *type_data, 
	case TC_SETUP_CLSMATCHALL:

		return lan966x_tc_matchall(port, type_data, ingress);

	case TC_SETUP_CLSFLOWER:

		return lan966x_tc_flower(port, type_data);

		return lan966x_tc_flower(port, type_data, ingress);

	default:

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c

+10 −6
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ static int lan966x_tc_flower_use_dissectors(struct flow_cls_offload *f, 


static int lan966x_tc_flower_action_check(struct vcap_control *vctrl,

					  struct net_device *dev,

					  struct flow_cls_offload *fco)

					  struct flow_cls_offload *fco,

					  bool ingress)

{

	struct flow_rule *rule = flow_cls_offload_flow_rule(fco);

	struct flow_action_entry *actent, *last_actent = NULL;
@@ -120,7 +121,8 @@ static int lan966x_tc_flower_action_check(struct vcap_control *vctrl, 
					   "Invalid goto chain");

			return -EINVAL;

		}

	} else if (!vcap_is_last_chain(vctrl, fco->common.chain_index)) {

	} else if (!vcap_is_last_chain(vctrl, fco->common.chain_index,

				       ingress)) {

		NL_SET_ERR_MSG_MOD(fco->common.extack,

				   "Last action must be 'goto'");

		return -EINVAL;
@@ -139,7 +141,8 @@ static int lan966x_tc_flower_action_check(struct vcap_control *vctrl, 


static int lan966x_tc_flower_add(struct lan966x_port *port,

				 struct flow_cls_offload *f,

				 struct vcap_admin *admin)

				 struct vcap_admin *admin,

				 bool ingress)

{

	struct flow_action_entry *act;

	u16 l3_proto = ETH_P_ALL;
@@ -148,7 +151,7 @@ static int lan966x_tc_flower_add(struct lan966x_port *port, 
	int err, idx;



	err = lan966x_tc_flower_action_check(port->lan966x->vcap_ctrl,

					     port->dev, f);

					     port->dev, f, ingress);

	if (err)

		return err;
@@ -232,7 +235,8 @@ static int lan966x_tc_flower_del(struct lan966x_port *port, 
}



int lan966x_tc_flower(struct lan966x_port *port,

		      struct flow_cls_offload *f)

		      struct flow_cls_offload *f,

		      bool ingress)

{

	struct vcap_admin *admin;
@@ -245,7 +249,7 @@ int lan966x_tc_flower(struct lan966x_port *port, 


	switch (f->command) {

	case FLOW_CLS_REPLACE:

		return lan966x_tc_flower_add(port, f, admin);

		return lan966x_tc_flower_add(port, f, admin, ingress);

	case FLOW_CLS_DESTROY:

		return lan966x_tc_flower_del(port, f, admin);

	default:

drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ static struct lan966x_vcap_inst { 
	int first_cid; /* first chain id in this vcap */

	int last_cid; /* last chain id in this vcap */

	int count; /* number of available addresses */

	bool ingress; /* is vcap in the ingress path */

} lan966x_vcap_inst_cfg[] = {

	{

		.vtype = VCAP_TYPE_IS2, /* IS2-0 */
@@ -31,6 +32,7 @@ static struct lan966x_vcap_inst { 
		.first_cid = LAN966X_VCAP_CID_IS2_L0,

		.last_cid = LAN966X_VCAP_CID_IS2_MAX,

		.count = 256,

		.ingress = true,

	},

};
@@ -431,6 +433,7 @@ lan966x_vcap_admin_alloc(struct lan966x *lan966x, struct vcap_control *ctrl, 


	admin->vtype = cfg->vtype;

	admin->vinst = 0;

	admin->ingress = cfg->ingress;

	admin->w32be = true;

	admin->tgt_inst = cfg->tgt_inst;

drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c

+8 −5
Original line number Diff line number Diff line
@@ -618,7 +618,8 @@ static int sparx5_tc_use_dissectors(struct flow_cls_offload *fco, 


static int sparx5_tc_flower_action_check(struct vcap_control *vctrl,

					 struct net_device *ndev,

					 struct flow_cls_offload *fco)

					 struct flow_cls_offload *fco,

					 bool ingress)

{

	struct flow_rule *rule = flow_cls_offload_flow_rule(fco);

	struct flow_action_entry *actent, *last_actent = NULL;
@@ -655,7 +656,8 @@ static int sparx5_tc_flower_action_check(struct vcap_control *vctrl, 
					   "Invalid goto chain");

			return -EINVAL;

		}

	} else if (!vcap_is_last_chain(vctrl, fco->common.chain_index)) {

	} else if (!vcap_is_last_chain(vctrl, fco->common.chain_index,

				       ingress)) {

		NL_SET_ERR_MSG_MOD(fco->common.extack,

				   "Last action must be 'goto'");

		return -EINVAL;
@@ -970,7 +972,8 @@ static int sparx5_tc_add_rule_link(struct vcap_control *vctrl, 


static int sparx5_tc_flower_replace(struct net_device *ndev,

				    struct flow_cls_offload *fco,

				    struct vcap_admin *admin)

				    struct vcap_admin *admin,

				    bool ingress)

{

	struct sparx5_port *port = netdev_priv(ndev);

	struct sparx5_multiple_rules multi = {};
@@ -983,7 +986,7 @@ static int sparx5_tc_flower_replace(struct net_device *ndev, 


	vctrl = port->sparx5->vcap_ctrl;



	err = sparx5_tc_flower_action_check(vctrl, ndev, fco);

	err = sparx5_tc_flower_action_check(vctrl, ndev, fco, ingress);

	if (err)

		return err;
@@ -1141,7 +1144,7 @@ int sparx5_tc_flower(struct net_device *ndev, struct flow_cls_offload *fco, 


	switch (fco->command) {

	case FLOW_CLS_REPLACE:

		return sparx5_tc_flower_replace(ndev, fco, admin);

		return sparx5_tc_flower_replace(ndev, fco, admin, ingress);

	case FLOW_CLS_DESTROY:

		return sparx5_tc_flower_destroy(ndev, fco, admin);

	case FLOW_CLS_STATS: