Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/547386/?format=api
{ "id": 547386, "url": "http://patchwork.ozlabs.org/api/patches/547386/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1448262224-71480-6-git-send-email-anjali.singhai@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1448262224-71480-6-git-send-email-anjali.singhai@intel.com>", "list_archive_url": null, "date": "2015-11-23T07:03:43", "name": "[v6,5/6] net: Refactor udp_offload and add Geneve port offload support", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "75dba7edfe4f91521b1b4ca907edf51aaa248596", "submitter": { "id": 65487, "url": "http://patchwork.ozlabs.org/api/people/65487/?format=api", "name": "Singhai, Anjali", "email": "anjali.singhai@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1448262224-71480-6-git-send-email-anjali.singhai@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/547386/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/547386/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 21EB61402B2\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 23 Nov 2015 17:46:59 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 688C8926E7;\n\tMon, 23 Nov 2015 06:46:58 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id UUpop79X3dOF; Mon, 23 Nov 2015 06:46:55 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D8460926F7;\n\tMon, 23 Nov 2015 06:46:53 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 09EF81C0ED0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 23 Nov 2015 06:46:51 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0599F925D4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 23 Nov 2015 06:46:51 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 3Zk9bhnlkUeF for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 23 Nov 2015 06:46:50 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0EEC2926CF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 23 Nov 2015 06:46:49 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga101.fm.intel.com with ESMTP; 22 Nov 2015 22:46:48 -0800", "from asinghai-cp.jf.intel.com ([134.134.3.84])\n\tby orsmga001.jf.intel.com with ESMTP; 22 Nov 2015 22:46:47 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,336,1444719600\"; d=\"scan'208\";a=\"826891649\"", "From": "Anjali Singhai Jain <anjali.singhai@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Sun, 22 Nov 2015 23:03:43 -0800", "Message-Id": "<1448262224-71480-6-git-send-email-anjali.singhai@intel.com>", "X-Mailer": "git-send-email 1.8.1.4", "In-Reply-To": "<1448262224-71480-1-git-send-email-anjali.singhai@intel.com>", "References": "<anjali.singhai@intel.com>\n\t<1448262224-71480-1-git-send-email-anjali.singhai@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v6 5/6] net: Refactor udp_offload and add\n\tGeneve port offload support", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "This patch moves the calls to ndo_add/del ops for vxlan tunnel\ninto udp_add/del_offload call. This way the ndo_add/del ops get called\nfor not only vxlan tunnels but for any udp based tunnel.\n\nSigned-off-by: Kiran Patil <kiran.patil@intel.com>\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\n---\n drivers/net/geneve.c | 18 +++++++--------\n drivers/net/vxlan.c | 35 ++++------------------------\n include/net/protocol.h | 4 ++--\n net/ipv4/fou.c | 15 ++++++------\n net/ipv4/udp_offload.c | 63 +++++++++++++++++++++++++++++++++-----------------\n 5 files changed, 64 insertions(+), 71 deletions(-)", "diff": "diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c\nindex de5c30c..9dc513a 100644\n--- a/drivers/net/geneve.c\n+++ b/drivers/net/geneve.c\n@@ -372,15 +372,12 @@ static struct socket *geneve_create_sock(struct net *net, bool ipv6,\n static void geneve_notify_add_rx_port(struct geneve_sock *gs)\n {\n \tstruct sock *sk = gs->sock->sk;\n-\tsa_family_t sa_family = sk->sk_family;\n+\tstruct net *net = sock_net(sk);\n \tint err;\n \n-\tif (sa_family == AF_INET) {\n-\t\terr = udp_add_offload(&gs->udp_offloads);\n-\t\tif (err)\n-\t\t\tpr_warn(\"geneve: udp_add_offload failed with status %d\\n\",\n-\t\t\t\terr);\n-\t}\n+\terr = udp_add_offload(&gs->udp_offloads, net);\n+\tif (err)\n+\t\tpr_warn(\"geneve: udp_add_offload failed with status %d\\n\", err);\n }\n \n static int geneve_hlen(struct genevehdr *gh)\n@@ -505,6 +502,8 @@ static struct geneve_sock *geneve_socket_create(struct net *net, __be16 port,\n \n \t/* Initialize the geneve udp offloads structure */\n \tgs->udp_offloads.port = port;\n+\tgs->udp_offloads.tunnel_type = UDP_TUNNEL_GENEVE;\n+\tgs->udp_offloads.family = ipv6 ? AF_INET6 : AF_INET;\n \tgs->udp_offloads.callbacks.gro_receive = geneve_gro_receive;\n \tgs->udp_offloads.callbacks.gro_complete = geneve_gro_complete;\n \tgeneve_notify_add_rx_port(gs);\n@@ -522,10 +521,9 @@ static struct geneve_sock *geneve_socket_create(struct net *net, __be16 port,\n static void geneve_notify_del_rx_port(struct geneve_sock *gs)\n {\n \tstruct sock *sk = gs->sock->sk;\n-\tsa_family_t sa_family = sk->sk_family;\n+\tstruct net *net = sock_net(sk);\n \n-\tif (sa_family == AF_INET)\n-\t\tudp_del_offload(&gs->udp_offloads);\n+\tudp_del_offload(&gs->udp_offloads, net);\n }\n \n static void __geneve_sock_release(struct geneve_sock *gs)\ndiff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c\nindex 702f9be..231c17e 100644\n--- a/drivers/net/vxlan.c\n+++ b/drivers/net/vxlan.c\n@@ -613,49 +613,22 @@ static int vxlan_gro_complete(struct sk_buff *skb, int nhoff,\n /* Notify netdevs that UDP port started listening */\n static void vxlan_notify_add_rx_port(struct vxlan_sock *vs)\n {\n-\tstruct net_device *dev;\n \tstruct sock *sk = vs->sock->sk;\n \tstruct net *net = sock_net(sk);\n-\tsa_family_t sa_family = vxlan_get_sk_family(vs);\n-\t__be16 port = inet_sk(sk)->inet_sport;\n \tint err;\n \n-\tif (sa_family == AF_INET) {\n-\t\terr = udp_add_offload(&vs->udp_offloads);\n-\t\tif (err)\n-\t\t\tpr_warn(\"vxlan: udp_add_offload failed with status %d\\n\", err);\n-\t}\n-\n-\trcu_read_lock();\n-\tfor_each_netdev_rcu(net, dev) {\n-\t\tif (dev->netdev_ops->ndo_add_udp_tunnel_port)\n-\t\t\tdev->netdev_ops->ndo_add_udp_tunnel_port(dev, sa_family,\n-\t\t\t\t\t\t\t port,\n-\t\t\t\t\t\t\t UDP_TUNNEL_VXLAN);\n-\t}\n-\trcu_read_unlock();\n+\terr = udp_add_offload(&vs->udp_offloads, net);\n+\tif (err)\n+\t\tpr_warn(\"vxlan: udp_add_offload failed with status %d\\n\", err);\n }\n \n /* Notify netdevs that UDP port is no more listening */\n static void vxlan_notify_del_rx_port(struct vxlan_sock *vs)\n {\n-\tstruct net_device *dev;\n \tstruct sock *sk = vs->sock->sk;\n \tstruct net *net = sock_net(sk);\n-\tsa_family_t sa_family = vxlan_get_sk_family(vs);\n-\t__be16 port = inet_sk(sk)->inet_sport;\n-\n-\trcu_read_lock();\n-\tfor_each_netdev_rcu(net, dev) {\n-\t\tif (dev->netdev_ops->ndo_del_udp_tunnel_port)\n-\t\t\tdev->netdev_ops->ndo_del_udp_tunnel_port(dev, sa_family,\n-\t\t\t\t\t\t\t port,\n-\t\t\t\t\t\t\t UDP_TUNNEL_VXLAN);\n-\t}\n-\trcu_read_unlock();\n \n-\tif (sa_family == AF_INET)\n-\t\tudp_del_offload(&vs->udp_offloads);\n+\tudp_del_offload(&vs->udp_offloads, net);\n }\n \n /* Add new entry to forwarding table -- assumes lock held */\ndiff --git a/include/net/protocol.h b/include/net/protocol.h\nindex 738bfc6..16ee9b5 100644\n--- a/include/net/protocol.h\n+++ b/include/net/protocol.h\n@@ -107,8 +107,8 @@ int inet_del_offload(const struct net_offload *prot, unsigned char num);\n void inet_register_protosw(struct inet_protosw *p);\n void inet_unregister_protosw(struct inet_protosw *p);\n \n-int udp_add_offload(struct udp_offload *prot);\n-void udp_del_offload(struct udp_offload *prot);\n+int udp_add_offload(struct udp_offload *prot, struct net *net);\n+void udp_del_offload(struct udp_offload *prot, struct net *net);\n \n void udp_offload_get_port(struct net_device *dev);\n \ndiff --git a/net/ipv4/fou.c b/net/ipv4/fou.c\nindex e0fcbbb..4705590 100644\n--- a/net/ipv4/fou.c\n+++ b/net/ipv4/fou.c\n@@ -411,9 +411,9 @@ static void fou_release(struct fou *fou)\n {\n \tstruct socket *sock = fou->sock;\n \tstruct sock *sk = sock->sk;\n+\tstruct net *net = sock_net(sk);\n \n-\tif (sk->sk_family == AF_INET)\n-\t\tudp_del_offload(&fou->udp_offloads);\n+\tudp_del_offload(&fou->udp_offloads, net);\n \tlist_del(&fou->list);\n \tudp_tunnel_sock_release(sock);\n \n@@ -484,6 +484,9 @@ static int fou_create(struct net *net, struct fou_cfg *cfg,\n \t\tgoto error;\n \t}\n \n+\tfou->udp_offloads.tunnel_type = UDP_TUNNEL_UNSPEC;\n+\tfou->udp_offloads.family = cfg->udp_config.family;\n+\n \tfou->type = cfg->type;\n \n \tudp_sk(sk)->encap_type = 1;\n@@ -496,11 +499,9 @@ static int fou_create(struct net *net, struct fou_cfg *cfg,\n \n \tsk->sk_allocation = GFP_ATOMIC;\n \n-\tif (cfg->udp_config.family == AF_INET) {\n-\t\terr = udp_add_offload(&fou->udp_offloads);\n-\t\tif (err)\n-\t\t\tgoto error;\n-\t}\n+\terr = udp_add_offload(&fou->udp_offloads, net);\n+\tif (err)\n+\t\tgoto error;\n \n \terr = fou_add_to_port_list(net, fou);\n \tif (err)\ndiff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c\nindex 8597020..cf71bd0 100644\n--- a/net/ipv4/udp_offload.c\n+++ b/net/ipv4/udp_offload.c\n@@ -241,18 +241,28 @@ out:\n \treturn segs;\n }\n \n-int udp_add_offload(struct udp_offload *uo)\n+int udp_add_offload(struct udp_offload *uo, struct net *net)\n {\n-\tstruct udp_offload_priv *new_offload = kzalloc(sizeof(*new_offload), GFP_ATOMIC);\n-\n-\tif (!new_offload)\n-\t\treturn -ENOMEM;\n-\n-\tnew_offload->offload = uo;\n+\tstruct udp_offload_priv *new_offload = NULL;\n+\tstruct net_device *dev;\n+\n+\tif (uo->family == AF_INET) {\n+\t\tnew_offload = kzalloc(sizeof(*new_offload), GFP_ATOMIC);\n+\t\tif (!new_offload)\n+\t\t\treturn -ENOMEM;\n+\t\tnew_offload->offload = uo;\n+\t}\n \n \tspin_lock(&udp_offload_lock);\n-\tnew_offload->next = udp_offload_base;\n-\trcu_assign_pointer(udp_offload_base, new_offload);\n+\tif (new_offload) {\n+\t\tnew_offload->next = udp_offload_base;\n+\t\trcu_assign_pointer(udp_offload_base, new_offload);\n+\t}\n+\tfor_each_netdev_rcu(net, dev) {\n+\t\tif (dev->netdev_ops->ndo_add_udp_tunnel_port)\n+\t\t\tdev->netdev_ops->ndo_add_udp_tunnel_port(dev,\n+\t\t\t\t\t uo->family, uo->port, uo->tunnel_type);\n+\t}\n \tspin_unlock(&udp_offload_lock);\n \n \treturn 0;\n@@ -265,24 +275,35 @@ static void udp_offload_free_routine(struct rcu_head *head)\n \tkfree(ou_priv);\n }\n \n-void udp_del_offload(struct udp_offload *uo)\n+void udp_del_offload(struct udp_offload *uo, struct net *net)\n {\n-\tstruct udp_offload_priv __rcu **head = &udp_offload_base;\n-\tstruct udp_offload_priv *uo_priv;\n+\tstruct udp_offload_priv __rcu **head;\n+\tstruct udp_offload_priv *uo_priv = NULL;\n+\tstruct net_device *dev;\n \n \tspin_lock(&udp_offload_lock);\n \n-\tuo_priv = udp_deref_protected(*head);\n-\tfor (; uo_priv != NULL;\n-\t uo_priv = udp_deref_protected(*head)) {\n-\t\tif (uo_priv->offload == uo) {\n-\t\t\trcu_assign_pointer(*head,\n-\t\t\t\t\t udp_deref_protected(uo_priv->next));\n-\t\t\tgoto unlock;\n+\tfor_each_netdev_rcu(net, dev) {\n+\t\tif (dev->netdev_ops->ndo_add_udp_tunnel_port)\n+\t\t\tdev->netdev_ops->ndo_del_udp_tunnel_port(dev,\n+\t\t\t\t\t uo->family, uo->port, uo->tunnel_type);\n+\t}\n+\n+\tif (uo->family == AF_INET) {\n+\t\thead = &udp_offload_base;\n+\t\tuo_priv = udp_deref_protected(*head);\n+\t\tfor (; uo_priv != NULL;\n+\t\t uo_priv = udp_deref_protected(*head)) {\n+\t\t\tif (uo_priv->offload == uo) {\n+\t\t\t\trcu_assign_pointer(*head,\n+\t\t\t\t\t udp_deref_protected(uo_priv->next));\n+\t\t\t\tgoto unlock;\n+\t\t\t}\n+\t\t\thead = &uo_priv->next;\n \t\t}\n-\t\thead = &uo_priv->next;\n+\t\tpr_warn(\"udp_del_offload: didn't find offload for port %d\\n\",\n+\t\t\tntohs(uo->port));\n \t}\n-\tpr_warn(\"udp_del_offload: didn't find offload for port %d\\n\", ntohs(uo->port));\n unlock:\n \tspin_unlock(&udp_offload_lock);\n \tif (uo_priv)\n", "prefixes": [ "v6", "5/6" ] }