From: Marek Lindner <lindner_marek@yahoo.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Marek Lindner <lindner_marek@yahoo.de>
Subject: [B.A.T.M.A.N.] [PATCH 3/9] batman-adv: protect neighbor list with rcu locks
Date: Mon, 29 Nov 2010 18:00:26 +0100 [thread overview]
Message-ID: <1291050032-20169-3-git-send-email-lindner_marek@yahoo.de> (raw)
In-Reply-To: <201011291800.02971.lindner_marek@yahoo.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
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;
};
--
1.7.2.3
next prev parent reply other threads:[~2010-11-29 17:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-29 17:00 [B.A.T.M.A.N.] performance patches (v2) Marek Lindner
2010-11-29 17:00 ` [B.A.T.M.A.N.] [PATCH 1/9] batman-adv: protect neighbor nodes with reference counters Marek Lindner
2010-11-29 17:00 ` [B.A.T.M.A.N.] [PATCH 2/9] batman-adv: convert neighbor list to hlist Marek Lindner
2010-11-29 17:00 ` Marek Lindner [this message]
2010-11-29 17:00 ` [B.A.T.M.A.N.] [PATCH 4/9] batman-adv: remove hash resize functions Marek Lindner
2010-11-29 17:00 ` [B.A.T.M.A.N.] [PATCH 5/9] batman-adv: protect each hash row with rcu locks Marek Lindner
2010-11-29 17:00 ` [B.A.T.M.A.N.] [PATCH 6/9] batman-adv: protect originator nodes with reference counters Marek Lindner
2010-11-29 17:00 ` [B.A.T.M.A.N.] [PATCH 7/9] batman-adv: replace orig_hash hash_iterate() with individual functions Marek Lindner
2010-11-29 17:00 ` [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: protect ogm counter arrays with spinlock Marek Lindner
2010-11-29 17:00 ` [B.A.T.M.A.N.] [PATCH 9/9] batman-adv: remove orig_hash spinlock Marek Lindner
2010-12-04 19:42 ` [B.A.T.M.A.N.] performance patches (v2) Sven Eckelmann
2010-12-04 20:03 ` [B.A.T.M.A.N.] [PATCH 1/9] batman-adv: remove hash resize functions Sven Eckelmann
2010-12-12 20:32 ` Marek Lindner
2010-12-04 20:03 ` [B.A.T.M.A.N.] [PATCH 2/9] batman-adv: Remove hash_iterate Sven Eckelmann
2010-12-12 20:33 ` Marek Lindner
2010-12-04 20:03 ` [B.A.T.M.A.N.] [PATCH 3/9] batman-adv: protect neighbor nodes with reference counters Sven Eckelmann
2010-12-12 21:55 ` Marek Lindner
2010-12-04 20:03 ` [B.A.T.M.A.N.] [PATCH 4/9] batman-adv: convert neighbor list to hlist Sven Eckelmann
2010-12-12 21:56 ` Marek Lindner
2010-12-04 20:03 ` [B.A.T.M.A.N.] [PATCH 5/9] batman-adv: protect neighbor list with rcu locks Sven Eckelmann
2010-12-12 21:57 ` Marek Lindner
2010-12-04 20:03 ` [B.A.T.M.A.N.] [PATCH 6/9] batman-adv: protect each hash row " Sven Eckelmann
2010-12-04 20:03 ` [B.A.T.M.A.N.] [PATCH 7/9] batman-adv: protect originator nodes with reference counters Sven Eckelmann
2010-12-04 20:03 ` [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: protect ogm counter arrays with spinlock Sven Eckelmann
2010-12-04 20:03 ` [B.A.T.M.A.N.] [PATCH 9/9] batman-adv: remove orig_hash spinlock 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=1291050032-20169-3-git-send-email-lindner_marek@yahoo.de \
--to=lindner_marek@yahoo.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/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).