Commit 319a1d19 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

flow_offload: check for basic action hw stats type 



Introduce flow_action_basic_hw_stats_types_check() helper and use it
in drivers. That sanitizes the drivers which do not have support
for action HW stats types.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ee47330

drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c

+7 −2
Original line number Diff line number Diff line
@@ -279,7 +279,8 @@ bnxt_tc_parse_pedit(struct bnxt *bp, struct bnxt_tc_actions *actions, 


static int bnxt_tc_parse_actions(struct bnxt *bp,

				 struct bnxt_tc_actions *actions,

				 struct flow_action *flow_action)

				 struct flow_action *flow_action,

				 struct netlink_ext_ack *extack)

{

	/* Used to store the L2 rewrite mask for dmac (6 bytes) followed by

	 * smac (6 bytes) if rewrite of both is specified, otherwise either
@@ -299,6 +300,9 @@ static int bnxt_tc_parse_actions(struct bnxt *bp, 
		return -EINVAL;

	}



	if (!flow_action_basic_hw_stats_types_check(flow_action, extack))

		return -EOPNOTSUPP;



	flow_action_for_each(i, act, flow_action) {

		switch (act->id) {

		case FLOW_ACTION_DROP:
@@ -491,7 +495,8 @@ static int bnxt_tc_parse_flow(struct bnxt *bp, 
		flow->tun_mask.tp_src = match.mask->src;

	}



	return bnxt_tc_parse_actions(bp, &flow->actions, &rule->action);

	return bnxt_tc_parse_actions(bp, &flow->actions, &rule->action,

				     tc_flow_cmd->common.extack);

}



static int bnxt_hwrm_cfa_flow_free(struct bnxt *bp,

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

+6 −2
Original line number Diff line number Diff line
@@ -544,7 +544,8 @@ static bool valid_pedit_action(struct net_device *dev, 
}



int cxgb4_validate_flow_actions(struct net_device *dev,

				struct flow_action *actions)

				struct flow_action *actions,

				struct netlink_ext_ack *extack)

{

	struct flow_action_entry *act;

	bool act_redir = false;
@@ -552,6 +553,9 @@ int cxgb4_validate_flow_actions(struct net_device *dev, 
	bool act_vlan = false;

	int i;



	if (!flow_action_basic_hw_stats_types_check(actions, extack))

		return -EOPNOTSUPP;



	flow_action_for_each(i, act, actions) {

		switch (act->id) {

		case FLOW_ACTION_ACCEPT:
@@ -642,7 +646,7 @@ int cxgb4_tc_flower_replace(struct net_device *dev, 
	struct filter_ctx ctx;

	int fidx, ret;



	if (cxgb4_validate_flow_actions(dev, &rule->action))

	if (cxgb4_validate_flow_actions(dev, &rule->action, extack))

		return -EOPNOTSUPP;



	if (cxgb4_validate_flow_match(dev, cls))

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ void cxgb4_process_flow_actions(struct net_device *in, 
				struct flow_action *actions,

				struct ch_filter_specification *fs);

int cxgb4_validate_flow_actions(struct net_device *dev,

				struct flow_action *actions);

				struct flow_action *actions,

				struct netlink_ext_ack *extack);



int cxgb4_tc_flower_replace(struct net_device *dev,

			    struct flow_cls_offload *cls);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c

+2 −1
Original line number Diff line number Diff line
@@ -286,7 +286,8 @@ int cxgb4_tc_matchall_replace(struct net_device *dev, 
		}



		ret = cxgb4_validate_flow_actions(dev,

						  &cls_matchall->rule->action);

						  &cls_matchall->rule->action,

						  extack);

		if (ret)

			return ret;

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

+6 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,9 @@ static int mvpp2_port_c2_tcam_rule_add(struct mvpp2_port *port, 
	u8 qh, ql, pmap;

	int index, ctx;



	if (!flow_action_basic_hw_stats_types_check(&rule->flow->action, NULL))

		return -EOPNOTSUPP;



	memset(&c2, 0, sizeof(c2));



	index = mvpp2_cls_c2_port_flow_index(port, rule->loc);
@@ -1305,6 +1308,9 @@ static int mvpp2_cls_rfs_parse_rule(struct mvpp2_rfs_rule *rule) 
	struct flow_rule *flow = rule->flow;

	struct flow_action_entry *act;



	if (!flow_action_basic_hw_stats_types_check(&rule->flow->action, NULL))

		return -EOPNOTSUPP;



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

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

		return -EOPNOTSUPP;

CRA Git | Maintained and supported by SUSTech CRA and CCSE