igb: Map entire page and sync half instead of mapping and unmapping half pages

This change makes it so that we map the entire page and just sync half of
it for the device at a time.  The advantage to this approach is that we can
avoid the locking on map/unmap seen in many IOMMU implementations.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 0faac423bd5b..96c6df65726f 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1694,7 +1694,7 @@ static int igb_check_lbtest_frame(struct igb_rx_buffer *rx_buffer,
 
         frame_size >>= 1;
 
-        data = kmap(rx_buffer->page) + rx_buffer->page_offset;
+        data = kmap(rx_buffer->page);
 
         if (data[3] != 0xFF ||
             data[frame_size + 10] != 0xBE ||
@@ -1713,9 +1713,7 @@ static int igb_clean_test_rings(struct igb_ring *rx_ring,
         union e1000_adv_rx_desc *rx_desc;
         struct igb_rx_buffer *rx_buffer_info;
         struct igb_tx_buffer *tx_buffer_info;
-        struct netdev_queue *txq;
         u16 rx_ntc, tx_ntc, count = 0;
-        unsigned int total_bytes = 0, total_packets = 0;
 
         /* initialize next to clean and descriptor values */
         rx_ntc = rx_ring->next_to_clean;
@@ -1726,21 +1724,24 @@ static int igb_clean_test_rings(struct igb_ring *rx_ring,
                 /* check rx buffer */
                 rx_buffer_info = &rx_ring->rx_buffer_info[rx_ntc];
 
-                /* unmap rx buffer, will be remapped by alloc_rx_buffers */
-                dma_unmap_single(rx_ring->dev,
-                                 rx_buffer_info->dma,
-                                 PAGE_SIZE / 2,
-                                 DMA_FROM_DEVICE);
-                rx_buffer_info->dma = 0;
+                /* sync Rx buffer for CPU read */
+                dma_sync_single_for_cpu(rx_ring->dev,
+                                        rx_buffer_info->dma,
+                                        PAGE_SIZE / 2,
+                                        DMA_FROM_DEVICE);
 
                 /* verify contents of skb */
                 if (igb_check_lbtest_frame(rx_buffer_info, size))
                         count++;
 
+                /* sync Rx buffer for device write */
+                dma_sync_single_for_device(rx_ring->dev,
+                                           rx_buffer_info->dma,
+                                           PAGE_SIZE / 2,
+                                           DMA_FROM_DEVICE);
+
                 /* unmap buffer on tx side */
                 tx_buffer_info = &tx_ring->tx_buffer_info[tx_ntc];
-                total_bytes += tx_buffer_info->bytecount;
-                total_packets += tx_buffer_info->gso_segs;
                 igb_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
 
                 /* increment rx/tx next to clean counters */
@@ -1755,8 +1756,7 @@ static int igb_clean_test_rings(struct igb_ring *rx_ring,
                 rx_desc = IGB_RX_DESC(rx_ring, rx_ntc);
         }
 
-        txq = netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index);
-        netdev_tx_completed_queue(txq, total_packets, total_bytes);
+        netdev_tx_reset_queue(txring_txq(tx_ring));
 
         /* re-map buffers to ring, store next to clean values */
         igb_alloc_rx_buffers(rx_ring, count);