All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: <netdev@vger.kernel.org>
Cc: Steffen Klassert <steffen.klassert@secunet.com>,
	Willem de Bruijn <willemb@google.com>,
	Paolo Abeni <pabeni@redhat.com>,
	"Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH RFC 1/3] net: Prepare GSO return values for fraglist GSO.
Date: Fri, 21 Dec 2018 08:53:32 +0100	[thread overview]
Message-ID: <20181221075334.9000-2-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20181221075334.9000-1-steffen.klassert@secunet.com>

On fraglist GSO, we don't need to clone the original
skb. So we don't have anything to return to free.
Prepare GSO that it frees the original skb only
if the return pointer really changed. Fraglist
GSO frees the original skb itself on error and
returns -EREMOTE in this case.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
 include/net/udp.h      |  8 ++++++--
 net/core/dev.c         | 11 +++++++----
 net/ipv4/ip_output.c   |  3 ++-
 net/xfrm/xfrm_output.c |  3 ++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/include/net/udp.h b/include/net/udp.h
index fd6d948755c8..f89b95c3f91e 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -482,11 +482,15 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk,
 
 		atomic_add(segs_nr, &sk->sk_drops);
 		SNMP_ADD_STATS(__UDPX_MIB(sk, ipv4), UDP_MIB_INERRORS, segs_nr);
-		kfree_skb(skb);
+
+		if (PTR_ERR(segs) != -EREMOTE)
+			kfree_skb(skb);
 		return NULL;
 	}
 
-	consume_skb(skb);
+	if (segs != skb)
+		consume_skb(skb);
+
 	return segs;
 }
 
diff --git a/net/core/dev.c b/net/core/dev.c
index 754284873355..53df5ac7c9b2 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3030,7 +3030,8 @@ struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
 	}
 	rcu_read_unlock();
 
-	__skb_push(skb, skb->data - skb_mac_header(skb));
+	if (segs != skb)
+		__skb_push(skb, skb->data - skb_mac_header(skb));
 
 	return segs;
 }
@@ -3099,7 +3100,7 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
 
 	segs = skb_mac_gso_segment(skb, features);
 
-	if (unlikely(skb_needs_check(skb, tx_path) && !IS_ERR(segs)))
+	if (segs != skb && unlikely(skb_needs_check(skb, tx_path) && !IS_ERR(segs)))
 		skb_warn_bad_offload(skb);
 
 	return segs;
@@ -3345,8 +3346,10 @@ static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device
 
 		segs = skb_gso_segment(skb, features);
 		if (IS_ERR(segs)) {
-			goto out_kfree_skb;
-		} else if (segs) {
+			if (PTR_ERR(segs) != -EREMOTE)
+				goto out_kfree_skb;
+			goto out_null;
+		} else if (segs && segs != skb) {
 			consume_skb(skb);
 			skb = segs;
 		}
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index ab6618036afe..f4cecda6c1e8 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -272,7 +272,8 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk,
 		return -ENOMEM;
 	}
 
-	consume_skb(skb);
+	if (segs != skb)
+		consume_skb(skb);
 
 	do {
 		struct sk_buff *nskb = segs->next;
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 4ae87c5ce2e3..1941dc2a80a0 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -183,7 +183,8 @@ static int xfrm_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb
 	BUILD_BUG_ON(sizeof(*IPCB(skb)) > SKB_SGO_CB_OFFSET);
 	BUILD_BUG_ON(sizeof(*IP6CB(skb)) > SKB_SGO_CB_OFFSET);
 	segs = skb_gso_segment(skb, 0);
-	kfree_skb(skb);
+	if (segs != skb)
+		kfree_skb(skb);
 	if (IS_ERR(segs))
 		return PTR_ERR(segs);
 	if (segs == NULL)
-- 
2.17.1

  reply	other threads:[~2018-12-21  7:53 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-21  7:53 [PATCH RFC 0/3] Support fraglist GRO/GSO Steffen Klassert
2018-12-21  7:53 ` Steffen Klassert [this message]
2019-01-08 13:53   ` [PATCH RFC 1/3] net: Prepare GSO return values for fraglist GSO Paolo Abeni
2019-01-14 12:53     ` Steffen Klassert
2018-12-21  7:53 ` [PATCH RFC 2/3] net: Support GRO/GSO fraglist chaining Steffen Klassert
2018-12-21  7:53 ` [PATCH RFC 3/3] udp: Support UDP fraglist GRO/GSO Steffen Klassert
2019-01-08 15:00   ` Paolo Abeni
2019-01-25  7:58     ` Steffen Klassert
2019-01-26  9:36       ` Paolo Abeni
2019-01-28  8:09         ` Steffen Klassert
2018-12-24  1:15 ` [PATCH RFC 0/3] Support " Willem de Bruijn
2018-12-26 13:09   ` Marcelo Ricardo Leitner
2019-01-14 12:50   ` Steffen Klassert
2019-01-14 17:09     ` Willem de Bruijn
2019-01-25  8:14       ` Steffen Klassert
2019-01-25 13:57         ` Willem de Bruijn
2019-01-28  7:51           ` Steffen Klassert
2019-01-28 16:46             ` Willem de Bruijn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181221075334.9000-2-steffen.klassert@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=Jason@zx2c4.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=willemb@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.