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

Commit bec2d46d authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: mvpp2: cls: Allow dropping packets with classification offload 



This commit introduces support for the "Drop" action in classification
offload. This corresponds to the "-1" action with ethtool -N.

This is achieved using the color marking actions available in the C2
engine, which associate a color to a packet. These colors can be either
Green, Yellow or Red, Red meaning that the packet should be dropped.

Green and Yellow colors are interpreted by the Policer, which isn't
supported yet.

This method of dropping using the Classifier is different than the
already existing early-drop features, such as VLAN filtering and MAC
UC/MC filtering, which are performed during the Parsing step, and
therefore take precedence over classification actions.

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90b509b3

drivers/net/ethernet/marvell/mvpp2/mvpp2.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
#define     MVPP22_CLS_C2_ACT_FWD(act)		(((act) & 0x7) << 13)

#define     MVPP22_CLS_C2_ACT_QHIGH(act)	(((act) & 0x3) << 11)

#define     MVPP22_CLS_C2_ACT_QLOW(act)		(((act) & 0x3) << 9)

#define     MVPP22_CLS_C2_ACT_COLOR(act)	((act) & 0x7)

#define MVPP22_CLS_C2_ATTR0			0x1b64

#define     MVPP22_CLS_C2_ATTR0_QHIGH(qh)	(((qh) & 0x1f) << 24)

#define     MVPP22_CLS_C2_ATTR0_QHIGH_MASK	0x1f

drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c

+20 −9
Original line number Diff line number Diff line
@@ -1057,6 +1057,16 @@ static int mvpp2_port_c2_tcam_rule_add(struct mvpp2_port *port, 
	c2.tcam[4] |= MVPP22_CLS_C2_TCAM_EN(MVPP22_CLS_C2_LU_TYPE(MVPP2_CLS_LU_TYPE_MASK));

	c2.tcam[4] |= MVPP22_CLS_C2_LU_TYPE(rule->loc);



	if (act->id == FLOW_ACTION_DROP) {

		c2.act = MVPP22_CLS_C2_ACT_COLOR(MVPP22_C2_COL_RED_LOCK);

	} else {

		/* We want to keep the default color derived from the Header

		 * Parser drop entries, for VLAN and MAC filtering. This will

		 * assign a default color of Green or Red, and we want matches

		 * with a non-drop action to keep that color.

		 */

		c2.act = MVPP22_CLS_C2_ACT_COLOR(MVPP22_C2_COL_NO_UPD_LOCK);



		/* Mark packet as "forwarded to software", needed for RSS */

		c2.act |= MVPP22_CLS_C2_ACT_FWD(MVPP22_C2_FWD_SW_LOCK);
@@ -1068,6 +1078,7 @@ static int mvpp2_port_c2_tcam_rule_add(struct mvpp2_port *port, 


		c2.attr[0] = MVPP22_CLS_C2_ATTR0_QHIGH(qh) |

			      MVPP22_CLS_C2_ATTR0_QLOW(ql);

	}



	c2.valid = true;
@@ -1183,7 +1194,7 @@ static int mvpp2_cls_rfs_parse_rule(struct mvpp2_rfs_rule *rule) 
	struct flow_action_entry *act;



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

	if (act->id != FLOW_ACTION_QUEUE)

	if (act->id != FLOW_ACTION_QUEUE && act->id != FLOW_ACTION_DROP)

		return -EOPNOTSUPP;



	/* For now, only use the C2 engine which has a HEK size limited to 64

drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h

+11 −0
Original line number Diff line number Diff line
@@ -92,6 +92,17 @@ enum mvpp22_cls_c2_fwd_action { 
	MVPP22_C2_FWD_HW_LOW_LAT_LOCK,

};



enum mvpp22_cls_c2_color_action {

	MVPP22_C2_COL_NO_UPD = 0,

	MVPP22_C2_COL_NO_UPD_LOCK,

	MVPP22_C2_COL_GREEN,

	MVPP22_C2_COL_GREEN_LOCK,

	MVPP22_C2_COL_YELLOW,

	MVPP22_C2_COL_YELLOW_LOCK,

	MVPP22_C2_COL_RED,		/* Drop */

	MVPP22_C2_COL_RED_LOCK,		/* Drop */

};



#define MVPP2_CLS_C2_TCAM_WORDS			5

#define MVPP2_CLS_C2_ATTR_WORDS			5