sfc: set csum_level for encapsulated packets

Set the csum_level for encapsulated packets where the encapsulation
 type, l3 class and l4 class are sets that need it.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index fd1008daf1e378ffc8a18f13ae31eec9453e3240..c738b113b0acda94b4eed39c7a6ff4ecc7b7fbf2 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -3339,9 +3339,26 @@ static int efx_ef10_handle_rx_event(struct efx_channel *channel,
                                                         rx_l3_class, rx_l4_class,
                                                         rx_encap_hdr, event);
        } else {
-               if (rx_l4_class == ESE_DZ_L4_CLASS_TCP ||
-                   rx_l4_class == ESE_DZ_L4_CLASS_UDP)
-                       flags |= EFX_RX_PKT_CSUMMED;
+               bool tcpudp = rx_l4_class == ESE_DZ_L4_CLASS_TCP ||
+                             rx_l4_class == ESE_DZ_L4_CLASS_UDP;
+
+               switch (rx_encap_hdr) {
+               case ESE_EZ_ENCAP_HDR_VXLAN: /* VxLAN or GENEVE */
+                       flags |= EFX_RX_PKT_CSUMMED; /* outer UDP csum */
+                       if (tcpudp)
+                               flags |= EFX_RX_PKT_CSUM_LEVEL; /* inner L4 */
+                       break;
+               case ESE_EZ_ENCAP_HDR_GRE:
+               case ESE_EZ_ENCAP_HDR_NONE:
+                       if (tcpudp)
+                               flags |= EFX_RX_PKT_CSUMMED;
+                       break;
+               default:
+                       netdev_WARN(efx->net_dev,
+                                   "unknown encapsulation type: event="
+                                   EFX_QWORD_FMT "\n",
+                                   EFX_QWORD_VAL(*event));
+               }
        }
 
        if (rx_l4_class == ESE_DZ_L4_CLASS_TCP)

diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 3b151109278168038a4b6a926b26a161e27035e8..e64e933c5bb361c0c239b9183e985e307d2d3ae0 100644 (file)
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -307,6 +307,7 @@ struct efx_rx_buffer {
 #define EFX_RX_PKT_DISCARD     0x0004
 #define EFX_RX_PKT_TCP         0x0040
 #define EFX_RX_PKT_PREFIX_LEN  0x0080  /* length is in prefix only */
+#define EFX_RX_PKT_CSUM_LEVEL  0x0200
 
 /**
  * struct efx_rx_page_state - Page-based rx buffer state

diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index 31587f4066ab08f52409b2c666df0b92b4707781..42443f434569b22865a450b0a3e249753fe86d76 100644 (file)
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -434,6 +434,7 @@ efx_rx_packet_gro(struct efx_channel *channel, struct efx_rx_buffer *rx_buf,
                             PKT_HASH_TYPE_L3);
        skb->ip_summed = ((rx_buf->flags & EFX_RX_PKT_CSUMMED) ?
                          CHECKSUM_UNNECESSARY : CHECKSUM_NONE);
+       skb->csum_level = !!(rx_buf->flags & EFX_RX_PKT_CSUM_LEVEL);
 
        for (;;) {
                skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
@@ -621,8 +622,10 @@ static void efx_rx_deliver(struct efx_channel *channel, u8 *eh,
 
        /* Set the SKB flags */
        skb_checksum_none_assert(skb);
-       if (likely(rx_buf->flags & EFX_RX_PKT_CSUMMED))
+       if (likely(rx_buf->flags & EFX_RX_PKT_CSUMMED)) {
                skb->ip_summed = CHECKSUM_UNNECESSARY;
+               skb->csum_level = !!(rx_buf->flags & EFX_RX_PKT_CSUM_LEVEL);
+       }
 
        efx_rx_skb_attach_timestamp(channel, skb);