Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/818921/?format=api
{ "id": 818921, "url": "http://patchwork.ozlabs.org/api/patches/818921/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170927045803.2477-4-tom@quantonium.net/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "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-4-tom@quantonium.net>", "list_archive_url": null, "date": "2017-09-27T04:57:54", "name": "[v4,net-next,03/12] gtp: Call common functions to get tunnel routes and add dst_cache", "commit_ref": null, "pull_url": null, "state": "deferred", "archived": true, "hash": "8e7bbd5b44dcbe5d8ee324862e8c1c61220e7da8", "submitter": { "id": 72064, "url": "http://patchwork.ozlabs.org/api/people/72064/?format=api", "name": "Tom Herbert", "email": "tom@quantonium.net" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170927045803.2477-4-tom@quantonium.net/mbox/", "series": [ { "id": 5279, "url": "http://patchwork.ozlabs.org/api/series/5279/?format=api", "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/818921/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/818921/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "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=<UNKNOWN>)", "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=\"Yt6+Ncsw\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y25FS5JNPz9t3F\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed, 27 Sep 2017 14:58:52 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1033410AbdI0E6u (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tWed, 27 Sep 2017 00:58:50 -0400", "from mail-pf0-f179.google.com ([209.85.192.179]:45100 \"EHLO\n\tmail-pf0-f179.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S967161AbdI0E6q (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Wed, 27 Sep 2017 00:58:46 -0400", "by mail-pf0-f179.google.com with SMTP id z84so6672392pfi.2\n\tfor <netdev@vger.kernel.org>; Tue, 26 Sep 2017 21:58:46 -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.44\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 26 Sep 2017 21:58:45 -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=Yt6+Ncsw3hZY9jJ9sEZHFWeNK3tx6horjcBRuMElplrMIQ5bF0yyJmuJgaM4Yq1P4B\n\tNlgjpNDfLHKXl5B2TLZug7ZM6plBVCwM7PrE8dmB5biUbFW8Qvt2QWDRSB5vQH7zvbYE\n\tvbLsOdyThqGUSrXcxJ827NwwWnxrU/Zs9wMQDAaXJ08EHsY1hniWjQ7BOw533ZOsbJWA\n\tfjahuYPgUvEv4QuZ4T4uXDM5VCGKuZl50EEcbKQFpN7uzItaBXzCbFv0+MWsbCM/fyjm\n\thx6umkIgnVNGYxl2VcdYyVs+3Y4s+caibieMK8x4k4nL60CSSMmbCWmWxDqREz6DYnYl\n\tzm9Q==", "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=TkcnoCIqP35OeV67vZmIlARDxVeqtTgsrDljGLyRLUJPh/JbFOsH8H5JmaYnCDI60T\n\tJuLNMTHG4Vkc4pccwJdQyFwShTtUczrp/S2BdgJ+4FnmrN+VWsfkaG3QBlk+Rb2Dhse6\n\tbhUm9lKz7+WKEIYaH7rn9ms6q7BL5XrNfQ7f7BmpXRPtLiTInltY4dwiNmxVixMYcul5\n\twRBAOcMxH9F3YdCAhih2CgyzMG+ryhneApi0ddW24XeuhXa4kGdZBJCV+2uZuyGjjt7H\n\tPkO+SGzJCcpqxJEyZ0vNhpnpOQAZ9PukzMHhzY5TGY4mCz0vImt1zzjtt2dZSbaxdWoh\n\tg/Zg==", "X-Gm-Message-State": "AHPjjUggicNiNkv4C6dIkTGafQqsjRQEZ3N9MD7vaojbJMI9KysJUkBB\n\tpP0nKKMJ7vlj7qUBO5+2TZR3B9gZ", "X-Google-Smtp-Source": "AOwi7QD4GF0K0hpckkmjP/p11O9VvkMscV0uVgLSgSdtSXmph6wz3hQvq/mIo98ib83R3uC7hFFEqA==", "X-Received": "by 10.84.212.2 with SMTP id d2mr180941pli.412.1506488326342;\n\tTue, 26 Sep 2017 21:58:46 -0700 (PDT)", "From": "Tom Herbert <tom@quantonium.net>", "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 <tom@quantonium.net>", "Subject": "[PATCH v4 net-next 03/12] gtp: Call common functions to get tunnel\n\troutes and add dst_cache", "Date": "Tue, 26 Sep 2017 21:57:54 -0700", "Message-Id": "<20170927045803.2477-4-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": "<netdev.vger.kernel.org>", "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 <tom@quantonium.net>\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": [ "v4", "net-next", "03/12" ] }