net/mlx5e: Properly handle offloading of source udp port for IP tunnels
We can offload the matching on source udp port of ip tunnels for decapsulation. We can not offload setting source udp port for tunnels as part of encapsulation. Fix both the code that deals with matching offload (decap) and the code that deal with encap offload to align with that. Fixes:a54e20b4fc
('net/mlx5e: Add basic TC tunnel set action for SRIOV offloads') Fixes:bbd00f7e23
('net/mlx5e: Add TC tunnel release action for SRIOV offloads') Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Reviewed-by: Hadar Hen Zion <hadarh@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
57ea52a865
Коммит
cd37766380
|
@ -239,10 +239,6 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv,
|
||||||
if (memchr_inv(&mask->dst, 0xff, sizeof(mask->dst)))
|
if (memchr_inv(&mask->dst, 0xff, sizeof(mask->dst)))
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
/* udp src port isn't supported */
|
|
||||||
if (memchr_inv(&mask->src, 0, sizeof(mask->src)))
|
|
||||||
return -EOPNOTSUPP;
|
|
||||||
|
|
||||||
if (mlx5e_vxlan_lookup_port(priv, be16_to_cpu(key->dst)) &&
|
if (mlx5e_vxlan_lookup_port(priv, be16_to_cpu(key->dst)) &&
|
||||||
MLX5_CAP_ESW(priv->mdev, vxlan_encap_decap))
|
MLX5_CAP_ESW(priv->mdev, vxlan_encap_decap))
|
||||||
parse_vxlan_attr(spec, f);
|
parse_vxlan_attr(spec, f);
|
||||||
|
@ -254,6 +250,10 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv,
|
||||||
MLX5_SET(fte_match_set_lyr_2_4, headers_v,
|
MLX5_SET(fte_match_set_lyr_2_4, headers_v,
|
||||||
udp_dport, ntohs(key->dst));
|
udp_dport, ntohs(key->dst));
|
||||||
|
|
||||||
|
MLX5_SET(fte_match_set_lyr_2_4, headers_c,
|
||||||
|
udp_sport, ntohs(mask->src));
|
||||||
|
MLX5_SET(fte_match_set_lyr_2_4, headers_v,
|
||||||
|
udp_sport, ntohs(key->src));
|
||||||
} else { /* udp dst port must be given */
|
} else { /* udp dst port must be given */
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
}
|
}
|
||||||
|
@ -796,6 +796,10 @@ static int mlx5e_attach_encap(struct mlx5e_priv *priv,
|
||||||
if (!memchr_inv(&key->tp_dst, 0, sizeof(key->tp_dst)))
|
if (!memchr_inv(&key->tp_dst, 0, sizeof(key->tp_dst)))
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
|
/* setting udp src port isn't supported */
|
||||||
|
if (memchr_inv(&key->tp_src, 0, sizeof(key->tp_src)))
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
if (mlx5e_vxlan_lookup_port(priv, be16_to_cpu(key->tp_dst)) &&
|
if (mlx5e_vxlan_lookup_port(priv, be16_to_cpu(key->tp_dst)) &&
|
||||||
MLX5_CAP_ESW(priv->mdev, vxlan_encap_decap)) {
|
MLX5_CAP_ESW(priv->mdev, vxlan_encap_decap)) {
|
||||||
info.tp_dst = key->tp_dst;
|
info.tp_dst = key->tp_dst;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче