net: move gro definitions to include/net/gro.h
authorEric Dumazet <edumazet@google.com>
Mon, 15 Nov 2021 17:05:51 +0000 (09:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Nov 2021 13:16:54 +0000 (13:16 +0000)
include/linux/netdevice.h became too big, move gro stuff
into include/net/gro.h

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 files changed:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
drivers/net/ethernet/qlogic/qede/qede_fp.c
drivers/net/geneve.c
drivers/net/vxlan.c
include/linux/netdevice.h
include/net/gro.h
include/net/ip.h
include/net/ip6_checksum.h
include/net/udp.h
net/core/skbuff.c
net/ipv4/af_inet.c
net/ipv4/esp4_offload.c
net/ipv4/fou.c
net/ipv4/gre_offload.c
net/ipv4/tcp_offload.c
net/ipv4/udp_offload.c
net/ipv6/esp6_offload.c
net/ipv6/tcpv6_offload.c
net/ipv6/udp_offload.c

index e8e8c2d..54a2334 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/ip.h>
 #include <linux/crash_dump.h>
 #include <net/tcp.h>
+#include <net/gro.h>
 #include <net/ipv6.h>
 #include <net/ip6_checksum.h>
 #include <linux/prefetch.h>
index c04ea83..c057b1d 100644 (file)
@@ -37,6 +37,7 @@
 #include <linux/if_bridge.h>
 #include <linux/rtc.h>
 #include <linux/bpf.h>
+#include <net/gro.h>
 #include <net/ip.h>
 #include <net/tcp.h>
 #include <net/udp.h>
index 9ccebba..13835a3 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/skbuff.h>
 #include <linux/sctp.h>
 #include <net/gre.h>
+#include <net/gro.h>
 #include <net/ip6_checksum.h>
 #include <net/pkt_cls.h>
 #include <net/tcp.h>
index 96967b0..e384f64 100644 (file)
@@ -37,6 +37,7 @@
 #include <net/ip6_checksum.h>
 #include <net/page_pool.h>
 #include <net/inet_ecn.h>
+#include <net/gro.h>
 #include <net/udp.h>
 #include <net/tcp.h>
 #include "en.h"
index 065e900..e113fbd 100644 (file)
@@ -10,6 +10,7 @@
 #include <linux/bpf_trace.h>
 #include <net/udp_tunnel.h>
 #include <linux/ip.h>
+#include <net/gro.h>
 #include <net/ipv6.h>
 #include <net/tcp.h>
 #include <linux/if_ether.h>
index 1ab94b5..9d26d1b 100644 (file)
@@ -17,6 +17,7 @@
 #include <net/gro_cells.h>
 #include <net/rtnetlink.h>
 #include <net/geneve.h>
+#include <net/gro.h>
 #include <net/protocol.h>
 
 #define GENEVE_NETDEV_VER      "0.6"
index 141635a..563f86d 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/ethtool.h>
 #include <net/arp.h>
 #include <net/ndisc.h>
+#include <net/gro.h>
 #include <net/ipv6_stubs.h>
 #include <net/ip.h>
 #include <net/icmp.h>
index 3ec4249..d95c983 100644 (file)
@@ -2520,109 +2520,6 @@ static inline void netif_napi_del(struct napi_struct *napi)
        synchronize_net();
 }
 
