Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/815216/?format=api
{ "id": 815216, "url": "http://patchwork.ozlabs.org/api/patches/815216/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170919003904.5124-3-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": "<20170919003904.5124-3-tom@quantonium.net>", "list_archive_url": null, "date": "2017-09-19T00:38:52", "name": "[net-next,02/14] vxlan: Call common functions to get tunnel routes", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "c6b9581e48a8c86b982d619634022d485d855689", "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/20170919003904.5124-3-tom@quantonium.net/mbox/", "series": [ { "id": 3758, "url": "http://patchwork.ozlabs.org/api/series/3758/?format=api", "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/815216/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815216/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=\"QqdKlShl\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xx3tL41yQz9s5L\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 19 Sep 2017 10:39:54 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751302AbdISAjh (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tMon, 18 Sep 2017 20:39:37 -0400", "from mail-pg0-f44.google.com ([74.125.83.44]:43205 \"EHLO\n\tmail-pg0-f44.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751227AbdISAjg (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Mon, 18 Sep 2017 20:39:36 -0400", "by mail-pg0-f44.google.com with SMTP id u18so1096845pgo.0\n\tfor <netdev@vger.kernel.org>; Mon, 18 Sep 2017 17:39:36 -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.34\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 17:39:35 -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=atgSc7cSWpfP0yeG8RydMP5L2g1hZzx81Z5EoLNlTI8=;\n\tb=QqdKlShliK0UaTZquUSdD7W1c/pKjyg0pZpcc/YyRUUTMg54qmFLeAddyOa357xMzE\n\t2dJeJ6N/j7vSYXo1E2HB1av48uWWleSOqu42c223xpJz2QDjOlsfxjeEFtvP621rg1L/\n\t8Y2BqpINjTqanfTZLNMa77C0QHxvIiwZttnA4kJ1Gvmy6Cwec7dCuMQfahzg6oI2Q5CU\n\tDjUUlWfukTtrOVh8fB2w8Ep3wJPh5v6kOEWGbLNc/vEhOEl+3oSm/pJxj+ZJV6tIYQus\n\t0Rhz+p4m4wZrqHB+H+mL7K6sUBvuH9bcO5xV+ayuRH0HA65+AVJ4D3c4UIXfOi6IuLo/\n\tgB4g==", "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=atgSc7cSWpfP0yeG8RydMP5L2g1hZzx81Z5EoLNlTI8=;\n\tb=M+w36j++6UyduU/+iDmYUpTN4Q+M6be09UG3GHe9QNxPAGyraSxHv9MPoisgV9S5cw\n\tITDd8/GwR+7AUn+iY3PDLrcNTHpcr/0ojcNt3HYJdUx71FqjkwR9QOR2U642UgQQbccS\n\t6AQDyIdcfyKi6iJWlaffHIXCX1UbDt+HnS81FkLX94t+XOkb+6EBGomW2cL+/sxJvUz+\n\tt78OlMr9BTTT5ZtC0Ev4KmaMofGEFm8EJMfGI6puA017iN7daGSJ48iW6/LbegMu5HYp\n\tkN056SnvMX9obCbqMRQhd8WJWF4AZq5aHUgW1xlDpAa3pxjuPUHOh19jLLCaPPPK7KQb\n\t27FQ==", "X-Gm-Message-State": "AHPjjUgc0R/Be/PKD6Ricx2YKq+Xs1yu5wyhPiFXQ+khe9lUiAstkvZu\n\t2avGx+1xurHcHQhh", "X-Google-Smtp-Source": "AOwi7QCpBhwz8GvunrWFY9+1KmWZrg6sssfvjmbV/cMECwLlgvbE1U6rkvlpubnvGnkXj41yM/3+Ng==", "X-Received": "by 10.98.82.74 with SMTP id g71mr330648pfb.300.1505781576075;\n\tMon, 18 Sep 2017 17:39:36 -0700 (PDT)", "From": "Tom Herbert <tom@quantonium.net>", "To": "davem@davemloft.net", "Cc": "netdev@vger.kernel.org, pablo@netfilter.org, laforge@gnumonks.org,\n\trohit@quantonium.net, Tom Herbert <tom@quantonium.net>", "Subject": "[PATCH net-next 02/14] vxlan: Call common functions to get tunnel\n\troutes", "Date": "Mon, 18 Sep 2017 17:38:52 -0700", "Message-Id": "<20170919003904.5124-3-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": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Call ip_tunnel_get_route and ip6_tnl_get_route to handle getting a route\nand dealing with the dst_cache.\n\nSigned-off-by: Tom Herbert <tom@quantonium.net>\n---\n drivers/net/vxlan.c | 84 ++++-------------------------------------------------\n 1 file changed, 5 insertions(+), 79 deletions(-)", "diff": "diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c\nindex d7c49cf1d5e9..810caa9adf37 100644\n--- a/drivers/net/vxlan.c\n+++ b/drivers/net/vxlan.c\n@@ -1867,47 +1867,11 @@ static struct rtable *vxlan_get_route(struct vxlan_dev *vxlan, struct net_device\n \t\t\t\t struct dst_cache *dst_cache,\n \t\t\t\t const struct ip_tunnel_info *info)\n {\n-\tbool use_cache = ip_tunnel_dst_cache_usable(skb, info);\n-\tstruct rtable *rt = NULL;\n-\tstruct flowi4 fl4;\n-\n \tif (!sock4)\n \t\treturn ERR_PTR(-EIO);\n \n-\tif (tos && !info)\n-\t\tuse_cache = false;\n-\tif (use_cache) {\n-\t\trt = dst_cache_get_ip4(dst_cache, saddr);\n-\t\tif (rt)\n-\t\t\treturn rt;\n-\t}\n-\n-\tmemset(&fl4, 0, sizeof(fl4));\n-\tfl4.flowi4_oif = oif;\n-\tfl4.flowi4_tos = RT_TOS(tos);\n-\tfl4.flowi4_mark = skb->mark;\n-\tfl4.flowi4_proto = IPPROTO_UDP;\n-\tfl4.daddr = daddr;\n-\tfl4.saddr = *saddr;\n-\tfl4.fl4_dport = dport;\n-\tfl4.fl4_sport = sport;\n-\n-\trt = ip_route_output_key(vxlan->net, &fl4);\n-\tif (likely(!IS_ERR(rt))) {\n-\t\tif (rt->dst.dev == dev) {\n-\t\t\tnetdev_dbg(dev, \"circular route to %pI4\\n\", &daddr);\n-\t\t\tip_rt_put(rt);\n-\t\t\treturn ERR_PTR(-ELOOP);\n-\t\t}\n-\n-\t\t*saddr = fl4.saddr;\n-\t\tif (use_cache)\n-\t\t\tdst_cache_set_ip4(dst_cache, &rt->dst, fl4.saddr);\n-\t} else {\n-\t\tnetdev_dbg(dev, \"no route to %pI4\\n\", &daddr);\n-\t\treturn ERR_PTR(-ENETUNREACH);\n-\t}\n-\treturn rt;\n+\treturn ip_tunnel_get_route(dev, skb, IPPROTO_UDP, oif, tos, daddr,\n+\t\t\t\t saddr, dport, sport, dst_cache, info);\n }\n \n #if IS_ENABLED(CONFIG_IPV6)\n@@ -1922,50 +1886,12 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,\n \t\t\t\t\t struct dst_cache *dst_cache,\n \t\t\t\t\t const struct ip_tunnel_info *info)\n {\n-\tbool use_cache = ip_tunnel_dst_cache_usable(skb, info);\n-\tstruct dst_entry *ndst;\n-\tstruct flowi6 fl6;\n-\tint err;\n-\n \tif (!sock6)\n \t\treturn ERR_PTR(-EIO);\n \n-\tif (tos && !info)\n-\t\tuse_cache = false;\n-\tif (use_cache) {\n-\t\tndst = dst_cache_get_ip6(dst_cache, saddr);\n-\t\tif (ndst)\n-\t\t\treturn ndst;\n-\t}\n-\n-\tmemset(&fl6, 0, sizeof(fl6));\n-\tfl6.flowi6_oif = oif;\n-\tfl6.daddr = *daddr;\n-\tfl6.saddr = *saddr;\n-\tfl6.flowlabel = ip6_make_flowinfo(RT_TOS(tos), label);\n-\tfl6.flowi6_mark = skb->mark;\n-\tfl6.flowi6_proto = IPPROTO_UDP;\n-\tfl6.fl6_dport = dport;\n-\tfl6.fl6_sport = sport;\n-\n-\terr = ipv6_stub->ipv6_dst_lookup(vxlan->net,\n-\t\t\t\t\t sock6->sock->sk,\n-\t\t\t\t\t &ndst, &fl6);\n-\tif (unlikely(err < 0)) {\n-\t\tnetdev_dbg(dev, \"no route to %pI6\\n\", daddr);\n-\t\treturn ERR_PTR(-ENETUNREACH);\n-\t}\n-\n-\tif (unlikely(ndst->dev == dev)) {\n-\t\tnetdev_dbg(dev, \"circular route to %pI6\\n\", daddr);\n-\t\tdst_release(ndst);\n-\t\treturn ERR_PTR(-ELOOP);\n-\t}\n-\n-\t*saddr = fl6.saddr;\n-\tif (use_cache)\n-\t\tdst_cache_set_ip6(dst_cache, ndst, saddr);\n-\treturn ndst;\n+\treturn ip6_tnl_get_route(dev, skb, sock6->sock->sk, IPPROTO_UDP, oif,\n+\t\t\t\t tos, label, daddr, saddr, dport, sport,\n+\t\t\t\t dst_cache, info);\n }\n #endif\n \n", "prefixes": [ "net-next", "02/14" ] }