Commit 0dfb2d82 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: sched: rename more stats_types 



Commit 53eca1f3 ("net: rename flow_action_hw_stats_types* ->
flow_action_hw_stats*") renamed just the flow action types and
helpers. For consistency rename variables, enums, struct members
and UAPI too (note that this UAPI was not in any official release,
yet).

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3c123d1

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

+3 −3
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, 
		return -EOPNOTSUPP;



	act = flow_action_first_entry_get(flow_action);

	if (act->hw_stats_type == FLOW_ACTION_HW_STATS_ANY ||

	    act->hw_stats_type == FLOW_ACTION_HW_STATS_IMMEDIATE) {

	if (act->hw_stats == FLOW_ACTION_HW_STATS_ANY ||

	    act->hw_stats == 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_DISABLED) {

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

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

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c

+2 −2
Original line number Diff line number Diff line
@@ -1387,7 +1387,7 @@ static int __stmmac_test_l3filt(struct stmmac_priv *priv, u32 dst, u32 src, 
	cls->rule = rule;



	rule->action.entries[0].id = FLOW_ACTION_DROP;

	rule->action.entries[0].hw_stats_type = FLOW_ACTION_HW_STATS_ANY;

	rule->action.entries[0].hw_stats = FLOW_ACTION_HW_STATS_ANY;

	rule->action.num_entries = 1;



	attr.dst = priv->dev->dev_addr;
@@ -1516,7 +1516,7 @@ static int __stmmac_test_l4filt(struct stmmac_priv *priv, u32 dst, u32 src, 
	cls->rule = rule;



	rule->action.entries[0].id = FLOW_ACTION_DROP;

	rule->action.entries[0].hw_stats_type = FLOW_ACTION_HW_STATS_ANY;

	rule->action.entries[0].hw_stats = FLOW_ACTION_HW_STATS_ANY;

	rule->action.num_entries = 1;



	attr.dst = priv->dev->dev_addr;

include/net/act_api.h

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct tc_action { 
	struct tc_cookie	__rcu *act_cookie;

	struct tcf_chain	__rcu *goto_chain;

	u32			tcfa_flags;

	u8			hw_stats_type;

	u8			hw_stats;

};

#define tcf_index	common.tcfa_index

#define tcf_refcnt	common.tcfa_refcnt
@@ -53,8 +53,8 @@ struct tc_action { 
#define tcf_rate_est	common.tcfa_rate_est

#define tcf_lock	common.tcfa_lock



#define TCA_ACT_HW_STATS_TYPE_ANY (TCA_ACT_HW_STATS_TYPE_IMMEDIATE | \

				   TCA_ACT_HW_STATS_TYPE_DELAYED)

#define TCA_ACT_HW_STATS_ANY (TCA_ACT_HW_STATS_IMMEDIATE | \

			      TCA_ACT_HW_STATS_DELAYED)



/* Update lastuse only if needed, to avoid dirtying a cache line.

 * We use a temp variable to avoid fetching jiffies twice.

include/net/flow_offload.h

+10 −10
Original line number Diff line number Diff line
@@ -163,12 +163,12 @@ enum flow_action_mangle_base { 
	FLOW_ACT_MANGLE_HDR_TYPE_UDP,

};



enum flow_action_hw_stats_type_bit {

enum flow_action_hw_stats_bit {

	FLOW_ACTION_HW_STATS_IMMEDIATE_BIT,

	FLOW_ACTION_HW_STATS_DELAYED_BIT,

};



enum flow_action_hw_stats_type {

enum flow_action_hw_stats {

	FLOW_ACTION_HW_STATS_DISABLED = 0,

	FLOW_ACTION_HW_STATS_IMMEDIATE =

		BIT(FLOW_ACTION_HW_STATS_IMMEDIATE_BIT),
@@ -191,7 +191,7 @@ void flow_action_cookie_destroy(struct flow_action_cookie *cookie); 


struct flow_action_entry {

	enum flow_action_id		id;

	enum flow_action_hw_stats_type	hw_stats_type;

	enum flow_action_hw_stats	hw_stats;

	action_destr			destructor;

	void				*destructor_priv;

	union {
@@ -289,18 +289,18 @@ flow_action_mixed_hw_stats_check(const struct flow_action *action, 
				 struct netlink_ext_ack *extack)

{

	const struct flow_action_entry *action_entry;

	u8 uninitialized_var(last_hw_stats_type);

	u8 uninitialized_var(last_hw_stats);

	int i;



	if (flow_offload_has_one_action(action))

		return true;



	flow_action_for_each(i, action_entry, action) {

		if (i && action_entry->hw_stats_type != last_hw_stats_type) {

		if (i && action_entry->hw_stats != last_hw_stats) {

			NL_SET_ERR_MSG_MOD(extack, "Mixing HW stats types for actions is not supported");

			return false;

		}

		last_hw_stats_type = action_entry->hw_stats_type;

		last_hw_stats = action_entry->hw_stats;

	}

	return true;

}
@@ -316,7 +316,7 @@ static inline bool 
__flow_action_hw_stats_check(const struct flow_action *action,

			     struct netlink_ext_ack *extack,

			     bool check_allow_bit,

			     enum flow_action_hw_stats_type_bit allow_bit)

			     enum flow_action_hw_stats_bit allow_bit)

{

	const struct flow_action_entry *action_entry;
@@ -326,11 +326,11 @@ __flow_action_hw_stats_check(const struct flow_action *action, 
		return false;

	action_entry = flow_action_first_entry_get(action);

	if (!check_allow_bit &&

	    action_entry->hw_stats_type != FLOW_ACTION_HW_STATS_ANY) {

	    action_entry->hw_stats != FLOW_ACTION_HW_STATS_ANY) {

		NL_SET_ERR_MSG_MOD(extack, "Driver supports only default HW stats type \"any\"");

		return false;

	} else if (check_allow_bit &&

		   !(action_entry->hw_stats_type & BIT(allow_bit))) {

		   !(action_entry->hw_stats & BIT(allow_bit))) {

		NL_SET_ERR_MSG_MOD(extack, "Driver does not support selected HW stats type");

		return false;

	}
@@ -340,7 +340,7 @@ __flow_action_hw_stats_check(const struct flow_action *action, 
static inline bool

flow_action_hw_stats_check(const struct flow_action *action,

			   struct netlink_ext_ack *extack,

			   enum flow_action_hw_stats_type_bit allow_bit)

			   enum flow_action_hw_stats_bit allow_bit)

{

	return __flow_action_hw_stats_check(action, extack, true, allow_bit);

}

include/uapi/linux/pkt_cls.h

+14 −15
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ enum { 
	TCA_ACT_PAD,

	TCA_ACT_COOKIE,

	TCA_ACT_FLAGS,

	TCA_ACT_HW_STATS_TYPE,

	TCA_ACT_HW_STATS,

	__TCA_ACT_MAX

};
@@ -31,19 +31,18 @@ enum { 
 * all supported bits set.

 * In case no bits are set, user is not interested in getting any HW statistics.

 */

#define TCA_ACT_HW_STATS_TYPE_IMMEDIATE (1 << 0) /* Means that in dump, user

#define TCA_ACT_HW_STATS_IMMEDIATE (1 << 0) /* Means that in dump, user

					     * gets the current HW stats

					     * state from the device

					     * queried at the dump time.

					     */

#define TCA_ACT_HW_STATS_TYPE_DELAYED (1 << 1) /* Means that in dump, user gets

						* HW stats that might be out

						* of date for some time, maybe

						* couple of seconds. This is

						* the case when driver polls

						* stats updates periodically

						* or when it gets async stats update

						* from the device.

#define TCA_ACT_HW_STATS_DELAYED (1 << 1) /* Means that in dump, user gets

					   * HW stats that might be out of date

					   * for some time, maybe couple of

					   * seconds. This is the case when

					   * driver polls stats updates

					   * periodically or when it gets async

					   * stats update from the device.

					   */



#define TCA_ACT_MAX __TCA_ACT_MAX

CRA Git | Maintained and supported by SUSTech CRA and CCSE