Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1bb2eb0 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

igb: Re-add support for build_skb in igb 



This reverts commit f9d40f6a ("igb: Revert support for build_skb in
igb") and adds a few changes to update it to work with the latest version
of igb. We are now able to revert the removal of this due to the fact
that with the recent changes to the page count and the use of
DMA_ATTR_SKIP_CPU_SYNC we can make the pages writable so we should not be
invalidating the additional data added when we call build_skb.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e0142726

drivers/net/ethernet/intel/igb/igb_main.c

+47 −0
Original line number Diff line number Diff line
@@ -7021,6 +7021,51 @@ static struct sk_buff *igb_construct_skb(struct igb_ring *rx_ring, 
	return skb;

}



static struct sk_buff *igb_build_skb(struct igb_ring *rx_ring,

				     struct igb_rx_buffer *rx_buffer,

				     union e1000_adv_rx_desc *rx_desc,

				     unsigned int size)

{

	void *va = page_address(rx_buffer->page) + rx_buffer->page_offset;

#if (PAGE_SIZE < 8192)

	unsigned int truesize = igb_rx_pg_size(rx_ring) / 2;

#else

	unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) +

				SKB_DATA_ALIGN(IGB_SKB_PAD + size);

#endif

	struct sk_buff *skb;



	/* prefetch first cache line of first page */

	prefetch(va);

#if L1_CACHE_BYTES < 128

	prefetch(va + L1_CACHE_BYTES);

#endif



	/* build an skb to around the page buffer */

	skb = build_skb(va - IGB_SKB_PAD, truesize);

	if (unlikely(!skb))

		return NULL;



	/* update pointers within the skb to store the data */

	skb_reserve(skb, IGB_SKB_PAD);

	__skb_put(skb, size);



	/* pull timestamp out of packet data */

	if (igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP)) {

		igb_ptp_rx_pktstamp(rx_ring->q_vector, skb->data, skb);

		__skb_pull(skb, IGB_TS_HDR_LEN);

	}



	/* update buffer offset */

#if (PAGE_SIZE < 8192)

	rx_buffer->page_offset ^= truesize;

#else

	rx_buffer->page_offset += truesize;

#endif



	return skb;

}



static inline void igb_rx_checksum(struct igb_ring *ring,

				   union e1000_adv_rx_desc *rx_desc,

				   struct sk_buff *skb)
@@ -7250,6 +7295,8 @@ static int igb_clean_rx_irq(struct igb_q_vector *q_vector, const int budget) 
		/* retrieve a buffer from the ring */

		if (skb)

			igb_add_rx_frag(rx_ring, rx_buffer, skb, size);

		else if (ring_uses_build_skb(rx_ring))

			skb = igb_build_skb(rx_ring, rx_buffer, rx_desc, size);

		else

			skb = igb_construct_skb(rx_ring, rx_buffer,

						rx_desc, size);