B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] batman-adv: unicast fragmentation enhancements
by Andreas Langer 13 Sep '10

13 Sep '10

Hi, things that changed since the last patch: - add support to fragment packets on every node, if outgoing iface mtu is smaller as the packet - add support to defragment packets on every node, if outgoing iface mtu is >= original size - rename some functions In this patch every node defragment packets if it can. Do you think it is better to add an option to enable/disable this ? regards, Andreas

3 6

[B.A.T.M.A.N.] [PATCH] batman-adv: checkpatch cleanup of comments
by Sven Eckelmann 12 Sep '10

12 Sep '10

checkpatch now detects the start of a comment and warns about usage of multiple spaces at the beginning of a line. We have to replace the ' ' in multiple lines comments by ' * ' to fix it. Checkpatch also wants a comment after a definition of a spinlock_t which describes what it protects. It is currently not possible to add it before the actual struct which includes the spinlock. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/packet.h | 2 +- batman-adv/types.h | 21 +++++++++++---------- batman-adv/vis.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/batman-adv/packet.h b/batman-adv/packet.h index 87e652e..b49fdf7 100644 --- a/batman-adv/packet.h +++ b/batman-adv/packet.h @@ -81,7 +81,7 @@ struct icmp_packet { #define BAT_RR_LEN 16 /* icmp_packet_rr must start with all fields from imcp_packet - as this is assumed by code that handles ICMP packets */ + * as this is assumed by code that handles ICMP packets */ struct icmp_packet_rr { uint8_t packet_type; uint8_t version; /* batman version field */ diff --git a/batman-adv/types.h b/batman-adv/types.h index 1e736fb..e7b53a4 100644 --- a/batman-adv/types.h +++ b/batman-adv/types.h @@ -118,6 +118,7 @@ struct neigh_node { struct batman_if *if_incoming; }; + struct bat_priv { atomic_t mesh_state; struct net_device_stats stats; @@ -145,14 +146,14 @@ struct bat_priv { struct hashtable_t *hna_local_hash; struct hashtable_t *hna_global_hash; struct hashtable_t *vis_hash; - spinlock_t orig_hash_lock; - spinlock_t forw_bat_list_lock; - spinlock_t forw_bcast_list_lock; - spinlock_t hna_lhash_lock; - spinlock_t hna_ghash_lock; - spinlock_t gw_list_lock; - spinlock_t vis_hash_lock; - spinlock_t vis_list_lock; + spinlock_t orig_hash_lock; /* protects orig_hash */ + spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ + spinlock_t forw_bcast_list_lock; /* protects */ + spinlock_t hna_lhash_lock; /* protects hna_local_hash */ + spinlock_t hna_ghash_lock; /* protects hna_global_hash */ + spinlock_t gw_list_lock; /* protects gw_list */ + spinlock_t vis_hash_lock; /* protects vis_hash */ + spinlock_t vis_list_lock; /* protects vis_info::recv_list */ int16_t num_local_hna; atomic_t hna_local_changed; struct delayed_work hna_work; @@ -166,7 +167,7 @@ struct socket_client { struct list_head queue_list; unsigned int queue_len; unsigned char index; - spinlock_t lock; + spinlock_t lock; /* protects queue_list, queue_len, index */ wait_queue_head_t queue_wait; struct bat_priv *bat_priv; }; @@ -218,7 +219,7 @@ struct debug_log { char log_buff[LOG_BUF_LEN]; unsigned long log_start; unsigned long log_end; - spinlock_t lock; + spinlock_t lock; /* protects log_buff, log_start and log_end */ wait_queue_head_t queue_wait; }; diff --git a/batman-adv/vis.c b/batman-adv/vis.c index 6de5c76..ddfdcd8 100644 --- a/batman-adv/vis.c +++ b/batman-adv/vis.c @@ -34,14 +34,14 @@ #define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) /* Checks if a sequence number x is a predecessor/successor of y. - they handle overflows/underflows and can correctly check for a - predecessor/successor unless the variable sequence number has grown by - more then 2**(bitwidth(x)-1)-1. - This means that for a uint8_t with the maximum value 255, it would think: - * when adding nothing - it is neither a predecessor nor a successor - * before adding more than 127 to the starting value - it is a predecessor, - * when adding 128 - it is neither a predecessor nor a successor, - * after adding more than 127 to the starting value - it is a successor */ + * they handle overflows/underflows and can correctly check for a + * predecessor/successor unless the variable sequence number has grown by + * more then 2**(bitwidth(x)-1)-1. + * This means that for a uint8_t with the maximum value 255, it would think: + * - when adding nothing - it is neither a predecessor nor a successor + * - before adding more than 127 to the starting value - it is a predecessor, + * - when adding 128 - it is neither a predecessor nor a successor, + * - after adding more than 127 to the starting value - it is a successor */ #define seq_before(x, y) ({typeof(x) _dummy = (x - y); \ _dummy > smallest_signed_int(_dummy); }) #define seq_after(x, y) seq_before(y, x) -- 1.7.1

2 1

Re: [B.A.T.M.A.N.] [PATCH] staging: batman-adv: check kmalloc() return value
by Sven Eckelmann 12 Sep '10

12 Sep '10

Vasiliy Kulikov wrote: > kmalloc() may fail, if so drop current packet. Thanks for your patch. The indention is right, but it adds just another bug (locking related). > Signed-off-by: Vasiliy Kulikov <segooon(a)gmail.com> > --- > Compile tested. > > drivers/staging/batman-adv/routing.c | 6 ++++-- > drivers/staging/batman-adv/unicast.c | 8 ++++++-- > drivers/staging/batman-adv/unicast.h | 2 +- > 3 files changed, 11 insertions(+), 5 deletions(-) > > diff --git a/drivers/staging/batman-adv/routing.c > b/drivers/staging/batman-adv/routing.c index e12fd99..e545260 100644 > --- a/drivers/staging/batman-adv/routing.c > +++ b/drivers/staging/batman-adv/routing.c > @@ -1232,8 +1232,10 @@ int recv_ucast_frag_packet(struct sk_buff *skb, > struct batman_if *recv_if) > > orig_node->last_frag_packet = jiffies; > > - if (list_empty(&orig_node->frag_list)) > - create_frag_buffer(&orig_node->frag_list); > + if (list_empty(&orig_node->frag_list)) { > + if (create_frag_buffer(&orig_node->frag_list)) > + return NET_RX_DROP; > + } > > tmp_frag_entry = > search_frag_packet(&orig_node->frag_list, You must spin_unlock_irqrestore before you return from that function. Best regards, Sven

2 2

[B.A.T.M.A.N.] Staging: batman-adv for 2.6.37 (2)
by Sven Eckelmann 12 Sep '10

12 Sep '10

Hi, here are some smaller cleanup/bugfix patches for 2.6.37. All patches needed for that patchset are already part of your staging-next tree. All patches are cleanup patches and no new feature is added. thanks, Sven Linus Lüssing (1): Staging: batman-adv: Always synchronize rcu's on module shutdown Marek Lindner (1): Staging: batman-adv: removing redundant assignment of skb->dev Sven Eckelmann (2): Staging: batman-adv: Remove currently unused gw_* datastructures Staging: batman-adv: Add rcu TODO Vasiliy Kulikov (1): Staging: batman-adv: check kmalloc() return value drivers/staging/batman-adv/TODO | 5 +++++ drivers/staging/batman-adv/main.c | 7 ++----- drivers/staging/batman-adv/routing.c | 8 ++++++-- drivers/staging/batman-adv/soft-interface.c | 5 +---- drivers/staging/batman-adv/types.h | 3 --- drivers/staging/batman-adv/unicast.c | 8 ++++++-- drivers/staging/batman-adv/unicast.h | 2 +- 7 files changed, 21 insertions(+), 17 deletions(-)

1 5

[B.A.T.M.A.N.] [PATCH] batman-adv: Always synchronize rcu's on module shutdown
by Linus Lüssing 06 Sep '10

06 Sep '10

During the module shutdown procedure in batman_exit(), a rcu callback is being scheduled (batman_exit -> hardif_remove_interfaces -> hardif_remove_interfae -> call_rcu). However, when the kernel unloads the module, the rcu callback might not have been executed yet, resulting in a "unable to handle kernel paging request" in __rcu_process_callback afterwards, causing the kernel to freeze. Therefore, we should always flush all rcu callback functions scheduled during the shutdown procedure. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- main.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 209a46b..e8acb46 100644 --- a/main.c +++ b/main.c @@ -73,6 +73,8 @@ static void __exit batman_exit(void) flush_workqueue(bat_event_workqueue); destroy_workqueue(bat_event_workqueue); bat_event_workqueue = NULL; + + synchronize_net(); } int mesh_init(struct net_device *soft_iface) @@ -135,9 +137,6 @@ void mesh_free(struct net_device *soft_iface) hna_local_free(bat_priv); hna_global_free(bat_priv); - synchronize_net(); - - synchronize_rcu(); atomic_set(&bat_priv->mesh_state, MESH_INACTIVE); } -- 1.7.1

