{"id":807052,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807052/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/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},"msgid":"<20170829112942.4791-3-fw@strlen.de>","date":"2017-08-29T11:29:42","name":"[net-next,2/2] addrlabel: add/delete/get can run without rtnl","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"6120c74b0a5e26176b67aa73b1c44cc0efc4a83d","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/1.0/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170829112942.4791-3-fw@strlen.de/mbox/","series":[{"id":350,"url":"http://patchwork.ozlabs.org/api/1.0/series/350/?format=json","date":"2017-08-29T11:29:40","name":"addrlabel: don't use rtnl locking","version":1,"mbox":"http://patchwork.ozlabs.org/series/350/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807052/checks/","tags":{},"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 3xhRK73x31z9t6J\n\tfor ;\n\tTue, 29 Aug 2017 21:30:51 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753491AbdH2L3k (ORCPT );\n\tTue, 29 Aug 2017 07:29:40 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:56350 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1752881AbdH2L3j (ORCPT\n\t); Tue, 29 Aug 2017 07:29:39 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dmefX-00084M-Ig; Tue, 29 Aug 2017 13:26:55 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH net-next 2/2] addrlabel: add/delete/get can run without rtnl","Date":"Tue, 29 Aug 2017 13:29:42 +0200","Message-Id":"<20170829112942.4791-3-fw@strlen.de>","X-Mailer":"git-send-email 2.13.0","In-Reply-To":"<20170829112942.4791-1-fw@strlen.de>","References":"<20170829112942.4791-1-fw@strlen.de>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"There appears to be no need to use rtnl, addrlabel entries are refcounted\nand add/delete is serialized by the addrlabel table spinlock.\n\nSigned-off-by: Florian Westphal \n---\n net/ipv6/addrlabel.c | 22 +++++++++++++++++-----\n 1 file changed, 17 insertions(+), 5 deletions(-)","diff":"diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c\nindex cea5eb488013..b055bc79f56d 100644\n--- a/net/ipv6/addrlabel.c\n+++ b/net/ipv6/addrlabel.c\n@@ -405,6 +405,18 @@ static const struct nla_policy ifal_policy[IFAL_MAX+1] = {\n \t[IFAL_LABEL]\t\t= { .len = sizeof(u32), },\n };\n \n+static bool addrlbl_ifindex_exists(struct net *net, int ifindex)\n+{\n+\n+\tstruct net_device *dev;\n+\n+\trcu_read_lock();\n+\tdev = dev_get_by_index_rcu(net, ifindex);\n+\trcu_read_unlock();\n+\n+\treturn dev != NULL;\n+}\n+\n static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,\n \t\t\t struct netlink_ext_ack *extack)\n {\n@@ -439,7 +451,7 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,\n \tswitch (nlh->nlmsg_type) {\n \tcase RTM_NEWADDRLABEL:\n \t\tif (ifal->ifal_index &&\n-\t\t !__dev_get_by_index(net, ifal->ifal_index))\n+\t\t !addrlbl_ifindex_exists(net, ifal->ifal_index))\n \t\t\treturn -EINVAL;\n \n \t\terr = ip6addrlbl_add(net, pfx, ifal->ifal_prefixlen,\n@@ -548,7 +560,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,\n \t\treturn -EINVAL;\n \n \tif (ifal->ifal_index &&\n-\t !__dev_get_by_index(net, ifal->ifal_index))\n+\t !addrlbl_ifindex_exists(net, ifal->ifal_index))\n \t\treturn -EINVAL;\n \n \tif (!tb[IFAL_ADDRESS])\n@@ -593,10 +605,10 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,\n void __init ipv6_addr_label_rtnl_register(void)\n {\n \t__rtnl_register(PF_INET6, RTM_NEWADDRLABEL, ip6addrlbl_newdel,\n-\t\t\tNULL, 0);\n+\t\t\tNULL, RTNL_FLAG_DOIT_UNLOCKED);\n \t__rtnl_register(PF_INET6, RTM_DELADDRLABEL, ip6addrlbl_newdel,\n-\t\t\tNULL, 0);\n+\t\t\tNULL, RTNL_FLAG_DOIT_UNLOCKED);\n \t__rtnl_register(PF_INET6, RTM_GETADDRLABEL, ip6addrlbl_get,\n-\t\t\tip6addrlbl_dump, 0);\n+\t\t\tip6addrlbl_dump, RTNL_FLAG_DOIT_UNLOCKED);\n }\n \n","prefixes":["net-next","2/2"]}