B.A.T.M.A.N November 2012

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

24 participants
65 discussions

[B.A.T.M.A.N.] [PATCH v4 9/9] net: batman-adv: use per_cpu_add helper
by Shan Wei 13 Nov '12

13 Nov '12

From: Shan Wei <davidshan(a)tencent.com> this_cpu_add is an atomic operation. and be more faster than per_cpu_ptr operation. Signed-off-by: Shan Wei <davidshan(a)tencent.com> Reviewed-by: Christoph Lameter <cl(a)linux.com> --- v4: no changes vs v3. --- net/batman-adv/main.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 897ba6a..3aef5b2 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -263,9 +263,7 @@ static inline bool batadv_has_timed_out(unsigned long timestamp, static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, size_t count) { - int cpu = get_cpu(); - per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count; - put_cpu(); + this_cpu_add(bat_priv->bat_counters[idx], count); } #define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1) -- 1.7.1

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Do not add multicast MAC addresses to translation table
by Linus Lüssing 13 Nov '12

13 Nov '12

The current translation table mechanism is not suitable for multicast addresses and we are currently flooding such frames anyway. Therefore this patch prevents multicast MAC addresses being added to the translation table. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- soft-interface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index 2d1f895..9955319 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -180,7 +180,8 @@ static int batadv_interface_tx(struct sk_buff *skb, goto dropped; /* Register the client MAC in the transtable */ - batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); + if (!is_multicast_ether_addr(ethhdr->h_source)) + batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); /* don't accept stp packets. STP does not help in meshes. * better use the bridge loop avoidance ... -- 1.7.10.4

4 4

[B.A.T.M.A.N.] [PATCH maint 1/2] batman-adv: don't add TEMP clients belonging to other backbone nodes
by Antonio Quartulli 13 Nov '12

13 Nov '12

The "early client detection" mechanism must not add clients belonging to other backbone nodes. Such clients must be reached by directly using the LAN instead of the mesh. This was introduced by 724d05c8215e4e8186097121595ef20b6ba601b7 ("batman-adv: detect not yet announced clients") Reported-by: Glen Page <glen.page(a)thet.net> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/translation-table.c b/translation-table.c index fec1a00..baae715 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2456,6 +2456,13 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, { bool ret = false; + /* if the originator is a backbone node (meaning it belongs to the same + * LAN of this node) the temporary client must not be added because to + * reach such destination the node must use the LAN instead of the mesh + */ + if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig)) + goto out; + if (!batadv_tt_global_add(bat_priv, orig_node, addr, BATADV_TT_CLIENT_TEMP, atomic_read(&orig_node->last_ttvn))) -- 1.8.0

2 3

[B.A.T.M.A.N.] net, batman: NULL ptr deref in batadv_iv_ogm_queue_add
by Sasha Levin 10 Nov '12

10 Nov '12

