b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven.eckelmann@gmx.de>
To: greg@kroah.com
Cc: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 04/29] Staging: batman-adv: Don't remove interface with spinlock held
Date: Mon, 22 Nov 2010 00:55:42 +0100	[thread overview]
Message-ID: <1290383767-32602-5-git-send-email-sven.eckelmann@gmx.de> (raw)
In-Reply-To: <1290383767-32602-1-git-send-email-sven.eckelmann@gmx.de>

We call a lot of the netdevice code when holding if_list_lock which will
spin the whole time. This is not necessary because we only want to
protect the access to the list to be serialized. An extra queue can be
used which hold all interfaces which should be removed and then use that
queue without any locks for netdevice cleanup.

Reported-by: Rafal Lesniak <lesniak@eresi-project.org>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
 drivers/staging/batman-adv/hard-interface.c |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c
index b68a7e5..d85de82 100644
--- a/drivers/staging/batman-adv/hard-interface.c
+++ b/drivers/staging/batman-adv/hard-interface.c
@@ -463,9 +463,6 @@ static void hardif_remove_interface(struct batman_if *batman_if)
 		return;
 
 	batman_if->if_status = IF_TO_BE_REMOVED;
-
-	/* caller must take if_list_lock */
-	list_del_rcu(&batman_if->list);
 	synchronize_rcu();
 	sysfs_del_hardif(&batman_if->hardif_obj);
 	hardif_put(batman_if);
@@ -474,13 +471,21 @@ static void hardif_remove_interface(struct batman_if *batman_if)
 void hardif_remove_interfaces(void)
 {
 	struct batman_if *batman_if, *batman_if_tmp;
+	struct list_head if_queue;
+
+	INIT_LIST_HEAD(&if_queue);
 
-	rtnl_lock();
 	spin_lock(&if_list_lock);
 	list_for_each_entry_safe(batman_if, batman_if_tmp, &if_list, list) {
-		hardif_remove_interface(batman_if);
+		list_del_rcu(&batman_if->list);
+		list_add_tail(&batman_if->list, &if_queue);
 	}
 	spin_unlock(&if_list_lock);
+
+	rtnl_lock();
+	list_for_each_entry_safe(batman_if, batman_if_tmp, &if_queue, list) {
+		hardif_remove_interface(batman_if);
+	}
 	rtnl_unlock();
 }
 
@@ -507,8 +512,10 @@ static int hard_if_event(struct notifier_block *this,
 		break;
 	case NETDEV_UNREGISTER:
 		spin_lock(&if_list_lock);
-		hardif_remove_interface(batman_if);
+		list_del_rcu(&batman_if->list);
 		spin_unlock(&if_list_lock);
+
+		hardif_remove_interface(batman_if);
 		break;
 	case NETDEV_CHANGEMTU:
 		if (batman_if->soft_iface)
-- 
1.7.2.3


  parent reply	other threads:[~2010-11-21 23:55 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-21 23:55 [B.A.T.M.A.N.] batman-adv for 2.6.38 (1) Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 01/29] Staging: batman-adv: Replace Andrew Lunn as Staging maintainer Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 02/29] Staging: batman-adv: ensure that eth_type_trans gets linear memory Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 03/29] Staging: batman-adv: Add new sysfs files to README Sven Eckelmann
2010-11-21 23:55 ` Sven Eckelmann [this message]
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 05/29] Staging: batman-adv: convert batman_if custom refcounting to kref functions Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 06/29] Staging: batman-adv: use rcu callbacks when freeing batman_if Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 07/29] Staging: batman-adv: restructure fragmentation to handle batman unicast packets Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 08/29] Staging: batman-adv: add frag_ prefix to all fragmentation related functions Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 09/29] Staging: batman-adv: move skb reassembly of fragmented packets into dedicated function Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 10/29] Staging: batman-adv: remove redundant is_my_mac() check in route_unicast_packet Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 11/29] Staging: batman-adv: fragment forwarded packets Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 12/29] Staging: batman-adv: reassemble fragmented skb if mtu allows it Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 13/29] Staging: batman-adv: softif bridge loop avoidance Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 14/29] Staging: batman-adv: Unify sysfs file names with their bat_priv atomics Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 15/29] Staging: batman-adv: Wrapper functions for sysfs storing Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 16/29] Staging: batman-adv: Ommit storing struct device in sysfs functions Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 17/29] Staging: batman-adv: Make hop_penalty configurable via sysfs Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 18/29] Staging: batman-adv: Remove hashdata_compare_cb from hash Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 19/29] Staging: batman-adv: Remove hashdata_choose_cb " Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 20/29] Staging: batman-adv: Move hash callback related function to header Sven Eckelmann
2010-11-21 23:55 ` [B.A.T.M.A.N.] [PATCH 21/29] Staging: batman-adv: Make hash_iterate inlineable Sven Eckelmann
2010-11-21 23:56 ` [B.A.T.M.A.N.] [PATCH 22/29] Staging: batman-adv: Rewrite hash using hlist_* Sven Eckelmann
2010-11-21 23:56 ` [B.A.T.M.A.N.] [PATCH 23/29] Staging: batman-adv: Limit spin_locks to spin_lock_bh Sven Eckelmann
2010-11-21 23:56 ` [B.A.T.M.A.N.] [PATCH 24/29] Staging: batman-adv: adding gateway functionality Sven Eckelmann
2010-11-21 23:56 ` [B.A.T.M.A.N.] [PATCH 25/29] Staging: batman-adv: send DHCP requests directly to the chosen gw Sven Eckelmann
2010-11-21 23:56 ` [B.A.T.M.A.N.] [PATCH 26/29] Staging: batman-adv: best gw DHCP filter 802.1Q support Sven Eckelmann
2010-11-21 23:56 ` [B.A.T.M.A.N.] [PATCH 27/29] Staging: batman-adv: add gateway IPv6 support by filtering DHCPv6 messages Sven Eckelmann
2010-11-21 23:56 ` [B.A.T.M.A.N.] [PATCH 28/29] Staging: batman-adv: Use kernel version min macro Sven Eckelmann
2010-11-21 23:56 ` [B.A.T.M.A.N.] [PATCH 29/29] Staging: batman-adv: Use kernel functions to identify broadcasts Sven Eckelmann
2010-11-22  1:06 ` [B.A.T.M.A.N.] batman-adv for 2.6.38 (1) Marek Lindner
2010-11-22 10:28   ` Sven Eckelmann
2010-11-22 11:34     ` [B.A.T.M.A.N.] Staging: batman-adv for 2.6.37 (6) Sven Eckelmann
2010-11-29 18:55       ` Greg KH
2010-11-22 11:34     ` [B.A.T.M.A.N.] [PATCH-stable] Staging: batman-adv: ensure that eth_type_trans gets linear memory Sven Eckelmann
2010-11-22 11:34     ` [B.A.T.M.A.N.] [PATCH 1/2] " Sven Eckelmann
2010-11-22 11:34     ` [B.A.T.M.A.N.] [PATCH 2/2] Staging: batman-adv: Don't remove interface with spinlock held Sven Eckelmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1290383767-32602-5-git-send-email-sven.eckelmann@gmx.de \
    --to=sven.eckelmann@gmx.de \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=greg@kroah.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).