B.A.T.M.A.N April 2012

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

25 participants
63 discussions

Re: [B.A.T.M.A.N.] [PATCH 4/5] batman-adv: trivial endianness annotations
by Marek Lindner 25 Apr '12

25 Apr '12

On Sunday, April 22, 2012 14:47:50 Al Viro wrote: > Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk> > --- > net/batman-adv/bridge_loop_avoidance.c | 6 +++--- > net/batman-adv/distributed-arp-table.c | 16 ++++++++-------- > net/batman-adv/distributed-arp-table.h | 4 ++-- > net/batman-adv/packet.h | 12 ++++++------ > 4 files changed, 19 insertions(+), 19 deletions(-) Applied in revision 276f053. Thanks, Marek

1 0

Re: [B.A.T.M.A.N.] [PATCH 5/5] batman-adv: get rid of pointless cast in memcpy()
by Marek Lindner 25 Apr '12

25 Apr '12

On Sunday, April 22, 2012 14:50:29 Al Viro wrote: > memcpy() arguments are void *, precisely to avoid that kind of pointless > casts. > > Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk> Applied in revision 815cfb5. Thanks, Marek

1 0

Re: [B.A.T.M.A.N.] [PATCH 1/5] batman-adv: don't bother flipping ->tt_data
by Marek Lindner 25 Apr '12

25 Apr '12