3 6

[B.A.T.M.A.N.] Staging: batman-adv for 2.6.37 (1)
by Sven Eckelmann 05 Sep '10

05 Sep '10

Hi, I hope that the fever-induced dreams are over now. Otherwise I will try to write my mails also as little tales. ;) Nevertheless, I would like to send some patches for 2.6.37. That is not 100% true. We would also like to see the revert 'Revert: "Staging: batman-adv: Adding netfilter-bridge hooks"' too in 2.6.36. It fixes a bug introduced by the commit we revert here. The rest is more or less the usual stuff, but more feature patches this time. All patches we depend on are already part of 2.6.36-rc3. I will try to sent a patch again to David S. Miller. thanks, Sven Andreas Langer (1): Staging: batman-adv: layer2 unicast packet fragmentation Marek Lindner (4): Staging: batman-adv: refactoring unicast payload code Staging: batman-adv: register the batman-adv packet type per interface Staging: batman-adv: attach each hard-interface to a soft-interface Staging: batman-adv: multiple mesh clouds Simon Wunderlich (2): Staging: batman-adv: Count Ethernet header for incoming packets Staging: batman-adv: move queue counters into bat_priv Sven Eckelmann (14): Revert: "Staging: batman-adv: Adding netfilter-bridge hooks" Staging: batman-adv: Remove CHANGELOG Staging: batman-adv: Start new development cycle Staging: batman-adv: Calculate hamming weight using optimized kernel functions Staging: batman-adv: Directly prepare icmp packets in socket buffer Staging: batman-adv: Keep header writable and unshared Staging: batman-adv: Only clone skb data for multiple broadcasts Staging: batman-adv: Aggregate batman packets directly in skb Staging: batman-adv: Prepare vis packets directly inside a skb Staging: batman-adv: Create copy of skb with pre-allocated headroom Staging: batman-adv: Provide full headers and packets as linear skb Staging: batman-adv: Remove duplicate of attached device name Staging: batman-adv: Don't inform about dropped packets in nodebug Staging: batman-adv: Update mtu of bat device by changing mtu of slave device drivers/staging/batman-adv/CHANGELOG | 63 --- drivers/staging/batman-adv/Makefile | 2 +- drivers/staging/batman-adv/README | 45 +-- drivers/staging/batman-adv/TODO | 3 - drivers/staging/batman-adv/aggregation.c | 57 ++-- drivers/staging/batman-adv/bat_sysfs.c | 106 ++++-- drivers/staging/batman-adv/bitarray.c | 22 +- drivers/staging/batman-adv/bitarray.h | 7 +- drivers/staging/batman-adv/hard-interface.c | 237 +++++++----- drivers/staging/batman-adv/hard-interface.h | 6 +- drivers/staging/batman-adv/hash.c | 6 +- drivers/staging/batman-adv/hash.h | 4 +- drivers/staging/batman-adv/icmp_socket.c | 70 ++-- drivers/staging/batman-adv/main.c | 138 ++----- drivers/staging/batman-adv/main.h | 28 +- drivers/staging/batman-adv/originator.c | 166 +++++---- drivers/staging/batman-adv/originator.h | 8 +- drivers/staging/batman-adv/packet.h | 26 +- drivers/staging/batman-adv/routing.c | 440 ++++++++++++--------- drivers/staging/batman-adv/routing.h | 16 +- drivers/staging/batman-adv/send.c | 174 ++++----- drivers/staging/batman-adv/send.h | 7 +- drivers/staging/batman-adv/soft-interface.c | 238 +++++++----- drivers/staging/batman-adv/soft-interface.h | 13 +- drivers/staging/batman-adv/translation-table.c | 266 +++++++------ drivers/staging/batman-adv/translation-table.h | 30 +- drivers/staging/batman-adv/types.h | 98 ++++- drivers/staging/batman-adv/unicast.c | 265 +++++++++++++ drivers/staging/batman-adv/unicast.h | 39 ++ drivers/staging/batman-adv/vis.c | 500 ++++++++++++++---------- drivers/staging/batman-adv/vis.h | 27 +-- 31 files changed, 1822 insertions(+), 1285 deletions(-)