-struct napi_gro_cb {
-       /* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */
-       void    *frag0;
-
-       /* Length of frag0. */
-       unsigned int frag0_len;
-
-       /* This indicates where we are processing relative to skb->data. */
-       int     data_offset;
-
-       /* This is non-zero if the packet cannot be merged with the new skb. */
-       u16     flush;
-
-       /* Save the IP ID here and check when we get to the transport layer */
-       u16     flush_id;
-
-       /* Number of segments aggregated. */
-       u16     count;
-
-       /* Start offset for remote checksum offload */
-       u16     gro_remcsum_start;
-
-       /* jiffies when first packet was created/queued */
-       unsigned long age;
-
-       /* Used in ipv6_gro_receive() and foo-over-udp */
-       u16     proto;
-
-       /* This is non-zero if the packet may be of the same flow. */
-       u8      same_flow:1;
-
-       /* Used in tunnel GRO receive */
-       u8      encap_mark:1;
-
-       /* GRO checksum is valid */
-       u8      csum_valid:1;
-
-       /* Number of checksums via CHECKSUM_UNNECESSARY */
-       u8      csum_cnt:3;
-
-       /* Free the skb? */
-       u8      free:2;
-#define NAPI_GRO_FREE            1
-#define NAPI_GRO_FREE_STOLEN_HEAD 2
-
-       /* Used in foo-over-udp, set in udp[46]_gro_receive */
-       u8      is_ipv6:1;
-
-       /* Used in GRE, set in fou/gue_gro_receive */
-       u8      is_fou:1;
-
-       /* Used to determine if flush_id can be ignored */
-       u8      is_atomic:1;
-
-       /* Number of gro_receive callbacks this packet already went through */
-       u8 recursion_counter:4;
-
-       /* GRO is done by frag_list pointer chaining. */
-       u8      is_flist:1;
-
-       /* used to support CHECKSUM_COMPLETE for tunneling protocols */
-       __wsum  csum;
-
-       /* used in skb_gro_receive() slow path */
-       struct sk_buff *last;
-};
-
-#define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)
-
-#define GRO_RECURSION_LIMIT 15
-static inline int gro_recursion_inc_test(struct sk_buff *skb)
-{
-       return ++NAPI_GRO_CB(skb)->recursion_counter == GRO_RECURSION_LIMIT;
-}
-
-typedef struct sk_buff *(*gro_receive_t)(struct list_head *, struct sk_buff *);
-static inline struct sk_buff *call_gro_receive(gro_receive_t cb,
-                                              struct list_head *head,
-                                              struct sk_buff *skb)
-{
-       if (unlikely(gro_recursion_inc_test(skb))) {
-               NAPI_GRO_CB(skb)->flush |= 1;
-               return NULL;
-       }
-
-       return cb(head, skb);
-}
-
-typedef struct sk_buff *(*gro_receive_sk_t)(struct sock *, struct list_head *,
-                                           struct sk_buff *);
-static inline struct sk_buff *call_gro_receive_sk(gro_receive_sk_t cb,
-                                                 struct sock *sk,
-                                                 struct list_head *head,
-                                                 struct sk_buff *skb)
-{
-       if (unlikely(gro_recursion_inc_test(skb))) {
-               NAPI_GRO_CB(skb)->flush |= 1;
-               return NULL;
-       }
-
-       return cb(sk, head, skb);
-}
-
 struct packet_type {
        __be16                  type;   /* This is really htons(ether_type). */
        bool                    ignore_outgoing;
@@ -3008,251 +2905,6 @@ int dev_restart(struct net_device *dev);
 int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb);
 int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb);
 
