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

Commit 0549ae20 authored by Alexander Duyck's avatar Alexander Duyck Committed by Peter P Waskiewicz Jr
Browse files

ixgbe: combine ixgbe_add_rx_frag and ixgbe_can_reuse_page 



This patch combines ixgbe_add_rx_frag and ixgbe_can_reuse_page into a
single function. The main motivation behind this is to make better use of
the values so that we don't have to load them from memory and into
registers twice.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent afaa9459

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+34 −39
Original line number Diff line number Diff line
@@ -1559,34 +1559,18 @@ static bool ixgbe_cleanup_headers(struct ixgbe_ring *rx_ring, 
	return false;

}



/**

 * ixgbe_can_reuse_page - determine if we can reuse a page

 * @rx_buffer: pointer to rx_buffer containing the page we want to reuse

 *

 * Returns true if page can be reused in another Rx buffer

 **/

static inline bool ixgbe_can_reuse_page(struct ixgbe_rx_buffer *rx_buffer)

{

	struct page *page = rx_buffer->page;



	/* if we are only owner of page and it is local we can reuse it */

	return likely(page_count(page) == 1) &&

	       likely(page_to_nid(page) == numa_node_id());

}



/**

 * ixgbe_reuse_rx_page - page flip buffer and store it back on the ring

 * @rx_ring: rx descriptor ring to store buffers on

 * @old_buff: donor buffer to have page reused

 *

 * Syncronizes page for reuse by the adapter

 * Synchronizes page for reuse by the adapter

 **/

static void ixgbe_reuse_rx_page(struct ixgbe_ring *rx_ring,

				struct ixgbe_rx_buffer *old_buff)

{

	struct ixgbe_rx_buffer *new_buff;

	u16 nta = rx_ring->next_to_alloc;

	u16 bufsz = ixgbe_rx_bufsz(rx_ring);



	new_buff = &rx_ring->rx_buffer_info[nta];
@@ -1597,17 +1581,13 @@ static void ixgbe_reuse_rx_page(struct ixgbe_ring *rx_ring, 
	/* transfer page from old buffer to new buffer */

	new_buff->page = old_buff->page;

	new_buff->dma = old_buff->dma;



	/* flip page offset to other buffer and store to new_buff */

	new_buff->page_offset = old_buff->page_offset ^ bufsz;

	new_buff->page_offset = old_buff->page_offset;



	/* sync the buffer for use by the device */

	dma_sync_single_range_for_device(rx_ring->dev, new_buff->dma,

					 new_buff->page_offset, bufsz,

					 new_buff->page_offset,

					 ixgbe_rx_bufsz(rx_ring),

					 DMA_FROM_DEVICE);



	/* bump ref count on page before it is given to the stack */

	get_page(new_buff->page);

}



/**
@@ -1617,20 +1597,38 @@ static void ixgbe_reuse_rx_page(struct ixgbe_ring *rx_ring, 
 * @rx_desc: descriptor containing length of buffer written by hardware

 * @skb: sk_buff to place the data into

 *

 * This function is based on skb_add_rx_frag.  I would have used that

 * function however it doesn't handle the truesize case correctly since we

 * are allocating more memory than might be used for a single receive.

 * This function will add the data contained in rx_buffer->page to the skb.

 * This is done either through a direct copy if the data in the buffer is

 * less than the skb header size, otherwise it will just attach the page as

 * a frag to the skb.

 *

 * The function will then update the page offset if necessary and return

 * true if the buffer can be reused by the adapter.

 **/

static void ixgbe_add_rx_frag(struct ixgbe_ring *rx_ring,

static bool ixgbe_add_rx_frag(struct ixgbe_ring *rx_ring,

			      struct ixgbe_rx_buffer *rx_buffer,

			      struct sk_buff *skb, int size)

			      union ixgbe_adv_rx_desc *rx_desc,

			      struct sk_buff *skb)

{

	skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,

			   rx_buffer->page, rx_buffer->page_offset,

			   size);

	skb->len += size;

	skb->data_len += size;

	skb->truesize += ixgbe_rx_bufsz(rx_ring);

	struct page *page = rx_buffer->page;

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

	unsigned int truesize = ixgbe_rx_bufsz(rx_ring);



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

			rx_buffer->page_offset, size, truesize);



	/* if we are only owner of page and it is local we can reuse it */

	if (unlikely(page_count(page) != 1) ||

	    unlikely(page_to_nid(page) != numa_node_id()))

		return false;



	/* flip page offset to other buffer */

	rx_buffer->page_offset ^= truesize;



	/* bump ref count on page before it is given to the stack */

	get_page(page);



	return true;

}



/**
@@ -1731,10 +1729,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
		}



		/* pull page into skb */

		ixgbe_add_rx_frag(rx_ring, rx_buffer, skb,

				  le16_to_cpu(rx_desc->wb.upper.length));



		if (ixgbe_can_reuse_page(rx_buffer)) {

		if (ixgbe_add_rx_frag(rx_ring, rx_buffer, rx_desc, skb)) {

			/* hand second half of page back to the ring */

			ixgbe_reuse_rx_page(rx_ring, rx_buffer);

		} else if (IXGBE_CB(skb)->dma == rx_buffer->dma) {