2 22

[B.A.T.M.A.N.] [PATCH] batman-adv: Don't free unicast skb on failure
by Sven Eckelmann 04 Sep '10

04 Sep '10

The soft-interface transmission function expects that the unicast skb is still available when a send failed. Otherwise we would try to free the skb twice and create many different and hard to debug memory access failures due to access on not (anymore) allocated memory. Reported-by: Andreas Langer <an.langer(a)gmx.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- unicast.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/unicast.c b/unicast.c index 84b204b..796d9c1 100644 --- a/unicast.c +++ b/unicast.c @@ -264,6 +264,5 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) unlock: spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags); dropped: - kfree_skb(skb); return 1; } -- 1.7.1

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Add missing include for bat_sys.h
by Sven Eckelmann 04 Sep '10

04 Sep '10

soft_interface.c needs sysfs_add_meshif and sysfs_del_meshif after "batman-adv: attach each hard-interface to a soft-interface". This Include is provided indirectly using compat.h on standalone sources, but missing on kernel builds. We should add it directly as the compat.h include is only a side effect we cannot rely on. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/soft-interface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/batman-adv/soft-interface.c b/batman-adv/soft-interface.c index 38134ae..28bd6a2 100644 --- a/batman-adv/soft-interface.c +++ b/batman-adv/soft-interface.c @@ -31,6 +31,7 @@ #include "gateway_common.h" #include "gateway_client.h" #include "send.h" +#include "bat_sysfs.h" #include <linux/slab.h> #include <linux/ethtool.h> #include <linux/etherdevice.h> -- 1.7.1

