Commit 9096a03f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-Offload-TC-action-skbedit-priority' 



Ido Schimmel says:

====================
mlxsw: Offload TC action skbedit priority

Petr says:

The TC action "skbedit priority P" has the effect of assigning skbprio of P
to SKBs that it's applied on. In HW datapath of a switch, the corresponding
action is assignment of internal switch priority. Spectrum switches allow
setting of packet priority based on an ACL action, which is good match for
the skbedit priority gadget. This patchset therefore implements offloading
of this action to the Spectrum ACL engine.

After a bit of refactoring in patch #1, patch #2 extends the skbedit action
to support offloading of "priority" subcommand.

On mlxsw side, in patch #3, the QOS_ACTION flexible action is added, with
fields necessary for priority adjustment. In patch #4, "skbedit priority"
is connected to that action.

Patch #5 implements a new forwarding selftest, suitable for both SW- and
HW-datapath testing.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3fd177cb 26d9f0cd

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

+53 −0
Original line number Diff line number Diff line
@@ -1238,6 +1238,59 @@ err_append_allocated_mirror: 
}

EXPORT_SYMBOL(mlxsw_afa_block_append_mirror);



/* QoS Action

 * ----------

 * The QOS_ACTION is used for manipulating the QoS attributes of a packet. It

 * can be used to change the DCSP, ECN, Color and Switch Priority of the packet.

 * Note that PCP field can be changed using the VLAN action.

 */



#define MLXSW_AFA_QOS_CODE 0x06

#define MLXSW_AFA_QOS_SIZE 1



enum mlxsw_afa_qos_cmd {

	/* Do nothing */

	MLXSW_AFA_QOS_CMD_NOP,

	/* Set a field */

	MLXSW_AFA_QOS_CMD_SET,

};



/* afa_qos_switch_prio_cmd

 * Switch Priority command as per mlxsw_afa_qos_cmd.

 */

MLXSW_ITEM32(afa, qos, switch_prio_cmd, 0x08, 14, 2);



/* afa_qos_switch_prio

 * Switch Priority.

 */

MLXSW_ITEM32(afa, qos, switch_prio, 0x08, 0, 4);



static inline void

mlxsw_afa_qos_switch_prio_pack(char *payload,

			       enum mlxsw_afa_qos_cmd prio_cmd, u8 prio)

{

	mlxsw_afa_qos_switch_prio_cmd_set(payload, prio_cmd);

	mlxsw_afa_qos_switch_prio_set(payload, prio);

}



int mlxsw_afa_block_append_qos_switch_prio(struct mlxsw_afa_block *block,

					   u8 prio,

					   struct netlink_ext_ack *extack)

{

	char *act = mlxsw_afa_block_append_action(block,

						  MLXSW_AFA_QOS_CODE,

						  MLXSW_AFA_QOS_SIZE);



	if (IS_ERR(act)) {

		NL_SET_ERR_MSG_MOD(extack, "Cannot append QOS action");

		return PTR_ERR(act);

	}

	mlxsw_afa_qos_switch_prio_pack(act, MLXSW_AFA_QOS_CMD_SET,

				       prio);

	return 0;

}

EXPORT_SYMBOL(mlxsw_afa_block_append_qos_switch_prio);



/* Forwarding Action

 * -----------------

 * Forwarding Action can be used to implement Policy Based Switching (PBS)

drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ int mlxsw_afa_block_append_fwd(struct mlxsw_afa_block *block, 
int mlxsw_afa_block_append_vlan_modify(struct mlxsw_afa_block *block,

				       u16 vid, u8 pcp, u8 et,

				       struct netlink_ext_ack *extack);

int mlxsw_afa_block_append_qos_switch_prio(struct mlxsw_afa_block *block,

					   u8 prio,

					   struct netlink_ext_ack *extack);

int mlxsw_afa_block_append_allocated_counter(struct mlxsw_afa_block *block,

					     u32 counter_index);

int mlxsw_afa_block_append_counter(struct mlxsw_afa_block *block,

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+3 −0
Original line number Diff line number Diff line
@@ -746,6 +746,9 @@ int mlxsw_sp_acl_rulei_act_vlan(struct mlxsw_sp *mlxsw_sp, 
				struct mlxsw_sp_acl_rule_info *rulei,

				u32 action, u16 vid, u16 proto, u8 prio,

				struct netlink_ext_ack *extack);

int mlxsw_sp_acl_rulei_act_priority(struct mlxsw_sp *mlxsw_sp,

				    struct mlxsw_sp_acl_rule_info *rulei,

				    u32 prio, struct netlink_ext_ack *extack);

int mlxsw_sp_acl_rulei_act_count(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_acl_rule_info *rulei,

				 struct netlink_ext_ack *extack);

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

+17 −0
Original line number Diff line number Diff line
@@ -638,6 +638,23 @@ int mlxsw_sp_acl_rulei_act_vlan(struct mlxsw_sp *mlxsw_sp, 
	}

}



int mlxsw_sp_acl_rulei_act_priority(struct mlxsw_sp *mlxsw_sp,

				    struct mlxsw_sp_acl_rule_info *rulei,

				    u32 prio, struct netlink_ext_ack *extack)

{

	/* Even though both Linux and Spectrum switches support 16 priorities,

	 * spectrum_qdisc only processes the first eight priomap elements, and

	 * the DCB and PFC features are tied to 8 priorities as well. Therefore

	 * bounce attempts to prioritize packets to higher priorities.

	 */

	if (prio >= IEEE_8021QAZ_MAX_TCS) {

		NL_SET_ERR_MSG_MOD(extack, "Only priorities 0..7 are supported");

		return -EINVAL;

	}

	return mlxsw_afa_block_append_qos_switch_prio(rulei->act_block, prio,

						      extack);

}



int mlxsw_sp_acl_rulei_act_count(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_acl_rule_info *rulei,

				 struct netlink_ext_ack *extack)

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

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, 
							   act->id, vid,

							   proto, prio, extack);

			}

		case FLOW_ACTION_PRIORITY:

			return mlxsw_sp_acl_rulei_act_priority(mlxsw_sp, rulei,

							       act->priority,

							       extack);

		default:

			NL_SET_ERR_MSG_MOD(extack, "Unsupported action");

			dev_err(mlxsw_sp->bus_info->dev, "Unsupported action\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE