B.A.T.M.A.N October 2011

b.a.t.m.a.n@lists.open-mesh.org

14 participants
43 discussions

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Fix style changes reported by cppcheck
by Simon Wunderlich 30 Oct '11

30 Oct '11

cppcheck reported some style issues this patch fixes. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- bat_iv_ogm.c | 2 +- routing.c | 2 +- soft-interface.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 3512e25..17b6dfa 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -990,7 +990,6 @@ static void bat_ogm_process(const struct ethhdr *ethhdr, if (is_my_orig) { unsigned long *word; - int offset; orig_neigh_node = get_orig_node(bat_priv, ethhdr->h_source); if (!orig_neigh_node) @@ -1002,6 +1001,7 @@ static void bat_ogm_process(const struct ethhdr *ethhdr, if (has_directlink_flag && compare_eth(if_incoming->net_dev->dev_addr, batman_ogm_packet->orig)) { + int offset; offset = if_incoming->if_num * NUM_WORDS; spin_lock_bh(&orig_neigh_node->ogm_cnt_lock); diff --git a/routing.c b/routing.c index ef24a72..3e97c2c 100644 --- a/routing.c +++ b/routing.c @@ -977,7 +977,6 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if) struct unicast_frag_packet *unicast_packet; int hdr_size = sizeof(*unicast_packet); struct sk_buff *new_skb = NULL; - int ret; if (check_unicast_packet(skb, hdr_size) < 0) return NET_RX_DROP; @@ -989,6 +988,7 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if) /* packet for me */ if (is_my_mac(unicast_packet->dest)) { + int ret; ret = frag_reassemble_skb(skb, bat_priv, &new_skb); diff --git a/soft-interface.c b/soft-interface.c index 45297c8..3ed6781 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -692,7 +692,6 @@ void interface_rx(struct net_device *soft_iface, struct vlan_ethhdr *vhdr; struct softif_neigh *curr_softif_neigh = NULL; short vid = -1; - int ret; /* check if enough space is available for pulling, and pull */ if (!pskb_may_pull(skb, hdr_size)) @@ -722,6 +721,7 @@ void interface_rx(struct net_device *soft_iface, */ curr_softif_neigh = softif_neigh_vid_get_selected(bat_priv, vid); if (curr_softif_neigh) { + int ret; skb_push(skb, hdr_size); unicast_packet = (struct unicast_packet *)skb->data; -- 1.7.7.1

2 2

[B.A.T.M.A.N.] Weird TTL for ICMP packets
by Sven Eckelmann 30 Oct '11

30 Oct '11

Hi, just looked through some ICMP code in icmp_socket.c and found a little bit weird TTL: 218 if (icmp_packet->version != COMPAT_VERSION) { 219 icmp_packet->msg_type = PARAMETER_PROBLEM; 220 icmp_packet->ttl = COMPAT_VERSION; 221 bat_socket_add_packet(socket_client, icmp_packet, packet_len); 222 goto free_skb; 223 } It was introduced by dba95eb270ff9674326865a20d25921c69c04d6c. My guess is that TTL should be used. Kind regards, Sven

2 3

[B.A.T.M.A.N.] pull request: batman-adv 2011-10-29
by Marek Lindner 30 Oct '11

30 Oct '11

Hi David, we have 3 more bugfixes for you which we would like to see getting merged into net-next/linux-3.2. They fix refcounting, a crash on module unload and a protocol handling bug. Thanks, Marek The following changes since commit 9d8523931f7f5eb8900077f0da0fbe6b8ad0010b: batman-adv: correctly set the data field in the TT_REPONSE packet (2011-10-18 22:45:10 +0200) are available in the git repository at: git://git.open-mesh.org/linux-merge.git batman-adv/maint Antonio Quartulli (1): batman-adv: unify hash_entry field position in tt_local/global_entry Simon Wunderlich (2): batman-adv: remove references for global tt entries batman-adv: add sanity check when removing global tts net/batman-adv/translation-table.c | 17 ++++++++++++++++- net/batman-adv/types.h | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-)

3 5

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: fix tt_local_reset_flags() function
by Antonio Quartulli 25 Oct '11

25 Oct '11

Currently the counter of tt_local_entry structures (tt_local_num) is incremented each time the tt_local_reset_flags() is invoked causing the node to send wrong TT_REPONSE packets containing a copy of non-initialised memory thus corrupting other nodes global translation table and making higher level communication impossible. Reported-by: Junkeun Song <jun361(a)gmail.com> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Acked-by: Junkeun Song <jun361(a)gmail.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- David S. Miller already merged this patch as 31901264511cf20c5ed33b8649a3ca9ce28df60b in his net-next tree net/batman-adv/translation-table.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index fb6931d..f599db9 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1668,6 +1668,8 @@ static void tt_local_reset_flags(struct bat_priv *bat_priv, uint16_t flags) rcu_read_lock(); hlist_for_each_entry_rcu(tt_local_entry, node, head, hash_entry) { + if (!(tt_local_entry->flags & flags)) + continue; tt_local_entry->flags &= ~flags; atomic_inc(&bat_priv->num_local_tt); } -- 1.7.3.4

1 1

[B.A.T.M.A.N.] [PATCHv3 1/3] batman-adv: linearise the tt_response skb only if needed
by Antonio Quartulli 24 Oct '11

24 Oct '11

The TT_RESPONSE skb has to be linearised only if the node plans to access the packet payload (so only if the message is directed to that node). In all the other cases the node can avoid this memory operation Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/routing.c b/routing.c index 60ce407..e0e7b7b 100644 --- a/routing.c +++ b/routing.c @@ -616,13 +616,14 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) } break; case TT_RESPONSE: - /* packet needs to be linearized to access the TT changes */ - if (skb_linearize(skb) < 0) - goto out; + if (is_my_mac(tt_query->dst)) { + /* packet needs to be linearized to access the TT + * changes */ + if (skb_linearize(skb) < 0) + goto out; - if (is_my_mac(tt_query->dst)) handle_tt_response(bat_priv, tt_query); - else { + } else { bat_dbg(DBG_TT, bat_priv, "Routing TT_RESPONSE to %pM [%c]\n", tt_query->dst, -- 1.7.3.4

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: directly write tt entries without buffering
by Simon Wunderlich 24 Oct '11

24 Oct '11

When the translation tables (global and local) are written for debugfs, it is not neccesary to allocate a buffer, we can directly use seq_printf() to print them out. This might actually be safer if the table changes between size calculation and traversal, and we can't estimate the required size wrong. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- translation-table.c | 57 +------------------------------------------------- 1 files changed, 2 insertions(+), 55 deletions(-) diff --git a/translation-table.c b/translation-table.c index c2af2b1..fadbc05 100644 --- a/translation-table.c +++ b/translation-table.c @@ -302,8 +302,6 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset) struct hard_iface *primary_if; struct hlist_node *node; struct hlist_head *head; - size_t buf_size, pos; - char *buff; uint32_t i; int ret = 0; @@ -326,34 +324,13 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset) "announced via TT (TTVN: %u):\n", net_dev->name, (uint8_t)atomic_read(&bat_priv->ttvn)); - buf_size = 1; - /* Estimate length for: " * xx:xx:xx:xx:xx:xx\n" */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - - rcu_read_lock(); - __hlist_for_each_rcu(node, head) - buf_size += 29; - rcu_read_unlock(); - } - - buff = kmalloc(buf_size, GFP_ATOMIC); - if (!buff) { - ret = -ENOMEM; - goto out; - } - - buff[0] = '\0'; - pos = 0; - for (i = 0; i < hash->size; i++) { head = &hash->table[i]; rcu_read_lock(); hlist_for_each_entry_rcu(tt_local_entry, node, head, hash_entry) { - pos += snprintf(buff + pos, 30, " * %pM " - "[%c%c%c%c%c]\n", + seq_printf(seq, " * %pM [%c%c%c%c%c]\n", tt_local_entry->addr, (tt_local_entry->flags & TT_CLIENT_ROAM ? 'R' : '.'), @@ -368,9 +345,6 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset) } rcu_read_unlock(); } - - seq_printf(seq, "%s", buff); - kfree(buff); out: if (primary_if) hardif_free_ref(primary_if); @@ -579,8 +553,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) struct hard_iface *primary_if; struct hlist_node *node; struct hlist_head *head; - size_t buf_size, pos; - char *buff; uint32_t i; int ret = 0; @@ -605,35 +577,13 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, " %-13s %s %-15s %s %s\n", "Client", "(TTVN)", "Originator", "(Curr TTVN)", "Flags"); - buf_size = 1; - /* Estimate length for: " * xx:xx:xx:xx:xx:xx (ttvn) via - * xx:xx:xx:xx:xx:xx (cur_ttvn)\n"*/ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - - rcu_read_lock(); - __hlist_for_each_rcu(node, head) - buf_size += 67; - rcu_read_unlock(); - } - - buff = kmalloc(buf_size, GFP_ATOMIC); - if (!buff) { - ret = -ENOMEM; - goto out; - } - - buff[0] = '\0'; - pos = 0; - for (i = 0; i < hash->size; i++) { head = &hash->table[i]; rcu_read_lock(); hlist_for_each_entry_rcu(tt_global_entry, node, head, hash_entry) { - pos += snprintf(buff + pos, 69, - " * %pM (%3u) via %pM (%3u) " + seq_printf(seq, " * %pM (%3u) via %pM (%3u) " "[%c%c%c]\n", tt_global_entry->addr, tt_global_entry->ttvn, tt_global_entry->orig_node->orig, @@ -649,9 +599,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) } rcu_read_unlock(); } - - seq_printf(seq, "%s", buff); - kfree(buff); out: if (primary_if) hardif_free_ref(primary_if); -- 1.7.7

2 1

[B.A.T.M.A.N.] [PATCH] batctl: correct ttcrc print format in the tcpdump output
by Antonio Quartull 24 Oct '11

24 Oct '11

The OGM ttcrc field is an unsigned short int, therefore it has to be printed using %hu and has to be converted from network to host order using ntohs Signed-off-by: Antonio Quartull <ordex(a)autistici.org> --- tcpdump.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index 977bedc..7dd289e 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -331,10 +331,10 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_ogm_packet->orig, read_opt)); - printf("OGM via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %d, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", + printf("OGM via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %hu, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), ntohl(batman_ogm_packet->seqno), batman_ogm_packet->tq, batman_ogm_packet->ttvn, - ntohl(batman_ogm_packet->tt_crc), batman_ogm_packet->ttl, batman_ogm_packet->version, + ntohs(batman_ogm_packet->tt_crc), batman_ogm_packet->ttl, batman_ogm_packet->version, (batman_ogm_packet->flags & DIRECTLINK ? 'D' : '.'), (batman_ogm_packet->flags & VIS_SERVER ? 'V' : '.'), (batman_ogm_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'), -- 1.7.3.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: unify hash_entry field position in tt_local/global_entry
by Antonio Quartulli 24 Oct '11

24 Oct '11

Function tt_response_fill_table() actually uses a tt_local_entry pointer to iterate either over the local or the global table entries (it depends on the what hash table is passed as argument). To iterate over such entries the hlist_for_each_entry_rcu() macro has to access their "hash_entry" field which MUST be at the same position in both the tt_global/local_entry structures. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- types.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/types.h b/types.h index 1ae3557..ab8d0fe 100644 --- a/types.h +++ b/types.h @@ -224,22 +224,22 @@ struct socket_packet { struct tt_local_entry { uint8_t addr[ETH_ALEN]; + struct hlist_node hash_entry; unsigned long last_seen; uint16_t flags; atomic_t refcount; struct rcu_head rcu; - struct hlist_node hash_entry; }; struct tt_global_entry { uint8_t addr[ETH_ALEN]; + struct hlist_node hash_entry; /* entry in the global table */ struct orig_node *orig_node; uint8_t ttvn; uint16_t flags; /* only TT_GLOBAL_ROAM is used */ unsigned long roam_at; /* time at which TT_GLOBAL_ROAM was set */ atomic_t refcount; struct rcu_head rcu; - struct hlist_node hash_entry; /* entry in the global table */ }; struct tt_change_node { -- 1.7.3.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: add sanity check when removing global tts
by Simon Wunderlich 24 Oct '11

24 Oct '11

After removing the batman-adv module, the hash may be already gone when tt_global_del_orig() tries to clean the hash. This patch adds a sanity check to avoid this. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- translation-table.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/translation-table.c b/translation-table.c index c2af2b1..ffa846c 100644 --- a/translation-table.c +++ b/translation-table.c @@ -712,6 +712,9 @@ void tt_global_del_orig(struct bat_priv *bat_priv, struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ + if (!hash) + return; + for (i = 0; i < hash->size; i++) { head = &hash->table[i]; list_lock = &hash->list_locks[i]; -- 1.7.7

4 3

[B.A.T.M.A.N.] [PATCH] batman-adv: remove references for global tt entries
by Simon Wunderlich 24 Oct '11

24 Oct '11

struct tt_global_entry holds a reference to an orig_node which must be decremented before deallocating the structure. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- compat.c | 8 -------- compat.h | 1 - translation-table.c | 14 +++++++++++++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/compat.c b/compat.c index 88ceb40..1793904 100644 --- a/compat.c +++ b/compat.c @@ -36,12 +36,4 @@ void free_rcu_tt_local_entry(struct rcu_head *rcu) kfree(tt_local_entry); } -void free_rcu_tt_global_entry(struct rcu_head *rcu) -{ - struct tt_global_entry *tt_global_entry; - - tt_global_entry = container_of(rcu, struct tt_global_entry, rcu); - kfree(tt_global_entry); -} - #endif /* < KERNEL_VERSION(3, 0, 0) */ diff --git a/compat.h b/compat.h index 43654e8..58c3c6a 100644 --- a/compat.h +++ b/compat.h @@ -63,7 +63,6 @@ void free_rcu_gw_node(struct rcu_head *rcu); void free_rcu_neigh_node(struct rcu_head *rcu); void free_rcu_softif_neigh(struct rcu_head *rcu); void free_rcu_tt_local_entry(struct rcu_head *rcu); -void free_rcu_tt_global_entry(struct rcu_head *rcu); #endif /* < KERNEL_VERSION(3, 0, 0) */ diff --git a/translation-table.c b/translation-table.c index 873fb3d..abf05cb 100644 --- a/translation-table.c +++ b/translation-table.c @@ -137,10 +137,22 @@ static void tt_local_entry_free_ref(struct tt_local_entry *tt_local_entry) kfree_rcu(tt_local_entry, rcu); } +static void tt_global_entry_free_rcu(struct rcu_head *rcu) +{ + struct tt_global_entry *tt_global_entry; + + tt_global_entry = container_of(rcu, struct tt_global_entry, rcu); + + if (tt_global_entry->orig_node) + orig_node_free_ref(tt_global_entry->orig_node); + + kfree(tt_global_entry); +} + static void tt_global_entry_free_ref(struct tt_global_entry *tt_global_entry) { if (atomic_dec_and_test(&tt_global_entry->refcount)) - kfree_rcu(tt_global_entry, rcu); + call_rcu(&tt_global_entry->rcu, tt_global_entry_free_rcu); } static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr, -- 1.7.7

4 5

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N October 2011