{"id":817821,"url":"http://patchwork.ozlabs.org/api/patches/817821/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170923192636.3932-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":"<20170923192636.3932-6-fw@strlen.de>","list_archive_url":null,"date":"2017-09-23T19:26:35","name":"[net-next,v3,5/6] rtnetlink: add helpers to dump netnsid information","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"b459a2b5e7cf1a2924fcb9552aaf0823e7b5606a","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/20170923192636.3932-6-fw@strlen.de/mbox/","series":[{"id":4777,"url":"http://patchwork.ozlabs.org/api/series/4777/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4777","date":"2017-09-23T19:26:30","name":"rtnetlink: preparation patches for further rtnl lock pushdown/removal","version":3,"mbox":"http://patchwork.ozlabs.org/series/4777/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817821/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817821/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 3y00hd6gdsz9t42\n\tfor ;\n\tSun, 24 Sep 2017 05:26:41 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751868AbdIWT0i (ORCPT );\n\tSat, 23 Sep 2017 15:26:38 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:46832 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1751726AbdIWT0h (ORCPT\n\t); Sat, 23 Sep 2017 15:26:37 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dvq19-0002tN-Vw; Sat, 23 Sep 2017 21:23:13 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH net-next v3 5/6] rtnetlink: add helpers to dump netnsid\n\tinformation","Date":"Sat, 23 Sep 2017 21:26:35 +0200","Message-Id":"<20170923192636.3932-6-fw@strlen.de>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170923192636.3932-1-fw@strlen.de>","References":"<20170923192636.3932-1-fw@strlen.de>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Reviewed-by: David Ahern \nSigned-off-by: Florian Westphal \n---\n Changes since v2:\n this hunk was part of patch #4.\n\n net/core/rtnetlink.c | 30 +++++++++++++++++++-----------\n 1 file changed, 19 insertions(+), 11 deletions(-)","diff":"diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c\nindex 625342d27c44..e858a2b48d7e 100644\n--- a/net/core/rtnetlink.c\n+++ b/net/core/rtnetlink.c\n@@ -1370,6 +1370,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@@ -1458,17 +1475,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","v3","5/6"]}