From patchwork Mon Nov 29 17:00:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 606 Return-Path: Received: from nm10-vm0.bullet.mail.ukl.yahoo.com (nm10-vm0.bullet.mail.ukl.yahoo.com [217.146.183.242]) by open-mesh.org (Postfix) with SMTP id 2A4EA15458A for ; Mon, 29 Nov 2010 18:03:21 +0100 (CET) Received: from [217.146.183.181] by nm10.bullet.mail.ukl.yahoo.com with NNFMP; 29 Nov 2010 17:03:20 -0000 Received: from [77.238.184.64] by tm12.bullet.mail.ukl.yahoo.com with NNFMP; 29 Nov 2010 17:03:20 -0000 Received: from [127.0.0.1] by smtp133.mail.ukl.yahoo.com with NNFMP; 29 Nov 2010 17:03:20 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1291050200; bh=UofRAvXYlICzQAiKIiOhY/Gc5YoRL6Qke5fPTnYytrI=; 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=5rnOfSg1/stDSmYL8xgngPPecucaGkewlKue3i6jGIGhdysCRhGgK5KX1x5myI/woMPOsvle20UClzF9RWxhvfRyhI2n66QOE+aWnnpXd52m0TvAxCIegMAS0PIyrY741+J3pXYvntDH1L9lgNlPYG8yzWnCF0EUVHB6AiXVBxc= X-Yahoo-Newman-Id: 423231.78906.bm@smtp133.mail.ukl.yahoo.com Received: from localhost (lindner_marek@81.57.254.118 with plain) by smtp133.mail.ukl.yahoo.com with SMTP; 29 Nov 2010 09:03:16 -0800 PST X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: FdPwBPYVM1k.Z8ODo1_Pxi8F8z2f3D5cUdUIPjxpip8Vyo. PuUmhHOXxwrDpjer01OD_i0KNjYVGiJ9R2eKMNGza72dJMMBcBwsQEz7apER mfNxrfrsJz5S5zHTaqLr0SH5Fklv0c0pMq7eyLKkn45vGZoqGuOLo8RpQhPO a5OP.v39Ga5OEbkHPpYcDQ74eRLe_ZeMls2xQbx7OA8UBGdwR.96UwgubPL5 PEcKvR8LUyL6L3UQtZWekJ52Ve6mNekQ_qRhELzKVRXpxQhRINw3CKG5r7yV Sa7pKX15_Ijd_X1XRAt.fUgJjjA-- X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 29 Nov 2010 18:00:26 +0100 Message-Id: <1291050032-20169-3-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <201011291800.02971.lindner_marek@yahoo.de> References: <201011291800.02971.lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 3/9] batman-adv: protect neighbor list with rcu locks 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: Mon, 29 Nov 2010 17:03:21 -0000 Signed-off-by: Marek Lindner --- batman-adv/originator.c | 31 ++++++++++++++++++++++++++----- batman-adv/routing.c | 13 +++++++++++++ batman-adv/types.h | 2 ++ 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/batman-adv/originator.c b/batman-adv/originator.c index dbc0dd1..71480af 100644 --- a/batman-adv/originator.c +++ b/batman-adv/originator.c @@ -67,6 +67,14 @@ void neigh_node_free_ref(struct kref *refcount) kfree(neigh_node); } +static void neigh_node_free_rcu(struct rcu_head *rcu) +{ + struct neigh_node *neigh_node; + + neigh_node = container_of(rcu, struct neigh_node, rcu); + kref_put(&neigh_node->refcount, neigh_node_free_ref); +} + struct neigh_node *create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, uint8_t *neigh, @@ -89,7 +97,9 @@ struct neigh_node *create_neighbor(struct orig_node *orig_node, neigh_node->if_incoming = if_incoming; kref_init(&neigh_node->refcount); - hlist_add_head(&neigh_node->list, &orig_node->neigh_list); + spin_lock_bh(&orig_node->neigh_list_lock); + hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + spin_unlock_bh(&orig_node->neigh_list_lock); return neigh_node; } @@ -100,13 +110,17 @@ static void free_orig_node(void *data, void *arg) struct orig_node *orig_node = (struct orig_node *)data; struct bat_priv *bat_priv = (struct bat_priv *)arg; + spin_lock_bh(&orig_node->neigh_list_lock); + /* for all neighbors towards this originator ... */ hlist_for_each_entry_safe(neigh_node, node, node_tmp, &orig_node->neigh_list, list) { - hlist_del(&neigh_node->list); - kref_put(&neigh_node->refcount, neigh_node_free_ref); + hlist_del_rcu(&neigh_node->list); + call_rcu(&neigh_node->rcu, neigh_node_free_rcu); } + spin_unlock_bh(&orig_node->neigh_list_lock); + frag_list_free(&orig_node->frag_list); hna_global_del_orig(bat_priv, orig_node, "originator timed out"); @@ -152,6 +166,7 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr) return NULL; INIT_HLIST_HEAD(&orig_node->neigh_list); + spin_lock_init(&orig_node->neigh_list_lock); memcpy(orig_node->orig, addr, ETH_ALEN); orig_node->router = NULL; @@ -212,6 +227,8 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, *best_neigh_node = NULL; + spin_lock_bh(&orig_node->neigh_list_lock); + /* for all neighbors towards this originator ... */ hlist_for_each_entry_safe(neigh_node, node, node_tmp, &orig_node->neigh_list, list) { @@ -237,14 +254,16 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, neigh_purged = true; - hlist_del(&neigh_node->list); - kref_put(&neigh_node->refcount, neigh_node_free_ref); + hlist_del_rcu(&neigh_node->list); + call_rcu(&neigh_node->rcu, neigh_node_free_rcu); } else { if ((*best_neigh_node == NULL) || (neigh_node->tq_avg > (*best_neigh_node)->tq_avg)) *best_neigh_node = neigh_node; } } + + spin_unlock_bh(&orig_node->neigh_list_lock); return neigh_purged; } @@ -380,11 +399,13 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) orig_node->router->tq_avg, orig_node->router->addr, orig_node->router->if_incoming->net_dev->name); + rcu_read_lock(); hlist_for_each_entry(neigh_node, node, &orig_node->neigh_list, list) { seq_printf(seq, " %pM (%3i)", neigh_node->addr, neigh_node->tq_avg); } + rcu_read_unlock(); seq_printf(seq, "\n"); batman_count++; diff --git a/batman-adv/routing.c b/batman-adv/routing.c index 102fc28..70f1977 100644 --- a/batman-adv/routing.c +++ b/batman-adv/routing.c @@ -146,6 +146,7 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, unsigned char total_count; if (orig_node == orig_neigh_node) { + rcu_read_lock(); hlist_for_each_entry(tmp_neigh_node, node, &orig_node->neigh_list, list) { @@ -154,6 +155,7 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, (tmp_neigh_node->if_incoming == if_incoming)) neigh_node = tmp_neigh_node; } + rcu_read_unlock(); if (!neigh_node) neigh_node = create_neighbor(orig_node, @@ -167,6 +169,7 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, neigh_node->last_valid = jiffies; } else { /* find packet count of corresponding one hop neighbor */ + rcu_read_lock(); hlist_for_each_entry(tmp_neigh_node, node, &orig_neigh_node->neigh_list, list) { @@ -175,6 +178,7 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, (tmp_neigh_node->if_incoming == if_incoming)) neigh_node = tmp_neigh_node; } + rcu_read_unlock(); if (!neigh_node) neigh_node = create_neighbor(orig_neigh_node, @@ -259,6 +263,7 @@ static void update_orig(struct bat_priv *bat_priv, bat_dbg(DBG_BATMAN, bat_priv, "update_originator(): " "Searching and updating originator entry of received packet\n"); + rcu_read_lock(); hlist_for_each_entry(tmp_neigh_node, node, &orig_node->neigh_list, list) { if (compare_orig(tmp_neigh_node->addr, ethhdr->h_source) && @@ -275,6 +280,7 @@ static void update_orig(struct bat_priv *bat_priv, tmp_neigh_node->tq_avg = ring_buffer_avg(tmp_neigh_node->tq_recv); } + rcu_read_unlock(); if (!neigh_node) { struct orig_node *orig_tmp; @@ -403,6 +409,7 @@ static char count_real_packets(struct ethhdr *ethhdr, &orig_node->batman_seqno_reset)) return -1; + rcu_read_lock(); hlist_for_each_entry(tmp_neigh_node, node, &orig_node->neigh_list, list) { @@ -424,6 +431,7 @@ static char count_real_packets(struct ethhdr *ethhdr, tmp_neigh_node->real_packet_count = bit_packet_count(tmp_neigh_node->real_bits); } + rcu_read_unlock(); if (need_update) { bat_dbg(DBG_BATMAN, bat_priv, @@ -476,13 +484,17 @@ void update_bonding_candidates(struct bat_priv *bat_priv, * as "bonding partner" */ /* first, zero the list */ + rcu_read_lock(); hlist_for_each_entry(tmp_neigh_node, node, &orig_node->neigh_list, list) { tmp_neigh_node->next_bond_candidate = NULL; } + rcu_read_unlock(); first_candidate = NULL; last_candidate = NULL; + + rcu_read_lock(); hlist_for_each_entry(tmp_neigh_node, node, &orig_node->neigh_list, list) { @@ -536,6 +548,7 @@ void update_bonding_candidates(struct bat_priv *bat_priv, candidates++; } + rcu_read_unlock(); if (candidates > 0) { first_candidate->next_bond_candidate = last_candidate; diff --git a/batman-adv/types.h b/batman-adv/types.h index 1ce91f6..1d6365d 100644 --- a/batman-adv/types.h +++ b/batman-adv/types.h @@ -85,6 +85,7 @@ struct orig_node { uint32_t last_bcast_seqno; struct hlist_head neigh_list; struct list_head frag_list; + spinlock_t neigh_list_lock; /* protects neighbor list */ unsigned long last_frag_packet; struct { uint8_t candidates; @@ -116,6 +117,7 @@ struct neigh_node { unsigned long last_valid; TYPE_OF_WORD real_bits[NUM_WORDS]; struct kref refcount; + struct rcu_head rcu; struct orig_node *orig_node; struct batman_if *if_incoming; };