{"id":817332,"url":"http://patchwork.ozlabs.org/api/patches/817332/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170922061008.14723-6-fw@strlen.de/","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":"<20170922061008.14723-6-fw@strlen.de>","list_archive_url":null,"date":"2017-09-22T06:10:07","name":"[net-next,v2,5/6] rtnetlink: add helpers to dump vf and netnsid information","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"bf3f8148b20090e5461fd57ba76932b0dcba0747","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"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/20170922061008.14723-6-fw@strlen.de/mbox/","series":[{"id":4543,"url":"http://patchwork.ozlabs.org/api/series/4543/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4543","date":"2017-09-22T06:10:02","name":"rtnetlink: preparation patches for further rtnl lock pushdown/removal","version":2,"mbox":"http://patchwork.ozlabs.org/series/4543/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817332/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817332/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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xz3440fVTz9sNc\n\tfor ;\n\tFri, 22 Sep 2017 16:10:12 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751896AbdIVGKK (ORCPT );\n\tFri, 22 Sep 2017 02:10:10 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:41600 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1751795AbdIVGKI (ORCPT\n\t); Fri, 22 Sep 2017 02:10:08 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dvH6t-0003aK-Gs; Fri, 22 Sep 2017 08:06:47 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH net-next v2 5/6] rtnetlink: add helpers to dump vf and\n\tnetnsid information","Date":"Fri, 22 Sep 2017 08:10:07 +0200","Message-Id":"<20170922061008.14723-6-fw@strlen.de>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170922061008.14723-1-fw@strlen.de>","References":"<20170922061008.14723-1-fw@strlen.de>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"similar to earlier patches, split out more parts of this function to\nbetter see what is happening and where we assume rtnl is locked.\n\nSigned-off-by: Florian Westphal \n---\n net/core/rtnetlink.c | 80 ++++++++++++++++++++++++++++++++--------------------\n 1 file changed, 50 insertions(+), 30 deletions(-)","diff":"diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c\nindex 42ff582a010e..590823f70cc3 100644\n--- a/net/core/rtnetlink.c\n+++ b/net/core/rtnetlink.c\n@@ -1211,6 +1211,36 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,\n \treturn -EMSGSIZE;\n }\n \n+static noinline_for_stack int rtnl_fill_vf(struct sk_buff *skb,\n+\t\t\t\t\t struct net_device *dev,\n+\t\t\t\t\t u32 ext_filter_mask)\n+{\n+\tstruct nlattr *vfinfo;\n+\tint i, num_vfs;\n+\n+\tif (!dev->dev.parent || ((ext_filter_mask & RTEXT_FILTER_VF) == 0))\n+\t\treturn 0;\n+\n+\tnum_vfs = dev_num_vf(dev->dev.parent);\n+\tif (nla_put_u32(skb, IFLA_NUM_VF, num_vfs))\n+\t\treturn -EMSGSIZE;\n+\n+\tif (!dev->netdev_ops->ndo_get_vf_config)\n+\t\treturn 0;\n+\n+\tvfinfo = nla_nest_start(skb, IFLA_VFINFO_LIST);\n+\tif (!vfinfo)\n+\t\treturn -EMSGSIZE;\n+\n+\tfor (i = 0; i < num_vfs; i++) {\n+\t\tif (rtnl_fill_vfinfo(skb, dev, i, vfinfo))\n+\t\t\treturn -EMSGSIZE;\n+\t}\n+\n+\tnla_nest_end(skb, vfinfo);\n+\treturn 0;\n+}\n+\n static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)\n {\n \tstruct rtnl_link_ifmap map;\n@@ -1355,6 +1385,23 @@ static noinline int nla_put_ifalias(struct sk_buff *skb, struct net_device *dev)\n \treturn 0;\n }\n \n+static noinline int rtnl_fill_link_netnsid(struct sk_buff *skb,\n+\t\t\t\t\t const struct net_device *dev)\n+{\n+\tif (dev->rtnl_link_ops && dev->rtnl_link_ops->get_link_net) {\n+\t\tstruct net *link_net = dev->rtnl_link_ops->get_link_net(dev);\n+\n+\t\tif (!net_eq(dev_net(dev), link_net)) {\n+\t\t\tint id = peernet2id_alloc(dev_net(dev), link_net);\n+\n+\t\t\tif (nla_put_s32(skb, IFLA_LINK_NETNSID, id))\n+\t\t\t\treturn -EMSGSIZE;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,\n \t\t\t int type, u32 pid, u32 seq, u32 change,\n \t\t\t unsigned int flags, u32 ext_filter_mask,\n@@ -1428,27 +1475,9 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,\n \tif (rtnl_fill_stats(skb, dev))\n \t\tgoto nla_put_failure;\n \n-\tif (dev->dev.parent && (ext_filter_mask & RTEXT_FILTER_VF) &&\n-\t nla_put_u32(skb, IFLA_NUM_VF, dev_num_vf(dev->dev.parent)))\n+\tif (rtnl_fill_vf(skb, dev, ext_filter_mask))\n \t\tgoto nla_put_failure;\n \n-\tif (dev->netdev_ops->ndo_get_vf_config && dev->dev.parent &&\n-\t ext_filter_mask & RTEXT_FILTER_VF) {\n-\t\tint i;\n-\t\tstruct nlattr *vfinfo;\n-\t\tint num_vfs = dev_num_vf(dev->dev.parent);\n-\n-\t\tvfinfo = nla_nest_start(skb, IFLA_VFINFO_LIST);\n-\t\tif (!vfinfo)\n-\t\t\tgoto nla_put_failure;\n-\t\tfor (i = 0; i < num_vfs; i++) {\n-\t\t\tif (rtnl_fill_vfinfo(skb, dev, i, vfinfo))\n-\t\t\t\tgoto nla_put_failure;\n-\t\t}\n-\n-\t\tnla_nest_end(skb, vfinfo);\n-\t}\n-\n \tif (rtnl_port_fill(skb, dev, ext_filter_mask))\n \t\tgoto nla_put_failure;\n \n@@ -1460,17 +1489,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,\n \t\t\tgoto nla_put_failure;\n \t}\n \n-\tif (dev->rtnl_link_ops &&\n-\t dev->rtnl_link_ops->get_link_net) {\n-\t\tstruct net *link_net = dev->rtnl_link_ops->get_link_net(dev);\n-\n-\t\tif (!net_eq(dev_net(dev), link_net)) {\n-\t\t\tint id = peernet2id_alloc(dev_net(dev), link_net);\n-\n-\t\t\tif (nla_put_s32(skb, IFLA_LINK_NETNSID, id))\n-\t\t\t\tgoto nla_put_failure;\n-\t\t}\n-\t}\n+\tif (rtnl_fill_link_netnsid(skb, dev))\n+\t\tgoto nla_put_failure;\n \n \tif (!(af_spec = nla_nest_start(skb, IFLA_AF_SPEC)))\n \t\tgoto nla_put_failure;\n","prefixes":["net-next","v2","5/6"]}