From patchwork Wed Feb 11 00:30:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 438617 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AA283140111 for ; Wed, 11 Feb 2015 11:31:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752458AbbBKAbM (ORCPT ); Tue, 10 Feb 2015 19:31:12 -0500 Received: from mail-ig0-f178.google.com ([209.85.213.178]:56800 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752071AbbBKAau (ORCPT ); Tue, 10 Feb 2015 19:30:50 -0500 Received: by mail-ig0-f178.google.com with SMTP id hl2so1267306igb.5 for ; Tue, 10 Feb 2015 16:30:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=3uSBXS2aO4QyLQA0DeUt4Jy401TM5lbOn+7JL1M2Osk=; b=U//LW6MaTWz5hxHrxc9o2AamyMctUFz+9dlqQCzsjs+7cCE0lD92SOh7dH/sjExyvL iiiuulcnJqUVPar0F6I/0t/HiStfh2WkkZO0Gfq6BetRKGmHf3TMmWoVlHj5ZdgaQAsd QiyN/qnm2ahHckH3RXiexYw/Mc9Dng7y1YrDQli3mUdSvJF4AoJ62kU+9WuHwlBUfDil +3BR4EGq+beBNqEFPrlcym1qpi2mOM+9IlI9qMLaK5+nq0VQwa4+i9NGLAu/AVNcW0De iVf06t8hYCB08jijC5Ttw323Yakc85fgi6zXpd4mHg6tjtRUZs9HU9r0B0ba+4SV+oIU vsWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3uSBXS2aO4QyLQA0DeUt4Jy401TM5lbOn+7JL1M2Osk=; b=Naqz5oe35v1gG7QY4yxz2JK4vZ7IKRKpKxO25bPzyBZfJTkl7WgkwpZVPvsQKHv1qH wtFd2KQx9qmuA6HXkStTOdmDMS2/zmmphgcRLk5YLdt50hjH8UXxsLP6IZHOimy+YU9Y IgZZtvwtCcT8mThyr525yiRO5P1tpynT14nnhBrYeneYPg0PI7Mj1AYlRnKtqgFYzeql jHr4sQBFz37BHOQmJ6imMUlNfoEbW3EDCITsGph1W/f1Xq5FYjU3no2iwrJhdJrpyCgf +ddHF2mte5ygLmp5xHyTvDfEDfHoWti88Ww4DrWYKn3hfxTXFsL22dEH6wLo1IAbHYO5 UBsA== X-Gm-Message-State: ALoCoQnbUqB16SDyVjUxvKQAskA71hXh1E08c4jrSwDcf4xWBMRh9mAhx36Xfxb0HspKy2CfmGC1 X-Received: by 10.50.137.99 with SMTP id qh3mr521749igb.7.1423614649550; Tue, 10 Feb 2015 16:30:49 -0800 (PST) Received: from tomh.mtv.corp.google.com ([172.18.117.126]) by mx.google.com with ESMTPSA id v39sm9655295iov.17.2015.02.10.16.30.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Feb 2015 16:30:49 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH net-next 3/7] udp: Set SKB_GSO_UDP_TUNNEL* in UDP GRO path Date: Tue, 10 Feb 2015 16:30:29 -0800 Message-Id: <1423614633-25042-4-git-send-email-therbert@google.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1423614633-25042-1-git-send-email-therbert@google.com> References: <1423614633-25042-1-git-send-email-therbert@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Properly set GSO types and skb->encapsulation in the UDP tunnel GRO complete so that packets are properly represented for GSO. This sets SKB_GSO_UDP_TUNNEL or SKB_GSO_UDP_TUNNEL_CSUM depending on whether non-zero checksums were received, and sets SKB_GSO_TUNNEL_REMCSUM if the remote checksum option was processed. Signed-off-by: Tom Herbert --- net/ipv4/udp_offload.c | 13 ++++++++++++- net/ipv6/udp_offload.c | 6 +++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index d10f6f4..4915d82 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -402,6 +402,13 @@ int udp_gro_complete(struct sk_buff *skb, int nhoff) } rcu_read_unlock(); + + if (skb->remcsum_offload) + skb_shinfo(skb)->gso_type |= SKB_GSO_TUNNEL_REMCSUM; + + skb->encapsulation = 1; + skb_set_inner_mac_header(skb, nhoff + sizeof(struct udphdr)); + return err; } @@ -410,9 +417,13 @@ static int udp4_gro_complete(struct sk_buff *skb, int nhoff) const struct iphdr *iph = ip_hdr(skb); struct udphdr *uh = (struct udphdr *)(skb->data + nhoff); - if (uh->check) + if (uh->check) { + skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL_CSUM; uh->check = ~udp_v4_check(skb->len - nhoff, iph->saddr, iph->daddr, 0); + } else { + skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL; + } return udp_gro_complete(skb, nhoff); } diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index a562769..ab889bb 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -161,9 +161,13 @@ static int udp6_gro_complete(struct sk_buff *skb, int nhoff) const struct ipv6hdr *ipv6h = ipv6_hdr(skb); struct udphdr *uh = (struct udphdr *)(skb->data + nhoff); - if (uh->check) + if (uh->check) { + skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL_CSUM; uh->check = ~udp_v6_check(skb->len - nhoff, &ipv6h->saddr, &ipv6h->daddr, 0); + } else { + skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL; + } return udp_gro_complete(skb, nhoff); }