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

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

ixgbevf: fold ixgbevf_pull_tail into ixgbevf_add_rx_frag 



This change folds the ixgbevf_pull_tail call into ixgbevf_add_rx_frag.  The
advantage to doing this is that the fragment doesn't have to be modified
after it is added to the skb.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f56e7bba

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+19 −47
Original line number Diff line number Diff line
@@ -648,46 +648,6 @@ static void ixgbevf_alloc_rx_buffers(struct ixgbevf_ring *rx_ring, 
	}

}



/**

 * ixgbevf_pull_tail - ixgbevf specific version of skb_pull_tail

 * @rx_ring: rx descriptor ring packet is being transacted on

 * @skb: pointer to current skb being adjusted

 *

 * This function is an ixgbevf specific version of __pskb_pull_tail.  The

 * main difference between this version and the original function is that

 * this function can make several assumptions about the state of things

 * that allow for significant optimizations versus the standard function.

 * As a result we can do things like drop a frag and maintain an accurate

 * truesize for the skb.

 **/

static void ixgbevf_pull_tail(struct ixgbevf_ring *rx_ring,

			      struct sk_buff *skb)

{

	struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[0];

	unsigned char *va;

	unsigned int pull_len;



	/* it is valid to use page_address instead of kmap since we are

	 * working with pages allocated out of the lomem pool per

	 * alloc_page(GFP_ATOMIC)

	 */

	va = skb_frag_address(frag);



	/* we need the header to contain the greater of either ETH_HLEN or

	 * 60 bytes if the skb->len is less than 60 for skb_pad.

	 */

	pull_len = eth_get_headlen(va, IXGBEVF_RX_HDR_SIZE);



	/* align pull length to size of long to optimize memcpy performance */

	skb_copy_to_linear_data(skb, va, ALIGN(pull_len, sizeof(long)));



	/* update all of the pointers */

	skb_frag_size_sub(frag, pull_len);

	frag->page_offset += pull_len;

	skb->data_len -= pull_len;

	skb->tail += pull_len;

}



/**

 * ixgbevf_cleanup_headers - Correct corrupted or empty headers

 * @rx_ring: rx descriptor ring packet is being transacted on
@@ -721,10 +681,6 @@ static bool ixgbevf_cleanup_headers(struct ixgbevf_ring *rx_ring, 
		}

	}



	/* place header in linear portion of buffer */

	if (skb_is_nonlinear(skb))

		ixgbevf_pull_tail(rx_ring, skb);



	/* if eth_skb_pad returns an error the skb was freed */

	if (eth_skb_pad(skb))

		return true;
@@ -789,16 +745,19 @@ static bool ixgbevf_add_rx_frag(struct ixgbevf_ring *rx_ring, 
				struct sk_buff *skb)

{

	struct page *page = rx_buffer->page;

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

	unsigned int size = le16_to_cpu(rx_desc->wb.upper.length);

#if (PAGE_SIZE < 8192)

	unsigned int truesize = IXGBEVF_RX_BUFSZ;

#else

	unsigned int truesize = ALIGN(size, L1_CACHE_BYTES);

#endif

	unsigned int pull_len;



	if ((size <= IXGBEVF_RX_HDR_SIZE) && !skb_is_nonlinear(skb)) {

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

	if (unlikely(skb_is_nonlinear(skb)))

		goto add_tail_frag;



	if (likely(size <= IXGBEVF_RX_HDR_SIZE)) {

		memcpy(__skb_put(skb, size), va, ALIGN(size, sizeof(long)));



		/* page is not reserved, we can reuse buffer as is */
@@ -810,8 +769,21 @@ static bool ixgbevf_add_rx_frag(struct ixgbevf_ring *rx_ring, 
		return false;

	}



	/* we need the header to contain the greater of either ETH_HLEN or

	 * 60 bytes if the skb->len is less than 60 for skb_pad.

	 */

	pull_len = eth_get_headlen(va, IXGBEVF_RX_HDR_SIZE);



	/* align pull length to size of long to optimize memcpy performance */

	memcpy(__skb_put(skb, pull_len), va, ALIGN(pull_len, sizeof(long)));



	/* update all of the pointers */

	va += pull_len;

	size -= pull_len;



add_tail_frag:

	skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,

			rx_buffer->page_offset, size, truesize);

			(unsigned long)va & ~PAGE_MASK, size, truesize);



	/* avoid re-using remote pages */

	if (unlikely(ixgbevf_page_is_reserved(page)))