From patchwork Mon Oct 9 20:47:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 823503 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TAQCjbvA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y9slD5DrQz9t5R for ; Tue, 10 Oct 2017 07:48:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754830AbdJIUsG (ORCPT ); Mon, 9 Oct 2017 16:48:06 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35742 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754295AbdJIUsE (ORCPT ); Mon, 9 Oct 2017 16:48:04 -0400 Received: by mail-pf0-f196.google.com with SMTP id i23so30357973pfi.2 for ; Mon, 09 Oct 2017 13:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=54vtuabB65QOPD93tkO3LVWTNto2qFRgRchZZifJkBc=; b=TAQCjbvAUq+wORrUR6pC3hTiw/4ilXiTnInOsnt+BWXpUm1bk0DBJTlLwbFDU2AKCz LZ+FZVf4rdp/wYjDbdE5FOrCrPJoGvi+iwLbZuPQaD4DZtmAY/DBwLpzSFhLhpMhDuiE wo3QwHDwYHV8+H4fntbzuYIaBXlsSOv62WNCWCpu7ewfEldWL4j+XztrTbskbyzCmHkT k7INztPqlmQueXtHYiSkfgbd2OBWj0PJygn/mF7l0dEnmtSFxBm6FnibCi9Qi9Xn0S5d mUCccmTM74GlFvsnkTocg78gl44qiWYZ5+4Qq6eXnp+A69qd3xmeQaUpbKpQ3ltuGpHD FN6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=54vtuabB65QOPD93tkO3LVWTNto2qFRgRchZZifJkBc=; b=p5PG51Fdve3DnPckmqaQpXVVpUXkKFotS96zgK0V9MvKhFPiEHBm3JwgOyEBTgBnVv UYGnMUredbLvDINVbjMuhEQPTFqeIEjejTNDBWGZLJJ3/+8LbtwVzbki8SkthYPVK4+H 9rYxsbbEvAsWuxF+RFin83GBg/w0/mBsdrn1SINFsI6ibn9bdteKnlk1onWKlSKxDdRw 6iBDTkHhuVAPfPyj4CyPxPv2WqgCj+U35gdNoqcL1ElP+lH9QGL/bIn7RIxGuv3luSmN VS6a+rmweTVx99LFZ1zbUGlcg+FUZ81PZe7LlUXA3xfDseC+sNWNc/lw3KpruTsq8oOX ImLw== X-Gm-Message-State: AMCzsaXNlHo/jWlzLRZgOX7Lo5fHnJZ95qa20FlyGXWVWxMHejsoS+s0 VAL12cn0+L3/SxVyX10DdJiwUaiU X-Google-Smtp-Source: AOwi7QCuvE70KS9GleA/twW2aXiCMXuAMbZnYmjYGCHpX49iQSSo5r+rbBVvhealnJgg2bQaeL1lvg== X-Received: by 10.98.15.77 with SMTP id x74mr5384400pfi.17.1507582083546; Mon, 09 Oct 2017 13:48:03 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id p71sm17861098pfl.56.2017.10.09.13.48.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Oct 2017 13:48:02 -0700 (PDT) From: William Tu To: netdev@vger.kernel.org Cc: Tom Herbert Subject: [net-next 1/3] ip_gre: fix mtu and headroom size Date: Mon, 9 Oct 2017 13:47:45 -0700 Message-Id: <1507582067-36718-2-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507582067-36718-1-git-send-email-u9012063@gmail.com> References: <1507582067-36718-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ip_gre_calc_hlen() already counts gre's base header len (4-byte) plus optional header's len, so tunnel->hlen has the entire gre headeri + options len. Thus, remove the -4 and +4 when calculating the needed_headroom and mtu. Fixes: 4565e9919cda ("gre: Setup and TX path for gre/UDP foo-over-udp encapsulation") Signed-off-by: William Tu Cc: Tom Herbert --- net/ipv4/ip_gre.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index c105a315b1a3..286065c35959 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -947,8 +947,8 @@ static void __gre_tunnel_init(struct net_device *dev) t_hlen = tunnel->hlen + sizeof(struct iphdr); - dev->needed_headroom = LL_MAX_HEADER + t_hlen + 4; - dev->mtu = ETH_DATA_LEN - t_hlen - 4; + dev->needed_headroom = LL_MAX_HEADER + t_hlen; + dev->mtu = ETH_DATA_LEN - t_hlen; dev->features |= GRE_FEATURES; dev->hw_features |= GRE_FEATURES; From patchwork Mon Oct 9 20:47:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 823504 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FL6Urmkd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y9slL2WKmz9t5R for ; Tue, 10 Oct 2017 07:48:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755060AbdJIUsN (ORCPT ); Mon, 9 Oct 2017 16:48:13 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35762 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754188AbdJIUsF (ORCPT ); Mon, 9 Oct 2017 16:48:05 -0400 Received: by mail-pf0-f193.google.com with SMTP id i23so30358057pfi.2 for ; Mon, 09 Oct 2017 13:48:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DeUMbNhFltfOQHupEAhMf2hnG7RZkZLAb1cXD5ENx3E=; b=FL6Urmkds2oOO7BuDyuozk6jp0Pm3HeZZxLS1Q9c7vLT5rLzW+FHajCbXSd7K7vWQs JgCkDmfA/4pfNb9Fu6pbhaX7E+tijWOgCzjAqYSLckvveypE38iGv3CLFFJnuGKXPRE2 +FrxUkyEECLFiPSQ+3ewP6k/lTC4qld7PCz8jIbJqdEmXARxHFSqbo9b01Xnhqcx151e BUr8irfGM9Vf+sIZOmXQ3QQJ2fbkLywia0UgK46u7gRnHa1DtKGRpJe4fx1JEc2CfXi1 E425WnPKu+cRj7c+ihlxMwYcGj1cK0R8DDf5MDhrFB/x7YByjyr5NQG69mQ0tc/CASzY hlWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DeUMbNhFltfOQHupEAhMf2hnG7RZkZLAb1cXD5ENx3E=; b=QJfsVecJOrd1Np5o/Sqs9TPtsPh7XGA621pZ7EcLov98NepxNCUGzs7Bzzovw9vQSw iIhMl8E6CQu8aZgLrBZi604Y9Cy043eGTziI6da+zNL0/lDEo+o8E1aGsELoEPzBAOOK V3PU/zM5agaFOBXzz/vEB9NgBzkm8zi02Skj3M954He1E86L0v+mPvkCbHp2wrhiNmYy M2BjvQgSGKqq6lvyDbs1tu4juiQIhGFTuDsI6H11zSizNQVCJBYqKzz1UnnDegRC8AtL tZCRWIwDH5ftS6a/NNYyA7sKf6UWpW568ioYuQAqh1tkA3xi3bMf1KP3DLEsxzetj+pw TNSw== X-Gm-Message-State: AMCzsaVE/vZ4wORn5MF2NodvvOYP91Cdn3CRy18BpbVFfsolAmir5Vcs fubXMCma0LI0wLoCjE1ERaU2tiGF X-Google-Smtp-Source: AOwi7QCSZPaPZQdTVG48ox7SAiz0uH39gnSAir8QdxdqLPYx0RdKSkQgCmunizhoNkRx7zIP7f0wFQ== X-Received: by 10.98.178.86 with SMTP id x83mr11248784pfe.332.1507582084489; Mon, 09 Oct 2017 13:48:04 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id p71sm17861098pfl.56.2017.10.09.13.48.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Oct 2017 13:48:03 -0700 (PDT) From: William Tu To: netdev@vger.kernel.org Cc: Xin Long Subject: [net-next 2/3] ip_gre: fix erspan tunnel mtu calculation Date: Mon, 9 Oct 2017 13:47:46 -0700 Message-Id: <1507582067-36718-3-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507582067-36718-1-git-send-email-u9012063@gmail.com> References: <1507582067-36718-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove the unnecessary -4 and +4 bytes at mtu and headroom calculation. In addition, erspan uses fixed 8-byte gre header, so add ERSPAN_GREHDR_LEN macro for better readability. Now tunnel->hlen = grehdr(8) + erspanhdr(8) = 16 byte. The mtu should be ETH_DATA_LEN - 16 - iph(20) = 1464. After the ip_tunnel_bind_dev(), the mtu is adjusted to 1464 - 14 (dev->hard_header_len) = 1450. The maximum skb->len the erspan tunnel can carry without being truncated is 1450 + 14 = 1464 byte. Signed-off-by: William Tu Cc: Xin Long --- include/net/erspan.h | 1 + net/ipv4/ip_gre.c | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/net/erspan.h b/include/net/erspan.h index ca94fc86865e..e28294e248d0 100644 --- a/include/net/erspan.h +++ b/include/net/erspan.h @@ -28,6 +28,7 @@ */ #define ERSPAN_VERSION 0x1 +#define ERSPAN_GREHDR_LEN 8 /* ERSPAN has fixed 8-byte GRE header */ #define VER_MASK 0xf000 #define VLAN_MASK 0x0fff diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 286065c35959..6e6e4c4811cc 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -569,8 +569,7 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev, key = &tun_info->key; - /* ERSPAN has fixed 8 byte GRE header */ - tunnel_hlen = 8 + sizeof(struct erspanhdr); + tunnel_hlen = ERSPAN_GREHDR_LEN + sizeof(struct erspanhdr); rt = prepare_fb_xmit(skb, dev, &fl, tunnel_hlen); if (!rt) @@ -591,7 +590,7 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev, erspan_build_header(skb, tunnel_id_to_key32(key->tun_id), ntohl(md->index), truncate); - gre_build_header(skb, 8, TUNNEL_SEQ, + gre_build_header(skb, ERSPAN_GREHDR_LEN, TUNNEL_SEQ, htons(ETH_P_ERSPAN), 0, htonl(tunnel->o_seqno++)); df = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0; @@ -1242,14 +1241,14 @@ static int erspan_tunnel_init(struct net_device *dev) struct ip_tunnel *tunnel = netdev_priv(dev); int t_hlen; - tunnel->tun_hlen = 8; + tunnel->tun_hlen = ERSPAN_GREHDR_LEN; tunnel->parms.iph.protocol = IPPROTO_GRE; tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen + sizeof(struct erspanhdr); t_hlen = tunnel->hlen + sizeof(struct iphdr); - dev->needed_headroom = LL_MAX_HEADER + t_hlen + 4; - dev->mtu = ETH_DATA_LEN - t_hlen - 4; + dev->needed_headroom = LL_MAX_HEADER + t_hlen; + dev->mtu = ETH_DATA_LEN - t_hlen; dev->features |= GRE_FEATURES; dev->hw_features |= GRE_FEATURES; dev->priv_flags |= IFF_LIVE_ADDR_CHANGE; From patchwork Mon Oct 9 20:47:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 823506 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HxnsPoTr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y9slP5s12z9s7v for ; Tue, 10 Oct 2017 07:48:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754906AbdJIUsL (ORCPT ); Mon, 9 Oct 2017 16:48:11 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38103 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754755AbdJIUsG (ORCPT ); Mon, 9 Oct 2017 16:48:06 -0400 Received: by mail-pf0-f195.google.com with SMTP id a7so30359421pfj.5 for ; Mon, 09 Oct 2017 13:48:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OMFwXx521lY7LsrMEsM57v7oeQbEs3shKpJjnGnnblo=; b=HxnsPoTr7Im3b08B6hPKVaJHHoPuIWYTWLTbSyj+82VbLsjjPy9jYkFcAT7Pi3gF6n +bvBt9ygKXlAaEIgNz3/OxKLo5YpmYk+zSAt6I4EeYIbMrW9Cz2WYaPd50//Brh7pkdM H25enFd9ilZDy/wi+5lfIfeXDcB//fqlJjDgTpTnM64pKBN1P+WIVj1Y6y5wqtkcuFfk 6OM2TO3twZaOfg1rpnIVI7lnoOB40TOzjhKShbOerD4wc3TA1EPwDRuruieLgEWNKV8/ XAeIhHNac6UxqnbARPXnYhP5TmiNueviIIDx2Dd6AvFcZZ6dSvwTXUILXE/XcieAInvf 79Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OMFwXx521lY7LsrMEsM57v7oeQbEs3shKpJjnGnnblo=; b=LMQvX5eCLiOH/za2lbe665wnHMSqXxcADlJPLGyEKWxw39MO8osBKZV9URYEOQnyEw CI4JqeJxvbINSfC5oZd0qDYLc32wBHd31tKZ+Se/QW2rUb/vSjPlLCRzW3QKBUUyHvZe xEE3zhtOnIptmcacEPeXeyFXE8UbU8D5Es+FQSJpAozBeCclL3tDWbEZZiyYcn4l3oHT e3fzJt7tr2eHlpUrjrfj4OBgmhwVRROdmFS+Bd7IH9kCHVZiU7ISkU6hqWPCbYZk6GeK c5922BcoIF1clB492si8xTT2MwIZEtWZvFwPkSeELD3sfxrWlT42KrjE8ldYzBqRvjHy WXKg== X-Gm-Message-State: AMCzsaU/AI9OdflMnAbPCocqPmjjuQM8VrJn9yFv9l5FsXO8dau3kwgE tbItO3aLJtX7ruIdrmAQRTdaLl8k X-Google-Smtp-Source: AOwi7QAyovrWUyKa6/bsoEcxrNiWM3xJAYtE0hS+dlaN51DD1SeVysao46gcN9kUJjpL2IE0C972Jw== X-Received: by 10.98.242.13 with SMTP id m13mr5503879pfh.306.1507582085345; Mon, 09 Oct 2017 13:48:05 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id p71sm17861098pfl.56.2017.10.09.13.48.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Oct 2017 13:48:04 -0700 (PDT) From: William Tu To: netdev@vger.kernel.org Cc: David Laight Subject: [net-next 3/3] ip_gre: cache the device mtu hard_header_len calc Date: Mon, 9 Oct 2017 13:47:47 -0700 Message-Id: <1507582067-36718-4-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507582067-36718-1-git-send-email-u9012063@gmail.com> References: <1507582067-36718-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch introduces ip_tunnel->ether_mtu fields to cache the value of dev->mtu + dev->hard_header_len. This avoids the arithmetic operation on every packet. Signed-off-by: William Tu Cc: David Laight --- include/net/ip_tunnels.h | 1 + net/ipv4/ip_gre.c | 8 ++++---- net/ipv4/ip_tunnel.c | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index b41a1e057fce..19565be26e13 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -117,6 +117,7 @@ struct ip_tunnel { /* This field used only by ERSPAN */ u32 index; /* ERSPAN type II index */ + unsigned int ether_mtu; /* The mtu including the ether hdr */ struct dst_cache dst_cache; diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 6e6e4c4811cc..994b8ddea0b1 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -578,8 +578,8 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev, if (gre_handle_offloads(skb, false)) goto err_free_rt; - if (skb->len > dev->mtu + dev->hard_header_len) { - pskb_trim(skb, dev->mtu + dev->hard_header_len); + if (skb->len > tunnel->ether_mtu) { + pskb_trim(skb, tunnel->ether_mtu); truncate = true; } @@ -730,8 +730,8 @@ static netdev_tx_t erspan_xmit(struct sk_buff *skb, if (skb_cow_head(skb, dev->needed_headroom)) goto free_skb; - if (skb->len > dev->mtu + dev->hard_header_len) { - pskb_trim(skb, dev->mtu + dev->hard_header_len); + if (skb->len > tunnel->ether_mtu) { + pskb_trim(skb, tunnel->ether_mtu); truncate = true; } diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index fe6fee728ce4..859af5b86802 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -348,6 +348,7 @@ static int ip_tunnel_bind_dev(struct net_device *dev) dev->needed_headroom = t_hlen + hlen; mtu -= (dev->hard_header_len + t_hlen); + tunnel->ether_mtu = mtu + dev->hard_header_len; if (mtu < 68) mtu = 68; @@ -952,6 +953,7 @@ int __ip_tunnel_change_mtu(struct net_device *dev, int new_mtu, bool strict) } dev->mtu = new_mtu; + tunnel->ether_mtu = new_mtu + dev->hard_header_len; return 0; } EXPORT_SYMBOL_GPL(__ip_tunnel_change_mtu); @@ -1183,6 +1185,7 @@ int ip_tunnel_init(struct net_device *dev) tunnel->dev = dev; tunnel->net = dev_net(dev); + tunnel->ether_mtu = dev->mtu + dev->hard_header_len; strcpy(tunnel->parms.name, dev->name); iph->version = 4; iph->ihl = 5;