2 1

[B.A.T.M.A.N.] batman-adv 2010.1.0 released
by Marek Lindner 04 Sep '10

04 Sep '10

New versions of the batman-adv kernel module and batctl are released today with the version number 2010.1.0. The B.A.T.M.A.N. team's main focus was on new features, Linux kernel compliance and a bunch of bug fixes. As the kernel module always depends on the Linux kernel it was compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: http://downloads.open-mesh.net/batman/releases/batman-adv-2010.1.0/ as well as prepackaged binaries in your distribution. Important changes ---------------- As part of the ongoing kernel interface restructuring all remaining tables and debug output was migrated from the proc filesystem to the debug filesystem. Also, some tables which went into sysfs followed this example as well as the layer 2 icmp socket which resided in /dev. All programs / scripts accessing these files directly need to be adjusted. Scripts using batctl are not affected by this transition as the batctl command line parameters are unchanged. More details can be found below as well as in our documentation. Thanks ---------------- Thanks to all people sending in patches: * Antonio Quartulli <ordex(a)ritirata.org> * Dan Carpenter <error27(a)gmail.com> * Daniel Seither <post(a)tiwoc.de> * Eric Dumazet <eric.dumazet(a)gmail.com> * Jiri Pirko <jpirko(a)redhat.com> * Joe Perches <joe(a)perches.com> * Linus Lüssing <linus.luessing(a)web.de> * Marek Lindner <lindner_marek(a)yahoo.de> * Randy Dunlap <randy.dunlap(a)oracle.com> * Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> * Sven Eckelmann <sven.eckelmann(a)gmx.de> * Tejun Heo <tj(a)kernel.org> batman-adv ---------------- The first B.A.T.M.A.N. V features left the experimental stage and went into this release: interface alternating (formerly known as incoming interface based routing) & bonding mode. These are optimizations for scenarios in which mesh nodes possess several WiFi cards to run the mesh on. In alternating mode batman-adv will switch the WiFi interface to forward the traffic with each hop, thereby avoiding store & forward (which would half the bandwidth with each forwarding node). Bonding mode will use all available interfaces at the same time to forward the traffic. Both modes do not require the whole network to have the same hardware configuration - the available interfaces are automatically detected and used if possible. Per default batman-adv operates in the alternating mode, bonding mode can be activated. To achieve Linux kernel compliance all tables and debug information have been concentrated in the debug filesystem (all configuration options remain in sysfs). Make sure your kernel has the debug filesystem compiled in if you want to access those information. The user space API is now considered clean and won't require significant changes in the future. The originator table outputs the "last seen" field to allow observing originator outages in real time. The batman-adv debug log returned with the debugfs changes, after it had been removed in previous releases. The batman icmp socket left the /dev directory to join the other debug facilities in debugfs (before it was not possible to create a socket for each configured mesh). This release also contains numerous bug fixes regarding stability, broadcast flood protection through 32Bit sequence numbers, supporting newer kernel versions, multiple interface bugs, rounding issues and more. batctl ---------------- Batctl has been adapted to retrieve the tables and other information from the debug filesystem. To provide a smooth user experience batctl automatically mounts the debug filesystem whenever necessary. As the debug log output moved from the standard kernel logging to the batman-adv log file, batctl re- introduces the convenience features to retrieve the logs and replace mac addresses with names. Batctl also followed the icmp socket move and is prepared for the multiple mesh support. The ping utility received the "record route" ability which allows to monitor route changes. The originator table viewer gained some additional options to filter for "fresh" entries (using the "last seen" field) and allows to specify a refresh interval to continuously print the table. Happy routing, The B.A.T.M.A.N. team

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: Merge batman-adv 2010.1.0
by Sven Eckelmann 04 Sep '10

