{"id":818032,"url":"http://patchwork.ozlabs.org/api/patches/818032/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170925032941.14586-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":"<20170925032941.14586-4-tom@quantonium.net>","list_archive_url":null,"date":"2017-09-25T03:29:32","name":"[v3,net-next,03/12] gtp: Call common functions to get tunnel routes and add dst_cache","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"8e7bbd5b44dcbe5d8ee324862e8c1c61220e7da8","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/20170925032941.14586-4-tom@quantonium.net/mbox/","series":[{"id":4865,"url":"http://patchwork.ozlabs.org/api/series/4865/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4865","date":"2017-09-25T03:29:29","name":"gtp: Additional feature support - Part I","version":3,"mbox":"http://patchwork.ozlabs.org/series/4865/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818032/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818032/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=\"cijeXWcl\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y0qN34Bjbz9t5b\n\tfor ;\n\tMon, 25 Sep 2017 13:30:11 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932937AbdIYDaJ (ORCPT );\n\tSun, 24 Sep 2017 23:30:09 -0400","from mail-pg0-f44.google.com ([74.125.83.44]:44472 \"EHLO\n\tmail-pg0-f44.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932893AbdIYDaH (ORCPT\n\t); Sun, 24 Sep 2017 23:30:07 -0400","by mail-pg0-f44.google.com with SMTP id j16so3280452pga.1\n\tfor ; Sun, 24 Sep 2017 20:30:06 -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\tj2sm9112907pgn.26.2017.09.24.20.30.04\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 24 Sep 2017 20:30:05 -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=0Vs249g8KFibi/hTwDBA/hTAfGlB+QSLg+DbDOQBVYE=;\n\tb=cijeXWclirYlY+4ZxAabQosjlqFuwoj2ecA0LPFMZgNM6cfLVBrPfSXllabqxJRZ+R\n\tMicg7i2LKEx94KRqcNNH1LH/rK2ANdTWIeOlDGu3HR5mB5lOvnMZ/wPH5MBqzDv7tUmS\n\tKEnZOMXPMNn62OeHvztolHVNOITa8lHslFPEL4ygjOTA2iBm1rhX28SgAeP87rDogTZH\n\t23j+rJQzEpGfKVEwXXJQbOdVrTl1Rr7bb5BhzPUcZD6e/2gkGpYDMYriMHrrbw1uRes9\n\t3MuDtdz0f6P9McfOlPZ8eN7i8HPjvFThfG6fVcQa9IcNh++wJloBJrGnAQXjoetkX1yp\n\tFU2g==","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=0Vs249g8KFibi/hTwDBA/hTAfGlB+QSLg+DbDOQBVYE=;\n\tb=ueD9ZZeaLbsPiSj6wxfpBqRv86wdBJMXGsUG5ArU9okjzweniopr2MD02K8BoEtUg8\n\twpxucFLOhNNTRRCZvQMORT7ndoSVI8iZJA7/XKUpircSKSiHhl2tMPXz1Z1/5Zxh4d5L\n\trSh5amHF8JzLvU6jp1iKcU+lNNPGA2omHLL03DtAYxT3aHUSfkNTLGB7KT0ZUbeEanSQ\n\t7qMjie5ofUfCdnOYMraLCBO7fCw3FeZyUCHHIWijCfF5DwQURtcGw7lp4FaLAqWeXg7F\n\tz6qxI5Qb44p11zVrXugqus08klBSUmJ7uzYOgBTxBH8qJqlPc1C6QO3aVgaONAvaCF3P\n\tz9+w==","X-Gm-Message-State":"AHPjjUgjXLb+HZ83OzBfdAW6HrQov0Q2kIlDy0IWgIqKyl9oLkWX8znK\n\t1RnrU/6FZUwQsb6tgremRip59A==","X-Google-Smtp-Source":"AOwi7QCH87bhSMAoXULZgJr5xAXmcZMZc6qyLjhg5x0L/7sY8b4FwY3y4cyJHxZEGYA5ky3XzUTTmA==","X-Received":"by 10.99.103.2 with SMTP id b2mr6182704pgc.177.1506310206442;\n\tSun, 24 Sep 2017 20:30:06 -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 v3 net-next 03/12] gtp: Call common functions to get tunnel\n\troutes and add dst_cache","Date":"Sun, 24 Sep 2017 20:29:32 -0700","Message-Id":"<20170925032941.14586-4-tom@quantonium.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170925032941.14586-1-tom@quantonium.net>","References":"<20170925032941.14586-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 | 62 +++++++++++++++++++++++++++++++------------------------\n 1 file changed, 35 insertions(+), 27 deletions(-)","diff":"diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c\nindex f38e32a7ec9c..6dabd605607c 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,30 @@ 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+\t/* Source address returned by route lookup is ignored since\n+\t * we get the address from a socket.\n+\t */\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 +544,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 +918,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 +953,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":["v3","net-next","03/12"]}