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

Commit bcef735c authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx5e: Offload TC matching on tos/ttl for ip tunnels 



Enable offloading of TC matching on tos/ttl for ipv4/6 tunnels.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f35f800d

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

+22 −1
Original line number Diff line number Diff line
@@ -1211,6 +1211,26 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, 
		MLX5_SET(fte_match_set_lyr_2_4, headers_v, ethertype, ETH_P_IPV6);

	}



	if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_ENC_IP)) {

		struct flow_dissector_key_ip *key =

			skb_flow_dissector_target(f->dissector,

						  FLOW_DISSECTOR_KEY_ENC_IP,

						  f->key);

		struct flow_dissector_key_ip *mask =

			skb_flow_dissector_target(f->dissector,

						  FLOW_DISSECTOR_KEY_ENC_IP,

						  f->mask);



		MLX5_SET(fte_match_set_lyr_2_4, headers_c, ip_ecn, mask->tos & 0x3);

		MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_ecn, key->tos & 0x3);



		MLX5_SET(fte_match_set_lyr_2_4, headers_c, ip_dscp, mask->tos >> 2);

		MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_dscp, key->tos  >> 2);



		MLX5_SET(fte_match_set_lyr_2_4, headers_c, ttl_hoplimit, mask->ttl);

		MLX5_SET(fte_match_set_lyr_2_4, headers_v, ttl_hoplimit, key->ttl);

	}



	/* Enforce DMAC when offloading incoming tunneled flows.

	 * Flow counters require a match on the DMAC.

	 */
@@ -1259,7 +1279,8 @@ static int __parse_cls_flower(struct mlx5e_priv *priv, 
	      BIT(FLOW_DISSECTOR_KEY_ENC_PORTS)	|

	      BIT(FLOW_DISSECTOR_KEY_ENC_CONTROL) |

	      BIT(FLOW_DISSECTOR_KEY_TCP) |

	      BIT(FLOW_DISSECTOR_KEY_IP))) {

	      BIT(FLOW_DISSECTOR_KEY_IP)  |

	      BIT(FLOW_DISSECTOR_KEY_ENC_IP))) {

		netdev_warn(priv->netdev, "Unsupported key used: 0x%x\n",

			    f->dissector->used_keys);

		return -EOPNOTSUPP;