Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/815226/?format=api
{ "id": 815226, "url": "http://patchwork.ozlabs.org/api/patches/815226/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170919003904.5124-10-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-10-tom@quantonium.net>", "list_archive_url": null, "date": "2017-09-19T00:38:59", "name": "[net-next,09/14] gtp: Allow configuring GTP interface as standalone", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "07b9f9da9b59134f557b15e26a33af318c94e922", "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-10-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/815226/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815226/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=\"JiY9biEa\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xx3tv45y4z9s5L\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 19 Sep 2017 10:40:23 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751497AbdISAj5 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tMon, 18 Sep 2017 20:39:57 -0400", "from mail-pf0-f180.google.com ([209.85.192.180]:43267 \"EHLO\n\tmail-pf0-f180.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751451AbdISAjy (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Mon, 18 Sep 2017 20:39:54 -0400", "by mail-pf0-f180.google.com with SMTP id y29so1113090pff.0\n\tfor <netdev@vger.kernel.org>; Mon, 18 Sep 2017 17:39:54 -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.52\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 17:39:52 -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=iBnLdbl8fy/qxABXYiVeXFIq+uuIK5Mwzs4+/8Gjrr8=;\n\tb=JiY9biEaT9H7ljTaW4qx2zjpuwLvZIj6dKbAoyjR6HHVI928bVHcYJ7x6q3bIAyFZJ\n\t+JylU3a6RHVTAOHcQw/fcgdTWY3jRvZiY6Dkf0vO552VLLIri0pucY7jEB47e4uCYo8l\n\tKoV/aYF1IXdrR1SiDV9k1pJNfMkzl7NRxk7yGnqdMAJRZm4aQoT4HoMaIbWViTR7z/sZ\n\toIQZZ91GjTgwua3qOuenk+UhV8DIfBRTovSK7ci4Mx1M1dMyogNCRECyHDxVv8Lr87bT\n\t0TJTTXeOd9oJ9xWVZhSaUEcYla3pOLaem5SVXbogDQzHJpRboV8Sjmx2BUiKb7iWd+cJ\n\t+SPA==", "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=iBnLdbl8fy/qxABXYiVeXFIq+uuIK5Mwzs4+/8Gjrr8=;\n\tb=TkCWFE8wLwXmNDaJSdNPjC07xjhuPnQ3WtniN6Ql9pNvO0K/07bkXHibl7h/kBiKp5\n\t+twWsaXJErLosmMPNbQ1kmO85V/IGVlEhb0MyKbgl5g0BJjvlbuer+mUBI0PjVFjV0nz\n\tJQDeCuBH3jevgnrAgf8DXv4MFuoMkU1SPr4PHR8zfx46psFElYCYcY8oqYLRUK9Zotza\n\tqwYuel5trOy8g8OU3jhWQUFx/PLc8HQOddWto1yXfVfw74Dky5XOQ/cqjbdcq9pXZ2uO\n\tSW03Vf3ET43jsSCPib6SI15eQ1SOzvisXDXjA9xmLYa+RTLlZt96hbR91KRIyT+1E4tx\n\tphtg==", "X-Gm-Message-State": "AHPjjUjnlVDkA1KCiFvgoi9C1VOFYexIi31b8DuImQsiiiyZkExQZopz\n\trTuTgv+X1YmrSccr", "X-Google-Smtp-Source": "AOwi7QC0bqA+I6XjOWIZPJddvhMRboQo2SbfeLpaCpwbi+IqJw38JE4cnHtVeSlAcGg6Vd1LoJdBPA==", "X-Received": "by 10.84.252.130 with SMTP id y2mr350269pll.68.1505781593663;\n\tMon, 18 Sep 2017 17:39:53 -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 09/14] gtp: Allow configuring GTP interface as\n\tstandalone", "Date": "Mon, 18 Sep 2017 17:38:59 -0700", "Message-Id": "<20170919003904.5124-10-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": "Add new configuration of GTP interfaces that allow specifying a port to\nlisten on (as opposed to having to get sockets from a userspace control\nplane). This allows GTP interfaces to be configured and the data path\ntested without requiring a GTP-C daemon.\n\nSigned-off-by: Tom Herbert <tom@quantonium.net>\n---\n drivers/net/gtp.c | 212 +++++++++++++++++++++++++++++++++++------------\n include/uapi/linux/gtp.h | 5 ++\n 2 files changed, 166 insertions(+), 51 deletions(-)", "diff": "diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c\nindex 121b41e7a901..1870469a4982 100644\n--- a/drivers/net/gtp.c\n+++ b/drivers/net/gtp.c\n@@ -86,6 +86,9 @@ struct gtp_dev {\n \tstruct sock\t\t*sk0;\n \tstruct sock\t\t*sk1u;\n \n+\tstruct socket\t\t*sock0;\n+\tstruct socket\t\t*sock1u;\n+\n \tstruct net_device\t*dev;\n \n \tunsigned int\t\trole;\n@@ -430,26 +433,33 @@ static void gtp_encap_destroy(struct sock *sk)\n \t}\n }\n \n-static void gtp_encap_disable_sock(struct sock *sk)\n+static void gtp_encap_release(struct gtp_dev *gtp)\n {\n-\tif (!sk)\n-\t\treturn;\n+\tif (gtp->sk0) {\n+\t\tif (gtp->sock0) {\n+\t\t\tudp_tunnel_sock_release(gtp->sock0);\n+\t\t\tgtp->sock0 = NULL;\n+\t\t} else {\n+\t\t\tgtp_encap_destroy(gtp->sk0);\n+\t\t}\n \n-\tgtp_encap_destroy(sk);\n-}\n+\t\tgtp->sk0 = NULL;\n+\t}\n \n-static void gtp_encap_disable(struct gtp_dev *gtp)\n-{\n-\tgtp_encap_disable_sock(gtp->sk0);\n-\tgtp_encap_disable_sock(gtp->sk1u);\n+\tif (gtp->sk1u) {\n+\t\tif (gtp->sock1u) {\n+\t\t\tudp_tunnel_sock_release(gtp->sock1u);\n+\t\t\tgtp->sock1u = NULL;\n+\t\t} else {\n+\t\t\tgtp_encap_destroy(gtp->sk1u);\n+\t\t}\n+\n+\t\tgtp->sk1u = NULL;\n+\t}\n }\n \n static int gtp_dev_init(struct net_device *dev)\n {\n-\tstruct gtp_dev *gtp = netdev_priv(dev);\n-\n-\tgtp->dev = dev;\n-\n \tdev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);\n \tif (!dev->tstats)\n \t\treturn -ENOMEM;\n@@ -461,7 +471,8 @@ static void gtp_dev_uninit(struct net_device *dev)\n {\n \tstruct gtp_dev *gtp = netdev_priv(dev);\n \n-\tgtp_encap_disable(gtp);\n+\tgtp_encap_release(gtp);\n+\n \tfree_percpu(dev->tstats);\n }\n \n@@ -676,6 +687,7 @@ static const struct net_device_ops gtp_netdev_ops = {\n \n static void gtp_link_setup(struct net_device *dev)\n {\n+\tstruct gtp_dev *gtp = netdev_priv(dev);\n \tdev->netdev_ops\t\t= >p_netdev_ops;\n \tdev->needs_free_netdev\t= true;\n \n@@ -697,6 +709,8 @@ static void gtp_link_setup(struct net_device *dev)\n \t\t\t\t sizeof(struct udphdr) +\n \t\t\t\t sizeof(struct gtp0_header);\n \n+\tgtp->dev = dev;\n+\n \tgro_cells_init(>p->gro_cells, dev);\n }\n \n@@ -710,13 +724,19 @@ static int gtp_newlink(struct net *src_net, struct net_device *dev,\n \t\t struct netlink_ext_ack *extack)\n {\n \tunsigned int role = GTP_ROLE_GGSN;\n+\tbool have_fd, have_ports;\n \tbool is_ipv6 = false;\n \tstruct gtp_dev *gtp;\n \tstruct gtp_net *gn;\n \tint hashsize, err;\n \n-\tif (!data[IFLA_GTP_FD0] && !data[IFLA_GTP_FD1])\n+\thave_fd = !!data[IFLA_GTP_FD0] || !!data[IFLA_GTP_FD1];\n+\thave_ports = !!data[IFLA_GTP_PORT0] || !!data[IFLA_GTP_PORT1];\n+\n+\tif (!(have_fd ^ have_ports)) {\n+\t\t/* Either got fd(s) or port(s) */\n \t\treturn -EINVAL;\n+\t}\n \n \tif (data[IFLA_GTP_ROLE]) {\n \t\trole = nla_get_u32(data[IFLA_GTP_ROLE]);\n@@ -773,7 +793,7 @@ static int gtp_newlink(struct net *src_net, struct net_device *dev,\n out_hashtable:\n \tgtp_hashtable_free(gtp);\n out_encap:\n-\tgtp_encap_disable(gtp);\n+\tgtp_encap_release(gtp);\n \treturn err;\n }\n \n@@ -782,7 +802,7 @@ static void gtp_dellink(struct net_device *dev, struct list_head *head)\n \tstruct gtp_dev *gtp = netdev_priv(dev);\n \n \tgro_cells_destroy(>p->gro_cells);\n-\tgtp_encap_disable(gtp);\n+\tgtp_encap_release(gtp);\n \tgtp_hashtable_free(gtp);\n \tlist_del_rcu(>p->list);\n \tunregister_netdevice_queue(dev, head);\n@@ -793,6 +813,8 @@ static const struct nla_policy gtp_policy[IFLA_GTP_MAX + 1] = {\n \t[IFLA_GTP_FD1]\t\t\t= { .type = NLA_U32 },\n \t[IFLA_GTP_PDP_HASHSIZE]\t\t= { .type = NLA_U32 },\n \t[IFLA_GTP_ROLE]\t\t\t= { .type = NLA_U32 },\n+\t[IFLA_GTP_PORT0]\t\t= { .type = NLA_U16 },\n+\t[IFLA_GTP_PORT1]\t\t= { .type = NLA_U16 },\n };\n \n static int gtp_validate(struct nlattr *tb[], struct nlattr *data[],\n@@ -883,11 +905,35 @@ static void gtp_hashtable_free(struct gtp_dev *gtp)\n \tkfree(gtp->tid_hash);\n }\n \n-static struct sock *gtp_encap_enable_socket(int fd, int type,\n-\t\t\t\t\t struct gtp_dev *gtp,\n-\t\t\t\t\t bool is_ipv6)\n+static int gtp_encap_enable_sock(struct socket *sock, int type,\n+\t\t\t\t struct gtp_dev *gtp)\n {\n \tstruct udp_tunnel_sock_cfg tuncfg = {NULL};\n+\n+\tswitch (type) {\n+\tcase UDP_ENCAP_GTP0:\n+\t\ttuncfg.encap_rcv = gtp0_udp_encap_recv;\n+\t\tbreak;\n+\tcase UDP_ENCAP_GTP1U:\n+\t\ttuncfg.encap_rcv = gtp1u_udp_encap_recv;\n+\t\tbreak;\n+\tdefault:\n+\t\tpr_debug(\"Unknown encap type %u\\n\", type);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\ttuncfg.sk_user_data = gtp;\n+\ttuncfg.encap_type = type;\n+\ttuncfg.encap_destroy = gtp_encap_destroy;\n+\n+\tsetup_udp_tunnel_sock(sock_net(sock->sk), sock, &tuncfg);\n+\n+\treturn 0;\n+}\n+\n+static struct sock *gtp_encap_enable_fd(int fd, int type, struct gtp_dev *gtp,\n+\t\t\t\t\tbool is_ipv6)\n+{\n \tstruct socket *sock;\n \tstruct sock *sk;\n \tint err;\n@@ -920,60 +966,124 @@ static struct sock *gtp_encap_enable_socket(int fd, int type,\n \tsk = sock->sk;\n \tsock_hold(sk);\n \n-\tswitch (type) {\n-\tcase UDP_ENCAP_GTP0:\n-\t\ttuncfg.encap_rcv = gtp0_udp_encap_recv;\n-\t\tbreak;\n-\tcase UDP_ENCAP_GTP1U:\n-\t\ttuncfg.encap_rcv = gtp1u_udp_encap_recv;\n-\t\tbreak;\n-\tdefault:\n-\t\tpr_debug(\"Unknown encap type %u\\n\", type);\n-\t\tsk = ERR_PTR(-EINVAL);\n-\t\tgoto out_sock;\n-\t}\n-\n-\ttuncfg.sk_user_data = gtp;\n-\ttuncfg.encap_type = type;\n-\ttuncfg.encap_destroy = gtp_encap_destroy;\n-\n-\tsetup_udp_tunnel_sock(sock_net(sock->sk), sock, &tuncfg);\n+\terr = gtp_encap_enable_sock(sock, type, gtp);\n+\tif (err < 0)\n+\t\tsk = ERR_PTR(err);\n \n out_sock:\n \tsockfd_put(sock);\n \treturn sk;\n }\n \n+static struct socket *gtp_create_sock(struct net *net, bool ipv6,\n+\t\t\t\t __be16 port, u32 flags)\n+{\n+\tstruct socket *sock;\n+\tstruct udp_port_cfg udp_conf;\n+\tint err;\n+\n+\tmemset(&udp_conf, 0, sizeof(udp_conf));\n+\n+\tif (ipv6) {\n+\t\tudp_conf.family = AF_INET6;\n+\t\tudp_conf.ipv6_v6only = 1;\n+\t} else {\n+\t\tudp_conf.family = AF_INET;\n+\t}\n+\n+\tudp_conf.local_udp_port = port;\n+\n+\t/* Open UDP socket */\n+\terr = udp_sock_create(net, &udp_conf, &sock);\n+\tif (err)\n+\t\treturn ERR_PTR(err);\n+\n+\treturn sock;\n+}\n+\n static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[],\n \t\t\t bool is_ipv6)\n {\n+\tint err;\n+\n+\tstruct socket *sock0 = NULL, *sock1u = NULL;\n \tstruct sock *sk0 = NULL, *sk1u = NULL;\n \n \tif (data[IFLA_GTP_FD0]) {\n \t\tu32 fd0 = nla_get_u32(data[IFLA_GTP_FD0]);\n \n-\t\tsk0 = gtp_encap_enable_socket(fd0, UDP_ENCAP_GTP0, gtp,\n-\t\t\t\t\t is_ipv6);\n-\t\tif (IS_ERR(sk0))\n-\t\t\treturn PTR_ERR(sk0);\n+\t\tsk0 = gtp_encap_enable_fd(fd0, UDP_ENCAP_GTP0, gtp, is_ipv6);\n+\t\tif (IS_ERR(sk0)) {\n+\t\t\terr = PTR_ERR(sk0);\n+\t\t\tsk0 = NULL;\n+\t\t\tgoto out_err;\n+\t\t}\n+\t} else if (data[IFLA_GTP_PORT0]) {\n+\t\t__be16 port = nla_get_u16(data[IFLA_GTP_PORT0]);\n+\n+\t\tsock0 = gtp_create_sock(dev_net(gtp->dev), is_ipv6, port, 0);\n+\t\tif (IS_ERR(sock0)) {\n+\t\t\terr = PTR_ERR(sock0);\n+\t\t\tsock0 = NULL;\n+\t\t\tgoto out_err;\n+\t\t}\n+\n+\t\terr = gtp_encap_enable_sock(sock0, UDP_ENCAP_GTP0, gtp);\n+\t\tif (err)\n+\t\t\tgoto out_err;\n \t}\n \n \tif (data[IFLA_GTP_FD1]) {\n \t\tu32 fd1 = nla_get_u32(data[IFLA_GTP_FD1]);\n \n-\t\tsk1u = gtp_encap_enable_socket(fd1, UDP_ENCAP_GTP1U, gtp,\n-\t\t\t\t\t is_ipv6);\n+\t\tsk1u = gtp_encap_enable_fd(fd1, UDP_ENCAP_GTP1U, gtp, is_ipv6);\n \t\tif (IS_ERR(sk1u)) {\n-\t\t\tif (sk0)\n-\t\t\t\tgtp_encap_disable_sock(sk0);\n-\t\t\treturn PTR_ERR(sk1u);\n+\t\t\terr = PTR_ERR(sk1u);\n+\t\t\tsk1u = NULL;\n+\t\t\tgoto out_err;\n+\t\t}\n+\t} else if (data[IFLA_GTP_PORT1]) {\n+\t\t__be16 port = nla_get_u16(data[IFLA_GTP_PORT1]);\n+\n+\t\tsock1u = gtp_create_sock(dev_net(gtp->dev), is_ipv6, port, 0);\n+\t\tif (IS_ERR(sock1u)) {\n+\t\t\terr = PTR_ERR(sock1u);\n+\t\t\tsock1u = NULL;\n+\t\t\tgoto out_err;\n \t\t}\n+\n+\t\terr = gtp_encap_enable_sock(sock1u, UDP_ENCAP_GTP1U, gtp);\n+\t\tif (err)\n+\t\t\tgoto out_err;\n+\t}\n+\n+\tif (sock0) {\n+\t\tgtp->sock0 = sock0;\n+\t\tgtp->sk0 = sock0->sk;\n+\t} else {\n+\t\tgtp->sk0 = sk0;\n \t}\n \n-\tgtp->sk0 = sk0;\n-\tgtp->sk1u = sk1u;\n+\tif (sock1u) {\n+\t\tgtp->sock1u = sock1u;\n+\t\tgtp->sk1u = sock1u->sk;\n+\t} else {\n+\t\tgtp->sk1u = sk1u;\n+\t}\n \n \treturn 0;\n+\n+out_err:\n+\tif (sk0)\n+\t\tgtp_encap_destroy(sk0);\n+\tif (sk1u)\n+\t\tgtp_encap_destroy(sk1u);\n+\tif (sock0)\n+\t\tudp_tunnel_sock_release(sock0);\n+\tif (sock1u)\n+\t\tudp_tunnel_sock_release(sock1u);\n+\n+\treturn err;\n }\n \n static struct gtp_dev *gtp_find_dev(struct net *src_net, struct nlattr *nla[])\n@@ -1515,8 +1625,8 @@ static const struct genl_ops gtp_genl_ops[] = {\n };\n \n static struct genl_family gtp_genl_family __ro_after_init = {\n-\t.name\t\t= \"gtp\",\n-\t.version\t= 0,\n+\t.name\t\t= GTP_GENL_NAME,\n+\t.version\t= GTP_GENL_VERSION,\n \t.hdrsize\t= 0,\n \t.maxattr\t= GTPA_MAX,\n \t.netnsok\t= true,\ndiff --git a/include/uapi/linux/gtp.h b/include/uapi/linux/gtp.h\nindex 8eec519fa754..0da18aa88be8 100644\n--- a/include/uapi/linux/gtp.h\n+++ b/include/uapi/linux/gtp.h\n@@ -9,6 +9,11 @@ enum gtp_genl_cmds {\n \tGTP_CMD_MAX,\n };\n \n+/* NETLINK_GENERIC related info\n+ */\n+#define GTP_GENL_NAME\t\t\"gtp\"\n+#define GTP_GENL_VERSION\t0\n+\n enum gtp_version {\n \tGTP_V0 = 0,\n \tGTP_V1,\n", "prefixes": [ "net-next", "09/14" ] }