Hi all, While fuzzing with trinity in a KVM tools (lkvm) guest running latest -next kernel, I've stumbled on the following: [ 469.854708] batman_adv: �,�]+: Removing interface: bond0 [ 469.890909] BUG: unable to handle kernel NULL pointer dereference at 0000000000000003 [ 469.906428] IP: [<ffffffff839e3810>] batadv_iv_ogm_queue_add+0x20/0x700 [ 469.906428] PGD 907c067 PUD 907b067 PMD 0 [ 469.906428] Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC [ 469.906428] Dumping ftrace buffer: [ 469.921756] (ftrace buffer empty) [ 469.921756] CPU 1 [ 469.921756] Pid: 43, comm: kworker/u:1 Tainted: G W 3.7.0-rc4-next-20121109-sasha-00013-g9407f3c #125 [ 469.921756] RIP: 0010:[<ffffffff839e3810>] [<ffffffff839e3810>] batadv_iv_ogm_queue_add+0x20/0x700 [ 469.921756] RSP: 0000:ffff880013361c08 EFLAGS: 00010292 [ 469.921756] RAX: 0000000000000062 RBX: 0000000000000000 RCX: ffff8800622d2c00 [ 469.921756] RDX: 000000000000001a RSI: 0000000000000000 RDI: 0000000000000064 [ 469.921756] RBP: ffff880013361c88 R08: 0000000000000001 R09: 00000001000042bf [ 469.921756] R10: 0000000000000000 R11: 0000000000000000 R12: 00000001000042bf [ 469.921756] R13: ffff8800088e8b00 R14: ffff8800088e8b00 R15: 0000000000000001 [ 469.921756] FS: 0000000000000000(0000) GS:ffff880027800000(0000) knlGS:0000000000000000 [ 469.921756] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 469.921756] CR2: 0000000000000003 CR3: 000000000788e000 CR4: 00000000000406e0 [ 469.921756] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 469.921756] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 469.921756] Process kworker/u:1 (pid: 43, threadinfo ffff880013360000, task ffff880013358000) [ 469.921756] Stack: [ 469.921756] ffff880013361c28 ffffffff81135a74 ffff8800088e8b00 0000000000000000 [ 469.921756] ffff880013361c88 ffffffff839f32ed ffffffff839f3160 0000000000000000 [ 469.921756] ffff880021f0cae0 0000000000000000 ffff8800622d2c00 0000000000000000 [ 469.921756] Call Trace: [ 469.921756] [<ffffffff81135a74>] ? __rcu_read_unlock+0x44/0xb0 [ 469.921756] [<ffffffff839f32ed>] ? batadv_slide_own_bcast_window+0x1cd/0x1f0 [ 469.921756] [<ffffffff839f3160>] ? batadv_slide_own_bcast_window+0x40/0x1f0 [ 469.921756] [<ffffffff839e4196>] batadv_iv_ogm_schedule+0x2a6/0x300 [ 469.921756] [<ffffffff839e3ef0>] ? batadv_iv_ogm_queue_add+0x700/0x700 [ 469.921756] [<ffffffff811135cf>] ? local_bh_enable_ip+0xef/0x150 [ 469.921756] [<ffffffff839f6d90>] batadv_send_outstanding_bat_ogm_packet+0xd0/0xf0 [ 469.921756] [<ffffffff8112d539>] process_one_work+0x3b9/0x770 [ 469.921756] [<ffffffff8112d3e8>] ? process_one_work+0x268/0x770 [ 469.921756] [<ffffffff8117d3f2>] ? get_lock_stats+0x22/0x70 [ 469.921756] [<ffffffff839f6cc0>] ? batadv_add_bcast_packet_to_list+0x320/0x320 [ 469.921756] [<ffffffff8112deba>] worker_thread+0x2ba/0x3f0 [ 469.921756] [<ffffffff8112dc00>] ? rescuer_thread+0x2d0/0x2d0 [ 469.921756] [<ffffffff81138c23>] kthread+0xe3/0xf0 [ 469.921756] [<ffffffff8117d47e>] ? put_lock_stats.isra.16+0xe/0x40 [ 469.921756] [<ffffffff81138b40>] ? insert_kthread_work+0x90/0x90 [ 469.921756] [<ffffffff83be1fbc>] ret_from_fork+0x7c/0xb0 [ 469.921756] [<ffffffff81138b40>] ? insert_kthread_work+0x90/0x90 [ 469.921756] Code: 16 7a fd e8 43 22 75 fd 5d c3 90 55 48 89 e5 41 57 41 56 41 55 49 89 fd bf 64 00 00 00 41 54 4d 89 cc 53 48 83 ec 58 48 89 75 b8 <0f> b6 5e 03 89 55 c0 48 89 4d b0 44 89 45 c4 e8 9c ec 72 fd 49 [ 469.921756] RIP [<ffffffff839e3810>] batadv_iv_ogm_queue_add+0x20/0x700 [ 469.921756] RSP <ffff880013361c08> [ 469.921756] CR2: 0000000000000003 [ 470.016647] ---[ end trace 42fb97717ce977ba ]--- Thanks, Sasha

1 0

[B.A.T.M.A.N.] 11s mesh mode on openwrt + batman-adv
by Flavio Leonel 09 Nov '12

09 Nov '12