-static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
-{
-       return NAPI_GRO_CB(skb)->data_offset;
-}
-
-static inline unsigned int skb_gro_len(const struct sk_buff *skb)
-{
-       return skb->len - NAPI_GRO_CB(skb)->data_offset;
-}
-
-static inline void skb_gro_pull(struct sk_buff *skb, unsigned int len)
-{
-       NAPI_GRO_CB(skb)->data_offset += len;
-}
-
-static inline void *skb_gro_header_fast(struct sk_buff *skb,
-                                       unsigned int offset)
-{
-       return NAPI_GRO_CB(skb)->frag0 + offset;
-}
-
-static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen)
-{
-       return NAPI_GRO_CB(skb)->frag0_len < hlen;
-}
-
-static inline void skb_gro_frag0_invalidate(struct sk_buff *skb)
-{
-       NAPI_GRO_CB(skb)->frag0 = NULL;
-       NAPI_GRO_CB(skb)->frag0_len = 0;
-}
-
-static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
-                                       unsigned int offset)
-{
-       if (!pskb_may_pull(skb, hlen))
-               return NULL;
-
-       skb_gro_frag0_invalidate(skb);
-       return skb->data + offset;
-}
-
-static inline void *skb_gro_network_header(struct sk_buff *skb)
-{
-       return (NAPI_GRO_CB(skb)->frag0 ?: skb->data) +
-              skb_network_offset(skb);
-}
-
-static inline void skb_gro_postpull_rcsum(struct sk_buff *skb,
-                                       const void *start, unsigned int len)
-{
-       if (NAPI_GRO_CB(skb)->csum_valid)
-               NAPI_GRO_CB(skb)->csum = csum_sub(NAPI_GRO_CB(skb)->csum,
-                                                 csum_partial(start, len, 0));
-}
-
-/* GRO checksum functions. These are logical equivalents of the normal
- * checksum functions (in skbuff.h) except that they operate on the GRO
- * offsets and fields in sk_buff.
- */
-
-__sum16 __skb_gro_checksum_complete(struct sk_buff *skb);
-
-static inline bool skb_at_gro_remcsum_start(struct sk_buff *skb)
-{
-       return (NAPI_GRO_CB(skb)->gro_remcsum_start == skb_gro_offset(skb));
-}
-
-static inline bool __skb_gro_checksum_validate_needed(struct sk_buff *skb,
-                                                     bool zero_okay,
-                                                     __sum16 check)
-{
-       return ((skb->ip_summed != CHECKSUM_PARTIAL ||
-               skb_checksum_start_offset(skb) <
-                skb_gro_offset(skb)) &&
-               !skb_at_gro_remcsum_start(skb) &&
-               NAPI_GRO_CB(skb)->csum_cnt == 0 &&
-               (!zero_okay || check));
-}
-
-static inline __sum16 __skb_gro_checksum_validate_complete(struct sk_buff *skb,
-                                                          __wsum psum)
-{
-       if (NAPI_GRO_CB(skb)->csum_valid &&
-           !csum_fold(csum_add(psum, NAPI_GRO_CB(skb)->csum)))
-               return 0;
-
-       NAPI_GRO_CB(skb)->csum = psum;
-
-       return __skb_gro_checksum_complete(skb);
-}
-
-static inline void skb_gro_incr_csum_unnecessary(struct sk_buff *skb)
-{
-       if (NAPI_GRO_CB(skb)->csum_cnt > 0) {
-               /* Consume a checksum from CHECKSUM_UNNECESSARY */
-               NAPI_GRO_CB(skb)->csum_cnt--;
-       } else {
-               /* Update skb for CHECKSUM_UNNECESSARY and csum_level when we
-                * verified a new top level checksum or an encapsulated one
-                * during GRO. This saves work if we fallback to normal path.
-                */
-               __skb_incr_checksum_unnecessary(skb);
-       }
-}
-
-#define __skb_gro_checksum_validate(skb, proto, zero_okay, check,      \
-                                   compute_pseudo)                     \
-({                                                                     \
-       __sum16 __ret = 0;                                              \
-       if (__skb_gro_checksum_validate_needed(skb, zero_okay, check))  \
-               __ret = __skb_gro_checksum_validate_complete(skb,       \
-                               compute_pseudo(skb, proto));            \
-       if (!__ret)                                                     \
-               skb_gro_incr_csum_unnecessary(skb);                     \
-       __ret;                                                          \
-})
-
-#define skb_gro_checksum_validate(skb, proto, compute_pseudo)          \
-       __skb_gro_checksum_validate(skb, proto, false, 0, compute_pseudo)
-
-#define skb_gro_checksum_validate_zero_check(skb, proto, check,                \
-                                            compute_pseudo)            \
-       __skb_gro_checksum_validate(skb, proto, true, check, compute_pseudo)
-
-#define skb_gro_checksum_simple_validate(skb)                          \
-       __skb_gro_checksum_validate(skb, 0, false, 0, null_compute_pseudo)
-
-static inline bool __skb_gro_checksum_convert_check(struct sk_buff *skb)
-{
-       return (NAPI_GRO_CB(skb)->csum_cnt == 0 &&
-               !NAPI_GRO_CB(skb)->csum_valid);
-}
-
-static inline void __skb_gro_checksum_convert(struct sk_buff *skb,
-                                             __wsum pseudo)
-{
-       NAPI_GRO_CB(skb)->csum = ~pseudo;
-       NAPI_GRO_CB(skb)->csum_valid = 1;
-}
-
-#define skb_gro_checksum_try_convert(skb, proto, compute_pseudo)       \
-do {                                                                   \
-       if (__skb_gro_checksum_convert_check(skb))                      \
-               __skb_gro_checksum_convert(skb,                         \
-                                          compute_pseudo(skb, proto)); \
-} while (0)
-
-struct gro_remcsum {
-       int offset;
-       __wsum delta;
-};
-
-static inline void skb_gro_remcsum_init(struct gro_remcsum *grc)
-{
-       grc->offset = 0;
-       grc->delta = 0;
-}
-
-static inline void *skb_gro_remcsum_process(struct sk_buff *skb, void *ptr,
-                                           unsigned int off, size_t hdrlen,
-                                           int start, int offset,
-                                           struct gro_remcsum *grc,
-                                           bool nopartial)
-{
-       __wsum delta;
-       size_t plen = hdrlen + max_t(size_t, offset + sizeof(u16), start);
-
-       BUG_ON(!NAPI_GRO_CB(skb)->csum_valid);
-
-       if (!nopartial) {
-               NAPI_GRO_CB(skb)->gro_remcsum_start = off + hdrlen + start;
-               return ptr;
-       }
-
-       ptr = skb_gro_header_fast(skb, off);
-       if (skb_gro_header_hard(skb, off + plen)) {
-               ptr = skb_gro_header_slow(skb, off + plen, off);
-               if (!ptr)
-                       return NULL;
-       }
-
-       delta = remcsum_adjust(ptr + hdrlen, NAPI_GRO_CB(skb)->csum,
-                              start, offset);
-
-       /* Adjust skb->csum since we changed the packet */
-       NAPI_GRO_CB(skb)->csum = csum_add(NAPI_GRO_CB(skb)->csum, delta);
-
-       grc->offset = off + hdrlen + offset;
-       grc->delta = delta;
-
-       return ptr;
-}
-
-static inline void skb_gro_remcsum_cleanup(struct sk_buff *skb,
-                                          struct gro_remcsum *grc)
-{
-       void *ptr;
-       size_t plen = grc->offset + sizeof(u16);
-
-       if (!grc->delta)
-               return;
-
-       ptr = skb_gro_header_fast(skb, grc->offset);
-       if (skb_gro_header_hard(skb, grc->offset + sizeof(u16))) {
-               ptr = skb_gro_header_slow(skb, plen, grc->offset);
-               if (!ptr)
-                       return;
-       }
-
-       remcsum_unadjust((__sum16 *)ptr, grc->delta);
-}
-
-#ifdef CONFIG_XFRM_OFFLOAD
-static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff *pp, int flush)
-{
-       if (PTR_ERR(pp) != -EINPROGRESS)
-               NAPI_GRO_CB(skb)->flush |= flush;
-}
-static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
-                                              struct sk_buff *pp,
-                                              int flush,
-                                              struct gro_remcsum *grc)
-{
-       if (PTR_ERR(pp) != -EINPROGRESS) {
-               NAPI_GRO_CB(skb)->flush |= flush;
-               skb_gro_remcsum_cleanup(skb, grc);
-               skb->remcsum_offload = 0;
-       }
-}
-#else
-static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff *pp, int flush)
-{
-       NAPI_GRO_CB(skb)->flush |= flush;
-}
-static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
-                                              struct sk_buff *pp,
-                                              int flush,
-                                              struct gro_remcsum *grc)
-{
-       NAPI_GRO_CB(skb)->flush |= flush;
-       skb_gro_remcsum_cleanup(skb, grc);
-       skb->remcsum_offload = 0;
-}
-#endif
 
 static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
                                  unsigned short type,
