From patchwork Wed Nov 16 21:09:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 126036 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 564DFB71C2 for ; Thu, 17 Nov 2011 08:09:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753695Ab1KPVJT (ORCPT ); Wed, 16 Nov 2011 16:09:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:18157 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753655Ab1KPVJS (ORCPT ); Wed, 16 Nov 2011 16:09:18 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pAGL9Eit007419 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Nov 2011 16:09:14 -0500 Received: from localhost (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pAGL9DlQ026319; Wed, 16 Nov 2011 16:09:14 -0500 From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, eric.dumazet@gmail.com, bhutchings@solarflare.com, shemminger@vyatta.com, andy@greyhouse.net, fbl@redhat.com, jzupka@redhat.com, ivecera@redhat.com Subject: [patch net-next 1/3] team: Do not hold rcu_read_lock when running netlink cmds Date: Wed, 16 Nov 2011 22:09:07 +0100 Message-Id: <1321477749-1877-2-git-send-email-jpirko@redhat.com> In-Reply-To: <1321477749-1877-1-git-send-email-jpirko@redhat.com> References: <1321477749-1877-1-git-send-email-jpirko@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jiri Pirko --- drivers/net/team/team.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 60672bb..e0cf11c 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1043,8 +1043,7 @@ err_msg_put: /* * Netlink cmd functions should be locked by following two functions. - * To ensure team_uninit would not be called in between, hold rcu_read_lock - * all the time. + * Since dev gets held here, that ensures dev won't disappear in between. */ static struct team *team_nl_team_get(struct genl_info *info) { @@ -1057,12 +1056,9 @@ static struct team *team_nl_team_get(struct genl_info *info) return NULL; ifindex = nla_get_u32(info->attrs[TEAM_ATTR_TEAM_IFINDEX]); - rcu_read_lock(); - dev = dev_get_by_index_rcu(net, ifindex); - if (!dev || dev->netdev_ops != &team_netdev_ops) { - rcu_read_unlock(); + dev = dev_get_by_index(net, ifindex); + if (!dev || dev->netdev_ops != &team_netdev_ops) return NULL; - } team = netdev_priv(dev); spin_lock(&team->lock); @@ -1072,7 +1068,7 @@ static struct team *team_nl_team_get(struct genl_info *info) static void team_nl_team_put(struct team *team) { spin_unlock(&team->lock); - rcu_read_unlock(); + dev_put(team->dev); } static int team_nl_send_generic(struct genl_info *info, struct team *team,