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

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

Merge branch 'mlxsw-ttl-tos' 



Jiri Pirko says:

====================
mlxsw: offloading matches on ip ttl and tos

Or says:

Support offloading matches on ip ttl and tos
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b145425f 87996f91

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

+6 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ enum mlxsw_afk_element { 
	MLXSW_AFK_ELEMENT_VID,

	MLXSW_AFK_ELEMENT_PCP,

	MLXSW_AFK_ELEMENT_TCP_FLAGS,

	MLXSW_AFK_ELEMENT_IP_TTL_,

	MLXSW_AFK_ELEMENT_IP_ECN,

	MLXSW_AFK_ELEMENT_IP_DSCP,

	MLXSW_AFK_ELEMENT_MAX,

};
@@ -104,6 +107,9 @@ static const struct mlxsw_afk_element_info mlxsw_afk_element_infos[] = { 
	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(IP_TTL_, 0x14, 0, 8),

	MLXSW_AFK_ELEMENT_INFO_U32(IP_ECN, 0x14, 9, 2),

	MLXSW_AFK_ELEMENT_INFO_U32(IP_DSCP, 0x14, 11, 6),

	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

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_ipv4_dip[] = { 


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(IP_ECN, 0x04, 4, 2),

	MLXSW_AFK_ELEMENT_INST_U32(IP_TTL_, 0x04, 24, 8),

	MLXSW_AFK_ELEMENT_INST_U32(IP_DSCP, 0x08, 0, 6),

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

};

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

+3 −0
Original line number Diff line number Diff line
@@ -984,6 +984,9 @@ static const enum mlxsw_afk_element mlxsw_sp_acl_tcam_pattern_ipv4[] = { 
	MLXSW_AFK_ELEMENT_VID,

	MLXSW_AFK_ELEMENT_PCP,

	MLXSW_AFK_ELEMENT_TCP_FLAGS,

	MLXSW_AFK_ELEMENT_IP_TTL_,

	MLXSW_AFK_ELEMENT_IP_ECN,

	MLXSW_AFK_ELEMENT_IP_DSCP,

};



static const enum mlxsw_afk_element mlxsw_sp_acl_tcam_pattern_ipv6[] = {

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

+42 −2
Original line number Diff line number Diff line
@@ -212,11 +212,46 @@ static int mlxsw_sp_flower_parse_tcp(struct mlxsw_sp *mlxsw_sp, 
	return 0;

}



static int mlxsw_sp_flower_parse_ip(struct mlxsw_sp *mlxsw_sp,

				    struct mlxsw_sp_acl_rule_info *rulei,

				    struct tc_cls_flower_offload *f,

				    u16 n_proto)

{

	struct flow_dissector_key_ip *key, *mask;



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

		return 0;



	if (n_proto != ETH_P_IP && n_proto != ETH_P_IPV6) {

		dev_err(mlxsw_sp->bus_info->dev, "IP keys supported only for IPv4/6\n");

		return -EINVAL;

	}



	key = skb_flow_dissector_target(f->dissector,

					FLOW_DISSECTOR_KEY_IP,

					f->key);

	mask = skb_flow_dissector_target(f->dissector,

					 FLOW_DISSECTOR_KEY_IP,

					 f->mask);

	mlxsw_sp_acl_rulei_keymask_u32(rulei, MLXSW_AFK_ELEMENT_IP_TTL_,

				       key->ttl, mask->ttl);



	mlxsw_sp_acl_rulei_keymask_u32(rulei, MLXSW_AFK_ELEMENT_IP_ECN,

				       key->tos & 0x3, mask->tos & 0x3);



	mlxsw_sp_acl_rulei_keymask_u32(rulei, MLXSW_AFK_ELEMENT_IP_DSCP,

				       key->tos >> 6, mask->tos >> 6);



	return 0;

}



static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp,

				 struct net_device *dev,

				 struct mlxsw_sp_acl_rule_info *rulei,

				 struct tc_cls_flower_offload *f)

{

	u16 n_proto_mask = 0;

	u16 n_proto_key = 0;

	u16 addr_type = 0;

	u8 ip_proto = 0;

	int err;
@@ -229,6 +264,7 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, 
	      BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_PORTS) |

	      BIT(FLOW_DISSECTOR_KEY_TCP) |

	      BIT(FLOW_DISSECTOR_KEY_IP) |

	      BIT(FLOW_DISSECTOR_KEY_VLAN))) {

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

		return -EOPNOTSUPP;
@@ -253,8 +289,8 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, 
			skb_flow_dissector_target(f->dissector,

						  FLOW_DISSECTOR_KEY_BASIC,

						  f->mask);

		u16 n_proto_key = ntohs(key->n_proto);

		u16 n_proto_mask = ntohs(mask->n_proto);

		n_proto_key = ntohs(key->n_proto);

		n_proto_mask = ntohs(mask->n_proto);



		if (n_proto_key == ETH_P_ALL) {

			n_proto_key = 0;
@@ -324,6 +360,10 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, 
	if (err)

		return err;



	err = mlxsw_sp_flower_parse_ip(mlxsw_sp, rulei, f, n_proto_key & n_proto_mask);

	if (err)

		return err;



	return mlxsw_sp_flower_parse_actions(mlxsw_sp, dev, rulei, f->exts);

}