Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next

Peter P Waskiewicz Jr says:

====================
This series contains multiple updates to the ixgbe driver.

The following are changes since commit 02644a17457414f38e29f32d5c640b06d08fa092:
    sctp: fix bogus if statement in sctp_auth_recv_cid()

and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next master

Alexander Duyck (9):
  ixgbe: Remove code that was initializing Rx page offset
  ixgbe: combine ixgbe_add_rx_frag and ixgbe_can_reuse_page
  ixgbe: Only use double buffering if page size is less than 8K
  ixgbe: Have the CPU take ownership of the buffers sooner
  ixgbe: Make pull tail function separate from rest of cleanup_headers
  ixgbe: Copybreak sooner to avoid get_page/put_page and offset change
    overhead
  ixgbe: Make allocating skb and placing data in it a separate function
  ixgbe: Roll RSC code into non-EOP code
  ixgbe: Rewrite code related to configuring IFCS bit in Tx descriptor
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 284 insertions, 238 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index b9623e9ea895..bffcf1f2357a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -78,6 +78,9 @@
 
 /* Supported Rx Buffer Sizes */
 #define IXGBE_RXBUFFER_256    256  /* Used for skb receive header */
+#define IXGBE_RXBUFFER_2K    2048
+#define IXGBE_RXBUFFER_3K    3072
+#define IXGBE_RXBUFFER_4K    4096
 #define IXGBE_MAX_RXBUFFER  16384  /* largest size for a single descriptor */
 
 /*
@@ -104,6 +107,7 @@
 #define IXGBE_TX_FLAGS_FSO              (u32)(1 << 6)
 #define IXGBE_TX_FLAGS_TXSW             (u32)(1 << 7)
 #define IXGBE_TX_FLAGS_TSTAMP           (u32)(1 << 8)
+#define IXGBE_TX_FLAGS_NO_IFCS          (u32)(1 << 9)
 #define IXGBE_TX_FLAGS_VLAN_MASK        0xffff0000
 #define IXGBE_TX_FLAGS_VLAN_PRIO_MASK   0xe0000000
 #define IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT  29
@@ -293,16 +297,25 @@ struct ixgbe_ring_feature {
  * this is twice the size of a half page we need to double the page order
  * for FCoE enabled Rx queues.
  */
-#if defined(IXGBE_FCOE) && (PAGE_SIZE < 8192)
-static inline unsigned int ixgbe_rx_pg_order(struct ixgbe_ring *ring)
+static inline unsigned int ixgbe_rx_bufsz(struct ixgbe_ring *ring)
 {
-        return test_bit(__IXGBE_RX_FCOE, &ring->state) ? 1 : 0;
+#ifdef IXGBE_FCOE
+        if (test_bit(__IXGBE_RX_FCOE, &ring->state))
+                return (PAGE_SIZE < 8192) ? IXGBE_RXBUFFER_4K :
+                                            IXGBE_RXBUFFER_3K;
+#endif
+        return IXGBE_RXBUFFER_2K;
 }
-#else
-#define ixgbe_rx_pg_order(_ring) 0
+
+static inline unsigned int ixgbe_rx_pg_order(struct ixgbe_ring *ring)
+{
+#ifdef IXGBE_FCOE
+        if (test_bit(__IXGBE_RX_FCOE, &ring->state))
+                return (PAGE_SIZE < 8192) ? 1 : 0;
 #endif
+        return 0;
+}
 #define ixgbe_rx_pg_size(_ring) (PAGE_SIZE << ixgbe_rx_pg_order(_ring))
-#define ixgbe_rx_bufsz(_ring) ((PAGE_SIZE / 2) << ixgbe_rx_pg_order(_ring))
 
 struct ixgbe_ring_container {
         struct ixgbe_ring *ring;        /* pointer to linked list of rings */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 4326f74f7137..fa0d6e1561c1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1167,7 +1167,7 @@ static bool ixgbe_alloc_mapped_page(struct ixgbe_ring *rx_ring,
         }
 
         bi->dma = dma;
-        bi->page_offset ^= ixgbe_rx_bufsz(rx_ring);
+        bi->page_offset = 0;
 
         return true;
 }
