sfc: correctly support non-partial GSO_UDP_TUNNEL_CSUM on EF100

By asking the HW for the correct edits, we can make UDP tunnel TSO
 work without needing GSO_PARTIAL.  So don't specify it in our
 netdev->gso_partial_features.
However, retain GSO_PARTIAL support, as this will be used for other
 protocols later.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Martin Habets <mhabets@solarflare.com>
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>

diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
index cd93c5ffd45c34fdc3b560a1dc8e7db94b20c269..05d22220228a4a1740eab1e09389db984e333212 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_nic.c
+++ b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -190,7 +190,6 @@ static int efx_ef100_init_datapath_caps(struct efx_nic *efx)
                net_dev->features |= tso;
                net_dev->hw_features |= tso;
                net_dev->hw_enc_features |= tso;
-               net_dev->gso_partial_features |= NETIF_F_GSO_UDP_TUNNEL | NETIF_F_GSO_UDP_TUNNEL_CSUM;
        }
        efx->num_mac_stats = MCDI_WORD(outbuf,
                                       GET_CAPABILITIES_V4_OUT_MAC_STATS_NUM_STATS);

diff --git a/drivers/net/ethernet/sfc/ef100_tx.c b/drivers/net/ethernet/sfc/ef100_tx.c
index ad0ad9bad423d0b23ddac8daa5953be16100ca35..a9e045c54a79e3d5e609a50fd303f5907cebf7e2 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_tx.c
+++ b/drivers/net/ethernet/sfc/ef100_tx.c
@@ -196,6 +196,7 @@ static void ef100_make_tso_desc(struct efx_nic *efx,
        bool encap = skb->encapsulation;
        u16 vlan_enable = 0;
        struct tcphdr *tcp;
+       bool outer_csum;
        u32 paylen;
 
        if (skb_shinfo(skb)->gso_type & SKB_GSO_TCP_FIXEDID)
@@ -216,19 +217,21 @@ static void ef100_make_tso_desc(struct efx_nic *efx,
                tcp_offset = skb_transport_offset(skb);
                outer_ip_offset = outer_l4_offset = 0;
        }
+       outer_csum = skb_shinfo(skb)->gso_type & SKB_GSO_UDP_TUNNEL_CSUM;
 
        /* subtract TCP payload length from inner checksum */
        tcp = (void *)skb->data + tcp_offset;
        paylen = skb->len - tcp_offset;
        csum_replace_by_diff(&tcp->check, (__force __wsum)htonl(paylen));
 
-       EFX_POPULATE_OWORD_17(*txd,
+       EFX_POPULATE_OWORD_19(*txd,
                              ESF_GZ_TX_DESC_TYPE, ESE_GZ_TX_DESC_TYPE_TSO,
                              ESF_GZ_TX_TSO_MSS, mss,
                              ESF_GZ_TX_TSO_HDR_NUM_SEGS, 1,
                              ESF_GZ_TX_TSO_PAYLOAD_NUM_SEGS, payload_segs,
                              ESF_GZ_TX_TSO_HDR_LEN_W, buffer->len >> 1,
                              ESF_GZ_TX_TSO_PAYLOAD_LEN, len,
+                             ESF_GZ_TX_TSO_CSO_OUTER_L4, outer_csum,
                              ESF_GZ_TX_TSO_CSO_INNER_L4, 1,
                              ESF_GZ_TX_TSO_INNER_L3_OFF_W, ip_offset >> 1,
                              ESF_GZ_TX_TSO_INNER_L4_OFF_W, tcp_offset >> 1,
@@ -237,6 +240,7 @@ static void ef100_make_tso_desc(struct efx_nic *efx,
                              ESF_GZ_TX_TSO_OUTER_L3_OFF_W, outer_ip_offset >> 1,
                              ESF_GZ_TX_TSO_OUTER_L4_OFF_W, outer_l4_offset >> 1,
                              ESF_GZ_TX_TSO_ED_OUTER_UDP_LEN, encap && !gso_partial,
+                             ESF_GZ_TX_TSO_ED_OUTER_IP_LEN, encap && !gso_partial,
                              ESF_GZ_TX_TSO_ED_OUTER_IP4_ID, encap ? mangleid :
                                                                     ESE_GZ_TX_DESC_IP4_ID_NO_OP,
                              ESF_GZ_TX_TSO_VLAN_INSERT_EN, vlan_enable,