index 01edaf3..1ffbe74 100644 (file)
@@ -4,9 +4,367 @@
 #define _NET_IPV6_GRO_H
 
 #include <linux/indirect_call_wrapper.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <linux/skbuff.h>
+#include <net/udp.h>
 
-struct list_head;
-struct sk_buff;
+struct napi_gro_cb {
+       /* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */
+       void    *frag0;
+
+       /* Length of frag0. */
+       unsigned int frag0_len;
+
+       /* This indicates where we are processing relative to skb->data. */
+       int     data_offset;
+
+       /* This is non-zero if the packet cannot be merged with the new skb. */
+       u16     flush;
+
+       /* Save the IP ID here and check when we get to the transport layer */
+       u16     flush_id;
+
+       /* Number of segments aggregated. */
+       u16     count;
+
+       /* Start offset for remote checksum offload */
+       u16     gro_remcsum_start;
+
+       /* jiffies when first packet was created/queued */
+       unsigned long age;
+
+       /* Used in ipv6_gro_receive() and foo-over-udp */
+       u16     proto;
+
+       /* This is non-zero if the packet may be of the same flow. */
+       u8      same_flow:1;
+
+       /* Used in tunnel GRO receive */
+       u8      encap_mark:1;
+
+       /* GRO checksum is valid */
+       u8      csum_valid:1;
+
+       /* Number of checksums via CHECKSUM_UNNECESSARY */
+       u8      csum_cnt:3;
+
+       /* Free the skb? */
+       u8      free:2;
+#define NAPI_GRO_FREE            1
+#define NAPI_GRO_FREE_STOLEN_HEAD 2
+
+       /* Used in foo-over-udp, set in udp[46]_gro_receive */
+       u8      is_ipv6:1;
+
+       /* Used in GRE, set in fou/gue_gro_receive */
+       u8      is_fou:1;
+
+       /* Used to determine if flush_id can be ignored */
+       u8      is_atomic:1;
+
+       /* Number of gro_receive callbacks this packet already went through */
+       u8 recursion_counter:4;
+
+       /* GRO is done by frag_list pointer chaining. */
+       u8      is_flist:1;
+
+       /* used to support CHECKSUM_COMPLETE for tunneling protocols */
+       __wsum  csum;
+
+       /* used in skb_gro_receive() slow path */
+       struct sk_buff *last;
+};
+
+#define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)
+
+#define GRO_RECURSION_LIMIT 15
+static inline int gro_recursion_inc_test(struct sk_buff *skb)
+{
+       return ++NAPI_GRO_CB(skb)->recursion_counter == GRO_RECURSION_LIMIT;
+}
+
+typedef struct sk_buff *(*gro_receive_t)(struct list_head *, struct sk_buff *);
+static inline struct sk_buff *call_gro_receive(gro_receive_t cb,
+                                              struct list_head *head,
+                                              struct sk_buff *skb)
+{
+       if (unlikely(gro_recursion_inc_test(skb))) {
+               NAPI_GRO_CB(skb)->flush |= 1;
+               return NULL;
+       }
+
+       return cb(head, skb);
+}
+
+typedef struct sk_buff *(*gro_receive_sk_t)(struct sock *, struct list_head *,
+                                           struct sk_buff *);
+static inline struct sk_buff *call_gro_receive_sk(gro_receive_sk_t cb,
+                                                 struct sock *sk,
+                                                 struct list_head *head,
+                                                 struct sk_buff *skb)
+{
+       if (unlikely(gro_recursion_inc_test(skb))) {
+               NAPI_GRO_CB(skb)->flush |= 1;
+               return NULL;
+       }
+
+       return cb(sk, head, skb);
+}
+
+static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
+{
+       return NAPI_GRO_CB(skb)->data_offset;
+}
+
+static inline unsigned int skb_gro_len(const struct sk_buff *skb)
+{
+       return skb->len - NAPI_GRO_CB(skb)->data_offset;
+}
+
+static inline void skb_gro_pull(struct sk_buff *skb, unsigned int len)
+{
+       NAPI_GRO_CB(skb)->data_offset += len;
+}
+
+static inline void *skb_gro_header_fast(struct sk_buff *skb,
+                                       unsigned int offset)
+{
+       return NAPI_GRO_CB(skb)->frag0 + offset;
+}
+
+static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen)
+{
+       return NAPI_GRO_CB(skb)->frag0_len < hlen;
+}
+
+static inline void skb_gro_frag0_invalidate(struct sk_buff *skb)
+{
+       NAPI_GRO_CB(skb)->frag0 = NULL;
+       NAPI_GRO_CB(skb)->frag0_len = 0;
+}
+
+static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
+                                       unsigned int offset)
+{
+       if (!pskb_may_pull(skb, hlen))
+               return NULL;
+
+       skb_gro_frag0_invalidate(skb);
+       return skb->data + offset;
+}
+
+static inline void *skb_gro_network_header(struct sk_buff *skb)
+{
+       return (NAPI_GRO_CB(skb)->frag0 ?: skb->data) +
+              skb_network_offset(skb);
+}
+
+static inline __wsum inet_gro_compute_pseudo(struct sk_buff *skb, int proto)
+{
+       const struct iphdr *iph = skb_gro_network_header(skb);
+
+       return csum_tcpudp_nofold(iph->saddr, iph->daddr,
+                                 skb_gro_len(skb), proto, 0);
+}
+
+static inline void skb_gro_postpull_rcsum(struct sk_buff *skb,
+                                       const void *start, unsigned int len)
+{
+       if (NAPI_GRO_CB(skb)->csum_valid)
+               NAPI_GRO_CB(skb)->csum = csum_sub(NAPI_GRO_CB(skb)->csum,
+                                                 csum_partial(start, len, 0));
+}
+
+/* GRO checksum functions. These are logical equivalents of the normal
+ * checksum functions (in skbuff.h) except that they operate on the GRO
+ * offsets and fields in sk_buff.
+ */
+
+__sum16 __skb_gro_checksum_complete(struct sk_buff *skb);
+
+static inline bool skb_at_gro_remcsum_start(struct sk_buff *skb)
+{
+       return (NAPI_GRO_CB(skb)->gro_remcsum_start == skb_gro_offset(skb));
+}
+
+static inline bool __skb_gro_checksum_validate_needed(struct sk_buff *skb,
+                                                     bool zero_okay,
+                                                     __sum16 check)
+{
+       return ((skb->ip_summed != CHECKSUM_PARTIAL ||
+               skb_checksum_start_offset(skb) <
+                skb_gro_offset(skb)) &&
+               !skb_at_gro_remcsum_start(skb) &&
+               NAPI_GRO_CB(skb)->csum_cnt == 0 &&
+               (!zero_okay || check));
+}
+
+static inline __sum16 __skb_gro_checksum_validate_complete(struct sk_buff *skb,
+                                                          __wsum psum)
+{
+       if (NAPI_GRO_CB(skb)->csum_valid &&
+           !csum_fold(csum_add(psum, NAPI_GRO_CB(skb)->csum)))
+               return 0;
+
+       NAPI_GRO_CB(skb)->csum = psum;
+
+       return __skb_gro_checksum_complete(skb);
+}
+
+static inline void skb_gro_incr_csum_unnecessary(struct sk_buff *skb)
+{
+       if (NAPI_GRO_CB(skb)->csum_cnt > 0) {
+               /* Consume a checksum from CHECKSUM_UNNECESSARY */
+               NAPI_GRO_CB(skb)->csum_cnt--;
+       } else {
+               /* Update skb for CHECKSUM_UNNECESSARY and csum_level when we
+                * verified a new top level checksum or an encapsulated one
+                * during GRO. This saves work if we fallback to normal path.
+                */
+               __skb_incr_checksum_unnecessary(skb);
+       }
+}
+
+#define __skb_gro_checksum_validate(skb, proto, zero_okay, check,      \
+                                   compute_pseudo)                     \
+({                                                                     \
+       __sum16 __ret = 0;                                              \
+       if (__skb_gro_checksum_validate_needed(skb, zero_okay, check))  \
+               __ret = __skb_gro_checksum_validate_complete(skb,       \
+                               compute_pseudo(skb, proto));            \
+       if (!__ret)                                                     \
+               skb_gro_incr_csum_unnecessary(skb);                     \
+       __ret;                                                          \
+})
+
+#define skb_gro_checksum_validate(skb, proto, compute_pseudo)          \
+       __skb_gro_checksum_validate(skb, proto, false, 0, compute_pseudo)
+
+#define skb_gro_checksum_validate_zero_check(skb, proto, check,                \
+                                            compute_pseudo)            \
+       __skb_gro_checksum_validate(skb, proto, true, check, compute_pseudo)
+
+#define skb_gro_checksum_simple_validate(skb)                          \
+       __skb_gro_checksum_validate(skb, 0, false, 0, null_compute_pseudo)
+
+static inline bool __skb_gro_checksum_convert_check(struct sk_buff *skb)
+{
+       return (NAPI_GRO_CB(skb)->csum_cnt == 0 &&
+               !NAPI_GRO_CB(skb)->csum_valid);
+}
+
+static inline void __skb_gro_checksum_convert(struct sk_buff *skb,
+                                             __wsum pseudo)
+{
+       NAPI_GRO_CB(skb)->csum = ~pseudo;
+       NAPI_GRO_CB(skb)->csum_valid = 1;
+}
+
+#define skb_gro_checksum_try_convert(skb, proto, compute_pseudo)       \
+do {                                                                   \
+       if (__skb_gro_checksum_convert_check(skb))                      \
+               __skb_gro_checksum_convert(skb,                         \
+                                          compute_pseudo(skb, proto)); \
+} while (0)
+
+struct gro_remcsum {
+       int offset;
+       __wsum delta;
+};
+
+static inline void skb_gro_remcsum_init(struct gro_remcsum *grc)
+{
+       grc->offset = 0;
+       grc->delta = 0;
+}
+
+static inline void *skb_gro_remcsum_process(struct sk_buff *skb, void *ptr,
+                                           unsigned int off, size_t hdrlen,
+                                           int start, int offset,
+                                           struct gro_remcsum *grc,
+                                           bool nopartial)
+{
+       __wsum delta;
+       size_t plen = hdrlen + max_t(size_t, offset + sizeof(u16), start);
+
+       BUG_ON(!NAPI_GRO_CB(skb)->csum_valid);
+
+       if (!nopartial) {
+               NAPI_GRO_CB(skb)->gro_remcsum_start = off + hdrlen + start;
+               return ptr;
+       }
+
+       ptr = skb_gro_header_fast(skb, off);
+       if (skb_gro_header_hard(skb, off + plen)) {
+               ptr = skb_gro_header_slow(skb, off + plen, off);
+               if (!ptr)
+                       return NULL;
+       }
+
+       delta = remcsum_adjust(ptr + hdrlen, NAPI_GRO_CB(skb)->csum,
+                              start, offset);
+
+       /* Adjust skb->csum since we changed the packet */
+       NAPI_GRO_CB(skb)->csum = csum_add(NAPI_GRO_CB(skb)->csum, delta);
+
+       grc->offset = off + hdrlen + offset;
+       grc->delta = delta;
+
+       return ptr;
+}
+
+static inline void skb_gro_remcsum_cleanup(struct sk_buff *skb,
+                                          struct gro_remcsum *grc)
+{
+       void *ptr;
+       size_t plen = grc->offset + sizeof(u16);
+
+       if (!grc->delta)
+               return;
+
+       ptr = skb_gro_header_fast(skb, grc->offset);
+       if (skb_gro_header_hard(skb, grc->offset + sizeof(u16))) {
+               ptr = skb_gro_header_slow(skb, plen, grc->offset);
+               if (!ptr)
+                       return;
+       }
+
+       remcsum_unadjust((__sum16 *)ptr, grc->delta);
+}
+
+#ifdef CONFIG_XFRM_OFFLOAD
+static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff *pp, int flush)
+{
+       if (PTR_ERR(pp) != -EINPROGRESS)
+               NAPI_GRO_CB(skb)->flush |= flush;
+}
+static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
+                                              struct sk_buff *pp,
+                                              int flush,
+                                              struct gro_remcsum *grc)
+{
+       if (PTR_ERR(pp) != -EINPROGRESS) {
+               NAPI_GRO_CB(skb)->flush |= flush;
+               skb_gro_remcsum_cleanup(skb, grc);
+               skb->remcsum_offload = 0;
+       }
+}
+#else
+static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff *pp, int flush)
+{
+       NAPI_GRO_CB(skb)->flush |= flush;
+}
+static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
+                                              struct sk_buff *pp,
+                                              int flush,
+                                              struct gro_remcsum *grc)
+{
+       NAPI_GRO_CB(skb)->flush |= flush;
+       skb_gro_remcsum_cleanup(skb, grc);
+       skb->remcsum_offload = 0;
+}
+#endif
 
 INDIRECT_CALLABLE_DECLARE(struct sk_buff *ipv6_gro_receive(struct list_head *,
                                                           struct sk_buff *));