@@ -1320,29 +1320,6 @@ static unsigned int ixgbe_get_headlen(unsigned char *data,
                 return max_len;
 }
 
-static void ixgbe_get_rsc_cnt(struct ixgbe_ring *rx_ring,
-                              union ixgbe_adv_rx_desc *rx_desc,
-                              struct sk_buff *skb)
-{
-        __le32 rsc_enabled;
-        u32 rsc_cnt;
-
-        if (!ring_is_rsc_enabled(rx_ring))
-                return;
-
-        rsc_enabled = rx_desc->wb.lower.lo_dword.data &
-                      cpu_to_le32(IXGBE_RXDADV_RSCCNT_MASK);
-
-        /* If this is an RSC frame rsc_cnt should be non-zero */
-        if (!rsc_enabled)
-                return;
-
-        rsc_cnt = le32_to_cpu(rsc_enabled);
-        rsc_cnt >>= IXGBE_RXDADV_RSCCNT_SHIFT;
-
-        IXGBE_CB(skb)->append_cnt += rsc_cnt - 1;
-}
-
 static void ixgbe_set_rsc_gso_size(struct ixgbe_ring *ring,
                                    struct sk_buff *skb)
 {
@@ -1440,16 +1417,28 @@ static bool ixgbe_is_non_eop(struct ixgbe_ring *rx_ring,
 
         prefetch(IXGBE_RX_DESC(rx_ring, ntc));
 
-        if (likely(ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_EOP)))
-                return false;
+        /* update RSC append count if present */
+        if (ring_is_rsc_enabled(rx_ring)) {
+                __le32 rsc_enabled = rx_desc->wb.lower.lo_dword.data &
+                                     cpu_to_le32(IXGBE_RXDADV_RSCCNT_MASK);
+
+                if (unlikely(rsc_enabled)) {
+                        u32 rsc_cnt = le32_to_cpu(rsc_enabled);
 
-        /* append_cnt indicates packet is RSC, if so fetch nextp */
-        if (IXGBE_CB(skb)->append_cnt) {
-                ntc = le32_to_cpu(rx_desc->wb.upper.status_error);
-                ntc &= IXGBE_RXDADV_NEXTP_MASK;
-                ntc >>= IXGBE_RXDADV_NEXTP_SHIFT;
+                        rsc_cnt >>= IXGBE_RXDADV_RSCCNT_SHIFT;
+                        IXGBE_CB(skb)->append_cnt += rsc_cnt - 1;
+
+                        /* update ntc based on RSC value */
+                        ntc = le32_to_cpu(rx_desc->wb.upper.status_error);
+                        ntc &= IXGBE_RXDADV_NEXTP_MASK;
+                        ntc >>= IXGBE_RXDADV_NEXTP_SHIFT;
+                }
         }
 
+        /* if we are the last buffer then there is nothing else to do */
+        if (likely(ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_EOP)))
+                return false;
+
         /* place skb in next buffer to be received */
         rx_ring->rx_buffer_info[ntc].skb = skb;
         rx_ring->rx_stats.non_eop_descs++;
@@ -1458,6 +1447,78 @@ static bool ixgbe_is_non_eop(struct ixgbe_ring *rx_ring,
 }
 
 /**
+ * ixgbe_pull_tail - ixgbe specific version of skb_pull_tail
+ * @rx_ring: rx descriptor ring packet is being transacted on
+ * @skb: pointer to current skb being adjusted
+ *
+ * This function is an ixgbe specific version of __pskb_pull_tail.  The
+ * main difference between this version and the original function is that
+ * this function can make several assumptions about the state of things
+ * that allow for significant optimizations versus the standard function.
+ * As a result we can do things like drop a frag and maintain an accurate
+ * truesize for the skb.
+ */
+static void ixgbe_pull_tail(struct ixgbe_ring *rx_ring,
+                            struct sk_buff *skb)
+{
+        struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[0];
+        unsigned char *va;
+        unsigned int pull_len;
+
+        /*
+         * it is valid to use page_address instead of kmap since we are
+         * working with pages allocated out of the lomem pool per
+         * alloc_page(GFP_ATOMIC)
+         */
+        va = skb_frag_address(frag);
+
+        /*