ethernet/intel: Use napi_alloc_skb

This change replaces calls to netdev_alloc_skb_ip_align with
napi_alloc_skb.  The advantage of napi_alloc_skb is currently the fact that
the page allocation doesn't make use of any irq disable calls.

There are few spots where I couldn't replace the calls as the buffer
allocation routine is called as a part of init which is outside of the
softirq context.

Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 10 insertions, 11 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 862d1989ae1c..83140cbb5f01 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -4100,7 +4100,7 @@ static bool e1000_tbi_should_accept(struct e1000_adapter *adapter,
 static struct sk_buff *e1000_alloc_rx_skb(struct e1000_adapter *adapter,
                                           unsigned int bufsz)
 {
-        struct sk_buff *skb = netdev_alloc_skb_ip_align(adapter->netdev, bufsz);
+        struct sk_buff *skb = napi_alloc_skb(&adapter->napi, bufsz);
 
         if (unlikely(!skb))
                 adapter->alloc_rx_buff_failed++;
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 88936aa0029d..5c82c8065501 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1016,7 +1016,7 @@ static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                  */
                 if (length < copybreak) {
                         struct sk_buff *new_skb =
-                            netdev_alloc_skb_ip_align(netdev, length);
+                                napi_alloc_skb(&adapter->napi, length);
                         if (new_skb) {
                                 skb_copy_to_linear_data_offset(new_skb,
                                                                -NET_IP_ALIGN,
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 91516aed373e..ee1ecb146df7 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -308,8 +308,8 @@ static struct sk_buff *fm10k_fetch_rx_buffer(struct fm10k_ring *rx_ring,
 #endif
 
                 /* allocate a skb to store the frags */
-                skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
-                                                FM10K_RX_HDR_LEN);
+                skb = napi_alloc_skb(&rx_ring->q_vector->napi,
+                                     FM10K_RX_HDR_LEN);
                 if (unlikely(!skb)) {
                         rx_ring->rx_stats.alloc_failed++;
                         return NULL;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index f04ad13f7159..485d2c609d5d 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6644,8 +6644,7 @@ static struct sk_buff *igb_fetch_rx_buffer(struct igb_ring *rx_ring,
 #endif
 
                 /* allocate a skb to store the frags */
-                skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
-                                                IGB_RX_HDR_LEN);
+                skb = napi_alloc_skb(&rx_ring->q_vector->napi, IGB_RX_HDR_LEN);
                 if (unlikely(!skb)) {
                         rx_ring->rx_stats.alloc_failed++;
                         return NULL;
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 055961b0f24b..aa87605b144a 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -1963,7 +1963,7 @@ ixgb_rx_checksum(struct ixgb_adapter *adapter,
  * this should improve performance for small packets with large amounts
  * of reassembly being done in the stack
  */
-static void ixgb_check_copybreak(struct net_device *netdev,
+static void ixgb_check_copybreak(struct napi_struct *napi,
                                  struct ixgb_buffer *buffer_info,
                                  u32 length, struct sk_buff **skb)
 {
@@ -1972,7 +1972,7 @@ static void ixgb_check_copybreak(struct net_device *netdev,
         if (length > copybreak)
                 return;
 
-        new_skb = netdev_alloc_skb_ip_align(netdev, length);
+        new_skb = napi_alloc_skb(napi, length);
         if (!new_skb)
                 return;
 
@@ -2064,7 +2064,7 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
                         goto rxdesc_done;
                 }
 
-                ixgb_check_copybreak(netdev, buffer_info, length, &skb);
+                ixgb_check_copybreak(&adapter->napi, buffer_info, length, &skb);
 
                 /* Good Receive */
                 skb_put(skb, length);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index fbd52924ee34..798b05556e1b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1913,8 +1913,8 @@ static struct sk_buff *ixgbe_fetch_rx_buffer(struct ixgbe_ring *rx_ring,
 #endif
 
                 /* allocate a skb to store the frags */
-                skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
-                                                IXGBE_RX_HDR_SIZE);
+                skb = napi_alloc_skb(&rx_ring->q_vector->napi,
+                                     IXGBE_RX_HDR_SIZE);
                 if (unlikely(!skb)) {
                         rx_ring->rx_stats.alloc_rx_buff_failed++;
                         return NULL;