hello friends come again disturb the lords - I have a network with openrando opewrt customized by me, here in Brazil as jah reported in other emails, but this network is growing and am having some difficulties that I can not solve it alone ... my ath9k driver operates today with 802.11s (mesh) on a virtual interface and another interface with 802.11g + n for wifi connections .. but I'm from the beginning in 2011 fighting with routing in the network .. AP: (config) Attached ... eg not know where I really run batman-adv or even whether he really works well with HWMP ... help me ...

2 1

[B.A.T.M.A.N.] [PATCH v3 9/9] net: batman-adv: use per_cpu_add helper
by Shan Wei 09 Nov '12

09 Nov '12

From: Shan Wei <davidshan(a)tencent.com> this_cpu_add is an atomic operation. and be more faster than per_cpu_ptr operation. Signed-off-by: Shan Wei <davidshan(a)tencent.com> Reviewed-by: Christoph Lameter <cl(a)linux.com> --- v3: change commit message. --- net/batman-adv/main.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 897ba6a..3aef5b2 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -263,9 +263,7 @@ static inline bool batadv_has_timed_out(unsigned long timestamp, static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, size_t count) { - int cpu = get_cpu(); - per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count; - put_cpu(); + this_cpu_add(bat_priv->bat_counters[idx], count); } #define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1) -- 1.7.1

1 0

[B.A.T.M.A.N.] [PATCH next] batman-adv: fix kernel-doc for batadv_reroute_unicast_packet()
by Antonio Quartulli 08 Nov '12

08 Nov '12

This was introduced by ("batman-adv: substitute tt_poss_change with a per-tt_entry flag") Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/routing.c b/routing.c index 63ff456..1aa1722 100644 --- a/routing.c +++ b/routing.c @@ -877,11 +877,10 @@ out: * @bat_priv: the bat priv with all the soft interface information * @unicast_packet: the unicast header to be updated * @dst_addr: the payload destination - * @msg: the message to print explaining the reason of the requested re-route * - * Search the global translation table for dst_addr and update the unicast - * header with the new corresponding information (originator address where the - * destination client currently is and its known TTVN) + * Search the translation table for dst_addr and update the unicast header with + * the new corresponding information (originator address where the destination + * client currently is and its known TTVN) * * Returns true if the packet header has been updated, false otherwise */ -- 1.8.0

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: correctly pass the WIFI flag on tt_response
by Antonio Quartulli 08 Nov '12

08 Nov '12

