From patchwork Thu Sep 13 14:43:07 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: 969409 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="ZuKMMBeR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42B1dg6W5Wz9s3l for ; Fri, 14 Sep 2018 00:44:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727636AbeIMTym (ORCPT ); Thu, 13 Sep 2018 15:54:42 -0400 Received: from mail.toke.dk ([52.28.52.200]:34193 "EHLO mail.toke.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726580AbeIMTyl (ORCPT ); Thu, 13 Sep 2018 15:54:41 -0400 From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=20161023; t=1536849891; bh=lCCzoQD7i2erxUtPk9xxcIKTjFPHWkaxKEL2p1LiDAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZuKMMBeRI1sHfS3GlOZJ1+ArArdblYTtisxN+/4u+JehYwkCxBOcJbX9EEeVxABzp 0CyEuX6KXliDp6S/K6i6VW3CMlvaa9i4Oy7a2ugeLcf4YXB3D/tlvJlW+QL6hqEqGa ow11+4haoAUCopnPcfMNkW2T4B1qkiQIGtKmoIW/hgZA3ziLMmYtB8yDTutb3EIhGl QSNTZsphme1kWSzTyXDk7pwGmm4pnqMWQOmn/LaL55QQVM6RtimHXeR/3ZXRGfZY2A fXlsVq0bpPH9uCkCWN/Y6kUC0NqlQ/urilZBlQbKRBzQ7iNMnW0dNsTIQIXbQKQNa9 6teLRbol/on0Q== To: netdev@vger.kernel.org Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , cake@lists.bufferbloat.net, David Miller , Eric Dumazet , Dave Taht Subject: [PATCH net v2] gso_segment: Reset skb->mac_len after modifying network header Date: Thu, 13 Sep 2018 16:43:07 +0200 Message-Id: <20180913144306.9077-1-toke@toke.dk> In-Reply-To: <153670437243.12756.693381878569982309.stgit@alrua-kau> References: 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. Many thanks to Eric Dumazet for his help in identifying the cause of the bug. Acked-by: Dave Taht Reviewed-by: Eric Dumazet Signed-off-by: Toke Høiland-Jørgensen --- v2: - Properly credit Eric for his help - Add review and ack tags 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);