From patchwork Fri Dec 21 07:53:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Klassert X-Patchwork-Id: 1017379 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=secunet.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Lgrw0cM3z9sLt for ; Fri, 21 Dec 2018 18:54:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731709AbeLUHxo (ORCPT ); Fri, 21 Dec 2018 02:53:44 -0500 Received: from a.mx.secunet.com ([62.96.220.36]:48908 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731337AbeLUHxn (ORCPT ); Fri, 21 Dec 2018 02:53:43 -0500 Received: from localhost (localhost [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id B91FD201D7; Fri, 21 Dec 2018 08:53:42 +0100 (CET) X-Virus-Scanned: by secunet Received: from a.mx.secunet.com ([127.0.0.1]) by localhost (a.mx.secunet.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EXKNVtNBHJDF; Fri, 21 Dec 2018 08:53:42 +0100 (CET) Received: from mail-essen-01.secunet.de (mail-essen-01.secunet.de [10.53.40.204]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a.mx.secunet.com (Postfix) with ESMTPS id 4293C201B4; Fri, 21 Dec 2018 08:53:42 +0100 (CET) Received: from gauss2.secunet.de (10.182.7.193) by mail-essen-01.secunet.de (10.53.40.204) with Microsoft SMTP Server id 14.3.408.0; Fri, 21 Dec 2018 08:53:41 +0100 Received: by gauss2.secunet.de (Postfix, from userid 1000) id 5335E318270E; Fri, 21 Dec 2018 08:53:41 +0100 (CET) From: Steffen Klassert To: CC: Steffen Klassert , Willem de Bruijn , Paolo Abeni , "Jason A. Donenfeld" Subject: [PATCH RFC 1/3] net: Prepare GSO return values for fraglist GSO. Date: Fri, 21 Dec 2018 08:53:32 +0100 Message-ID: <20181221075334.9000-2-steffen.klassert@secunet.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181221075334.9000-1-steffen.klassert@secunet.com> References: <20181221075334.9000-1-steffen.klassert@secunet.com> MIME-Version: 1.0 X-G-Data-MailSecurity-for-Exchange-State: 0 X-G-Data-MailSecurity-for-Exchange-Error: 0 X-G-Data-MailSecurity-for-Exchange-Sender: 23 X-G-Data-MailSecurity-for-Exchange-Server: d65e63f7-5c15-413f-8f63-c0d707471c93 X-EXCLAIMER-MD-CONFIG: 2c86f778-e09b-4440-8b15-867914633a10 X-G-Data-MailSecurity-for-Exchange-Guid: 171B3972-47D7-4E26-AC55-D996A3C050F9 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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)