Commit da50ae2e authored by Jon Cooper's avatar Jon Cooper Committed by David S. Miller
Browse files

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: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0ee3541

drivers/net/ethernet/sfc/ef10.c

+20 −3
Original line number Diff line number Diff line
@@ -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)

		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)

drivers/net/ethernet/sfc/net_driver.h

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/sfc/rx.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE