From patchwork Tue Sep 11 22:19:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 968734 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=pass (p=none dis=none) header.from=toke.dk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=toke.dk header.i=@toke.dk header.b="HF6ElTHu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 428zqF39Y3z9s9N for ; Wed, 12 Sep 2018 08:19:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727836AbeILDU6 (ORCPT ); Tue, 11 Sep 2018 23:20:58 -0400 Received: from mail.toke.dk ([52.28.52.200]:34489 "EHLO mail.toke.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726885AbeILDU6 (ORCPT ); Tue, 11 Sep 2018 23:20:58 -0400 Subject: [PATCH net] gso_segment: Reset skb->mac_len after modifying network header DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=20161023; t=1536704373; bh=O4Y7eqIdEXaAty7Hnl2Yto4Gh8vwlVXVvbF9s15//Zs=; h=Subject:From:To:Cc:Date:From; b=HF6ElTHuD7XFKE9LJQkdz7GYkP0zxgPtnjtZTmqcQE/pbelK62SjK8UH1Fb83xgxf 3cS4L3lFOC0OKsuYHfEGU+5+IkFwjWskr1Cv4V/lixg2SNhdFkuf9Nf1mQmsRshDdo e5kziJNClQDwbRNmaPCrxH9zOx2seltV8TKMWKzBNhAO1pTDfe7Zw9HpWSc6RbSC/x 9nsifGr7xjZDc2bNtj/XSsI8EZqcXe8gGkWlJx4zuFutWIWPB0J7BxT3dPhXN4Mbdp lFCUWdQhSzils7ESZW4CJGpaL3no5BmgSlbgGWhp9k+f8qsrSMg2dNR6Hi6den4Z99 qV3+SgEJDuLRA== From: Toke =?utf-8?q?H=C3=B8iland-J=C3=B8rgensen?= To: netdev@vger.kernel.org Cc: cake@lists.bufferbloat.net, Eric Dumazet Date: Wed, 12 Sep 2018 00:19:32 +0200 X-Clacks-Overhead: GNU Terry Pratchett Message-ID: <153670437243.12756.693381878569982309.stgit@alrua-kau> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When splitting a GSO segment that consists of encapsulated packets, the skb->mac_len of the segments can end up being set wrong, causing packet drops in particular when using act_mirred and ifb interfaces in combination with a qdisc that splits GSO packets. This happens because at the time skb_segment() is called, network_header will point to the inner header, throwing off the calculation in skb_reset_mac_len(). The network_header is subsequently adjust by the outer IP gso_segment handlers, but they don't set the mac_len. Fix this by adding skb_reset_mac_len() calls to both the IPv4 and IPv6 gso_segment handlers, after they modify the network_header. Signed-off-by: Toke Høiland-Jørgensen Reviewed-by: Eric Dumazet Acked-by: Dave Taht --- net/ipv4/af_inet.c | 1 + net/ipv6/ip6_offload.c | 1 + 2 files changed, 2 insertions(+) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 20fda8fb8ffd..1fbe2f815474 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1377,6 +1377,7 @@ struct sk_buff *inet_gso_segment(struct sk_buff *skb, if (encap) skb_reset_inner_headers(skb); skb->network_header = (u8 *)iph - skb->head; + skb_reset_mac_len(skb); } while ((skb = skb->next)); out: diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index 37ff4805b20c..c7e495f12011 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -115,6 +115,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, payload_len = skb->len - nhoff - sizeof(*ipv6h); ipv6h->payload_len = htons(payload_len); skb->network_header = (u8 *)ipv6h - skb->head; + skb_reset_mac_len(skb); if (udpfrag) { int err = ip6_find_1stfragopt(skb, &prevhdr);