From patchwork Sun Feb 13 21:40:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 802 Return-Path: Received: from nm13-vm0.bullet.mail.ukl.yahoo.com (nm13-vm0.bullet.mail.ukl.yahoo.com [217.146.183.248]) by open-mesh.org (Postfix) with SMTP id 3574415420C for ; Sun, 13 Feb 2011 22:44:09 +0100 (CET) Received: from [217.146.183.213] by nm13.bullet.mail.ukl.yahoo.com with NNFMP; 13 Feb 2011 21:44:06 -0000 Received: from [77.238.184.68] by tm6.bullet.mail.ukl.yahoo.com with NNFMP; 13 Feb 2011 21:44:06 -0000 Received: from [127.0.0.1] by smtp137.mail.ukl.yahoo.com with NNFMP; 13 Feb 2011 21:44:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1297633446; bh=TU3PAWdus1r5tsMp6cGWDYl+YlYMxXxe3uKDkStij+4=; h=X-Yahoo-Newman-Id: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=F3x6n+jPiGu8u8CmRfxHYevQ2zmrtmB3Ndw3pHtEnanDPWbb90ho0R88PQLJDV3/cjGrluNT1+AyGqw45LcJm+SVl/bIfcqV2irj0zC57/THJbBmLm/02z7MvDD9eTNrHWpwXXzZqpt51vaJu145Q1PbEIuOwJwxftNe03T9Wxo= X-Yahoo-Newman-Id: 497733.48144.bm@smtp137.mail.ukl.yahoo.com Received: from localhost (lindner_marek@90.61.214.155 with plain) by smtp137.mail.ukl.yahoo.com with SMTP; 13 Feb 2011 21:44:02 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: xxbvYvkVM1lkoc2j814c8eUE6Ic1rJJh5CZoMO3xwCqZF_O 3OXbRfH5OYXkh5nlw9sbtWJUet9XkV5DP78hmFZ.W7L1ZVPvEb7b4025dkYs _o32WaQ85U_TRU.G34YaF0XtNZYtU6OB_pGMxFO.DaMKmn15bFREhcs.ZoTM P9fjVtV9C6rrMZQ4auBvPvUDWUdfLu83GHNk.Wb_FKNnIM4.RcGCrQdIUIc5 xRSDZ7nAzAkDulHnXSxr09GjaDNCwVqK6R6LopYgfg6eMQ2.2uYkStaAjADc vGbvgndESoRa1VNM- X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 13 Feb 2011 22:40:01 +0100 Message-Id: <1297633201-16458-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <201102091918.42080.lindner_marek@yahoo.de> References: <201102091918.42080.lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 4/4] batman-adv: increase refcount in create_neighbor to be consistent 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: Sun, 13 Feb 2011 21:44:09 -0000 Signed-off-by: Marek Lindner --- batman-adv/originator.c | 4 ++- batman-adv/routing.c | 63 ++++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 37 deletions(-) diff --git a/batman-adv/originator.c b/batman-adv/originator.c index f6be7a1..c2017b2 100644 --- a/batman-adv/originator.c +++ b/batman-adv/originator.c @@ -91,7 +91,9 @@ struct neigh_node *create_neighbor(struct orig_node *orig_node, memcpy(neigh_node->addr, neigh, ETH_ALEN); neigh_node->orig_node = orig_neigh_node; neigh_node->if_incoming = if_incoming; - atomic_set(&neigh_node->refcount, 1); + + /* extra reference for return */ + atomic_set(&neigh_node->refcount, 2); spin_lock_bh(&orig_node->neigh_list_lock); hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); diff --git a/batman-adv/routing.c b/batman-adv/routing.c index dc24871..3cfa2c7 100644 --- a/batman-adv/routing.c +++ b/batman-adv/routing.c @@ -146,7 +146,7 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, struct batman_if *if_incoming) { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); - struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL; + struct neigh_node *neigh_node = NULL, *tmp_neigh_node; struct hlist_node *node; unsigned char total_count; uint8_t orig_eq_count, neigh_rq_count, tq_own; @@ -157,27 +157,27 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, hlist_for_each_entry_rcu(tmp_neigh_node, node, &orig_node->neigh_list, list) { - if (compare_eth(tmp_neigh_node->addr, - orig_neigh_node->orig) && - (tmp_neigh_node->if_incoming == if_incoming)) - neigh_node = tmp_neigh_node; + if (!compare_eth(tmp_neigh_node->addr, + orig_neigh_node->orig)) + continue; + + if (tmp_neigh_node->if_incoming != if_incoming) + continue; + + if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + continue; + + neigh_node = tmp_neigh_node; } + rcu_read_unlock(); if (!neigh_node) neigh_node = create_neighbor(orig_node, orig_neigh_node, orig_neigh_node->orig, if_incoming); - /* create_neighbor failed, return 0 */ if (!neigh_node) - goto unlock; - - if (!atomic_inc_not_zero(&neigh_node->refcount)) { - neigh_node = NULL; - goto unlock; - } - - rcu_read_unlock(); + goto out; neigh_node->last_valid = jiffies; } else { @@ -186,27 +186,27 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, hlist_for_each_entry_rcu(tmp_neigh_node, node, &orig_neigh_node->neigh_list, list) { - if (compare_eth(tmp_neigh_node->addr, - orig_neigh_node->orig) && - (tmp_neigh_node->if_incoming == if_incoming)) - neigh_node = tmp_neigh_node; + if (!compare_eth(tmp_neigh_node->addr, + orig_neigh_node->orig)) + continue; + + if (tmp_neigh_node->if_incoming != if_incoming) + continue; + + if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + continue; + + neigh_node = tmp_neigh_node; } + rcu_read_unlock(); if (!neigh_node) neigh_node = create_neighbor(orig_neigh_node, orig_neigh_node, orig_neigh_node->orig, if_incoming); - /* create_neighbor failed, return 0 */ if (!neigh_node) - goto unlock; - - if (!atomic_inc_not_zero(&neigh_node->refcount)) { - neigh_node = NULL; - goto unlock; - } - - rcu_read_unlock(); + goto out; } orig_node->last_valid = jiffies; @@ -261,10 +261,6 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, if (batman_packet->tq >= TQ_TOTAL_BIDRECT_LIMIT) ret = 1; - goto out; - -unlock: - rcu_read_unlock(); out: if (neigh_node) neigh_node_free_ref(neigh_node); @@ -419,11 +415,6 @@ static void update_orig(struct bat_priv *bat_priv, orig_node_free_ref(orig_tmp); if (!neigh_node) goto unlock; - - if (!atomic_inc_not_zero(&neigh_node->refcount)) { - neigh_node = NULL; - goto unlock; - } } else bat_dbg(DBG_BATMAN, bat_priv, "Updating existing last-hop neighbor of originator\n");