Merge branch 'flow_offload-follow-ups-to-HW-stats-type-patchset' (377bb764) · Commits · 戴 / test

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2879,7 +2879,7 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,
		return -EINVAL;

		if (!flow_action_hw_stats_types_check(flow_action, extack,
		FLOW_ACTION_HW_STATS_TYPE_DELAYED))
		FLOW_ACTION_HW_STATS_TYPE_DELAYED_BIT))
		return -EOPNOTSUPP;

		attr->flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;
		@@ -3374,7 +3374,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
		return -EINVAL;

		if (!flow_action_hw_stats_types_check(flow_action, extack,
		FLOW_ACTION_HW_STATS_TYPE_DELAYED))
		FLOW_ACTION_HW_STATS_TYPE_DELAYED_BIT))
		return -EOPNOTSUPP;

		flow_action_for_each(i, act, flow_action) {

include/net/flow_offload.h

+33 −13

Original line number	Diff line number	Diff line
		@@ -155,11 +155,21 @@ enum flow_action_mangle_base {
		FLOW_ACT_MANGLE_HDR_TYPE_UDP,
		};

		#define FLOW_ACTION_HW_STATS_TYPE_IMMEDIATE BIT(0)
		#define FLOW_ACTION_HW_STATS_TYPE_DELAYED BIT(1)
		#define FLOW_ACTION_HW_STATS_TYPE_ANY (FLOW_ACTION_HW_STATS_TYPE_IMMEDIATE \| \
		FLOW_ACTION_HW_STATS_TYPE_DELAYED)
		#define FLOW_ACTION_HW_STATS_TYPE_DISABLED 0
		enum flow_action_hw_stats_type_bit {
		FLOW_ACTION_HW_STATS_TYPE_IMMEDIATE_BIT,
		FLOW_ACTION_HW_STATS_TYPE_DELAYED_BIT,
		};

		enum flow_action_hw_stats_type {
		FLOW_ACTION_HW_STATS_TYPE_DISABLED = 0,
		FLOW_ACTION_HW_STATS_TYPE_IMMEDIATE =
		BIT(FLOW_ACTION_HW_STATS_TYPE_IMMEDIATE_BIT),
		FLOW_ACTION_HW_STATS_TYPE_DELAYED =
		BIT(FLOW_ACTION_HW_STATS_TYPE_DELAYED_BIT),
		FLOW_ACTION_HW_STATS_TYPE_ANY =
		FLOW_ACTION_HW_STATS_TYPE_IMMEDIATE \|
		FLOW_ACTION_HW_STATS_TYPE_DELAYED,
		};

		typedef void (action_destr)(void priv);

		@@ -175,7 +185,7 @@ void flow_action_cookie_destroy(struct flow_action_cookie *cookie);

		struct flow_action_entry {
		enum flow_action_id id;
		u8 hw_stats_type;
		enum flow_action_hw_stats_type hw_stats_type;
		action_destr destructor;
		void *destructor_priv;
		union {
		@@ -290,9 +300,10 @@ flow_action_first_entry_get(const struct flow_action *action)
		}

		static inline bool
		flow_action_hw_stats_types_check(const struct flow_action *action,
		__flow_action_hw_stats_types_check(const struct flow_action *action,
		struct netlink_ext_ack *extack,
		u8 allowed_hw_stats_type)
		bool check_allow_bit,
		enum flow_action_hw_stats_type_bit allow_bit)
		{
		const struct flow_action_entry *action_entry;

		@@ -301,23 +312,32 @@ flow_action_hw_stats_types_check(const struct flow_action *action,
		if (!flow_action_mixed_hw_stats_types_check(action, extack))
		return false;
		action_entry = flow_action_first_entry_get(action);
		if (allowed_hw_stats_type == 0 &&
		if (!check_allow_bit &&
		action_entry->hw_stats_type != FLOW_ACTION_HW_STATS_TYPE_ANY) {
		NL_SET_ERR_MSG_MOD(extack, "Driver supports only default HW stats type \"any\"");
		return false;
		} else if (allowed_hw_stats_type != 0 &&
		action_entry->hw_stats_type != allowed_hw_stats_type) {
		} else if (check_allow_bit &&
		!(action_entry->hw_stats_type & BIT(allow_bit))) {
		NL_SET_ERR_MSG_MOD(extack, "Driver does not support selected HW stats type");
		return false;
		}
		return true;
		}

		static inline bool
		flow_action_hw_stats_types_check(const struct flow_action *action,
		struct netlink_ext_ack *extack,
		enum flow_action_hw_stats_type_bit allow_bit)
		{
		return __flow_action_hw_stats_types_check(action, extack,
		true, allow_bit);
		}

		static inline bool
		flow_action_basic_hw_stats_types_check(const struct flow_action *action,
		struct netlink_ext_ack *extack)
		{
		return flow_action_hw_stats_types_check(action, extack, 0);
		return __flow_action_hw_stats_types_check(action, extack, false, 0);
		}

		struct flow_rule {

Admin message