@@ -15,6 +373,14 @@ INDIRECT_CALLABLE_DECLARE(struct sk_buff *inet_gro_receive(struct list_head *,
                                                           struct sk_buff *));
 INDIRECT_CALLABLE_DECLARE(int inet_gro_complete(struct sk_buff *, int));
 
+INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp4_gro_receive(struct list_head *,
+                                                          struct sk_buff *));
+INDIRECT_CALLABLE_DECLARE(int udp4_gro_complete(struct sk_buff *, int));
+
+INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp6_gro_receive(struct list_head *,
+                                                          struct sk_buff *));
+INDIRECT_CALLABLE_DECLARE(int udp6_gro_complete(struct sk_buff *, int));
+
 #define indirect_call_gro_receive_inet(cb, f2, f1, head, skb)  \
 ({                                                             \
        unlikely(gro_recursion_inc_test(skb)) ?                 \
@@ -22,4 +388,30 @@ INDIRECT_CALLABLE_DECLARE(int inet_gro_complete(struct sk_buff *, int));
                INDIRECT_CALL_INET(cb, f2, f1, head, skb);      \
 })
 
+struct sk_buff *udp_gro_receive(struct list_head *head, struct sk_buff *skb,
+                               struct udphdr *uh, struct sock *sk);
+int udp_gro_complete(struct sk_buff *skb, int nhoff, udp_lookup_t lookup);
+
+static inline struct udphdr *udp_gro_udphdr(struct sk_buff *skb)
+{
+       struct udphdr *uh;
+       unsigned int hlen, off;
+
+       off  = skb_gro_offset(skb);
+       hlen = off + sizeof(*uh);
+       uh   = skb_gro_header_fast(skb, off);
+       if (skb_gro_header_hard(skb, hlen))
+               uh = skb_gro_header_slow(skb, hlen, off);
+
+       return uh;
+}
+
+static inline __wsum ip6_gro_compute_pseudo(struct sk_buff *skb, int proto)
+{
+       const struct ipv6hdr *iph = skb_gro_network_header(skb);
+
+       return ~csum_unfold(csum_ipv6_magic(&iph->saddr, &iph->daddr,
+                                           skb_gro_len(skb), proto, 0));
+}
+
 #endif /* _NET_IPV6_GRO_H */
