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

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

igb: Use page_address offset from page instead of masking virtual address 



Update the handling of page addresses so that we always refer to them using
a void pointer, and try to use the consistent name of va indicating we are
working with a virtual address.

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 cb0ef1d1

drivers/net/ethernet/intel/igb/igb.h

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ void igb_ptp_reset(struct igb_adapter *adapter); 
void igb_ptp_suspend(struct igb_adapter *adapter);

void igb_ptp_rx_hang(struct igb_adapter *adapter);

void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, struct sk_buff *skb);

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, unsigned char *va,

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, void *va,

			 struct sk_buff *skb);

int igb_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr);

int igb_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr);

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

+5 −6
Original line number Diff line number Diff line
@@ -6927,7 +6927,7 @@ static bool igb_add_rx_frag(struct igb_ring *rx_ring, 
			    struct sk_buff *skb)

{

	struct page *page = rx_buffer->page;

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

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

#if (PAGE_SIZE < 8192)

	unsigned int truesize = IGB_RX_BUFSZ;

#else
@@ -6969,7 +6969,7 @@ static bool igb_add_rx_frag(struct igb_ring *rx_ring, 


add_tail_frag:

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

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

			va - page_address(page), size, truesize);



	return igb_can_reuse_rx_page(rx_buffer, page, truesize);

}
@@ -6994,13 +6994,12 @@ static struct sk_buff *igb_fetch_rx_buffer(struct igb_ring *rx_ring, 
				      DMA_FROM_DEVICE);



	if (likely(!skb)) {

		void *page_addr = page_address(page) +

				  rx_buffer->page_offset;

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



		/* prefetch first cache line of first page */

		prefetch(page_addr);

		prefetch(va);

#if L1_CACHE_BYTES < 128

		prefetch(page_addr + L1_CACHE_BYTES);

		prefetch(va + L1_CACHE_BYTES);

#endif



		/* allocate a skb to store the frags */

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

+1 −2
Original line number Diff line number Diff line
@@ -764,8 +764,7 @@ static void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter) 
 * incoming frame.  The value is stored in little endian format starting on

 * byte 8.

 **/

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector,

			 unsigned char *va,

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, void *va,

			 struct sk_buff *skb)

{

	__le64 *regval = (__le64 *)va;