net: Remove gso_send_check as an offload callback

The send_check logic was only interesting in cases of TCP offload and
UDP UFO where the checksum needed to be initialized to the pseudo
header checksum. Now we've moved that logic into the related
gso_segment functions so gso_send_check is no longer needed.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 4354b4307e37ab8ea87d8ecf3dfb2ccadeb220fe..9f5d293a028118007d1fbe9fc1dff40dc4b94f1f 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1911,7 +1911,6 @@ struct packet_type {
 struct offload_callbacks {
        struct sk_buff          *(*gso_segment)(struct sk_buff *skb,
                                                netdev_features_t features);
-       int                     (*gso_send_check)(struct sk_buff *skb);
        struct sk_buff          **(*gro_receive)(struct sk_buff **head,
                                               struct sk_buff *skb);
        int                     (*gro_complete)(struct sk_buff *skb, int nhoff);

diff --git a/net/core/dev.c b/net/core/dev.c
index db0388607329e71bb40230196c37d63faddc3ad2..e2ced01c01e4d58f8c53c7e67f98ad6648a8ea59 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2422,16 +2422,6 @@ struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
        rcu_read_lock();
        list_for_each_entry_rcu(ptype, &offload_base, list) {
                if (ptype->type == type && ptype->callbacks.gso_segment) {
-                       if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) {
-                               int err;
-
-                               err = ptype->callbacks.gso_send_check(skb);
-                               segs = ERR_PTR(err);
-                               if (err || skb_gso_ok(skb, features))
-                                       break;
-                               __skb_push(skb, (skb->data -
-                                                skb_network_header(skb)));
-                       }
                        segs = ptype->callbacks.gso_segment(skb, features);
                        break;
                }

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 72011cc4c13bb1301e193a65386dafb608f5c78d..28e589c5f32dd4c4e84f764dbb2f178134aa88bf 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1197,40 +1197,6 @@ int inet_sk_rebuild_header(struct sock *sk)
 }
 EXPORT_SYMBOL(inet_sk_rebuild_header);
 
-static int inet_gso_send_check(struct sk_buff *skb)
-{
-       const struct net_offload *ops;
-       const struct iphdr *iph;
-       int proto;
-       int ihl;
-       int err = -EINVAL;
-
-       if (unlikely(!pskb_may_pull(skb, sizeof(*iph))))
-               goto out;
-
-       iph = ip_hdr(skb);
-       ihl = iph->ihl * 4;
-       if (ihl < sizeof(*iph))
-               goto out;
-
-       proto = iph->protocol;
-
-       /* Warning: after this point, iph might be no longer valid */
-       if (unlikely(!pskb_may_pull(skb, ihl)))
-               goto out;
-       __skb_pull(skb, ihl);
-
-       skb_reset_transport_header(skb);
-       err = -EPROTONOSUPPORT;
-
-       ops = rcu_dereference(inet_offloads[proto]);
-       if (likely(ops && ops->callbacks.gso_send_check))
-               err = ops->callbacks.gso_send_check(skb);
-
-out:
-       return err;
-}
-
 static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
                                        netdev_features_t features)
 {
@@ -1655,7 +1621,6 @@ static int ipv4_proc_init(void);
 static struct packet_offload ip_packet_offload __read_mostly = {
        .type = cpu_to_be16(ETH_P_IP),
        .callbacks = {
-               .gso_send_check = inet_gso_send_check,
                .gso_segment = inet_gso_segment,
                .gro_receive = inet_gro_receive,
                .gro_complete = inet_gro_complete,
@@ -1664,7 +1629,6 @@ static struct packet_offload ip_packet_offload __read_mostly = {
 
 static const struct net_offload ipip_offload = {
        .callbacks = {
-               .gso_send_check = inet_gso_send_check,
                .gso_segment    = inet_gso_segment,
                .gro_receive    = inet_gro_receive,
                .gro_complete   = inet_gro_complete,

diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index d3fe2ac05167230985e44a4cfc2150b279717dc0..a777295030716930a8ec6ef90f121f363f859683 100644 (file)
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -15,13 +15,6 @@
 #include <net/protocol.h>
 #include <net/gre.h>
 
-static int gre_gso_send_check(struct sk_buff *skb)
-{
-       if (!skb->encapsulation)
-               return -EINVAL;
-       return 0;
-}
-
 static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
                                       netdev_features_t features)
 {
@@ -46,6 +39,9 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
                                  SKB_GSO_IPIP)))
                goto out;
 
+       if (!skb->encapsulation)
+               goto out;
+
        if (unlikely(!pskb_may_pull(skb, sizeof(*greh))))
                goto out;
 
@@ -256,7 +252,6 @@ static int gre_gro_complete(struct sk_buff *skb, int nhoff)
 
 static const struct net_offload gre_offload = {
        .callbacks = {
-               .gso_send_check = gre_gso_send_check,
                .gso_segment = gre_gso_segment,
                .gro_receive = gre_gro_receive,
                .gro_complete = gre_gro_complete,

diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c
index 7cd12b0458ff1a531bcfbe0874f647e38ded5677..5b90f2f447a511703bbce1e22e8ef55888c43479 100644 (file)
--- a/net/ipv4/tcp_offload.c
+++ b/net/ipv4/tcp_offload.c
@@ -288,11 +288,6 @@ int tcp_gro_complete(struct sk_buff *skb)
 }
 EXPORT_SYMBOL(tcp_gro_complete);
 
-static int tcp_v4_gso_send_check(struct sk_buff *skb)
-{
-       return 0;
-}
-
 static struct sk_buff **tcp4_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 {
        /* Don't bother verifying checksum if we're going to flush anyway. */
@@ -320,7 +315,6 @@ static int tcp4_gro_complete(struct sk_buff *skb, int thoff)
 
 static const struct net_offload tcpv4_offload = {
        .callbacks = {
-               .gso_send_check =       tcp_v4_gso_send_check,
                .gso_segment    =       tcp4_gso_segment,
                .gro_receive    =       tcp4_gro_receive,
                .gro_complete   =       tcp4_gro_complete,

diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 2918cc914824b34f4b30b908a84e930d5287079d..19ebe6a39ddcf37fc67e123a7e1f10cf3d6b7208 100644 (file)
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -25,11 +25,6 @@ struct udp_offload_priv {
        struct udp_offload_priv __rcu *next;
 };
 
-static int udp4_ufo_send_check(struct sk_buff *skb)
-{
-       return 0;
-}
-
 struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,
                                       netdev_features_t features)
 {
@@ -346,7 +341,6 @@ static int udp4_gro_complete(struct sk_buff *skb, int nhoff)
 
 static const struct net_offload udpv4_offload = {
        .callbacks = {
-               .gso_send_check = udp4_ufo_send_check,
                .gso_segment = udp4_ufo_fragment,
                .gro_receive  = udp4_gro_receive,
                .gro_complete = udp4_gro_complete,

diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index 9952f3fce30a3257f9ea706d76d1ab83febe8c26..9034f76ae0138c4a201708ea15e28ba0b846247b 100644 (file)
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -53,31 +53,6 @@ static int ipv6_gso_pull_exthdrs(struct sk_buff *skb, int proto)
        return proto;
 }
 
-static int ipv6_gso_send_check(struct sk_buff *skb)
-{
-       const struct ipv6hdr *ipv6h;
-       const struct net_offload *ops;
-       int err = -EINVAL;
-
-       if (unlikely(!pskb_may_pull(skb, sizeof(*ipv6h))))
-               goto out;
-
-       ipv6h = ipv6_hdr(skb);
-       __skb_pull(skb, sizeof(*ipv6h));
-       err = -EPROTONOSUPPORT;
-
-       ops = rcu_dereference(inet6_offloads[
-               ipv6_gso_pull_exthdrs(skb, ipv6h->nexthdr)]);
-
-       if (likely(ops && ops->callbacks.gso_send_check)) {
-               skb_reset_transport_header(skb);
-               err = ops->callbacks.gso_send_check(skb);
-       }
-
-out:
-       return err;
-}
-
 static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
        netdev_features_t features)
 {
@@ -306,7 +281,6 @@ out_unlock:
 static struct packet_offload ipv6_packet_offload __read_mostly = {
        .type = cpu_to_be16(ETH_P_IPV6),
        .callbacks = {
-               .gso_send_check = ipv6_gso_send_check,
                .gso_segment = ipv6_gso_segment,
                .gro_receive = ipv6_gro_receive,
                .gro_complete = ipv6_gro_complete,
@@ -315,7 +289,6 @@ static struct packet_offload ipv6_packet_offload __read_mostly = {
 
 static const struct net_offload sit_offload = {
        .callbacks = {
-               .gso_send_check = ipv6_gso_send_check,
                .gso_segment    = ipv6_gso_segment,
                .gro_receive    = ipv6_gro_receive,
                .gro_complete   = ipv6_gro_complete,

diff --git a/net/ipv6/tcpv6_offload.c b/net/ipv6/tcpv6_offload.c
index 96253154db3a0d0fdae3da0440214ec8e0d14e1d..c1ab77105b4c3f8025beea58d06c3607eda44656 100644 (file)
--- a/net/ipv6/tcpv6_offload.c
+++ b/net/ipv6/tcpv6_offload.c
@@ -15,11 +15,6 @@
 #include <net/ip6_checksum.h>
 #include "ip6_offload.h"
 
-static int tcp_v6_gso_send_check(struct sk_buff *skb)
-{
-       return 0;
-}
-
 static struct sk_buff **tcp6_gro_receive(struct sk_buff **head,
                                         struct sk_buff *skb)
 {
@@ -71,7 +66,6 @@ struct sk_buff *tcp6_gso_segment(struct sk_buff *skb,
 }
 static const struct net_offload tcpv6_offload = {
        .callbacks = {
-               .gso_send_check =       tcp_v6_gso_send_check,
                .gso_segment    =       tcp6_gso_segment,
                .gro_receive    =       tcp6_gro_receive,
                .gro_complete   =       tcp6_gro_complete,

diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c
index e4af6437ea3baeabaeaa74af83be751455c0db66..212ebfc7973f2c4c2fa4f79a22bc9b6c0649f79a 100644 (file)
--- a/net/ipv6/udp_offload.c
+++ b/net/ipv6/udp_offload.c
@@ -17,11 +17,6 @@
 #include <net/ip6_checksum.h>
 #include "ip6_offload.h"
 
-static int udp6_ufo_send_check(struct sk_buff *skb)
-{
-       return 0;
-}
-
 static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,
                                         netdev_features_t features)
 {
@@ -166,7 +161,6 @@ static int udp6_gro_complete(struct sk_buff *skb, int nhoff)
 
 static const struct net_offload udpv6_offload = {
        .callbacks = {
-               .gso_send_check =       udp6_ufo_send_check,
                .gso_segment    =       udp6_ufo_fragment,
                .gro_receive    =       udp6_gro_receive,
                .gro_complete   =       udp6_gro_complete,

diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c
index 6b38d083e1c973c55e18914748d49fe4968a7188..e28ed2ef5b0650faf5f3f0db950c319f4caa7c31 100644 (file)
--- a/net/mpls/mpls_gso.c
+++ b/net/mpls/mpls_gso.c
@@ -65,15 +65,9 @@ out:
        return segs;
 }
 
-static int mpls_gso_send_check(struct sk_buff *skb)
-{
-       return 0;
-}
-
 static struct packet_offload mpls_mc_offload = {
        .type = cpu_to_be16(ETH_P_MPLS_MC),
        .callbacks = {
-               .gso_send_check =       mpls_gso_send_check,
                .gso_segment    =       mpls_gso_segment,
        },
 };
@@ -81,7 +75,6 @@ static struct packet_offload mpls_mc_offload = {
 static struct packet_offload mpls_uc_offload = {
        .type = cpu_to_be16(ETH_P_MPLS_UC),
        .callbacks = {
-               .gso_send_check =       mpls_gso_send_check,
                .gso_segment    =       mpls_gso_segment,
        },
 };