index b71e885..7d10888 100644 (file)
@@ -568,14 +568,6 @@ static inline void iph_to_flow_copy_v4addrs(struct flow_keys *flow,
        flow->control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;
 }
 
-static inline __wsum inet_gro_compute_pseudo(struct sk_buff *skb, int proto)
-{
-       const struct iphdr *iph = skb_gro_network_header(skb);
-
-       return csum_tcpudp_nofold(iph->saddr, iph->daddr,
-                                 skb_gro_len(skb), proto, 0);
-}
-
 /*
  *     Map a multicast IP onto multicast MAC for type ethernet.
  */
index ea68191..c8a96b8 100644 (file)
@@ -43,14 +43,6 @@ static inline __wsum ip6_compute_pseudo(struct sk_buff *skb, int proto)
                                            skb->len, proto, 0));
 }
 
-static inline __wsum ip6_gro_compute_pseudo(struct sk_buff *skb, int proto)
-{
-       const struct ipv6hdr *iph = skb_gro_network_header(skb);
-
-       return ~csum_unfold(csum_ipv6_magic(&iph->saddr, &iph->daddr,
-                                           skb_gro_len(skb), proto, 0));
-}
-
 static __inline__ __sum16 tcp_v6_check(int len,
                                   const struct in6_addr *saddr,
                                   const struct in6_addr *daddr,
index 909ecf4..f1c2a88 100644 (file)
@@ -167,36 +167,12 @@ static inline void udp_csum_pull_header(struct sk_buff *skb)
 typedef struct sock *(*udp_lookup_t)(const struct sk_buff *skb, __be16 sport,
                                     __be16 dport);
 
-INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp4_gro_receive(struct list_head *,
-                                                          struct sk_buff *));
-INDIRECT_CALLABLE_DECLARE(int udp4_gro_complete(struct sk_buff *, int));
-INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp6_gro_receive(struct list_head *,
-                                                          struct sk_buff *));
-INDIRECT_CALLABLE_DECLARE(int udp6_gro_complete(struct sk_buff *, int));
 INDIRECT_CALLABLE_DECLARE(void udp_v6_early_demux(struct sk_buff *));
 INDIRECT_CALLABLE_DECLARE(int udpv6_rcv(struct sk_buff *));
 
