From patchwork Sat Apr 30 16:56:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 944 Return-Path: Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 73528154406 for ; Sat, 30 Apr 2011 18:57:07 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@narfation.org; dkim-adsp=pass Received: from sven-desktop.home.narfation.org (i59F6C2C6.versanet.de [89.246.194.198]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id B0E4F940E0; Sat, 30 Apr 2011 18:57:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1304182639; bh=OTJPlBySHA+bjWXWEy9vJiH5WTLC9bCCNrTIITeLHQ0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=NIWEqFAMNMNU3THVzRu4/Puua+gHKWprqGXdwocR4VHx4/UvwvdMYYXk0MJpCuUp9 VnFxVXuScG9Il3mhGAU+AJ3s8aOmR81+Rgo9bcZgjVeAK+RduR3QCJrowGh8SPuY09 IjWuOU1gTLVUXOpUpsdgSWUzrtVwInVws4gOoRSI= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 30 Apr 2011 18:56:59 +0200 Message-Id: <1304182620-12637-2-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304182620-12637-1-git-send-email-sven@narfation.org> References: <1304182620-12637-1-git-send-email-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCHv2 2/3] batman-adv: Remove unnecessary hardif_list_lock X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2011 16:57:07 -0000 hardif_list_lock is unneccessary because we already ensure that no multiple admin operations can take place through rtnl_lock. hardif_list_lock only adds additional overhead and complexity. Critical functions now check whether they are called with rtnl_lock using ASSERT_RTNL. Signed-off-by: Sven Eckelmann --- Splitted the first patch to keep Linus' fame. There should be no difference (after all patches are applied) between the first and the second version. hard-interface.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index c6edf0a..ebd7ef0 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -31,9 +31,6 @@ #include -/* protect update critical side of hardif_list - but not the content */ -static DEFINE_SPINLOCK(hardif_list_lock); - static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, @@ -432,6 +429,8 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev) struct hard_iface *hard_iface; int ret; + ASSERT_RTNL(); + ret = is_valid_iface(net_dev); if (ret != 1) goto out; @@ -458,10 +457,7 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev) atomic_set(&hard_iface->refcount, 2); check_known_mac_addr(hard_iface->net_dev); - - spin_lock(&hardif_list_lock); list_add_tail_rcu(&hard_iface->list, &hardif_list); - spin_unlock(&hardif_list_lock); return hard_iface; @@ -475,6 +471,8 @@ out: static void hardif_remove_interface(struct hard_iface *hard_iface) { + ASSERT_RTNL(); + /* first deactivate interface */ if (hard_iface->if_status != IF_NOT_IN_USE) hardif_disable_interface(hard_iface); @@ -492,13 +490,11 @@ void hardif_remove_interfaces(void) struct hard_iface *hard_iface, *hard_iface_tmp; rtnl_lock(); - spin_lock(&hardif_list_lock); list_for_each_entry_safe(hard_iface, hard_iface_tmp, &hardif_list, list) { list_del_rcu(&hard_iface->list); hardif_remove_interface(hard_iface); } - spin_unlock(&hardif_list_lock); rtnl_unlock(); } @@ -524,9 +520,7 @@ static int hard_if_event(struct notifier_block *this, hardif_deactivate_interface(hard_iface); break; case NETDEV_UNREGISTER: - spin_lock(&hardif_list_lock); list_del_rcu(&hard_iface->list); - spin_unlock(&hardif_list_lock); hardif_remove_interface(hard_iface); break;