04 Sep '10

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/CHANGELOG | 16 ++++++++++++++++ batman-adv/README | 47 +++++++++++++++++++++++------------------------ 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/batman-adv/CHANGELOG b/batman-adv/CHANGELOG index 86450b4..67bfc6e 100644 --- a/batman-adv/CHANGELOG +++ b/batman-adv/CHANGELOG @@ -1,3 +1,19 @@ +batman-adv 2010.1.0: + +* support latest kernels (2.6.21 - 2.6.36) +* further cleanup of coding style +* recording of routes for batman icmp messages +* move of complex sysfs files to debugfs +* change output of all sysfs files to single-value-only +* reintroduce virtual file for the debug log +* bonding and alternating added +* add ttl to broadcasts +* change all sequence numbers to 32 bit +* show last-seen in originator table +* many bugs (rounding issues, locking, netdev event handler, ...) squashed + + -- Sat, 04 Sep 2010 13:56:38 +0200 + batman-adv 2010.0.0: * support latest kernels (2.6.21 - 2.6.35) diff --git a/batman-adv/README b/batman-adv/README index 24b062b..ecef96d 100644 --- a/batman-adv/README +++ b/batman-adv/README @@ -1,4 +1,4 @@ -[state: 12-06-2010] +[state: 04-09-2010] BATMAN-ADV ---------- @@ -18,7 +18,7 @@ Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.21 - 2.6.35. Supporting +against and should work with Linux 2.6.21 - 2.6.36. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) @@ -83,15 +83,21 @@ All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ -# aggregate_ogm originators transtable_global vis_mode -# orig_interval transtable_local vis_data +# aggregated_ogms bonding orig_interval vis_mode + + +There is a special folder for debugging informations: + +# ls /sys/kernel/debug/batman_adv/bat0/ +# originators socket transtable_global transtable_local +# vis_data Some of the files contain all sort of status information regard- ing the mesh network. For example, you can view the table of originators (mesh participants) with: -# cat /sys/class/net/bat0/mesh/originators +# cat /sys/kernel/debug/batman_adv/bat0/originators Other files allow to change batman's behaviour to better fit your requirements. For instance, you can check the current originator @@ -99,7 +105,7 @@ interval (value in milliseconds which determines how often batman sends its broadcast packets): # cat /sys/class/net/bat0/mesh/orig_interval -# status: 1000 +# 1000 and also change its value: @@ -153,7 +159,7 @@ at least very similar) data. When configured as server, you can get a topology snapshot of your mesh: -# cat /sys/class/net/bat0/mesh/vis_data +# cat /sys/kernel/debug/batman_adv/bat0/vis_data This raw output is intended to be easily parsable and convertable with other tools. Have a look at the batctl README if you want a @@ -201,32 +207,25 @@ uncomment the line #EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG +Those additional debug messages can be accessed using a special +file in debugfs + +# cat /sys/kernel/debug/batman_adv/bat0/log + The additional debug output is by default disabled. It can be en- -abled either at kernel modules load time or during run time. To -enable debug output at module load time, add the module parameter -debug=<value>. <value> can take one of four values. +abled during run time. Following log_levels are defined: 0 - All debug output disabled 1 - Enable messages related to routing / flooding / broadcasting 2 - Enable route or hna added / changed / deleted 3 - Enable all messages -e.g. - -# modprobe batman-adv debug=2 - -will load the module and enable debug messages for when routes or -HNAs change. - -The debug output can also be changed at runtime using the file -/sys/module/batman-adv/parameters/debug. e.g. - -# echo 2 > /sys/module/batman-adv/parameters/debug +The debug output can be changed at runtime using the file +/sys/class/net/bat0/mesh/log_level. e.g. -enables debug messages for when routes or HNAs +# echo 2 > /sys/class/net/bat0/mesh/log_level -The debug output is sent to the kernel logs. So try dmesg, lo- -gread, etc to see the debug messages. +will enable debug messages for when routes or HNAs change. BATCTL -- 1.7.1

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N