-struct sk_buff *udp_gro_receive(struct list_head *head, struct sk_buff *skb,
-                               struct udphdr *uh, struct sock *sk);
-int udp_gro_complete(struct sk_buff *skb, int nhoff, udp_lookup_t lookup);
-
 struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
                                  netdev_features_t features, bool is_ipv6);
 
-static inline struct udphdr *udp_gro_udphdr(struct sk_buff *skb)
-{
-       struct udphdr *uh;
-       unsigned int hlen, off;
-
-       off  = skb_gro_offset(skb);
-       hlen = off + sizeof(*uh);
-       uh   = skb_gro_header_fast(skb, off);
-       if (skb_gro_header_hard(skb, hlen))
-               uh = skb_gro_header_slow(skb, hlen, off);
-
-       return uh;
-}
-
 /* hash routines shared between UDPv4/6 and UDP-Litev4/6 */
 static inline int udp_lib_hash(struct sock *sk)
 {
index d57796f..5b9472b 100644 (file)
@@ -64,6 +64,7 @@
 
 #include <net/protocol.h>
 #include <net/dst.h>
+#include <net/gro.h>
 #include <net/sock.h>
 #include <net/checksum.h>
 #include <net/ip6_checksum.h>
index 0189e3c..6d52b64 100644 (file)
@@ -99,6 +99,7 @@
 #include <net/route.h>
 #include <net/ip_fib.h>
 #include <net/inet_connection_sock.h>
+#include <net/gro.h>
 #include <net/tcp.h>
 #include <net/udp.h>
 #include <net/udplite.h>
index 8e4e9aa..d87f02a 100644 (file)
@@ -16,6 +16,7 @@
 #include <crypto/authenc.h>
 #include <linux/err.h>
 #include <linux/module.h>
+#include <net/gro.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/esp.h>
index 8fcbc62..b56d6b4 100644 (file)
@@ -9,6 +9,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <net/genetlink.h>
+#include <net/gro.h>
 #include <net/gue.h>
 #include <net/fou.h>
 #include <net/ip.h>
index 1121a9d..740298d 100644 (file)
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <net/protocol.h>
 #include <net/gre.h>
+#include <net/gro.h>
 
 static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
                                       netdev_features_t features)
index fc61cd3..30abde8 100644 (file)
@@ -8,6 +8,7 @@
 
 #include <linux/indirect_call_wrapper.h>
 #include <linux/skbuff.h>
+#include <net/gro.h>
 #include <net/tcp.h>
 #include <net/protocol.h>
 
index 86d32a1..7fbf997 100644 (file)
@@ -7,6 +7,7 @@
  */
 
 #include <linux/skbuff.h>
+#include <net/gro.h>
 #include <net/udp.h>
 #include <net/protocol.h>
 #include <net/inet_common.h>
index a349d47..ba5e81c 100644 (file)
@@ -16,6 +16,7 @@
 #include <crypto/authenc.h>
 #include <linux/err.h>
 #include <linux/module.h>
+#include <net/gro.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/esp.h>
index 1796856..39db5a2 100644 (file)
@@ -7,6 +7,7 @@
  */
 #include <linux/indirect_call_wrapper.h>
 #include <linux/skbuff.h>
+#include <net/gro.h>
 #include <net/protocol.h>
 #include <net/tcp.h>
 #include <net/ip6_checksum.h>
index b3d9ed9..50a8a65 100644 (file)
@@ -13,6 +13,7 @@
 #include <net/udp.h>
 #include <net/ip6_checksum.h>
 #include "ip6_offload.h"
+#include <net/gro.h>
 
 static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,
                                         netdev_features_t features)