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

Merge branch 'geneve-fixes' 

Tariq Toukan says:

====================
geneve fixes

This small patchset by Gal provides bug fixes to the geneve tunnels flows.

Patch 1 fixes an incorrect value returned by the inner network header
offset helper.
Patch 2 fixes an issue inside the mlx5e tunneling flow. It 'happened' to
be harmless so far, before applying patch 1.

Series generated against:
commit d30d0e49 ("Merge tag 'net-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net"

)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d029edef 791b4089

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

+1 −2
Original line number Diff line number Diff line
@@ -4875,7 +4875,7 @@ static netdev_features_t mlx5e_tunnel_features_check(struct mlx5e_priv *priv, 


		/* Verify if UDP port is being offloaded by HW */

		if (mlx5_vxlan_lookup_port(priv->mdev->vxlan, port))

			return features;

			return vxlan_features_check(skb, features);



#if IS_ENABLED(CONFIG_GENEVE)

		/* Support Geneve offload for default UDP port */
@@ -4901,7 +4901,6 @@ netdev_features_t mlx5e_features_check(struct sk_buff *skb, 
	struct mlx5e_priv *priv = netdev_priv(netdev);



	features = vlan_features_check(skb, features);

	features = vxlan_features_check(skb, features);



	/* Validate if the tunneled packet is being offloaded by HW */

	if (skb->encapsulation &&

drivers/net/geneve.c

+6 −4
Original line number Diff line number Diff line
@@ -815,6 +815,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
			   struct geneve_dev *geneve,

			   const struct ip_tunnel_info *info)

{

	bool inner_proto_inherit = geneve->cfg.inner_proto_inherit;

	bool xnet = !net_eq(geneve->net, dev_net(geneve->dev));

	struct geneve_sock *gs4 = rcu_dereference(geneve->sock4);

	const struct ip_tunnel_key *key = &info->key;
@@ -826,7 +827,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
	__be16 sport;

	int err;



	if (!skb_vlan_inet_prepare(skb))

	if (!skb_vlan_inet_prepare(skb, inner_proto_inherit))

		return -EINVAL;



	if (!gs4)
@@ -908,7 +909,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
	}



	err = geneve_build_skb(&rt->dst, skb, info, xnet, sizeof(struct iphdr),

			       geneve->cfg.inner_proto_inherit);

			       inner_proto_inherit);

	if (unlikely(err))

		return err;
@@ -925,6 +926,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
			    struct geneve_dev *geneve,

			    const struct ip_tunnel_info *info)

{

	bool inner_proto_inherit = geneve->cfg.inner_proto_inherit;

	bool xnet = !net_eq(geneve->net, dev_net(geneve->dev));

	struct geneve_sock *gs6 = rcu_dereference(geneve->sock6);

	const struct ip_tunnel_key *key = &info->key;
@@ -935,7 +937,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
	__be16 sport;

	int err;



	if (!skb_vlan_inet_prepare(skb))

	if (!skb_vlan_inet_prepare(skb, inner_proto_inherit))

		return -EINVAL;



	if (!gs6)
@@ -997,7 +999,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		ttl = ttl ? : ip6_dst_hoplimit(dst);

	}

	err = geneve_build_skb(dst, skb, info, xnet, sizeof(struct ipv6hdr),

			       geneve->cfg.inner_proto_inherit);

			       inner_proto_inherit);

	if (unlikely(err))

		return err;

include/net/ip_tunnels.h

+3 −2
Original line number Diff line number Diff line
@@ -461,9 +461,10 @@ static inline bool pskb_inet_may_pull(struct sk_buff *skb) 


/* Variant of pskb_inet_may_pull().

 */

static inline bool skb_vlan_inet_prepare(struct sk_buff *skb)

static inline bool skb_vlan_inet_prepare(struct sk_buff *skb,

					 bool inner_proto_inherit)

{

	int nhlen = 0, maclen = ETH_HLEN;

	int nhlen = 0, maclen = inner_proto_inherit ? 0 : ETH_HLEN;

	__be16 type = skb->protocol;



	/* Essentially this is skb_protocol(skb, true)