Commit 24ee8651 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfp-type' 



Jakub Kicinski says:

====================
net: rename flow_action stats and set NFP type

Jiri, I hope this is okay with you, I just dropped the "type" from
the helper and value names, and now things should be able to fit
on a line, within 80 characters.

Second patch makes the NFP able to offload DELAYED stats, which
is the type it supports.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 362d3d88 36b4b92b

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

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static int bnxt_tc_parse_actions(struct bnxt *bp, 
		return -EINVAL;

	}



	if (!flow_action_basic_hw_stats_types_check(flow_action, extack))

	if (!flow_action_basic_hw_stats_check(flow_action, extack))

		return -EOPNOTSUPP;



	flow_action_for_each(i, act, flow_action) {

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

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ 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))

	if (!flow_action_basic_hw_stats_check(actions, extack))

		return -EOPNOTSUPP;



	flow_action_for_each(i, act, actions) {

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

+2 −2
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ 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))

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

		return -EOPNOTSUPP;



	memset(&c2, 0, sizeof(c2));
@@ -1308,7 +1308,7 @@ 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))

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

		return -EOPNOTSUPP;



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

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+5 −5
Original line number Diff line number Diff line
@@ -3180,8 +3180,8 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv, 
	if (!flow_action_has_entries(flow_action))

		return -EINVAL;



	if (!flow_action_hw_stats_types_check(flow_action, extack,

					      FLOW_ACTION_HW_STATS_TYPE_DELAYED_BIT))

	if (!flow_action_hw_stats_check(flow_action, extack,

					FLOW_ACTION_HW_STATS_DELAYED_BIT))

		return -EOPNOTSUPP;



	attr->flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;
@@ -3675,8 +3675,8 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, 
	if (!flow_action_has_entries(flow_action))

		return -EINVAL;



	if (!flow_action_hw_stats_types_check(flow_action, extack,

					      FLOW_ACTION_HW_STATS_TYPE_DELAYED_BIT))

	if (!flow_action_hw_stats_check(flow_action, extack,

					FLOW_ACTION_HW_STATS_DELAYED_BIT))

		return -EOPNOTSUPP;



	flow_action_for_each(i, act, flow_action) {
@@ -4510,7 +4510,7 @@ static int scan_tc_matchall_fdb_actions(struct mlx5e_priv *priv, 
		return -EOPNOTSUPP;

	}



	if (!flow_action_basic_hw_stats_types_check(flow_action, extack))

	if (!flow_action_basic_hw_stats_check(flow_action, extack))

		return -EOPNOTSUPP;



	flow_action_for_each(i, act, flow_action) {

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

+4 −4
Original line number Diff line number Diff line
@@ -26,17 +26,17 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, 


	if (!flow_action_has_entries(flow_action))

		return 0;

	if (!flow_action_mixed_hw_stats_types_check(flow_action, extack))

	if (!flow_action_mixed_hw_stats_check(flow_action, extack))

		return -EOPNOTSUPP;



	act = flow_action_first_entry_get(flow_action);

	if (act->hw_stats_type == FLOW_ACTION_HW_STATS_TYPE_ANY ||

	    act->hw_stats_type == FLOW_ACTION_HW_STATS_TYPE_IMMEDIATE) {

	if (act->hw_stats_type == FLOW_ACTION_HW_STATS_ANY ||

	    act->hw_stats_type == FLOW_ACTION_HW_STATS_IMMEDIATE) {

		/* Count action is inserted first */

		err = mlxsw_sp_acl_rulei_act_count(mlxsw_sp, rulei, extack);

		if (err)

			return err;

	} else if (act->hw_stats_type != FLOW_ACTION_HW_STATS_TYPE_DISABLED) {

	} else if (act->hw_stats_type != FLOW_ACTION_HW_STATS_DISABLED) {

		NL_SET_ERR_MSG_MOD(extack, "Unsupported action HW stats type");

		return -EOPNOTSUPP;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE