From patchwork Thu Sep 30 12:08:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 472 Return-Path: Received: from smtp140.mail.ukl.yahoo.com (smtp140.mail.ukl.yahoo.com [77.238.184.71]) by open-mesh.org (Postfix) with SMTP id 12797154534 for ; Thu, 30 Sep 2010 14:10:31 +0200 (CEST) Received: (qmail 76322 invoked from network); 30 Sep 2010 12:10:30 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.de; h=DKIM-Signature:Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=AL4iHhKgYxM0QTTC5REWucoEkZb/bDjvp1eFntIXos49kiAW2MLGP1gE9v1CTIPvejIjr2aVqRfg1K50DwirMHjlvTsG80gtDxUlTfYwcDePyzfz5kpN13cAYIlHp1XczpwriM20WkO0sPsDDXTgQuIOxvTpfLBHKfWfUkaNakw= ; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1285848630; bh=AupiUtZw1kPRMeYG2Xa4vtDy4RhSvd55+w1sYDHswow=; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=oAti+GqtzcrMF0XM/2vhuSgL8V/OdamZ7l3ORM/T2aHddtsHbXw1frA8V+u9fnQFoq6TFGC2Hna8267mZb2WWvE8otcK2ksk41Zd33j5pLd/J1fEhA7we+nz8gXgittJ/Rr4H1MxRcGLerdmbz9lXVm226KB8bDpszCprTuvCkc= Received: from localhost (lindner_marek@78.225.40.81 with plain) by smtp140.mail.ukl.yahoo.com with SMTP; 30 Sep 2010 12:10:29 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: EWjnfBEVM1mxBDsdkKRPUbmsXvKNppq6SD6SY8DIVB4Rz2G LeRM6pc565kIxeAYHjcuXmdeJLFYYle.bd8Ho8rL7ozn6t20jwjcNxh2Slc0 z5EAWv1v9RILL0DlblSHYaPvK6OJTBaUfLsoCEdYMvrb3kmvKwlCPun3_DML pa3mo1Ol5h8Vf6qZF6LZjKZbE4gHHv8uCHzTph8pw.NGMfc9ViJ_CAnUE1gq _2_IDhV1GhcDESPtI6PjcBejzIYtMaWrYMipUVcZYjVVw01YD09Vd94UunUd r7xZhtWCb X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 30 Sep 2010 14:08:44 +0200 Message-Id: <1285848524-13469-5-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1285848524-13469-1-git-send-email-lindner_marek@yahoo.de> References: <1285848524-13469-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 4/4] batman-adv: use rcu callbacks when freeing batman_if X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 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: Thu, 30 Sep 2010 12:10:31 -0000 Signed-off-by: Marek Lindner --- batman-adv/hard-interface.c | 13 ++++++++++--- batman-adv/types.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index 87693db..ec16dc9 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/hard-interface.c @@ -38,6 +38,15 @@ /* protect update critical side of if_list - but not the content */ static DEFINE_SPINLOCK(if_list_lock); +static void hardif_free_rcu(struct rcu_head *rcu) +{ + struct batman_if *batman_if; + + batman_if = container_of(rcu, struct batman_if, rcu); + sysfs_del_hardif(&batman_if->hardif_obj); + kref_put(&batman_if->refcount, hardif_free_ref); +} + struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev) { struct batman_if *batman_if; @@ -464,9 +473,7 @@ static void hardif_remove_interface(struct batman_if *batman_if) /* caller must take if_list_lock */ list_del_rcu(&batman_if->list); - synchronize_rcu(); - sysfs_del_hardif(&batman_if->hardif_obj); - kref_put(&batman_if->refcount, hardif_free_ref); + call_rcu(&batman_if->rcu, hardif_free_rcu); } void hardif_remove_interfaces(void) diff --git a/batman-adv/types.h b/batman-adv/types.h index 585647b..9a6f464 100644 --- a/batman-adv/types.h +++ b/batman-adv/types.h @@ -47,6 +47,7 @@ struct batman_if { struct kref refcount; struct packet_type batman_adv_ptype; struct net_device *soft_iface; + struct rcu_head rcu; }; /**