vxlan: expose gso partial features for tunnel offload

Similar to the previous patch, reuse the same helpers to add tunnel GSO
partial capabilities to vxlan devices.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Link: https://patch.msgid.link/93d916c11b3a790a8bfccad77d9e85ee6e533042.1769011015.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index e957aa12a8a44afc501d5b72585d5207b23cda6c..7bd0ae0a6a33828131419f21a966645a01dd0761 100644 (file)
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -2183,11 +2183,12 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst,
                           struct vxlan_metadata *md, u32 vxflags,
                           bool udp_sum)
 {
+       int type = udp_sum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;
+       __be16 inner_protocol = htons(ETH_P_TEB);
        struct vxlanhdr *vxh;
+       bool double_encap;
        int min_headroom;
        int err;
-       int type = udp_sum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;
-       __be16 inner_protocol = htons(ETH_P_TEB);
 
        if ((vxflags & VXLAN_F_REMCSUM_TX) &&
            skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -2208,6 +2209,7 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst,
        if (unlikely(err))
                return err;
 
+       double_encap = udp_tunnel_handle_partial(skb);
        err = iptunnel_handle_offloads(skb, type);
        if (err)
                return err;
@@ -2238,7 +2240,7 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst,
                inner_protocol = skb->protocol;
        }
 
-       skb_set_inner_protocol(skb, inner_protocol);
+       udp_tunnel_set_inner_protocol(skb, double_encap, inner_protocol);
        return 0;
 }
 
@@ -3348,10 +3350,18 @@ static void vxlan_setup(struct net_device *dev)
        dev->features   |= NETIF_F_RXCSUM;
        dev->features   |= NETIF_F_GSO_SOFTWARE;
 
+       /* Partial features are disabled by default. */
        dev->vlan_features = dev->features;
        dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_FRAGLIST;
        dev->hw_features |= NETIF_F_RXCSUM;
        dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+       dev->hw_features |= UDP_TUNNEL_PARTIAL_FEATURES;
+       dev->hw_features |= NETIF_F_GSO_PARTIAL;
+
+       dev->hw_enc_features = dev->hw_features;
+       dev->gso_partial_features = UDP_TUNNEL_PARTIAL_FEATURES;
+       dev->mangleid_features = NETIF_F_GSO_PARTIAL;
+
        netif_keep_dst(dev);
        dev->priv_flags |= IFF_NO_QUEUE;
        dev->change_proto_down = true;