{"id":817333,"url":"http://patchwork.ozlabs.org/api/patches/817333/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170922061008.14723-7-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-7-fw@strlen.de>","list_archive_url":null,"date":"2017-09-22T06:10:08","name":"[net-next,v2,6/6] rtnetlink: rtnl_have_link_slave_info doesn't need rtnl","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"240b5edf0e146a8d3f382a77838960cd77e46c56","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-7-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/817333/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817333/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 3xz3480YfWz9sNc\n\tfor ;\n\tFri, 22 Sep 2017 16:10:16 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751903AbdIVGKO (ORCPT );\n\tFri, 22 Sep 2017 02:10:14 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:41606 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1751795AbdIVGKM (ORCPT\n\t); Fri, 22 Sep 2017 02:10:12 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dvH6x-0003ad-2B; Fri, 22 Sep 2017 08:06:51 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH net-next v2 6/6] rtnetlink: rtnl_have_link_slave_info\n\tdoesn't need rtnl","Date":"Fri, 22 Sep 2017 08:10:08 +0200","Message-Id":"<20170922061008.14723-7-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":"Switch it to rcu.\n\nrtnl_link_slave_info_fill on to other hand does need rtnl mutex for now so\nadd an annotation to its caller as a reminder.\n\nSigned-off-by: Florian Westphal \n---\n Change since v1:\n - don't add ASSERT_RTNL to rtnl_link_slave_info_fill and\n rtnl_link_info_fill they are only called via rtnl_link_fill.\n\n net/core/rtnetlink.c | 12 +++++++++---\n 1 file changed, 9 insertions(+), 3 deletions(-)","diff":"diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c\nindex 590823f70cc3..e6f9e36d9d5a 100644\n--- a/net/core/rtnetlink.c\n+++ b/net/core/rtnetlink.c\n@@ -522,11 +522,15 @@ static size_t rtnl_link_get_af_size(const struct net_device *dev,\n static bool rtnl_have_link_slave_info(const struct net_device *dev)\n {\n \tstruct net_device *master_dev;\n+\tbool ret = false;\n \n-\tmaster_dev = netdev_master_upper_dev_get((struct net_device *) dev);\n+\trcu_read_lock();\n+\n+\tmaster_dev = netdev_master_upper_dev_get_rcu((struct net_device *)dev);\n \tif (master_dev && master_dev->rtnl_link_ops)\n-\t\treturn true;\n-\treturn false;\n+\t\tret = true;\n+\trcu_read_unlock();\n+\treturn ret;\n }\n \n static int rtnl_link_slave_info_fill(struct sk_buff *skb,\n@@ -598,6 +602,8 @@ static int rtnl_link_fill(struct sk_buff *skb, const struct net_device *dev)\n \tstruct nlattr *linkinfo;\n \tint err = -EMSGSIZE;\n \n+\tASSERT_RTNL();\n+\n \tlinkinfo = nla_nest_start(skb, IFLA_LINKINFO);\n \tif (linkinfo == NULL)\n \t\tgoto out;\n","prefixes":["net-next","v2","6/6"]}