Hey, I was about to merge the patch when I realized checkpatch is complaining. See below for details. > @@ -618,7 +615,7 @@ int recv_tt_query(struct sk_buff *skb, struct > hard_iface *recv_if) if (skb_linearize(skb) < 0) > goto out; > > - tt_len = tt_query->tt_data * sizeof(struct tt_change); > + tt_len = ntohs(tt_query->tt_data) * sizeof(struct tt_change); Line is too long. > @@ -1727,7 +1727,7 @@ void handle_tt_response(struct bat_priv *bat_priv, > > bat_dbg(DBG_TT, bat_priv, > "Received TT_RESPONSE from %pM for ttvn %d t_size: %d [%c]\n", > - tt_response->src, tt_response->ttvn, tt_response->tt_data, > + tt_response->src, tt_response->ttvn, ntohs(tt_response->tt_data), > (tt_response->flags & TT_FULL_TABLE ? 'F' : '.')); > > /* we should have never asked a backbone gw */ > @@ -1741,7 +1741,7 @@ void handle_tt_response(struct bat_priv *bat_priv, > if (tt_response->flags & TT_FULL_TABLE) > tt_fill_gtable(bat_priv, tt_response); > else > - tt_update_changes(bat_priv, orig_node, tt_response->tt_data, > + tt_update_changes(bat_priv, orig_node, ntohs(tt_response->tt_data), > tt_response->ttvn, > (struct tt_change *)(tt_response + 1)); Both changes are too long as well. Regards, Marek

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: return added entries instead of number of possibly added entries
by Marek Lindner 25 Apr '12

25 Apr '12

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- translation-table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/translation-table.c b/translation-table.c index f8f207a..88c62f1 100644 --- a/translation-table.c +++ b/translation-table.c @@ -319,7 +319,7 @@ int tt_changes_fill_buffer(struct bat_priv *bat_priv, } spin_unlock_bh(&bat_priv->tt_buff_lock); - return tot_changes; + return count; } int tt_local_seq_print_text(struct seq_file *seq, void *offset) -- 1.7.9.1

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Add cast to bat_counters in types.h
by Martin Hundebøll 25 Apr '12

25 Apr '12

Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types.h b/types.h index 2944f77..41283e0 100644 --- a/types.h +++ b/types.h @@ -187,7 +187,7 @@ enum bat_counters { struct bat_priv { atomic_t mesh_state; struct net_device_stats stats; - uint64_t *bat_counters; /* Per cpu counters */ + uint64_t __percpu *bat_counters; /* Per cpu counters */ atomic_t aggregated_ogms; /* boolean */ atomic_t bonding; /* boolean */ atomic_t fragmentation; /* boolean */ -- 1.7.10

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: make __alloc_percpu 2.6.29 compatible
by Martin Hundebøll 25 Apr '12

25 Apr '12

In 2.6.29, __alloc_percpu doesn't take a align argument, so ignore this. Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- compat.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/compat.h b/compat.h index 1cf5210..98b2b4c 100644 --- a/compat.h +++ b/compat.h @@ -148,4 +148,13 @@ static inline void eth_hw_addr_random(struct net_device *dev) #endif /* < KERNEL_VERSION(3, 4, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) + +#undef __alloc_percpu +#define __alloc_percpu(size, align) \ + percpu_alloc_mask((size), GFP_KERNEL, cpu_possible_map) + +#endif /* < KERNEL_VERSION(2, 6, 30) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ -- 1.7.10

2 1

[B.A.T.M.A.N.] [PATCH 0/3] Cleanups
by Antonio Quartulli 25 Apr '12

25 Apr '12

*** This patches are for next since they should be sent to David within the next pull request *** The following three patches simply clean the code by following David's suggestions and more. Remember: - multiline comment must end with */ on a new line - not compiled-in routines must be faked by means of static functions, not defines Thanks, Antonio

2 6

Re: [B.A.T.M.A.N.] pull request: batman-adv 2012-04-18
by Antonio Quartulli 23 Apr '12

23 Apr '12

Hello, On Thu, Apr 19, 2012 at 02:48:54 +0100, Al Viro wrote: > On Thu, Apr 19, 2012 at 08:10:27AM +0200, Antonio Quartulli wrote: > > > Hello Al, > > > > and thank you very much for your patches. > > Before committing them, do you mind if we reword the subject by substituting > > "batman" with "batman-adv"? > > No problem... > > > Moreover, patch 3/4, fixes the memcpy() casting too other than the endianess > > 4/4, actually. > > > stuff. We would prefer to have two different patches for fixing those two > > issues. What about splitting it and resending them? > > Can do; I've just grepped for memcpy() in there, to see if there are other > places like that. Thanks! > Haven't found any, but > * you do an awful lot of GFP_ATOMIC allocations and those can and > do fail from time to time. What's worse, you ignore some of those failures - > e.g. failing allocation in orig_hash_{add,del}_if() will be ignored by the > caller. I haven't looked into that code enough to tell if it could be > exploited, but I really don't like the look of it... > * orig_node_add_if() leaves junk in added array elements. You do > kmalloc() followed by memcpy(), but leave the last element uninitialized. > May be safe if you assign it soon enough, but I'd suggest checking that. > * orig_node_del_if() looks odd - it removes element #hard_iface->if_num > and shifts all subsequent ones down; then it renumbers interfaces to match > that. So far, so good, and there's even a plausible comment about locking: > /* renumber remaining batman interfaces _inside_ of orig_hash_lock */ > except that no such lock exists since commit d007260. What protects us from > the obvious race in there? Thank you very much for your analysis. I really appreciated it! I'm CCing our mailing list so that other people can comment on it. Cheers, -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara

3 3

[B.A.T.M.A.N.] [PATCH] batman-adv: ignore trailing CR when comparing protocol names
by Marek Lindner 22 Apr '12

22 Apr '12

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 1d338a3..fa29234 100644 --- a/main.c +++ b/main.c @@ -378,14 +378,19 @@ int bat_algo_seq_print_text(struct seq_file *seq, void *offset) static int param_set_ra(const char *val, const struct kernel_param *kp) { struct bat_algo_ops *bat_algo_ops; + char *algo_name = (char *)val; + size_t name_len = strlen(algo_name); - bat_algo_ops = bat_algo_get((char *)val); + if (algo_name[name_len - 1] == '\n') + algo_name[name_len - 1] = '\0'; + + bat_algo_ops = bat_algo_get(algo_name); if (!bat_algo_ops) { - pr_err("Routing algorithm '%s' is not supported\n", val); + pr_err("Routing algorithm '%s' is not supported\n", algo_name); return -EINVAL; } - return param_set_copystring(val, kp); + return param_set_copystring(algo_name, kp); } static const struct kernel_param_ops param_ops_ra = { -- 1.7.9.1

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: avoid characters requiring shell escapes in protocol names
by Marek Lindner 22 Apr '12

22 Apr '12

Reported-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- bat_iv_ogm.c | 2 +- main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index ed743a4..19da9d5 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1233,7 +1233,7 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, } static struct bat_algo_ops batman_iv __read_mostly = { - .name = "BATMAN IV", + .name = "BATMAN_IV", .bat_iface_enable = bat_iv_ogm_iface_enable, .bat_iface_disable = bat_iv_ogm_iface_disable, .bat_iface_update_mac = bat_iv_ogm_iface_update_mac, diff --git a/main.c b/main.c index 0757c2d..1d338a3 100644 --- a/main.c +++ b/main.c @@ -40,7 +40,7 @@ * list traversals just rcu-locked */ struct list_head hardif_list; static int (*recv_packet_handler[256])(struct sk_buff *, struct hard_iface *); -char bat_routing_algo[20] = "BATMAN IV"; +char bat_routing_algo[20] = "BATMAN_IV"; static struct hlist_head bat_algo_list; unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -- 1.7.9.1

1 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N April 2012