When a TT response with the full table is sent, attribue flags should be sent as well. This patch fix the flags assignment when populating the tt_response to send back This was introduced by ("batman-adv: detect not yet announced clients") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- * based on maint translation-table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 64c0012..2ff086e 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1469,6 +1469,7 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, ssize_t tt_query_size = sizeof(struct batadv_tt_query_packet); uint32_t i; size_t len; + uint8_t flags; if (tt_query_size + tt_len > primary_if->soft_iface->mtu) { tt_len = primary_if->soft_iface->mtu - tt_query_size; @@ -1502,7 +1503,8 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, memcpy(tt_change->addr, tt_common_entry->addr, ETH_ALEN); - tt_change->flags = BATADV_NO_FLAGS; + flags = tt_common_entry->flags | TT_CLIENT_WIFI; + tt_change->flags = flags; tt_count++; tt_change++; -- 1.8.0

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: fix tt_global_entries flags update
by Antonio Quartulli 08 Nov '12

08 Nov '12

Flags carried by a change_entry have to be always copied into the client entry as they may contain important attributes (e.g. TT_CLIENT_WIFI). For instance, a client added by means of the "early detection mechanism" has no flag set at the beginning, so they must be updated once the proper ADD event is received. This was introduced by ("batman-adv: detect not yet announced clients") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- This patch is based on "maint" translation-table.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/translation-table.c b/translation-table.c index 112edd3..64c0012 100644 --- a/translation-table.c +++ b/translation-table.c @@ -769,6 +769,12 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, */ tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_TEMP; + /* the change can carry possible "attribute" flags like the + * TT_CLIENT_WIFI, therefore they have to be copied in the + * client entry + */ + tt_global_entry->common.flags |= flags; + /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only * one originator left in the list and we previously received a * delete + roaming change for this originator. -- 1.8.0

2 1

[B.A.T.M.A.N.] pull request: batman-adv 2012-11-07
by Antonio Quartulli 08 Nov '12

08 Nov '12

Hello David, first of all thank you for having made us aware of the packet format problem in batman-adv! The impact of __packed on performances was not entirely known to me, in particular for what concerns the RISC arch. We have to change a number of packet formats before we can remove __packed everywhere which will obviously break compatibility. However we already scheduled a compatibility break because we want to heavily improve our packet formats and to provide a more flexible framework that would allow us to add new types and features while reducing the probability of breaking compatibility again and again as happened in the past (we are implementing TypeLengthValue (TLV) containers among other things). To avoid breaking compatibility (at least) twice we decided to fix now (in this patchset) what is fixable with no consequences to compatibility while we would ilike to defer the remaining changes for the scheduled compatibility break. In this patchset you have the two new features intended for net-next/linux-3.8: 1) the new UNICAST_4ADDR packet type 2) the Distributed ARP Table (DAT) component The new packet type has been reviewed to entirely address the alignment issue. At the same time we also reviewed the other packet types but as I told you before, we will send these changes later. Other than that you have patch 02/12 that removes the __packed attribute from the structures where it was not really needed. Please, let me know if there is any problem. Thank you very much, Antonio The following changes since commit 6f0a0986e328dd61610d898a09c9f4aa960ae64a: usbnet: runtime wake up device before calling usbnet_{read|write}_cmd (2012-11-07 03:53:38 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 9affec6be810d1d529cb9dc95126119451696ba6: batman-adv: enable fast client detection using unicast_4addr packets (2012-11-07 20:00:24 +0100) ---------------------------------------------------------------- Included changes: - minimal fixes to the packet layout to avoid the __packed attribute when not needed - new packet type called UNICAST_4ADDR: in this packet it is possible to find both source and destination node (in the classic UNICAST header only the destination field exists). - a new feature: Distributed ARP Table (D.A.T.). It aims to reduce ARP lookups latency by means of a simil-DHT approach. ---------------------------------------------------------------- Antonio Quartulli (9): batman-adv: add UNICAST_4ADDR packet type batman-adv: Distributed ARP Table - add a new debug log level batman-adv: Distributed ARP Table - create DHT helper functions batman-adv: Distributed ARP Table - implement local storage batman-adv: Distributed ARP Table - add ARP parsing functions batman-adv: Distributed ARP Table - add snooping functions for ARP messages batman-adv: Distributed ARP Table - add compile option batman-adv: Distributed ARP Table - add runtime switch batman-adv: enable fast client detection using unicast_4addr packets Martin Hundebøll (1): batman-adv: Add get_ethtool_stats() support for DAT Sven Eckelmann (2): batman-adv: Reserve extra bytes in skb for better alignment batman-adv: Mark correctly aligned headers not as __packed Documentation/networking/batman-adv.txt | 3 +- net/batman-adv/Kconfig | 10 + net/batman-adv/Makefile | 1 + net/batman-adv/bat_iv_ogm.c | 8 +- net/batman-adv/debugfs.c | 20 + net/batman-adv/distributed-arp-table.c | 1066 +++++++++++++++++++++++++++++++ net/batman-adv/distributed-arp-table.h | 167 +++++ net/batman-adv/hard-interface.c | 3 + net/batman-adv/icmp_socket.c | 4 +- net/batman-adv/main.c | 9 + net/batman-adv/main.h | 13 +- net/batman-adv/originator.c | 2 + net/batman-adv/packet.h | 68 +- net/batman-adv/routing.c | 51 +- net/batman-adv/send.c | 4 + net/batman-adv/soft-interface.c | 28 +- net/batman-adv/sysfs.c | 7 + net/batman-adv/translation-table.c | 20 +- net/batman-adv/types.h | 73 +++ net/batman-adv/unicast.c | 135 +++- net/batman-adv/unicast.h | 36 +- net/batman-adv/vis.c | 9 +- 22 files changed, 1682 insertions(+), 55 deletions(-) create mode 100644 net/batman-adv/distributed-arp-table.c create mode 100644 net/batman-adv/distributed-arp-table.h

3 15

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2012