From patchwork Thu Sep 30 12:08:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 492 Return-Path: Received: from smtp138.mail.ukl.yahoo.com (smtp138.mail.ukl.yahoo.com [77.238.184.69]) by open-mesh.org (Postfix) with SMTP id 23CBA15448A for ; Thu, 30 Sep 2010 14:10:24 +0200 (CEST) Received: (qmail 86108 invoked from network); 30 Sep 2010 12:10:23 -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=j/uZFMsbuCm+KlWaL0zzclQFRUB+qko0+m5QwFsRcmcMH7iFtZZTrdF39DyPJAnlOmr98BX2uBTj55+m7af6cgbTfj+4s6JZMjn+RBPHlgWLgeZ85gcDZ4ImSdi/ciK3mVXKP5nPfCGeNu+JePLhbZin70FRyxAeDBoRJVvHpx0= ; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1285848623; bh=BBYNTWrOYn3uklsvmv8mkv/UH9vyhFAVGXqrhwnDdgs=; 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=B+yRf07eQUA9HHlyjRBDFFdhcash5sz6jEsfOLMFkUlvK6fNmvhqqJ4UiCaXozt3KXkWdJmNQ1QG0AYfqNlQ2VkOnl/Sexe6l4eLCIch035jks2YB6pXMF/Z8+k9I+UU/MUB+cViCDusGCFv2/JOKGUmc6+F0aZqhe6UOpk8wNs= Received: from localhost (lindner_marek@78.225.40.81 with plain) by smtp138.mail.ukl.yahoo.com with SMTP; 30 Sep 2010 12:10:23 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: 9wdwVWEVM1kqOYsPPicOfHABxhTg.h4oIVgGrVjYLPxhR6l ZwL3BXHr83pH4j2fgM.EzT5mArt0exYZRAkxO4L9hIVCu3iW1tatR5scRbqD GxwOdPpmWLuFJUdMFaFh6yJve.lrBiREfgEihBI2ifLmzeTRGMFdEkFiwcOR vggdYWfxFkTiLiBEjoHWtYaVoy_3L3UxTaORatYsgRoPvS82tI9I.wHRdTgK IfMOsO58UnNBq4Saaxy2EcaH7bc.lSIJT6Oz_bSIP 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:42 +0200 Message-Id: <1285848524-13469-3-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 2/4] batman-adv: use rcu callbacks when freeing gw_nodes 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:24 -0000 Signed-off-by: Marek Lindner --- batman-adv/gateway_client.c | 14 ++++++++++---- batman-adv/types.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/batman-adv/gateway_client.c b/batman-adv/gateway_client.c index d275560..ae1ab1e 100644 --- a/batman-adv/gateway_client.c +++ b/batman-adv/gateway_client.c @@ -36,6 +36,14 @@ static void gw_node_free_ref(struct kref *refcount) kfree(gw_node); } +static void gw_node_free_rcu(struct rcu_head *rcu) +{ + struct gw_node *gw_node; + + gw_node = container_of(rcu, struct gw_node, rcu); + kref_put(&gw_node->refcount, gw_node_free_ref); +} + void *gw_get_selected(struct bat_priv *bat_priv) { struct gw_node *curr_gateway_tmp = bat_priv->curr_gw; @@ -314,8 +322,7 @@ void gw_node_purge_deleted(struct bat_priv *bat_priv) (time_after(jiffies, gw_node->deleted + timeout))) { hlist_del_rcu(&gw_node->list); - synchronize_rcu(); - kref_put(&gw_node->refcount, gw_node_free_ref); + call_rcu(&gw_node->rcu, gw_node_free_rcu); } } @@ -333,8 +340,7 @@ void gw_node_list_free(struct bat_priv *bat_priv) hlist_for_each_entry_safe(gw_node, node, node_tmp, &bat_priv->gw_list, list) { hlist_del_rcu(&gw_node->list); - synchronize_rcu(); - kref_put(&gw_node->refcount, gw_node_free_ref); + call_rcu(&gw_node->rcu, gw_node_free_rcu); } gw_deselect(bat_priv); diff --git a/batman-adv/types.h b/batman-adv/types.h index f5d29e6..11f1017 100644 --- a/batman-adv/types.h +++ b/batman-adv/types.h @@ -97,6 +97,7 @@ struct gw_node { struct orig_node *orig_node; unsigned long deleted; struct kref refcount; + struct rcu_head rcu; }; /**