udp: pass udp_offload struct to UDP gro callbacks

This patch introduces udp_offload_callbacks which has the same
GRO functions (but not a GSO function) as offload_callbacks,
except there is an argument to a udp_offload struct passed to
gro_receive and gro_complete functions. This additional argument
can be used to retrieve the per port structure of the encapsulation
for use in gro processing (mostly by doing container_of on the
structure).

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

3 files changed, 17 insertions, 8 deletions

diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index 2197c36f722f..3bc0cf07661c 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -174,7 +174,8 @@ drop:
 }
 
 static struct sk_buff **fou_gro_receive(struct sk_buff **head,
-                                        struct sk_buff *skb)
+                                        struct sk_buff *skb,
+                                        struct udp_offload *uoff)
 {
         const struct net_offload *ops;
         struct sk_buff **pp = NULL;
@@ -195,7 +196,8 @@ out_unlock:
         return pp;
 }
 
-static int fou_gro_complete(struct sk_buff *skb, int nhoff)
+static int fou_gro_complete(struct sk_buff *skb, int nhoff,
+                            struct udp_offload *uoff)
 {
         const struct net_offload *ops;
         u8 proto = NAPI_GRO_CB(skb)->proto;
@@ -254,7 +256,8 @@ static struct guehdr *gue_gro_remcsum(struct sk_buff *skb, unsigned int off,
 }
 
 static struct sk_buff **gue_gro_receive(struct sk_buff **head,
-                                        struct sk_buff *skb)
+                                        struct sk_buff *skb,
+                                        struct udp_offload *uoff)
 {
         const struct net_offload **offloads;
         const struct net_offload *ops;
@@ -360,7 +363,8 @@ out:
         return pp;
 }
 
-static int gue_gro_complete(struct sk_buff *skb, int nhoff)
+static int gue_gro_complete(struct sk_buff *skb, int nhoff,
+                            struct udp_offload *uoff)
 {
         const struct net_offload **offloads;
         struct guehdr *guehdr = (struct guehdr *)(skb->data + nhoff);
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
index 23744c7a9718..9568594ca2f1 100644
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
@@ -147,7 +147,8 @@ static int geneve_hlen(struct genevehdr *gh)
 }
 
 static struct sk_buff **geneve_gro_receive(struct sk_buff **head,
-                                           struct sk_buff *skb)
+                                           struct sk_buff *skb,
+                                           struct udp_offload *uoff)
 {
         struct sk_buff *p, **pp = NULL;
         struct genevehdr *gh, *gh2;
@@ -211,7 +212,8 @@ out:
         return pp;
 }
 
-static int geneve_gro_complete(struct sk_buff *skb, int nhoff)
+static int geneve_gro_complete(struct sk_buff *skb, int nhoff,
+                               struct udp_offload *uoff)
 {
         struct genevehdr *gh;
         struct packet_offload *ptype;
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index d3e537ef6b7f..d10f6f4ead27 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -339,7 +339,8 @@ unflush:
         skb_gro_pull(skb, sizeof(struct udphdr)); /* pull encapsulating udp header */
         skb_gro_postpull_rcsum(skb, uh, sizeof(struct udphdr));
         NAPI_GRO_CB(skb)->proto = uo_priv->offload->ipproto;
-        pp = uo_priv->offload->callbacks.gro_receive(head, skb);
+        pp = uo_priv->offload->callbacks.gro_receive(head, skb,
+                                                     uo_priv->offload);
 
 out_unlock:
         rcu_read_unlock();
@@ -395,7 +396,9 @@ int udp_gro_complete(struct sk_buff *skb, int nhoff)
 
         if (uo_priv != NULL) {
                 NAPI_GRO_CB(skb)->proto = uo_priv->offload->ipproto;
-                err = uo_priv->offload->callbacks.gro_complete(skb, nhoff + sizeof(struct udphdr));
+                err = uo_priv->offload->callbacks.gro_complete(skb,
+                                nhoff + sizeof(struct udphdr),
+                                uo_priv->offload);
         }
 
         rcu_read_unlock();