Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39a7d527 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-tcpflags' 



Jiri Pirko says:

====================
net: add tcp flags match support to flower and offload it

This patch adds support to dissect tcp flags, match on them using
flower classifier and offload such rules to mlxsw Spectrum devices.

v1->v2:
- removed no longer relevant comment from patch 1 as suggested by Or
- sent correct patches this time
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2a7f38c5 8a41d845

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

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ enum mlxsw_afk_element { 
	MLXSW_AFK_ELEMENT_SRC_L4_PORT,

	MLXSW_AFK_ELEMENT_VID,

	MLXSW_AFK_ELEMENT_PCP,

	MLXSW_AFK_ELEMENT_TCP_FLAGS,

	MLXSW_AFK_ELEMENT_MAX,

};
@@ -102,6 +103,7 @@ static const struct mlxsw_afk_element_info mlxsw_afk_element_infos[] = { 
	MLXSW_AFK_ELEMENT_INFO_U32(IP_PROTO, 0x10, 0, 8),

	MLXSW_AFK_ELEMENT_INFO_U32(VID, 0x10, 8, 12),

	MLXSW_AFK_ELEMENT_INFO_U32(PCP, 0x10, 20, 3),

	MLXSW_AFK_ELEMENT_INFO_U32(TCP_FLAGS, 0x10, 23, 9),

	MLXSW_AFK_ELEMENT_INFO_U32(SRC_IP4, 0x18, 0, 32),

	MLXSW_AFK_ELEMENT_INFO_U32(DST_IP4, 0x1C, 0, 32),

	MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP6_HI, 0x18, 8),

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

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_ipv4_dip[] = { 
	MLXSW_AFK_ELEMENT_INST_U32(SRC_SYS_PORT, 0x0C, 0, 16),

};



static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_ipv4[] = {

	MLXSW_AFK_ELEMENT_INST_U32(SRC_IP4, 0x00, 0, 32),

	MLXSW_AFK_ELEMENT_INST_U32(TCP_FLAGS, 0x08, 8, 9), /* TCP_CONTROL+TCP_ECN */

};



static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_ipv4_ex[] = {

	MLXSW_AFK_ELEMENT_INST_U32(VID, 0x00, 0, 12),

	MLXSW_AFK_ELEMENT_INST_U32(PCP, 0x08, 29, 3),
@@ -102,6 +107,7 @@ static const struct mlxsw_afk_block mlxsw_sp_afk_blocks[] = { 
	MLXSW_AFK_BLOCK(0x12, mlxsw_sp_afk_element_info_l2_smac_ex),

	MLXSW_AFK_BLOCK(0x30, mlxsw_sp_afk_element_info_ipv4_sip),

	MLXSW_AFK_BLOCK(0x31, mlxsw_sp_afk_element_info_ipv4_dip),

	MLXSW_AFK_BLOCK(0x32, mlxsw_sp_afk_element_info_ipv4),

	MLXSW_AFK_BLOCK(0x33, mlxsw_sp_afk_element_info_ipv4_ex),

	MLXSW_AFK_BLOCK(0x60, mlxsw_sp_afk_element_info_ipv6_dip),

	MLXSW_AFK_BLOCK(0x65, mlxsw_sp_afk_element_info_ipv6_ex1),

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

+1 −0
Original line number Diff line number Diff line
@@ -983,6 +983,7 @@ static const enum mlxsw_afk_element mlxsw_sp_acl_tcam_pattern_ipv4[] = { 
	MLXSW_AFK_ELEMENT_SRC_L4_PORT,

	MLXSW_AFK_ELEMENT_VID,

	MLXSW_AFK_ELEMENT_PCP,

	MLXSW_AFK_ELEMENT_TCP_FLAGS,

};



static const enum mlxsw_afk_element mlxsw_sp_acl_tcam_pattern_ipv6[] = {

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

+30 −0
Original line number Diff line number Diff line
@@ -178,6 +178,32 @@ static int mlxsw_sp_flower_parse_ports(struct mlxsw_sp *mlxsw_sp, 
	return 0;

}



static int mlxsw_sp_flower_parse_tcp(struct mlxsw_sp *mlxsw_sp,

				     struct mlxsw_sp_acl_rule_info *rulei,

				     struct tc_cls_flower_offload *f,

				     u8 ip_proto)

{

	struct flow_dissector_key_tcp *key, *mask;



	if (!dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_TCP))

		return 0;



	if (ip_proto != IPPROTO_TCP) {

		dev_err(mlxsw_sp->bus_info->dev, "TCP keys supported only for TCP\n");

		return -EINVAL;

	}



	key = skb_flow_dissector_target(f->dissector,

					FLOW_DISSECTOR_KEY_TCP,

					f->key);

	mask = skb_flow_dissector_target(f->dissector,

					 FLOW_DISSECTOR_KEY_TCP,

					 f->mask);

	mlxsw_sp_acl_rulei_keymask_u32(rulei, MLXSW_AFK_ELEMENT_TCP_FLAGS,

				       ntohs(key->flags), ntohs(mask->flags));

	return 0;

}



static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp,

				 struct net_device *dev,

				 struct mlxsw_sp_acl_rule_info *rulei,
@@ -194,6 +220,7 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, 
	      BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_PORTS) |

	      BIT(FLOW_DISSECTOR_KEY_TCP) |

	      BIT(FLOW_DISSECTOR_KEY_VLAN))) {

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

		return -EOPNOTSUPP;
@@ -283,6 +310,9 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, 
		mlxsw_sp_flower_parse_ipv6(rulei, f);



	err = mlxsw_sp_flower_parse_ports(mlxsw_sp, rulei, f, ip_proto);

	if (err)

		return err;

	err = mlxsw_sp_flower_parse_tcp(mlxsw_sp, rulei, f, ip_proto);

	if (err)

		return err;

include/net/flow_dissector.h

+9 −0
Original line number Diff line number Diff line
@@ -157,6 +157,14 @@ struct flow_dissector_key_eth_addrs { 
	unsigned char src[ETH_ALEN];

};



/**

 * struct flow_dissector_key_tcp:

 * @flags: flags

 */

struct flow_dissector_key_tcp {

	__be16 flags;

};



enum flow_dissector_key_id {

	FLOW_DISSECTOR_KEY_CONTROL, /* struct flow_dissector_key_control */

	FLOW_DISSECTOR_KEY_BASIC, /* struct flow_dissector_key_basic */
@@ -177,6 +185,7 @@ enum flow_dissector_key_id { 
	FLOW_DISSECTOR_KEY_ENC_CONTROL, /* struct flow_dissector_key_control */

	FLOW_DISSECTOR_KEY_ENC_PORTS, /* struct flow_dissector_key_ports */

	FLOW_DISSECTOR_KEY_MPLS, /* struct flow_dissector_key_mpls */

	FLOW_DISSECTOR_KEY_TCP, /* struct flow_dissector_key_tcp */



	FLOW_DISSECTOR_KEY_MAX,

};