{"id":815217,"url":"http://patchwork.ozlabs.org/api/patches/815217/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170919003904.5124-4-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":"<20170919003904.5124-4-tom@quantonium.net>","list_archive_url":null,"date":"2017-09-19T00:38:53","name":"[net-next,03/14] gtp: Call common functions to get tunnel routes and add dst_cache","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"5e7280561860fa5bd9a3363696abf844ac36fbab","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/20170919003904.5124-4-tom@quantonium.net/mbox/","series":[{"id":3758,"url":"http://patchwork.ozlabs.org/api/series/3758/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3758","date":"2017-09-19T00:38:50","name":"gtp: Additional feature support","version":1,"mbox":"http://patchwork.ozlabs.org/series/3758/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815217/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815217/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=\"d8whlsBw\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xx3tM1k45z9s78\n\tfor ;\n\tTue, 19 Sep 2017 10:39:55 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751361AbdISAjm (ORCPT );\n\tMon, 18 Sep 2017 20:39:42 -0400","from mail-pf0-f169.google.com ([209.85.192.169]:48467 \"EHLO\n\tmail-pf0-f169.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751227AbdISAjj (ORCPT\n\t); Mon, 18 Sep 2017 20:39:39 -0400","by mail-pf0-f169.google.com with SMTP id n24so1107405pfk.5\n\tfor ; Mon, 18 Sep 2017 17:39:39 -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\tk78sm662018pfb.157.2017.09.18.17.39.37\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 17:39:38 -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=dm9swcGuIk75jL41bv8tNdZ2xCw67/rn0Fh5lKTZlYM=;\n\tb=d8whlsBwHBY63KJgj4x+folyJmeI2RxzNS8Wl6J7DEiEYKZiJntHxchMkxkiJDbqgU\n\tnOhHtXzjxlFghB33s9oT63ilnK/9a3bscn7OfHYuMwIR6+rw7d4nx9+2hKXHRHNuLxSW\n\tjUTaExhAWIAVadsZSnJ4R7N9+4J1re6aD/7RBkVEMHxVOdVO0OqZgQgHETiM/wIfeDxy\n\tQ+kpmOGjZJGVgfJBWt2qNmdH13llj/iXetOof/Dj2HExfTQJvCN1Pdpn2JiItsQmACqz\n\tu6LDDrJ8lZzDz8XIWn020cvXElMNLeqVJndv11TLFE8bfCaqrkFh639saJnzCADioxyo\n\t7kjA==","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=dm9swcGuIk75jL41bv8tNdZ2xCw67/rn0Fh5lKTZlYM=;\n\tb=HD6Xj7y7PolKU+uVv20HH2Z9f7Of4HtQVnkoh/AvQ8DYoAvsgccJuSc3TIPshQtZ8w\n\tFzY7TtdFSCWw1K4AIIaDZF3x86agKqTSYV97Q4aZOAy4tTZwpTtXD+4MTt0HGT0HCTNa\n\tHAmdeLnrVDByAhj21eHovp871uPeybMeP8I4LWRcIq5Ouzc+0sGc+ydURlCZVls5OIMC\n\tRhvpGcMH4r5EVbS0JKGDmEsnT92aSUnFee9N/jdxYwTa99+HB5UWZGU4R8Z6YWzrWeNf\n\tyXzLMD14wt8fZt3MY9nj8QcvoBjpT6DMxA4JmtEnMTCLuA9DG9UnIQJLL+vspAdqOD0i\n\trIQg==","X-Gm-Message-State":"AHPjjUifv9aevT0NtmBGJLV5uEz06s1su1BPyDO/wWYRSPk1CDv5OZA8\n\tWcnwmKufABv+ZVjeWLg=","X-Google-Smtp-Source":"AOwi7QDTVJSonMWs14gqYSNTvi7D2aynR1oDg+CD71DnxZvpSO83LMFGTosADnETUF9tJ5MPplBqnA==","X-Received":"by 10.98.76.70 with SMTP id z67mr347087pfa.78.1505781579074;\n\tMon, 18 Sep 2017 17:39:39 -0700 (PDT)","From":"Tom Herbert ","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org, pablo@netfilter.org, laforge@gnumonks.org,\n\trohit@quantonium.net, Tom Herbert ","Subject":"[PATCH net-next 03/14] gtp: Call common functions to get tunnel\n\troutes and add dst_cache","Date":"Mon, 18 Sep 2017 17:38:53 -0700","Message-Id":"<20170919003904.5124-4-tom@quantonium.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170919003904.5124-1-tom@quantonium.net>","References":"<20170919003904.5124-1-tom@quantonium.net>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Call ip_tunnel_get_route and dst_cache to pdp context which should\nimprove performance by obviating the need to perform a route lookup\non every packet.\n\nSigned-off-by: Tom Herbert \n---\n drivers/net/gtp.c | 59 ++++++++++++++++++++++++++++++-------------------------\n 1 file changed, 32 insertions(+), 27 deletions(-)","diff":"diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c\nindex f38e32a7ec9c..95df3bcebbb2 100644\n--- a/drivers/net/gtp.c\n+++ b/drivers/net/gtp.c\n@@ -63,6 +63,8 @@ struct pdp_ctx {\n \n \tatomic_t\t\ttx_seq;\n \tstruct rcu_head\t\trcu_head;\n+\n+\tstruct dst_cache\tdst_cache;\n };\n \n /* One instance of the GTP device. */\n@@ -379,20 +381,6 @@ static void gtp_dev_uninit(struct net_device *dev)\n \tfree_percpu(dev->tstats);\n }\n \n-static struct rtable *ip4_route_output_gtp(struct flowi4 *fl4,\n-\t\t\t\t\t const struct sock *sk,\n-\t\t\t\t\t __be32 daddr)\n-{\n-\tmemset(fl4, 0, sizeof(*fl4));\n-\tfl4->flowi4_oif\t\t= sk->sk_bound_dev_if;\n-\tfl4->daddr\t\t= daddr;\n-\tfl4->saddr\t\t= inet_sk(sk)->inet_saddr;\n-\tfl4->flowi4_tos\t\t= RT_CONN_FLAGS(sk);\n-\tfl4->flowi4_proto\t= sk->sk_protocol;\n-\n-\treturn ip_route_output_key(sock_net(sk), fl4);\n-}\n-\n static inline void gtp0_push_header(struct sk_buff *skb, struct pdp_ctx *pctx)\n {\n \tint payload_len = skb->len;\n@@ -479,6 +467,8 @@ static int gtp_build_skb_ip4(struct sk_buff *skb, struct net_device *dev,\n \tstruct rtable *rt;\n \tstruct flowi4 fl4;\n \tstruct iphdr *iph;\n+\tstruct sock *sk;\n+\t__be32 saddr;\n \t__be16 df;\n \tint mtu;\n \n@@ -498,19 +488,27 @@ static int gtp_build_skb_ip4(struct sk_buff *skb, struct net_device *dev,\n \t}\n \tnetdev_dbg(dev, \"found PDP context %p\\n\", pctx);\n \n-\trt = ip4_route_output_gtp(&fl4, pctx->sk, pctx->peer_addr_ip4.s_addr);\n-\tif (IS_ERR(rt)) {\n-\t\tnetdev_dbg(dev, \"no route to SSGN %pI4\\n\",\n-\t\t\t &pctx->peer_addr_ip4.s_addr);\n-\t\tdev->stats.tx_carrier_errors++;\n-\t\tgoto err;\n-\t}\n+\tsk = pctx->sk;\n+\tsaddr = inet_sk(sk)->inet_saddr;\n \n-\tif (rt->dst.dev == dev) {\n-\t\tnetdev_dbg(dev, \"circular route to SSGN %pI4\\n\",\n-\t\t\t &pctx->peer_addr_ip4.s_addr);\n-\t\tdev->stats.collisions++;\n-\t\tgoto err_rt;\n+\trt = ip_tunnel_get_route(dev, skb, sk->sk_protocol,\n+\t\t\t\t sk->sk_bound_dev_if, RT_CONN_FLAGS(sk),\n+\t\t\t\t pctx->peer_addr_ip4.s_addr, &saddr,\n+\t\t\t\t pktinfo->gtph_port, pktinfo->gtph_port,\n+\t\t\t\t &pctx->dst_cache, NULL);\n+\n+\tif (IS_ERR(rt)) {\n+\t\tif (rt == ERR_PTR(-ELOOP)) {\n+\t\t\tnetdev_dbg(dev, \"circular route to SSGN %pI4\\n\",\n+\t\t\t\t &pctx->peer_addr_ip4.s_addr);\n+\t\t\tdev->stats.collisions++;\n+\t\t\tgoto err_rt;\n+\t\t} else {\n+\t\t\tnetdev_dbg(dev, \"no route to SSGN %pI4\\n\",\n+\t\t\t\t &pctx->peer_addr_ip4.s_addr);\n+\t\t\tdev->stats.tx_carrier_errors++;\n+\t\t\tgoto err;\n+\t\t}\n \t}\n \n \tskb_dst_drop(skb);\n@@ -543,7 +541,7 @@ static int gtp_build_skb_ip4(struct sk_buff *skb, struct net_device *dev,\n \t\tgoto err_rt;\n \t}\n \n-\tgtp_set_pktinfo_ipv4(pktinfo, pctx->sk, iph, pctx, rt, &fl4, dev);\n+\tgtp_set_pktinfo_ipv4(pktinfo, sk, iph, pctx, rt, &fl4, dev);\n \tgtp_push_header(skb, pktinfo);\n \n \treturn 0;\n@@ -917,6 +915,7 @@ static int ipv4_pdp_add(struct gtp_dev *gtp, struct sock *sk,\n \tstruct pdp_ctx *pctx;\n \tbool found = false;\n \t__be32 ms_addr;\n+\tint err;\n \n \tms_addr = nla_get_be32(info->attrs[GTPA_MS_ADDRESS]);\n \thash_ms = ipv4_hashfn(ms_addr) % gtp->hash_size;\n@@ -951,6 +950,12 @@ static int ipv4_pdp_add(struct gtp_dev *gtp, struct sock *sk,\n \tif (pctx == NULL)\n \t\treturn -ENOMEM;\n \n+\terr = dst_cache_init(&pctx->dst_cache, GFP_KERNEL);\n+\tif (err) {\n+\t\tkfree(pctx);\n+\t\treturn err;\n+\t}\n+\n \tsock_hold(sk);\n \tpctx->sk = sk;\n \tpctx->dev = gtp->dev;\n","prefixes":["net-next","03/14"]}