i40e/i40evf: avoid atomics

Orabug: 22342532

In the case where we have a page fully used by receive data, we need to
release the page fully to the stack. Instead of calling get_page (which
increments the page count) followed by free_page (which decrements the
page count), just donate our reference to the stack. Although this
donation is not tax deductible, it does allow us to avoid two very
expensive atomic operations that reverse each other.

Change-ID: If70739792d5748995fc175ec92ac2171ed4ad8fc
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 16fd08b85962f6288fe1191856aa98cb0d40aa30)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 2ab78455b0e37f9179dae5b3d738e446a10af569..05f7b90d6f33d84ae31f14a5916a228d419cc614 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1663,28 +1663,33 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, const int budget)
                                        rx_bi->page_offset + copysize,
                                        rx_packet_len, I40E_RXBUFFER_2048);
 
-                       get_page(rx_bi->page);
-                       /* switch to the other half-page here; the allocation
-                        * code programs the right addr into HW. If we haven't
-                        * used this half-page, the address won't be changed,
-                        * and HW can just use it next time through.
-                        */
-                       rx_bi->page_offset ^= PAGE_SIZE / 2;
                        /* If the page count is more than 2, then both halves
                         * of the page are used and we need to free it. Do it
                         * here instead of in the alloc code. Otherwise one
                         * of the half-pages might be released between now and
                         * then, and we wouldn't know which one to use.
+                        * Don't call get_page and free_page since those are
+                        * both expensive atomic operations that just change
+                        * the refcount in opposite directions. Just give the
+                        * page to the stack; he can have our refcount.
                         */
                        if (page_count(rx_bi->page) > 2) {
                                dma_unmap_page(rx_ring->dev,
                                               rx_bi->page_dma,
                                               PAGE_SIZE,
                                               DMA_FROM_DEVICE);
-                               __free_page(rx_bi->page);
                                rx_bi->page = NULL;
                                rx_bi->page_dma = 0;
                                rx_ring->rx_stats.realloc_count++;
+                       } else {
+                               get_page(rx_bi->page);
+                               /* switch to the other half-page here; the
+                                * allocation code programs the right addr
+                                * into HW. If we haven't used this half-page,
+                                * the address won't be changed, and HW can
+                                * just use it next time through.
+                                */
+                               rx_bi->page_offset ^= PAGE_SIZE / 2;
                        }
 
                }

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 8a612f14666b0a2297a0da8bc480c5e2430a42ba..46f6a65afc812250c7028aa3f0f5cd5555dfa635 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1126,28 +1126,33 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, const int budget)
                                        rx_bi->page_offset + copysize,
                                        rx_packet_len, I40E_RXBUFFER_2048);
 
-                       get_page(rx_bi->page);
-                       /* switch to the other half-page here; the allocation
-                        * code programs the right addr into HW. If we haven't
-                        * used this half-page, the address won't be changed,
-                        * and HW can just use it next time through.
-                        */
-                       rx_bi->page_offset ^= PAGE_SIZE / 2;
                        /* If the page count is more than 2, then both halves
                         * of the page are used and we need to free it. Do it
                         * here instead of in the alloc code. Otherwise one
                         * of the half-pages might be released between now and
                         * then, and we wouldn't know which one to use.
+                        * Don't call get_page and free_page since those are
+                        * both expensive atomic operations that just change
+                        * the refcount in opposite directions. Just give the
+                        * page to the stack; he can have our refcount.
                         */
                        if (page_count(rx_bi->page) > 2) {
                                dma_unmap_page(rx_ring->dev,
                                               rx_bi->page_dma,
                                               PAGE_SIZE,
                                               DMA_FROM_DEVICE);
-                               __free_page(rx_bi->page);
                                rx_bi->page = NULL;
                                rx_bi->page_dma = 0;
                                rx_ring->rx_stats.realloc_count++;
+                       } else {
+                               get_page(rx_bi->page);
+                               /* switch to the other half-page here; the
+                                * allocation code programs the right addr
+                                * into HW. If we haven't used this half-page,
+                                * the address won't be changed, and HW can
+                                * just use it next time through.
+                                */
+                               rx_bi->page_offset ^= PAGE_SIZE / 2;
                        }
 
                }