From patchwork Sat Oct 28 00:09:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 831555 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=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="0Nm1mHHp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yP1NM1Nfpz9t4X for ; Sat, 28 Oct 2017 11:10:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751704AbdJ1AKZ (ORCPT ); Fri, 27 Oct 2017 20:10:25 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:50209 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751673AbdJ1AKW (ORCPT ); Fri, 27 Oct 2017 20:10:22 -0400 Received: by mail-pf0-f195.google.com with SMTP id b6so6009922pfh.7 for ; Fri, 27 Oct 2017 17:10:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZmOW2Y2jK+xxsUBqAZbGHqwyqBypvBw6lWA5nDsXKrM=; b=0Nm1mHHp5BVdgJ6q4dfGWKAzXyfMVGyAn0sjK4Hsz24WNJlPC11PfJYIoqXX9B4P2p EVoSx1MWOdtgBuQ1560Ah4Uji8QiuwPzfgV8b+pvK5sP2bdr1AnNkcBZRe7LPGdbf6dx Dufy/wMYllwRSLSLq+q1LzU5XhYdcK2CaPSw19hb4GHOm/yYNzsP6P99/qAgK7OqIbPv 8Ay54H55bvjRBu/qGeC1tPIJIbwFw8jLRbnJZIw6PHnKk09NWzmPAQv0rgFRqoLtRDt5 u9WwoNElICHObkOia0gGoXqOZtbbZoruFDT2kisiuMUQ5pD93HxDdY9yQg7g6ZIPkpeV ZunA== 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=ZmOW2Y2jK+xxsUBqAZbGHqwyqBypvBw6lWA5nDsXKrM=; b=pJyTX2nVNCZBbeJk3sDfPjlqV1rzCFA+/9/cSFckt6XaTUfQSQWSl+d+H/Lxe5XZED nu/ZonDowWHAj0bhBebBzsx+MnbMT4U/AiNdkYRHitrMOp5VRGcQoT2JOGXolPfP0TbQ 0RSnPsxEkQR9NEN9UXJnJeBaerFhcMgbcGdK1p4wCCjHiKdRcuCB2XExDTjkrFPgkVMa 8tHyoc6jK2XZUVK60NnISVHOEW7n+p3k2rlOvzeYckAjTknbwUYJmrDeogFUTcECPUFq MgtCJ0Iu5L49xLltZtk6seq7YzO/u7lTQcsuyMaC0XcMcz20HpE5f0abR4zQPGT/07cy BJqQ== X-Gm-Message-State: AMCzsaVk2YBiGGqE77nf0ojHW4GkzufGHz7RFepxozV7Njy6AKnDWoK+ xqLqgs5I9s+zLLgp15H3JnRdYryc X-Google-Smtp-Source: ABhQp+QDWNg/o9Feo8Vkbmrd+sixDYD/mpq+sCe07LDHCozCoIsHWr5uEO0D8MwL377w6EJBdFABLw== X-Received: by 10.101.78.5 with SMTP id r5mr1615210pgt.94.1509149422115; Fri, 27 Oct 2017 17:10:22 -0700 (PDT) Received: from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net. [73.162.13.107]) by smtp.gmail.com with ESMTPSA id 2sm9068398pgb.30.2017.10.27.17.10.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Oct 2017 17:10:21 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net Cc: pablo@netfilter.org, laforge@gnumonks.org, aschultz@tpip.net, netdev@vger.kernel.org, rohit@quantonium.net, Tom Herbert Subject: [PATCH v7 net-next 09/13] gtp: Call function to update path mtu Date: Fri, 27 Oct 2017 17:09:33 -0700 Message-Id: <20171028000937.2631-10-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171028000937.2631-1-tom@quantonium.net> References: <20171028000937.2631-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace mtu handling with call to __iptunnel_update_pmtu. Signed-off-by: Tom Herbert --- drivers/net/gtp.c | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 8b7014aa45c2..7b9a482b3d22 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -53,6 +53,7 @@ struct pdp_ctx { } v1; } u; u8 gtp_version; + u8 hlen; u16 af; struct in_addr ms_addr_ip4; @@ -474,8 +475,6 @@ static int gtp_build_skb_ip4(struct sk_buff *skb, struct net_device *dev, struct iphdr *iph; struct sock *sk; __be32 saddr; - __be16 df; - int mtu; /* Read the IP destination address and resolve the PDP context. * Prepend PDP header with TEI/TID from PDP ctx. @@ -521,37 +520,12 @@ static int gtp_build_skb_ip4(struct sk_buff *skb, struct net_device *dev, skb_dst_drop(skb); - /* This is similar to tnl_update_pmtu(). */ - df = iph->frag_off; - if (df) { - mtu = dst_mtu(&rt->dst) - dev->hard_header_len - - sizeof(struct iphdr) - sizeof(struct udphdr); - switch (pctx->gtp_version) { - case GTP_V0: - mtu -= sizeof(struct gtp0_header); - break; - case GTP_V1: - mtu -= sizeof(struct gtp1_header); - break; - } - } else { - mtu = dst_mtu(&rt->dst); - } - - rt->dst.ops->update_pmtu(&rt->dst, NULL, skb, mtu); - - if (!skb_is_gso(skb) && (iph->frag_off & htons(IP_DF)) && - mtu < ntohs(iph->tot_len)) { - netdev_dbg(dev, "packet too big, fragmentation needed\n"); - memset(IPCB(skb), 0, sizeof(*IPCB(skb))); - icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, - htonl(mtu)); - goto err_rt; - } - gtp_set_pktinfo_ipv4(pktinfo, sk, iph, pctx, rt, &fl4, dev); gtp_push_header(skb, pktinfo); + __iptunnel_update_pmtu(dev, skb, &rt->dst, !!iph->frag_off, iph, + pctx->hlen, pctx->peer_addr_ip4.s_addr); + return 0; err_rt: ip_rt_put(rt); @@ -922,10 +896,12 @@ static void ipv4_pdp_fill(struct pdp_ctx *pctx, struct genl_info *info) */ pctx->u.v0.tid = nla_get_u64(info->attrs[GTPA_TID]); pctx->u.v0.flow = nla_get_u16(info->attrs[GTPA_FLOW]); + pctx->hlen = sizeof(struct udphdr) + sizeof(struct gtp0_header); break; case GTP_V1: pctx->u.v1.i_tei = nla_get_u32(info->attrs[GTPA_I_TEI]); pctx->u.v1.o_tei = nla_get_u32(info->attrs[GTPA_O_TEI]); + pctx->hlen = sizeof(struct udphdr) + sizeof(struct gtp1_header); break; default: break;