commits December 2010

commits@lists.open-mesh.org

1 participants
226 discussions

batman-adv; branch, next, updated. v2010.2.0-271-gd420904
by postmaster＠open-mesh.org 18 Dec '10

18 Dec '10

The following commit has been merged in the next branch: commit aca73a84699db1e34664d4d0c0f5aa28635cee5a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 12 21:57:14 2010 +0000 batman-adv: Remove TYPE_OF_WORD define We use functions like hweight_long or set/test_bit which enforce the type "unsigned long". This makes it impossible to replace the type in this define with any other type without breaking the kernel module. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bitarray.c b/bitarray.c index 5dad5e8..bbcd8f7 100644 --- a/bitarray.c +++ b/bitarray.c @@ -26,7 +26,7 @@ /* returns true if the corresponding bit in the given seq_bits indicates true * and curr_seqno is within range of last_seqno */ -uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno, +uint8_t get_bit_status(unsigned long *seq_bits, uint32_t last_seqno, uint32_t curr_seqno) { int32_t diff, word_offset, word_num; @@ -48,7 +48,7 @@ uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno, } /* turn corresponding bit on, so we can remember that we got the packet */ -void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n) +void bit_mark(unsigned long *seq_bits, int32_t n) { int32_t word_offset, word_num; @@ -65,7 +65,7 @@ void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n) } /* shift the packet array by n places. */ -static void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n) +static void bit_shift(unsigned long *seq_bits, int32_t n) { int32_t word_offset, word_num; int32_t i; @@ -113,7 +113,7 @@ static void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n) seq_bits[i] = 0; } -static void bit_reset_window(TYPE_OF_WORD *seq_bits) +static void bit_reset_window(unsigned long *seq_bits) { int i; for (i = 0; i < NUM_WORDS; i++) @@ -127,7 +127,7 @@ static void bit_reset_window(TYPE_OF_WORD *seq_bits) * 1 if the window was moved (either new or very old) * 0 if the window was not moved/shifted. */ -char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits, +char bit_get_packet(void *priv, unsigned long *seq_bits, int32_t seq_num_diff, int8_t set_mark) { struct bat_priv *bat_priv = (struct bat_priv *)priv; @@ -190,7 +190,7 @@ char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits, /* count the hamming weight, how many good packets did we receive? just count * the 1's. */ -int bit_packet_count(TYPE_OF_WORD *seq_bits) +int bit_packet_count(unsigned long *seq_bits) { int i, hamming = 0; diff --git a/bitarray.h b/bitarray.h index 2635d67..ac54017 100644 --- a/bitarray.h +++ b/bitarray.h @@ -22,30 +22,23 @@ #ifndef _NET_BATMAN_ADV_BITARRAY_H_ #define _NET_BATMAN_ADV_BITARRAY_H_ -/* you should choose something big, if you don't want to waste cpu - * and keep the type in sync with bit_packet_count */ - -/* don't change 'unsigned long' as test_bit()/set_bit()/hweight_long() - * expect this length - */ -#define TYPE_OF_WORD unsigned long -#define WORD_BIT_SIZE (sizeof(TYPE_OF_WORD) * 8) +#define WORD_BIT_SIZE (sizeof(unsigned long) * 8) /* returns true if the corresponding bit in the given seq_bits indicates true * and curr_seqno is within range of last_seqno */ -uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno, +uint8_t get_bit_status(unsigned long *seq_bits, uint32_t last_seqno, uint32_t curr_seqno); /* turn corresponding bit on, so we can remember that we got the packet */ -void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n); +void bit_mark(unsigned long *seq_bits, int32_t n); /* receive and process one packet, returns 1 if received seq_num is considered * new, 0 if old */ -char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits, +char bit_get_packet(void *priv, unsigned long *seq_bits, int32_t seq_num_diff, int8_t set_mark); /* count the hamming weight, how many good packets did we receive? */ -int bit_packet_count(TYPE_OF_WORD *seq_bits); +int bit_packet_count(unsigned long *seq_bits); #endif /* _NET_BATMAN_ADV_BITARRAY_H_ */ diff --git a/originator.c b/originator.c index 7b1fc52..93ac59b 100644 --- a/originator.c +++ b/originator.c @@ -151,7 +151,7 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr) orig_node->batman_seqno_reset = jiffies - 1 - msecs_to_jiffies(RESET_PROTECTION_MS); - size = bat_priv->num_ifaces * sizeof(TYPE_OF_WORD) * NUM_WORDS; + size = bat_priv->num_ifaces * sizeof(unsigned long) * NUM_WORDS; orig_node->bcast_own = kzalloc(size, GFP_ATOMIC); if (!orig_node->bcast_own) @@ -397,7 +397,7 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num) { void *data_ptr; - data_ptr = kmalloc(max_if_num * sizeof(TYPE_OF_WORD) * NUM_WORDS, + data_ptr = kmalloc(max_if_num * sizeof(unsigned long) * NUM_WORDS, GFP_ATOMIC); if (!data_ptr) { pr_err("Can't resize orig: out of memory\n"); @@ -405,7 +405,7 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num) } memcpy(data_ptr, orig_node->bcast_own, - (max_if_num - 1) * sizeof(TYPE_OF_WORD) * NUM_WORDS); + (max_if_num - 1) * sizeof(unsigned long) * NUM_WORDS); kfree(orig_node->bcast_own); orig_node->bcast_own = data_ptr; @@ -466,7 +466,7 @@ static int orig_node_del_if(struct orig_node *orig_node, if (max_if_num == 0) goto free_bcast_own; - chunk_size = sizeof(TYPE_OF_WORD) * NUM_WORDS; + chunk_size = sizeof(unsigned long) * NUM_WORDS; data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); if (!data_ptr) { pr_err("Can't resize orig: out of memory\n"); diff --git a/routing.c b/routing.c index 8cec99b..cd2d4d8 100644 --- a/routing.c +++ b/routing.c @@ -44,7 +44,7 @@ void slide_own_bcast_window(struct batman_if *batman_if) struct hlist_head *head; struct element_t *bucket; struct orig_node *orig_node; - TYPE_OF_WORD *word; + unsigned long *word; int i; size_t word_index; @@ -634,7 +634,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, } if (is_my_orig) { - TYPE_OF_WORD *word; + unsigned long *word; int offset; orig_neigh_node = get_orig_node(bat_priv, ethhdr->h_source); diff --git a/types.h b/types.h index 1d00849..97cb23d 100644 --- a/types.h +++ b/types.h @@ -68,7 +68,7 @@ struct orig_node { uint8_t orig[ETH_ALEN]; uint8_t primary_addr[ETH_ALEN]; struct neigh_node *router; - TYPE_OF_WORD *bcast_own; + unsigned long *bcast_own; uint8_t *bcast_own_sum; uint8_t tq_own; int tq_asym_penalty; @@ -81,7 +81,7 @@ struct orig_node { int16_t hna_buff_len; uint32_t last_real_seqno; uint8_t last_ttl; - TYPE_OF_WORD bcast_bits[NUM_WORDS]; + unsigned long bcast_bits[NUM_WORDS]; uint32_t last_bcast_seqno; struct list_head neigh_list; struct list_head frag_list; @@ -114,7 +114,7 @@ struct neigh_node { uint8_t last_ttl; struct neigh_node *next_bond_candidate; unsigned long last_valid; - TYPE_OF_WORD real_bits[NUM_WORDS]; + unsigned long real_bits[NUM_WORDS]; struct orig_node *orig_node; struct batman_if *if_incoming; }; -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-271-gd420904
by postmaster＠open-mesh.org 18 Dec '10

18 Dec '10

The following commit has been merged in the next branch: commit d420904fe4e0fa376409f2c78975c4a2f1c97041 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Dec 13 00:01:54 2010 +0000 batman-adv: adjust NULL pointer check style Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/aggregation.c b/aggregation.c index 0c92e3b..3850a3e 100644 --- a/aggregation.c +++ b/aggregation.c @@ -221,7 +221,7 @@ void add_bat_packet_to_list(struct bat_priv *bat_priv, /* nothing to aggregate with - either aggregation disabled or no * suitable aggregation packet found */ - if (forw_packet_aggr == NULL) { + if (!forw_packet_aggr) { /* the following section can run without the lock */ spin_unlock_bh(&bat_priv->forw_bat_list_lock); diff --git a/hash.c b/hash.c index fec9bbd..26e623e 100644 --- a/hash.c +++ b/hash.c @@ -45,13 +45,13 @@ struct hashtable_t *hash_new(int size) hash = kmalloc(sizeof(struct hashtable_t) , GFP_ATOMIC); - if (hash == NULL) + if (!hash) return NULL; hash->size = size; hash->table = kmalloc(sizeof(struct element_t *) * size, GFP_ATOMIC); - if (hash->table == NULL) { + if (!hash->table) { kfree(hash); return NULL; } diff --git a/hash.h b/hash.h index 0801f9c..09216ad 100644 --- a/hash.h +++ b/hash.h @@ -73,7 +73,7 @@ static inline void hash_delete(struct hashtable_t *hash, hlist_for_each_safe(walk, safe, head) { bucket = hlist_entry(walk, struct element_t, hlist); - if (free_cb != NULL) + if (free_cb) free_cb(bucket->data, arg); hlist_del(walk); @@ -109,7 +109,7 @@ static inline int hash_add(struct hashtable_t *hash, /* no duplicate found in list, add new element */ bucket = kmalloc(sizeof(struct element_t), GFP_ATOMIC); - if (bucket == NULL) + if (!bucket) return -1; bucket->data = data; diff --git a/originator.c b/originator.c index 93ac59b..6b7fb6b 100644 --- a/originator.c +++ b/originator.c @@ -218,7 +218,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, list_del(list_pos); kfree(neigh_node); } else { - if ((*best_neigh_node == NULL) || + if ((!*best_neigh_node) || (neigh_node->tq_avg > (*best_neigh_node)->tq_avg)) *best_neigh_node = neigh_node; } diff --git a/routing.c b/routing.c index cd2d4d8..8828edd 100644 --- a/routing.c +++ b/routing.c @@ -79,7 +79,7 @@ static void update_HNA(struct bat_priv *bat_priv, struct orig_node *orig_node, hna_global_del_orig(bat_priv, orig_node, "originator changed hna"); - if ((hna_buff_len > 0) && (hna_buff != NULL)) + if ((hna_buff_len > 0) && (hna_buff)) hna_global_add_orig(bat_priv, orig_node, hna_buff, hna_buff_len); } @@ -91,7 +91,7 @@ static void update_route(struct bat_priv *bat_priv, unsigned char *hna_buff, int hna_buff_len) { /* route deleted */ - if ((orig_node->router != NULL) && (neigh_node == NULL)) { + if ((orig_node->router) && (!neigh_node)) { bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n", orig_node->orig); @@ -99,7 +99,7 @@ static void update_route(struct bat_priv *bat_priv, "originator timed out"); /* route added */ - } else if ((orig_node->router == NULL) && (neigh_node != NULL)) { + } else if ((!orig_node->router) && (neigh_node)) { bat_dbg(DBG_ROUTES, bat_priv, "Adding route towards: %pM (via %pM)\n", @@ -125,7 +125,7 @@ void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, int hna_buff_len) { - if (orig_node == NULL) + if (!orig_node) return; if (orig_node->router != neigh_node) @@ -391,7 +391,7 @@ static char count_real_packets(struct ethhdr *ethhdr, int set_mark; orig_node = get_orig_node(bat_priv, batman_packet->orig); - if (orig_node == NULL) + if (!orig_node) return 0; seq_diff = batman_packet->seqno - orig_node->last_real_seqno; @@ -503,7 +503,7 @@ void update_bonding_candidates(struct bat_priv *bat_priv, /* we only care if the other candidate is even * considered as candidate. */ - if (tmp_neigh_node2->next_bond_candidate == NULL) + if (!tmp_neigh_node2->next_bond_candidate) continue; @@ -520,7 +520,7 @@ void update_bonding_candidates(struct bat_priv *bat_priv, if (interference_candidate) continue; - if (first_candidate == NULL) { + if (!first_candidate) { first_candidate = tmp_neigh_node; tmp_neigh_node->next_bond_candidate = first_candidate; } else @@ -670,7 +670,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, } orig_node = get_orig_node(bat_priv, batman_packet->orig); - if (orig_node == NULL) + if (!orig_node) return; is_duplicate = count_real_packets(ethhdr, batman_packet, if_incoming); @@ -707,13 +707,12 @@ void receive_bat_packet(struct ethhdr *ethhdr, orig_neigh_node = (is_single_hop_neigh ? orig_node : get_orig_node(bat_priv, ethhdr->h_source)); - if (orig_neigh_node == NULL) + if (!orig_neigh_node) return; /* drop packet if sender is not a direct neighbor and if we * don't route towards it */ - if (!is_single_hop_neigh && - (orig_neigh_node->router == NULL)) { + if (!is_single_hop_neigh && (!orig_neigh_node->router)) { bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: OGM via unknown neighbor!\n"); return; @@ -836,8 +835,7 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, icmp_packet->orig)); ret = NET_RX_DROP; - if ((orig_node != NULL) && - (orig_node->router != NULL)) { + if ((orig_node) && (orig_node->router)) { /* don't lock while sending the packets ... we therefore * copy the required data before sending */ @@ -898,8 +896,7 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, icmp_packet->orig)); ret = NET_RX_DROP; - if ((orig_node != NULL) && - (orig_node->router != NULL)) { + if ((orig_node) && (orig_node->router)) { /* don't lock while sending the packets ... we therefore * copy the required data before sending */ @@ -991,8 +988,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) hash_find(bat_priv->orig_hash, compare_orig, choose_orig, icmp_packet->dst)); - if ((orig_node != NULL) && - (orig_node->router != NULL)) { + if ((orig_node) && (orig_node->router)) { /* don't lock while sending the packets ... we therefore * copy the required data before sending */ @@ -1315,7 +1311,7 @@ int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if) hash_find(bat_priv->orig_hash, compare_orig, choose_orig, bcast_packet->orig)); - if (orig_node == NULL) { + if (!orig_node) { spin_unlock_bh(&bat_priv->orig_hash_lock); return NET_RX_DROP; } diff --git a/vis.c b/vis.c index d7f5b6b..cd4c423 100644 --- a/vis.c +++ b/vis.c @@ -384,7 +384,7 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv, &search_elem); kfree_skb(search_elem.skb_packet); - if (old_info != NULL) { + if (old_info) { old_packet = (struct vis_packet *)old_info->skb_packet->data; if (!seq_after(ntohl(vis_packet->seqno), ntohl(old_packet->seqno))) { -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-271-gd420904
by postmaster＠open-mesh.org 18 Dec '10

18 Dec '10

The following commit has been merged in the next branch: commit 70535af8d6790fad91bd8f02fed375049d6eb141 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Dec 12 20:33:15 2010 +0000 batman-adv: remove hash resize functions Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/hash.c b/hash.c index 8605e2f..3dedb06 100644 --- a/hash.c +++ b/hash.c @@ -27,8 +27,6 @@ static void hash_init(struct hashtable_t *hash) { int i; - hash->elements = 0; - for (i = 0 ; i < hash->size; i++) INIT_HLIST_HEAD(&hash->table[i]); } @@ -77,7 +75,6 @@ void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t) hlist_del(hash_it_t->walk); kfree(bucket); - hash->elements--; return data_save; } diff --git a/hash.h b/hash.h index 0b61c6e..16b23bf 100644 --- a/hash.h +++ b/hash.h @@ -53,7 +53,6 @@ struct hash_it_t { struct hashtable_t { struct hlist_head *table; /* the hashtable itself, with the buckets */ - int elements; /* number of elements registered */ int size; /* size of hashtable */ }; @@ -127,7 +126,6 @@ static inline int hash_add(struct hashtable_t *hash, bucket->data = data; hlist_add_head(&bucket->hlist, head); - hash->elements++; return 0; } @@ -181,44 +179,6 @@ static inline void *hash_find(struct hashtable_t *hash, return NULL; } -/* resize the hash, returns the pointer to the new hash or NULL on - * error. removes the old hash on success */ -static inline struct hashtable_t *hash_resize(struct hashtable_t *hash, - hashdata_choose_cb choose, - int size) -{ - struct hashtable_t *new_hash; - struct hlist_head *head, *new_head; - struct hlist_node *walk, *safe; - struct element_t *bucket; - int i, new_index; - - /* initialize a new hash with the new size */ - new_hash = hash_new(size); - - if (new_hash == NULL) - return NULL; - - /* copy the elements */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - - hlist_for_each_safe(walk, safe, head) { - bucket = hlist_entry(walk, struct element_t, hlist); - - new_index = choose(bucket->data, size); - new_head = &new_hash->table[new_index]; - - hlist_del(walk); - hlist_add_head(walk, new_head); - } - } - - hash_destroy(hash); - - return new_hash; -} - /* iterate though the hash. First element is selected if an iterator * initialized with HASHIT() is supplied as iter. Use the returned * (or supplied) iterator to access the elements until hash_iterate returns diff --git a/originator.c b/originator.c index 89ec021..a5612e6 100644 --- a/originator.c +++ b/originator.c @@ -45,7 +45,7 @@ int originator_init(struct bat_priv *bat_priv) return 1; spin_lock_bh(&bat_priv->orig_hash_lock); - bat_priv->orig_hash = hash_new(128); + bat_priv->orig_hash = hash_new(1024); if (!bat_priv->orig_hash) goto err; @@ -124,7 +124,6 @@ void originator_free(struct bat_priv *bat_priv) struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr) { struct orig_node *orig_node; - struct hashtable_t *swaphash; int size; int hash_added; @@ -172,17 +171,6 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr) if (hash_added < 0) goto free_bcast_own_sum; - if (bat_priv->orig_hash->elements * 4 > bat_priv->orig_hash->size) { - swaphash = hash_resize(bat_priv->orig_hash, choose_orig, - bat_priv->orig_hash->size * 2); - - if (!swaphash) - bat_dbg(DBG_BATMAN, bat_priv, - "Couldn't resize orig hash table\n"); - else - bat_priv->orig_hash = swaphash; - } - return orig_node; free_bcast_own_sum: kfree(orig_node->bcast_own_sum); diff --git a/translation-table.c b/translation-table.c index 4b0a107..72448c9 100644 --- a/translation-table.c +++ b/translation-table.c @@ -42,7 +42,7 @@ int hna_local_init(struct bat_priv *bat_priv) if (bat_priv->hna_local_hash) return 1; - bat_priv->hna_local_hash = hash_new(128); + bat_priv->hna_local_hash = hash_new(1024); if (!bat_priv->hna_local_hash) return 0; @@ -58,7 +58,6 @@ void hna_local_add(struct net_device *soft_iface, uint8_t *addr) struct bat_priv *bat_priv = netdev_priv(soft_iface); struct hna_local_entry *hna_local_entry; struct hna_global_entry *hna_global_entry; - struct hashtable_t *swaphash; int required_bytes; spin_lock_bh(&bat_priv->hna_lhash_lock); @@ -113,17 +112,6 @@ void hna_local_add(struct net_device *soft_iface, uint8_t *addr) bat_priv->num_local_hna++; atomic_set(&bat_priv->hna_local_changed, 1); - if (bat_priv->hna_local_hash->elements * 4 > - bat_priv->hna_local_hash->size) { - swaphash = hash_resize(bat_priv->hna_local_hash, choose_orig, - bat_priv->hna_local_hash->size * 2); - - if (!swaphash) - pr_err("Couldn't resize local hna hash table\n"); - else - bat_priv->hna_local_hash = swaphash; - } - spin_unlock_bh(&bat_priv->hna_lhash_lock); /* remove address from global hash if present */ @@ -302,7 +290,7 @@ int hna_global_init(struct bat_priv *bat_priv) if (bat_priv->hna_global_hash) return 1; - bat_priv->hna_global_hash = hash_new(128); + bat_priv->hna_global_hash = hash_new(1024); if (!bat_priv->hna_global_hash) return 0; @@ -316,7 +304,6 @@ void hna_global_add_orig(struct bat_priv *bat_priv, { struct hna_global_entry *hna_global_entry; struct hna_local_entry *hna_local_entry; - struct hashtable_t *swaphash; int hna_buff_count = 0; unsigned char *hna_ptr; @@ -382,21 +369,6 @@ void hna_global_add_orig(struct bat_priv *bat_priv, orig_node->hna_buff_len = hna_buff_len; } } - - spin_lock_bh(&bat_priv->hna_ghash_lock); - - if (bat_priv->hna_global_hash->elements * 4 > - bat_priv->hna_global_hash->size) { - swaphash = hash_resize(bat_priv->hna_global_hash, choose_orig, - bat_priv->hna_global_hash->size * 2); - - if (!swaphash) - pr_err("Couldn't resize global hna hash table\n"); - else - bat_priv->hna_global_hash = swaphash; - } - - spin_unlock_bh(&bat_priv->hna_ghash_lock); } int hna_global_seq_print_text(struct seq_file *seq, void *offset) -- batman-adv

1 0

linux integration; annotated tag, v2.6.37-rc6, created. v2.6.37-rc6
by postmaster＠open-mesh.org 16 Dec '10

16 Dec '10

The annotated tag, v2.6.37-rc6 has been created at 3f4ddf273ce92382ad3ce55fde3d773bd9e4bddd (tag) tagging b0c3844d8af6b9f3f18f31e1b0502fbefa2166be (commit) replaces v2.6.37-rc5 tagged by Linus Torvalds on Wed Dec 15 17:25:02 2010 -0800 - Shortlog ------------------------------------------------------------ Linux 2.6.37-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk0JanMACgkQF3YsRnbiHLtK0QCffowWmKd+eqJoeyccekel1Uza azUAni6g8B9W4ZRwLXYvW6ccrEZHwl02 =Yl6h -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2010.2.0-245-gde76f04
by postmaster＠open-mesh.org 13 Dec '10

13 Dec '10

The following commit has been merged in the master branch: commit de76f04ee8ad10a18dbd30996dc3c11226850802 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Dec 13 00:01:54 2010 +0000 batman-adv: adjust NULL pointer check style Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/aggregation.c b/aggregation.c index 0c92e3b..3850a3e 100644 --- a/aggregation.c +++ b/aggregation.c @@ -221,7 +221,7 @@ void add_bat_packet_to_list(struct bat_priv *bat_priv, /* nothing to aggregate with - either aggregation disabled or no * suitable aggregation packet found */ - if (forw_packet_aggr == NULL) { + if (!forw_packet_aggr) { /* the following section can run without the lock */ spin_unlock_bh(&bat_priv->forw_bat_list_lock); diff --git a/hash.c b/hash.c index fec9bbd..26e623e 100644 --- a/hash.c +++ b/hash.c @@ -45,13 +45,13 @@ struct hashtable_t *hash_new(int size) hash = kmalloc(sizeof(struct hashtable_t) , GFP_ATOMIC); - if (hash == NULL) + if (!hash) return NULL; hash->size = size; hash->table = kmalloc(sizeof(struct element_t *) * size, GFP_ATOMIC); - if (hash->table == NULL) { + if (!hash->table) { kfree(hash); return NULL; } diff --git a/hash.h b/hash.h index 0801f9c..09216ad 100644 --- a/hash.h +++ b/hash.h @@ -73,7 +73,7 @@ static inline void hash_delete(struct hashtable_t *hash, hlist_for_each_safe(walk, safe, head) { bucket = hlist_entry(walk, struct element_t, hlist); - if (free_cb != NULL) + if (free_cb) free_cb(bucket->data, arg); hlist_del(walk); @@ -109,7 +109,7 @@ static inline int hash_add(struct hashtable_t *hash, /* no duplicate found in list, add new element */ bucket = kmalloc(sizeof(struct element_t), GFP_ATOMIC); - if (bucket == NULL) + if (!bucket) return -1; bucket->data = data; diff --git a/originator.c b/originator.c index 2533a9f..6816054 100644 --- a/originator.c +++ b/originator.c @@ -245,7 +245,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, hlist_del_rcu(&neigh_node->list); call_rcu(&neigh_node->rcu, neigh_node_free_rcu); } else { - if ((*best_neigh_node == NULL) || + if ((!*best_neigh_node) || (neigh_node->tq_avg > (*best_neigh_node)->tq_avg)) *best_neigh_node = neigh_node; } diff --git a/routing.c b/routing.c index 1f41555..abce1ae 100644 --- a/routing.c +++ b/routing.c @@ -79,7 +79,7 @@ static void update_HNA(struct bat_priv *bat_priv, struct orig_node *orig_node, hna_global_del_orig(bat_priv, orig_node, "originator changed hna"); - if ((hna_buff_len > 0) && (hna_buff != NULL)) + if ((hna_buff_len > 0) && (hna_buff)) hna_global_add_orig(bat_priv, orig_node, hna_buff, hna_buff_len); } @@ -93,7 +93,7 @@ static void update_route(struct bat_priv *bat_priv, struct neigh_node *neigh_node_tmp; /* route deleted */ - if ((orig_node->router != NULL) && (neigh_node == NULL)) { + if ((orig_node->router) && (!neigh_node)) { bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n", orig_node->orig); @@ -101,7 +101,7 @@ static void update_route(struct bat_priv *bat_priv, "originator timed out"); /* route added */ - } else if ((orig_node->router == NULL) && (neigh_node != NULL)) { + } else if ((!orig_node->router) && (neigh_node)) { bat_dbg(DBG_ROUTES, bat_priv, "Adding route towards: %pM (via %pM)\n", @@ -132,7 +132,7 @@ void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, int hna_buff_len) { - if (orig_node == NULL) + if (!orig_node) return; if (orig_node->router != neigh_node) @@ -407,7 +407,7 @@ static char count_real_packets(struct ethhdr *ethhdr, int set_mark; orig_node = get_orig_node(bat_priv, batman_packet->orig); - if (orig_node == NULL) + if (!orig_node) return 0; seq_diff = batman_packet->seqno - orig_node->last_real_seqno; @@ -529,7 +529,7 @@ void update_bonding_candidates(struct bat_priv *bat_priv, /* we only care if the other candidate is even * considered as candidate. */ - if (tmp_neigh_node2->next_bond_candidate == NULL) + if (!tmp_neigh_node2->next_bond_candidate) continue; @@ -546,7 +546,7 @@ void update_bonding_candidates(struct bat_priv *bat_priv, if (interference_candidate) continue; - if (first_candidate == NULL) { + if (!first_candidate) { first_candidate = tmp_neigh_node; tmp_neigh_node->next_bond_candidate = first_candidate; } else @@ -697,7 +697,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, } orig_node = get_orig_node(bat_priv, batman_packet->orig); - if (orig_node == NULL) + if (!orig_node) return; is_duplicate = count_real_packets(ethhdr, batman_packet, if_incoming); @@ -734,13 +734,12 @@ void receive_bat_packet(struct ethhdr *ethhdr, orig_neigh_node = (is_single_hop_neigh ? orig_node : get_orig_node(bat_priv, ethhdr->h_source)); - if (orig_neigh_node == NULL) + if (!orig_neigh_node) return; /* drop packet if sender is not a direct neighbor and if we * don't route towards it */ - if (!is_single_hop_neigh && - (orig_neigh_node->router == NULL)) { + if (!is_single_hop_neigh && (!orig_neigh_node->router)) { bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: OGM via unknown neighbor!\n"); return; @@ -863,8 +862,7 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, icmp_packet->orig)); ret = NET_RX_DROP; - if ((orig_node != NULL) && - (orig_node->router != NULL)) { + if ((orig_node) && (orig_node->router)) { /* don't lock while sending the packets ... we therefore * copy the required data before sending */ @@ -925,8 +923,7 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, icmp_packet->orig)); ret = NET_RX_DROP; - if ((orig_node != NULL) && - (orig_node->router != NULL)) { + if ((orig_node) && (orig_node->router)) { /* don't lock while sending the packets ... we therefore * copy the required data before sending */ @@ -1018,8 +1015,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) hash_find(bat_priv->orig_hash, compare_orig, choose_orig, icmp_packet->dst)); - if ((orig_node != NULL) && - (orig_node->router != NULL)) { + if ((orig_node) && (orig_node->router)) { /* don't lock while sending the packets ... we therefore * copy the required data before sending */ @@ -1342,7 +1338,7 @@ int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if) hash_find(bat_priv->orig_hash, compare_orig, choose_orig, bcast_packet->orig)); - if (orig_node == NULL) { + if (!orig_node) { spin_unlock_bh(&bat_priv->orig_hash_lock); return NET_RX_DROP; } diff --git a/vis.c b/vis.c index d7f5b6b..cd4c423 100644 --- a/vis.c +++ b/vis.c @@ -384,7 +384,7 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv, &search_elem); kfree_skb(search_elem.skb_packet); - if (old_info != NULL) { + if (old_info) { old_packet = (struct vis_packet *)old_info->skb_packet->data; if (!seq_after(ntohl(vis_packet->seqno), ntohl(old_packet->seqno))) { -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-244-gb863d6e
by postmaster＠open-mesh.org 12 Dec '10

12 Dec '10

The following commit has been merged in the master branch: commit b863d6e516a9ae39c7695b54bdc73729ea1901c1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 12 21:57:14 2010 +0000 batman-adv: Remove TYPE_OF_WORD define We use functions like hweight_long or set/test_bit which enforce the type "unsigned long". This makes it impossible to replace the type in this define with any other type without breaking the kernel module. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bitarray.c b/bitarray.c index 5dad5e8..bbcd8f7 100644 --- a/bitarray.c +++ b/bitarray.c @@ -26,7 +26,7 @@ /* returns true if the corresponding bit in the given seq_bits indicates true * and curr_seqno is within range of last_seqno */ -uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno, +uint8_t get_bit_status(unsigned long *seq_bits, uint32_t last_seqno, uint32_t curr_seqno) { int32_t diff, word_offset, word_num; @@ -48,7 +48,7 @@ uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno, } /* turn corresponding bit on, so we can remember that we got the packet */ -void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n) +void bit_mark(unsigned long *seq_bits, int32_t n) { int32_t word_offset, word_num; @@ -65,7 +65,7 @@ void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n) } /* shift the packet array by n places. */ -static void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n) +static void bit_shift(unsigned long *seq_bits, int32_t n) { int32_t word_offset, word_num; int32_t i; @@ -113,7 +113,7 @@ static void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n) seq_bits[i] = 0; } -static void bit_reset_window(TYPE_OF_WORD *seq_bits) +static void bit_reset_window(unsigned long *seq_bits) { int i; for (i = 0; i < NUM_WORDS; i++) @@ -127,7 +127,7 @@ static void bit_reset_window(TYPE_OF_WORD *seq_bits) * 1 if the window was moved (either new or very old) * 0 if the window was not moved/shifted. */ -char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits, +char bit_get_packet(void *priv, unsigned long *seq_bits, int32_t seq_num_diff, int8_t set_mark) { struct bat_priv *bat_priv = (struct bat_priv *)priv; @@ -190,7 +190,7 @@ char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits, /* count the hamming weight, how many good packets did we receive? just count * the 1's. */ -int bit_packet_count(TYPE_OF_WORD *seq_bits) +int bit_packet_count(unsigned long *seq_bits) { int i, hamming = 0; diff --git a/bitarray.h b/bitarray.h index 2635d67..ac54017 100644 --- a/bitarray.h +++ b/bitarray.h @@ -22,30 +22,23 @@ #ifndef _NET_BATMAN_ADV_BITARRAY_H_ #define _NET_BATMAN_ADV_BITARRAY_H_ -/* you should choose something big, if you don't want to waste cpu - * and keep the type in sync with bit_packet_count */ - -/* don't change 'unsigned long' as test_bit()/set_bit()/hweight_long() - * expect this length - */ -#define TYPE_OF_WORD unsigned long -#define WORD_BIT_SIZE (sizeof(TYPE_OF_WORD) * 8) +#define WORD_BIT_SIZE (sizeof(unsigned long) * 8) /* returns true if the corresponding bit in the given seq_bits indicates true * and curr_seqno is within range of last_seqno */ -uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno, +uint8_t get_bit_status(unsigned long *seq_bits, uint32_t last_seqno, uint32_t curr_seqno); /* turn corresponding bit on, so we can remember that we got the packet */ -void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n); +void bit_mark(unsigned long *seq_bits, int32_t n); /* receive and process one packet, returns 1 if received seq_num is considered * new, 0 if old */ -char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits, +char bit_get_packet(void *priv, unsigned long *seq_bits, int32_t seq_num_diff, int8_t set_mark); /* count the hamming weight, how many good packets did we receive? */ -int bit_packet_count(TYPE_OF_WORD *seq_bits); +int bit_packet_count(unsigned long *seq_bits); #endif /* _NET_BATMAN_ADV_BITARRAY_H_ */ diff --git a/originator.c b/originator.c index 4d6d125..2533a9f 100644 --- a/originator.c +++ b/originator.c @@ -175,7 +175,7 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr) orig_node->batman_seqno_reset = jiffies - 1 - msecs_to_jiffies(RESET_PROTECTION_MS); - size = bat_priv->num_ifaces * sizeof(TYPE_OF_WORD) * NUM_WORDS; + size = bat_priv->num_ifaces * sizeof(unsigned long) * NUM_WORDS; orig_node->bcast_own = kzalloc(size, GFP_ATOMIC); if (!orig_node->bcast_own) @@ -428,7 +428,7 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num) { void *data_ptr; - data_ptr = kmalloc(max_if_num * sizeof(TYPE_OF_WORD) * NUM_WORDS, + data_ptr = kmalloc(max_if_num * sizeof(unsigned long) * NUM_WORDS, GFP_ATOMIC); if (!data_ptr) { pr_err("Can't resize orig: out of memory\n"); @@ -436,7 +436,7 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num) } memcpy(data_ptr, orig_node->bcast_own, - (max_if_num - 1) * sizeof(TYPE_OF_WORD) * NUM_WORDS); + (max_if_num - 1) * sizeof(unsigned long) * NUM_WORDS); kfree(orig_node->bcast_own); orig_node->bcast_own = data_ptr; @@ -497,7 +497,7 @@ static int orig_node_del_if(struct orig_node *orig_node, if (max_if_num == 0) goto free_bcast_own; - chunk_size = sizeof(TYPE_OF_WORD) * NUM_WORDS; + chunk_size = sizeof(unsigned long) * NUM_WORDS; data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); if (!data_ptr) { pr_err("Can't resize orig: out of memory\n"); diff --git a/routing.c b/routing.c index ae383d6..1f41555 100644 --- a/routing.c +++ b/routing.c @@ -44,7 +44,7 @@ void slide_own_bcast_window(struct batman_if *batman_if) struct hlist_head *head; struct element_t *bucket; struct orig_node *orig_node; - TYPE_OF_WORD *word; + unsigned long *word; int i; size_t word_index; @@ -661,7 +661,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, } if (is_my_orig) { - TYPE_OF_WORD *word; + unsigned long *word; int offset; orig_neigh_node = get_orig_node(bat_priv, ethhdr->h_source); diff --git a/types.h b/types.h index 1d6365d..09d18d8 100644 --- a/types.h +++ b/types.h @@ -68,7 +68,7 @@ struct orig_node { uint8_t orig[ETH_ALEN]; uint8_t primary_addr[ETH_ALEN]; struct neigh_node *router; - TYPE_OF_WORD *bcast_own; + unsigned long *bcast_own; uint8_t *bcast_own_sum; uint8_t tq_own; int tq_asym_penalty; @@ -81,7 +81,7 @@ struct orig_node { int16_t hna_buff_len; uint32_t last_real_seqno; uint8_t last_ttl; - TYPE_OF_WORD bcast_bits[NUM_WORDS]; + unsigned long bcast_bits[NUM_WORDS]; uint32_t last_bcast_seqno; struct hlist_head neigh_list; struct list_head frag_list; @@ -115,7 +115,7 @@ struct neigh_node { uint8_t last_ttl; struct neigh_node *next_bond_candidate; unsigned long last_valid; - TYPE_OF_WORD real_bits[NUM_WORDS]; + unsigned long real_bits[NUM_WORDS]; struct kref refcount; struct rcu_head rcu; struct orig_node *orig_node; -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-244-gb863d6e
by postmaster＠open-mesh.org 12 Dec '10

12 Dec '10

The following commit has been merged in the master branch: commit a29d8351fc9700c728e0807a01b1584ad10c9116 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Dec 12 21:57:10 2010 +0000 batman-adv: protect neighbor nodes with reference counters Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/originator.c b/originator.c index 7b1fc52..cc778ea 100644 --- a/originator.c +++ b/originator.c @@ -59,9 +59,18 @@ err: return 0; } -struct neigh_node * -create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, - uint8_t *neigh, struct batman_if *if_incoming) +void neigh_node_free_ref(struct kref *refcount) +{ + struct neigh_node *neigh_node; + + neigh_node = container_of(refcount, struct neigh_node, refcount); + kfree(neigh_node); +} + +struct neigh_node *create_neighbor(struct orig_node *orig_node, + struct orig_node *orig_neigh_node, + uint8_t *neigh, + struct batman_if *if_incoming) { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct neigh_node *neigh_node; @@ -78,6 +87,7 @@ create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, memcpy(neigh_node->addr, neigh, ETH_ALEN); neigh_node->orig_node = orig_neigh_node; neigh_node->if_incoming = if_incoming; + kref_init(&neigh_node->refcount); list_add_tail(&neigh_node->list, &orig_node->neigh_list); return neigh_node; @@ -95,7 +105,7 @@ static void free_orig_node(void *data, void *arg) neigh_node = list_entry(list_pos, struct neigh_node, list); list_del(list_pos); - kfree(neigh_node); + kref_put(&neigh_node->refcount, neigh_node_free_ref); } frag_list_free(&orig_node->frag_list); @@ -216,7 +226,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, neigh_purged = true; list_del(list_pos); - kfree(neigh_node); + kref_put(&neigh_node->refcount, neigh_node_free_ref); } else { if ((*best_neigh_node == NULL) || (neigh_node->tq_avg > (*best_neigh_node)->tq_avg)) diff --git a/originator.h b/originator.h index d474ceb..f3676fa 100644 --- a/originator.h +++ b/originator.h @@ -26,9 +26,11 @@ int originator_init(struct bat_priv *bat_priv); void originator_free(struct bat_priv *bat_priv); void purge_orig_ref(struct bat_priv *bat_priv); struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr); -struct neigh_node * -create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, - uint8_t *neigh, struct batman_if *if_incoming); +struct neigh_node *create_neighbor(struct orig_node *orig_node, + struct orig_node *orig_neigh_node, + uint8_t *neigh, + struct batman_if *if_incoming); +void neigh_node_free_ref(struct kref *refcount); int orig_seq_print_text(struct seq_file *seq, void *offset); int orig_hash_add_if(struct batman_if *batman_if, int max_if_num); int orig_hash_del_if(struct batman_if *batman_if, int max_if_num); diff --git a/routing.c b/routing.c index 8cec99b..014413e 100644 --- a/routing.c +++ b/routing.c @@ -90,6 +90,8 @@ static void update_route(struct bat_priv *bat_priv, struct neigh_node *neigh_node, unsigned char *hna_buff, int hna_buff_len) { + struct neigh_node *neigh_node_tmp; + /* route deleted */ if ((orig_node->router != NULL) && (neigh_node == NULL)) { @@ -116,7 +118,12 @@ static void update_route(struct bat_priv *bat_priv, orig_node->router->addr); } + if (neigh_node) + kref_get(&neigh_node->refcount); + neigh_node_tmp = orig_node->router; orig_node->router = neigh_node; + if (neigh_node_tmp) + kref_put(&neigh_node_tmp->refcount, neigh_node_free_ref); } diff --git a/types.h b/types.h index 1d00849..c1accbf 100644 --- a/types.h +++ b/types.h @@ -115,6 +115,7 @@ struct neigh_node { struct neigh_node *next_bond_candidate; unsigned long last_valid; TYPE_OF_WORD real_bits[NUM_WORDS]; + struct kref refcount; struct orig_node *orig_node; struct batman_if *if_incoming; }; -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-244-gb863d6e
by postmaster＠open-mesh.org 12 Dec '10

12 Dec '10

The following commit has been merged in the master branch: commit c6a0d5864b4b2f66d827ffd11885746959710bca Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Dec 12 21:57:11 2010 +0000 batman-adv: convert neighbor list to hlist Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/originator.c b/originator.c index cc778ea..1df73e3 100644 --- a/originator.c +++ b/originator.c @@ -82,29 +82,28 @@ struct neigh_node *create_neighbor(struct orig_node *orig_node, if (!neigh_node) return NULL; - INIT_LIST_HEAD(&neigh_node->list); + INIT_HLIST_NODE(&neigh_node->list); memcpy(neigh_node->addr, neigh, ETH_ALEN); neigh_node->orig_node = orig_neigh_node; neigh_node->if_incoming = if_incoming; kref_init(&neigh_node->refcount); - list_add_tail(&neigh_node->list, &orig_node->neigh_list); + hlist_add_head(&neigh_node->list, &orig_node->neigh_list); return neigh_node; } static void free_orig_node(void *data, void *arg) { - struct list_head *list_pos, *list_pos_tmp; + struct hlist_node *node, *node_tmp; struct neigh_node *neigh_node; struct orig_node *orig_node = (struct orig_node *)data; struct bat_priv *bat_priv = (struct bat_priv *)arg; /* for all neighbors towards this originator ... */ - list_for_each_safe(list_pos, list_pos_tmp, &orig_node->neigh_list) { - neigh_node = list_entry(list_pos, struct neigh_node, list); - - list_del(list_pos); + 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); } @@ -151,7 +150,7 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr) if (!orig_node) return NULL; - INIT_LIST_HEAD(&orig_node->neigh_list); + INIT_HLIST_HEAD(&orig_node->neigh_list); memcpy(orig_node->orig, addr, ETH_ALEN); orig_node->router = NULL; @@ -195,15 +194,15 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, struct orig_node *orig_node, struct neigh_node **best_neigh_node) { - struct list_head *list_pos, *list_pos_tmp; + struct hlist_node *node, *node_tmp; struct neigh_node *neigh_node; bool neigh_purged = false; *best_neigh_node = NULL; /* for all neighbors towards this originator ... */ - list_for_each_safe(list_pos, list_pos_tmp, &orig_node->neigh_list) { - neigh_node = list_entry(list_pos, struct neigh_node, list); + hlist_for_each_entry_safe(neigh_node, node, node_tmp, + &orig_node->neigh_list, list) { if ((time_after(jiffies, neigh_node->last_valid + PURGE_TIMEOUT * HZ)) || @@ -225,7 +224,8 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, (neigh_node->last_valid / HZ)); neigh_purged = true; - list_del(list_pos); + + hlist_del(&neigh_node->list); kref_put(&neigh_node->refcount, neigh_node_free_ref); } else { if ((*best_neigh_node == NULL) || @@ -328,7 +328,7 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) struct net_device *net_dev = (struct net_device *)seq->private; struct bat_priv *bat_priv = netdev_priv(net_dev); struct hashtable_t *hash = bat_priv->orig_hash; - struct hlist_node *walk; + struct hlist_node *walk, *node; struct hlist_head *head; struct element_t *bucket; struct orig_node *orig_node; @@ -384,8 +384,8 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) neigh_node->addr, neigh_node->if_incoming->net_dev->name); - list_for_each_entry(neigh_node, &orig_node->neigh_list, - list) { + hlist_for_each_entry(neigh_node, node, + &orig_node->neigh_list, list) { seq_printf(seq, " %pM (%3i)", neigh_node->addr, neigh_node->tq_avg); } diff --git a/routing.c b/routing.c index 014413e..773c1ba 100644 --- a/routing.c +++ b/routing.c @@ -150,12 +150,12 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL; + struct hlist_node *node; unsigned char total_count; if (orig_node == orig_neigh_node) { - list_for_each_entry(tmp_neigh_node, - &orig_node->neigh_list, - list) { + hlist_for_each_entry(tmp_neigh_node, node, + &orig_node->neigh_list, list) { if (compare_orig(tmp_neigh_node->addr, orig_neigh_node->orig) && @@ -175,8 +175,8 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, neigh_node->last_valid = jiffies; } else { /* find packet count of corresponding one hop neighbor */ - list_for_each_entry(tmp_neigh_node, - &orig_neigh_node->neigh_list, list) { + hlist_for_each_entry(tmp_neigh_node, node, + &orig_neigh_node->neigh_list, list) { if (compare_orig(tmp_neigh_node->addr, orig_neigh_node->orig) && @@ -261,12 +261,14 @@ static void update_orig(struct bat_priv *bat_priv, char is_duplicate) { struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL; + struct hlist_node *node; int tmp_hna_buff_len; bat_dbg(DBG_BATMAN, bat_priv, "update_originator(): " "Searching and updating originator entry of received packet\n"); - list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) { + hlist_for_each_entry(tmp_neigh_node, node, + &orig_node->neigh_list, list) { if (compare_orig(tmp_neigh_node->addr, ethhdr->h_source) && (tmp_neigh_node->if_incoming == if_incoming)) { neigh_node = tmp_neigh_node; @@ -392,6 +394,7 @@ static char count_real_packets(struct ethhdr *ethhdr, struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct orig_node *orig_node; struct neigh_node *tmp_neigh_node; + struct hlist_node *node; char is_duplicate = 0; int32_t seq_diff; int need_update = 0; @@ -408,7 +411,8 @@ static char count_real_packets(struct ethhdr *ethhdr, &orig_node->batman_seqno_reset)) return -1; - list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) { + hlist_for_each_entry(tmp_neigh_node, node, + &orig_node->neigh_list, list) { is_duplicate |= get_bit_status(tmp_neigh_node->real_bits, orig_node->last_real_seqno, @@ -460,6 +464,7 @@ void update_bonding_candidates(struct bat_priv *bat_priv, int candidates; int interference_candidate; int best_tq; + struct hlist_node *node, *node2; struct neigh_node *tmp_neigh_node, *tmp_neigh_node2; struct neigh_node *first_candidate, *last_candidate; @@ -479,13 +484,15 @@ void update_bonding_candidates(struct bat_priv *bat_priv, * as "bonding partner" */ /* first, zero the list */ - list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) { + hlist_for_each_entry(tmp_neigh_node, node, + &orig_node->neigh_list, list) { tmp_neigh_node->next_bond_candidate = NULL; } first_candidate = NULL; last_candidate = NULL; - list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) { + hlist_for_each_entry(tmp_neigh_node, node, + &orig_node->neigh_list, list) { /* only consider if it has the same primary address ... */ if (memcmp(orig_node->orig, @@ -502,8 +509,8 @@ void update_bonding_candidates(struct bat_priv *bat_priv, * select this candidate because of possible interference. */ interference_candidate = 0; - list_for_each_entry(tmp_neigh_node2, - &orig_node->neigh_list, list) { + hlist_for_each_entry(tmp_neigh_node2, node2, + &orig_node->neigh_list, list) { if (tmp_neigh_node2 == tmp_neigh_node) continue; diff --git a/types.h b/types.h index c1accbf..1ce91f6 100644 --- a/types.h +++ b/types.h @@ -83,7 +83,7 @@ struct orig_node { uint8_t last_ttl; TYPE_OF_WORD bcast_bits[NUM_WORDS]; uint32_t last_bcast_seqno; - struct list_head neigh_list; + struct hlist_head neigh_list; struct list_head frag_list; unsigned long last_frag_packet; struct { @@ -105,7 +105,7 @@ struct gw_node { * @last_valid: when last packet via this neighbor was received */ struct neigh_node { - struct list_head list; + struct hlist_node list; uint8_t addr[ETH_ALEN]; uint8_t real_packet_count; uint8_t tq_recv[TQ_GLOBAL_WINDOW_SIZE]; -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-244-gb863d6e
by postmaster＠open-mesh.org 12 Dec '10

12 Dec '10

The following commit has been merged in the master branch: commit 568cb9eb815fec8efd0349f75e654035813199b6 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Dec 12 21:57:12 2010 +0000 batman-adv: protect neighbor list with rcu locks Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/originator.c b/originator.c index 1df73e3..4d6d125 100644 --- a/originator.c +++ b/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"); @@ -151,6 +165,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; @@ -200,6 +215,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) { @@ -225,14 +242,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; } @@ -384,11 +403,13 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) neigh_node->addr, neigh_node->if_incoming->net_dev->name); - hlist_for_each_entry(neigh_node, node, - &orig_node->neigh_list, list) { + rcu_read_lock(); + hlist_for_each_entry_rcu(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/routing.c b/routing.c index 773c1ba..ae383d6 100644 --- a/routing.c +++ b/routing.c @@ -154,14 +154,16 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, unsigned char total_count; if (orig_node == orig_neigh_node) { - hlist_for_each_entry(tmp_neigh_node, node, - &orig_node->neigh_list, list) { + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, node, + &orig_node->neigh_list, list) { if (compare_orig(tmp_neigh_node->addr, orig_neigh_node->orig) && (tmp_neigh_node->if_incoming == if_incoming)) neigh_node = tmp_neigh_node; } + rcu_read_unlock(); if (!neigh_node) neigh_node = create_neighbor(orig_node, @@ -175,14 +177,16 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, neigh_node->last_valid = jiffies; } else { /* find packet count of corresponding one hop neighbor */ - hlist_for_each_entry(tmp_neigh_node, node, - &orig_neigh_node->neigh_list, list) { + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, node, + &orig_neigh_node->neigh_list, list) { if (compare_orig(tmp_neigh_node->addr, orig_neigh_node->orig) && (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, @@ -267,8 +271,9 @@ 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"); - hlist_for_each_entry(tmp_neigh_node, node, - &orig_node->neigh_list, list) { + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, node, + &orig_node->neigh_list, list) { if (compare_orig(tmp_neigh_node->addr, ethhdr->h_source) && (tmp_neigh_node->if_incoming == if_incoming)) { neigh_node = tmp_neigh_node; @@ -283,6 +288,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; @@ -411,8 +417,9 @@ static char count_real_packets(struct ethhdr *ethhdr, &orig_node->batman_seqno_reset)) return -1; - hlist_for_each_entry(tmp_neigh_node, node, - &orig_node->neigh_list, list) { + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, node, + &orig_node->neigh_list, list) { is_duplicate |= get_bit_status(tmp_neigh_node->real_bits, orig_node->last_real_seqno, @@ -432,6 +439,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, @@ -484,15 +492,19 @@ void update_bonding_candidates(struct bat_priv *bat_priv, * as "bonding partner" */ /* first, zero the list */ - hlist_for_each_entry(tmp_neigh_node, node, - &orig_node->neigh_list, list) { + rcu_read_lock(); + hlist_for_each_entry_rcu(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; - hlist_for_each_entry(tmp_neigh_node, node, - &orig_node->neigh_list, list) { + + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, node, + &orig_node->neigh_list, list) { /* only consider if it has the same primary address ... */ if (memcmp(orig_node->orig, @@ -509,8 +521,8 @@ void update_bonding_candidates(struct bat_priv *bat_priv, * select this candidate because of possible interference. */ interference_candidate = 0; - hlist_for_each_entry(tmp_neigh_node2, node2, - &orig_node->neigh_list, list) { + hlist_for_each_entry_rcu(tmp_neigh_node2, node2, + &orig_node->neigh_list, list) { if (tmp_neigh_node2 == tmp_neigh_node) continue; @@ -544,6 +556,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/types.h b/types.h index 1ce91f6..1d6365d 100644 --- a/types.h +++ b/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; }; -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-244-gb863d6e
by postmaster＠open-mesh.org 12 Dec '10

12 Dec '10

The following commit has been merged in the master branch: commit ae1cd00b0412e2d220b289be340efcca30db778c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 12 21:57:13 2010 +0000 batman-adv: Remove line over 80 characters "Use kernel facilities for bit operations" increased accidently the character count on a line to more than 80 characters when counting a tab as 8 characters. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bitarray.c b/bitarray.c index 14606fc..5dad5e8 100644 --- a/bitarray.c +++ b/bitarray.c @@ -61,7 +61,7 @@ void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n) /* which position in the selected word */ word_offset = n % WORD_BIT_SIZE; - set_bit(word_offset, &seq_bits[word_num]); /* turn the position on */ + set_bit(word_offset, &seq_bits[word_num]); /* turn the position on */ } /* shift the packet array by n places. */ -- batman-adv

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2010