{"id":818925,"url":"http://patchwork.ozlabs.org/api/patches/818925/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170927045803.2477-9-tom@quantonium.net/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170927045803.2477-9-tom@quantonium.net>","list_archive_url":null,"date":"2017-09-27T04:57:59","name":"[v4,net-next,08/12] gtp: Call function to update path mtu","commit_ref":null,"pull_url":null,"state":"deferred","archived":true,"hash":"96c326e18c6ce0bcc4d1bc7a1386b563cdce6d8c","submitter":{"id":72064,"url":"http://patchwork.ozlabs.org/api/people/72064/?format=json","name":"Tom Herbert","email":"tom@quantonium.net"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170927045803.2477-9-tom@quantonium.net/mbox/","series":[{"id":5279,"url":"http://patchwork.ozlabs.org/api/series/5279/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=5279","date":"2017-09-27T04:57:51","name":"gtp: Additional feature support - Part I","version":4,"mbox":"http://patchwork.ozlabs.org/series/5279/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818925/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818925/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=quantonium-net.20150623.gappssmtp.com\n\theader.i=@quantonium-net.20150623.gappssmtp.com\n\theader.b=\"pdMZs5Pr\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y25Fh4Cm9z9t3F\n\tfor ;\n\tWed, 27 Sep 2017 14:59:04 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1161079AbdI0E7C (ORCPT );\n\tWed, 27 Sep 2017 00:59:02 -0400","from mail-pg0-f48.google.com ([74.125.83.48]:52652 \"EHLO\n\tmail-pg0-f48.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1161072AbdI0E67 (ORCPT\n\t); Wed, 27 Sep 2017 00:58:59 -0400","by mail-pg0-f48.google.com with SMTP id i195so7133341pgd.9\n\tfor ; Tue, 26 Sep 2017 21:58:59 -0700 (PDT)","from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net.\n\t[73.162.13.107]) by smtp.gmail.com with ESMTPSA id\n\ty16sm16502728pfe.68.2017.09.26.21.58.57\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 26 Sep 2017 21:58:58 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=quantonium-net.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=c9b+Zk1pz2iqm+GXKGvvZ1oRizQA5GgRF8hIJCjrWB0=;\n\tb=pdMZs5PrVLBVVo9QWNWw4RNHeEjPpPSJGFeBhF7qj02GjaCU0601XKhXINUcf36NIj\n\tBJdnzXhqrUSS2lEBzAyYlDLXYgXDKgdi763HfdwOpuVvItaCFSYu20nFQBieHn6iTS+G\n\tGIqoE4nspVaSIvB6UUEksA2rmE4RHWavQS9VpY877RVNx7/Q9ndpEEWQ7u+wUkEEGqHr\n\tVXF05LdYEpwJJq+yjJ7cAw0KR3G89IZkrfUq64BHKH6owUnUJy0sOGg4nVpAuLmjI0x/\n\tqTsL4IJRwmaQ3nWClkui7JnTmldYx45vyEF9/vhkgO2du9M/SE+NHBNwmtRxkLJI/gm2\n\tJ9Qg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=c9b+Zk1pz2iqm+GXKGvvZ1oRizQA5GgRF8hIJCjrWB0=;\n\tb=Mgo2bX6udFfFjfXhg1Megd7L3q5rNgrJFsKlIWPYQVM2gP4NFWbrd/+uuMQGOa3VM/\n\t2v/w0K6gUyuT0t3VQ16QHfGzz9BkZWdA335L5gC6Ox0kxVTKmN/MwTtk634+iVammv9f\n\tUzSzKlLzKPBzm8jNQiNhCxfIlVr8oRfGQHJhboGjCJ1pbH34ckgbFHlW/IJG6LpzW6pL\n\tEgcW9ZYzoHFFOD9fm73oggC51puzHp3AEv/oeRNcWFsKrw+tAsoMYZ68lq3Mk8Nvva2j\n\tgsBvyCBCywUgHWzLf9lfV2Yw7OFoDwHlJqT/nYG+8iXNo2qGsfew5lr82eaqf3MDO4LQ\n\tuSGQ==","X-Gm-Message-State":"AHPjjUhaRpOff4tf5UDFHDtCCKPtfSkIhbftLUgUB+OSHw2ved6zagvP\n\t7tNVevVI4zWir29TjHsb88TloQ==","X-Google-Smtp-Source":"AOwi7QAacnoQoW7l3a8Ow31v75Ez7rMVU7D64VZhzTIexCUlgntC/4QN2Q127A8oudxQw2wC7L90YA==","X-Received":"by 10.99.123.18 with SMTP id w18mr192672pgc.27.1506488339428;\n\tTue, 26 Sep 2017 21:58:59 -0700 (PDT)","From":"Tom Herbert ","To":"davem@davemloft.net","Cc":"pablo@netfilter.org, laforge@gnumonks.org, aschultz@tpip.net,\n\tnetdev@vger.kernel.org, rohit@quantonium.net,\n\tTom Herbert ","Subject":"[PATCH v4 net-next 08/12] gtp: Call function to update path mtu","Date":"Tue, 26 Sep 2017 21:57:59 -0700","Message-Id":"<20170927045803.2477-9-tom@quantonium.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170927045803.2477-1-tom@quantonium.net>","References":"<20170927045803.2477-1-tom@quantonium.net>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Replace mtu handling with call to __iptunnel_update_pmtu.\n\nSigned-off-by: Tom Herbert \n---\n drivers/net/gtp.c | 36 ++++++------------------------------\n 1 file changed, 6 insertions(+), 30 deletions(-)","diff":"diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c\nindex a6e2e0a1f424..bbb08f8849d3 100644\n--- a/drivers/net/gtp.c\n+++ b/drivers/net/gtp.c\n@@ -53,6 +53,7 @@ struct pdp_ctx {\n \t\t} v1;\n \t} u;\n \tu8\t\t\tgtp_version;\n+\tu8\t\t\thlen;\n \tu16\t\t\taf;\n \n \tstruct in_addr\t\tms_addr_ip4;\n@@ -467,8 +468,6 @@ static int gtp_build_skb_ip4(struct sk_buff *skb, struct net_device *dev,\n \tstruct iphdr *iph;\n \tstruct sock *sk;\n \t__be32 saddr;\n-\t__be16 df;\n-\tint mtu;\n \n \t/* Read the IP destination address and resolve the PDP context.\n \t * Prepend PDP header with TEI/TID from PDP ctx.\n@@ -514,37 +513,12 @@ static int gtp_build_skb_ip4(struct sk_buff *skb, struct net_device *dev,\n \n \tskb_dst_drop(skb);\n \n-\t/* This is similar to tnl_update_pmtu(). */\n-\tdf = iph->frag_off;\n-\tif (df) {\n-\t\tmtu = dst_mtu(&rt->dst) - dev->hard_header_len -\n-\t\t\tsizeof(struct iphdr) - sizeof(struct udphdr);\n-\t\tswitch (pctx->gtp_version) {\n-\t\tcase GTP_V0:\n-\t\t\tmtu -= sizeof(struct gtp0_header);\n-\t\t\tbreak;\n-\t\tcase GTP_V1:\n-\t\t\tmtu -= sizeof(struct gtp1_header);\n-\t\t\tbreak;\n-\t\t}\n-\t} else {\n-\t\tmtu = dst_mtu(&rt->dst);\n-\t}\n-\n-\trt->dst.ops->update_pmtu(&rt->dst, NULL, skb, mtu);\n-\n-\tif (!skb_is_gso(skb) && (iph->frag_off & htons(IP_DF)) &&\n-\t mtu < ntohs(iph->tot_len)) {\n-\t\tnetdev_dbg(dev, \"packet too big, fragmentation needed\\n\");\n-\t\tmemset(IPCB(skb), 0, sizeof(*IPCB(skb)));\n-\t\ticmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,\n-\t\t\t htonl(mtu));\n-\t\tgoto err_rt;\n-\t}\n-\n \tgtp_set_pktinfo_ipv4(pktinfo, sk, iph, pctx, rt, &fl4, dev);\n \tgtp_push_header(skb, pktinfo);\n \n+\t__iptunnel_update_pmtu(dev, skb, &rt->dst, !!iph->frag_off, iph,\n+\t\t\t pctx->hlen, pctx->peer_addr_ip4.s_addr);\n+\n \treturn 0;\n err_rt:\n \tip_rt_put(rt);\n@@ -915,10 +889,12 @@ static void ipv4_pdp_fill(struct pdp_ctx *pctx, struct genl_info *info)\n \t\t */\n \t\tpctx->u.v0.tid = nla_get_u64(info->attrs[GTPA_TID]);\n \t\tpctx->u.v0.flow = nla_get_u16(info->attrs[GTPA_FLOW]);\n+\t\tpctx->hlen = sizeof(struct udphdr) + sizeof(struct gtp0_header);\n \t\tbreak;\n \tcase GTP_V1:\n \t\tpctx->u.v1.i_tei = nla_get_u32(info->attrs[GTPA_I_TEI]);\n \t\tpctx->u.v1.o_tei = nla_get_u32(info->attrs[GTPA_O_TEI]);\n+\t\tpctx->hlen = sizeof(struct udphdr) + sizeof(struct gtp1_header);\n \t\tbreak;\n \tdefault:\n \t\tbreak;\n","prefixes":["v4","net-next","08/12"]}