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.] [PATCH] batman-adv: free the dat hash only if not NULL
by Antonio Quartulli 01 Nov '12

01 Nov '12

It could be the case that the user tries to disable DAT when it is already disabled. To prevent kernel oops, batadv_dat_hash_free() has to check for the hash table pointer being different from NULL before to try to free it. This was introduced by ("batman-adv: Distributed ARP Table - add runtime switch") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- distributed-arp-table.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index c933615..0fea29a 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -634,6 +634,9 @@ out: */ static void batadv_dat_hash_free(struct batadv_priv *bat_priv) { + if (!bat_priv->dat.hash) + return; + __batadv_dat_purge(bat_priv, NULL); batadv_hash_destroy(bat_priv->dat.hash); -- 1.7.12.4

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: don't free resource when DAT is disabled
by Antonio Quartulli 01 Nov '12

01 Nov '12

Freeing all the resources when DAT is disabled need a much more complicated locking system to prevent concurrent enable/disable operations to destroy the internal state of the component. For now it is safe to avoid such freeing operation when DAT is disabled. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - removed declaration of batadv_dat_switch() in distributed-arp-table.h distributed-arp-table.c | 10 ---------- distributed-arp-table.h | 1 - sysfs.c | 3 +-- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index c933615..7921030 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1061,13 +1061,3 @@ out: batadv_dat_entry_free_ref(dat_entry); return ret; } - -void batadv_dat_switch(struct net_device *net_dev) -{ - struct batadv_priv *bat_priv = netdev_priv(net_dev); - - if (atomic_read(&bat_priv->distributed_arp_table)) - batadv_dat_init(bat_priv); - else - batadv_dat_free(bat_priv); -} diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 63a13a5..d060c03 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -73,7 +73,6 @@ batadv_dat_init_own_addr(struct batadv_priv *bat_priv, int batadv_dat_init(struct batadv_priv *bat_priv); void batadv_dat_free(struct batadv_priv *bat_priv); int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset); -void batadv_dat_switch(struct net_device *net_dev); /** * batadv_dat_inc_counter - increment the correct DAT packet counter diff --git a/sysfs.c b/sysfs.c index 9dc58b5..84a55cb 100644 --- a/sysfs.c +++ b/sysfs.c @@ -422,8 +422,7 @@ BATADV_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); BATADV_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); #endif #ifdef CONFIG_BATMAN_ADV_DAT -BATADV_ATTR_SIF_BOOL(distributed_arp_table, S_IRUGO | S_IWUSR, - batadv_dat_switch); +BATADV_ATTR_SIF_BOOL(distributed_arp_table, S_IRUGO | S_IWUSR, NULL); #endif BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu); BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); -- 1.7.12.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: remove useless assignment
by Antonio Quartulli 01 Nov '12

01 Nov '12

Introduced by ("batman-adv: Fix broadcast duplist for fragmentation") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/routing.c b/routing.c index 5da7724..d5a01d1 100644 --- a/routing.c +++ b/routing.c @@ -1185,8 +1185,6 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, if (batadv_bla_check_bcast_duplist(bat_priv, skb)) goto out; - bcast_packet = (struct batadv_bcast_packet *)skb->data; - /* rebroadcast packet */ batadv_add_bcast_packet_to_list(bat_priv, skb, 1); -- 1.7.12.4

2 1

[B.A.T.M.A.N.] batman-adv 2012.4.0 released
by Marek Lindner 01 Nov '12

01 Nov '12

The B.A.T.M.A.N. team proudly presents its newest release, batman-adv 2012.4.0, mostly dedicating itself to stability with some smaller enhancements to improve the user experience. 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.org/batman/releases/batman-adv-2012.4.0/ as well as prepackaged binaries in your distribution. Thanks ------ Thanks to all people sending in patches: * Antonio Quartulli <ordex(a)autistici.org> * Def <def(a)laposte.net> * Jonathan Corbet <corbet(a)lwn.net> * Linus Lüssing <linus.luessing(a)web.de> * Marek Lindner <lindner_marek(a)yahoo.de> * Martin Hundebøll <martin(a)hundeboll.net> * Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> * Sven Eckelmann <sven(a)narfation.org> batman-adv ---------- The translation table (the core system for managing all non-mesh clients across the mesh network) has been supplemented by the "speedy join" mechanism. Speedy join was designed to make the location of non-mesh clients known throughout the mesh without depending on OGM messages. As soon as non-mesh clients issue a DHCP or ARP request or any other broadcast message they are immediately full participants of the network. This will lead to a faster network connection experience, especially when the mesh network has been configured with higher OGM intervals. All remaining traffic counters were converted to the recently introduced traffic counting framework and its ethtool API, thereby completely replacing the old traffic counter mechanism for the purpose of better scalability. The bridge loop avoidance comes with an additional backbone gateway table (exported via debugfs) allowing to retrieve the list of all detected backbone gateways attached to the same LAN, regardless of whether or not it has claimed any non-mesh client. Several reports about packet loss in combination with vlan tagging encouraged us to investigated the cause. A bug was found in the Linux kernel vlan code and a patch was submitted. At the same time a workaround was added to our out- of-tree kernel module which automatically takes effect for kernel versions older than Linux 3.8 (which contains the proper fix). This release also comes with a few bug fixes concerning the batman-adv code directly: with the intent of suppressing duplicate broadcast packets in the mesh the bridge loop avoidance computes CRC checksums for each broadcast packet it receives and compares them to a list of already received broadcast checksums. The check- summing code miscalculated the CRC leading to overly aggressive broadcast packet drops. Also addressed was the missing "no purge" flag for the batX mac addresses after manually changing its mac address. The code refactoring regression leading to route flapping in multiple interfaces setup was corrected along with wrong OGM counting on Intel x86. batctl ------ As gradually more functionality of the batman-adv kernel module is optional and can be compiled out, batctl won't be able to find the corresponding files in sysfs or debugfs. Therefore, batctl now maintains a list of optional features and informs the user about a possibly deactivated optional feature. At the same time the sysfs / debugfs code has been refactored to remove redundant boilerplate code. Also removed was the code querying the traffic statistics through the old API because all statistics can be retrieved via the new API. The batctl utility also gained an option to display the newly added backbone gateway table. Happy routing, The B.A.T.M.A.N. team

1 0

[B.A.T.M.A.N.] pull request: batman-adv 202-10-29
by Antonio Quartulli 31 Oct '12

31 Oct '12

Hello David, this is again our first set of changes intended for net-next/linux-3.8. With respect to the previous changeset we substituted the patch changing the BAT_ATTR_HIF_UINT macro with a new one that removes it (we will re-add such macro together with the user). The rest is exactly the same as before. Thank you very much, Antonio The following changes since commit a932657f51eadb8280166e82dc7034dfbff3985a: net: sierra: shut up sparse restricted type warnings (2012-10-28 19:09:02 -0400) 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 0aca86cd92282359d2f7202804bd92e7d092c04e: batman-adv: add kernel-doc for enum batadv_dbg_level (2012-10-29 09:42:51 +0100) ---------------------------------------------------------------- included changes: - some code cleanups and minor fixes (3 of them were reported by Coverity) - 'struct hard_iface' re-shaping to improve multi-protocol support - ECTP packets silent drop - transfer the WIFI flag on clients in case of roaming ---------------------------------------------------------------- Antonio Quartulli (8): batman-adv: use check_unicast_packet() in recv_roam_adv() batman-adv: return proper value in case of hash_add failure batman-adv: properly store the roaming time batman-adv: print packets re-routing on DBG_TT and ratelimit it batman-adv: check for more space before accessing the skb batman-adv: properly convert flag into a boolean value batman-adv: pass the WIFI flag from the local to global entry batman-adv: add kernel-doc for enum batadv_dbg_level Marek Lindner (2): batman-adv: split hard_iface struct for each routing protocol batman-adv: consolidate duplicated primary_if checking code Simon Wunderlich (1): batman-adv: don't allow ECTP traffic on batman-adv Sven Eckelmann (5): batman-adv: Remove unused define BAT_ATTR_HIF_UINT batman-adv: Set special lockdep classes to avoid lockdep warning batman-adv: Remove extra check in batadv_bit_get_packet batman-adv: Check return value of try_module_get batman-adv: Only increase refcounter once for alternate router net/batman-adv/bat_iv_ogm.c | 43 ++++++++++--------- net/batman-adv/bitarray.c | 23 +++++----- net/batman-adv/bridge_loop_avoidance.c | 36 +++------------- net/batman-adv/debugfs.c | 6 ++- net/batman-adv/gateway_client.c | 19 ++------- net/batman-adv/hard-interface.c | 4 +- net/batman-adv/icmp_socket.c | 12 ++++-- net/batman-adv/main.c | 46 +++++++++++++++----- net/batman-adv/main.h | 19 ++++++--- net/batman-adv/originator.c | 19 ++------- net/batman-adv/routing.c | 54 +++++++++--------------- net/batman-adv/soft-interface.c | 56 ++++++++++++++++++++++++- net/batman-adv/sysfs.c | 49 ---------------------- net/batman-adv/translation-table.c | 77 +++++++++++++++++----------------- net/batman-adv/translation-table.h | 6 +-- net/batman-adv/types.h | 16 +++++-- 16 files changed, 238 insertions(+), 247 deletions(-)

2 17

[B.A.T.M.A.N.] [PATCH 0/6] TT improvement campaign
by Antonio Quartulli 30 Oct '12

30 Oct '12

Hello, as you may have seen in the last period, TT has been under heavily re-design/work in order to improve its robustness (and also readability). However, some more extensive tests and emulated scenarios revealed that it is possible to hit some situations in which TT behaviour is not optimal. This set of patches aims to fix some glitches introduces with the last re-design and to fix some issues discovered by testing complex scenarios. Cheers, Antonio Quartulli (6): batman-adv: fix TT packet rerouting batman-adv: fix debug message batman-adv: remove useless goto batman-adv: send ROAMING_ADV once batman-adv: remove useless assignment in tt_local_add() batman-adv: fix local client recognition in is_my_client() routing.c | 36 ++++++++++++++++++++++++++---------- translation-table.c | 22 +++++++++++----------- 2 files changed, 37 insertions(+), 21 deletions(-) -- 1.7.12.4

1 6

[B.A.T.M.A.N.] [PATCH] batman-adv: don't free resources when DAT is disabled
by Antonio Quartulli 29 Oct '12

29 Oct '12

Freeing all the resources when DAT is disabled need a much more complicated locking system to prevent concurrent enable/disable operations to destroy the internal state of the component. For now it is safe to avoid such freeing operation at all when DAT gets disabled. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- distributed-arp-table.c | 10 ---------- sysfs.c | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index c933615..7921030 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1061,13 +1061,3 @@ out: batadv_dat_entry_free_ref(dat_entry); return ret; } - -void batadv_dat_switch(struct net_device *net_dev) -{ - struct batadv_priv *bat_priv = netdev_priv(net_dev); - - if (atomic_read(&bat_priv->distributed_arp_table)) - batadv_dat_init(bat_priv); - else - batadv_dat_free(bat_priv); -} diff --git a/sysfs.c b/sysfs.c index 9dc58b5..84a55cb 100644 --- a/sysfs.c +++ b/sysfs.c @@ -422,8 +422,7 @@ BATADV_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); BATADV_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); #endif #ifdef CONFIG_BATMAN_ADV_DAT -BATADV_ATTR_SIF_BOOL(distributed_arp_table, S_IRUGO | S_IWUSR, - batadv_dat_switch); +BATADV_ATTR_SIF_BOOL(distributed_arp_table, S_IRUGO | S_IWUSR, NULL); #endif BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu); BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); -- 1.7.12.4

2 3

[B.A.T.M.A.N.] [PATCHv2] batman-adv: Remove unused define BAT_ATTR_HIF_UINT
by Sven Eckelmann 29 Oct '12

29 Oct '12

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: - Rebased this patch from May on top of current master sysfs.c | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) diff --git a/sysfs.c b/sysfs.c index cc56ed0..9dc58b5 100644 --- a/sysfs.c +++ b/sysfs.c @@ -123,56 +123,6 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ batadv_store_##_name) -#define BATADV_ATTR_HIF_STORE_UINT(_name, _var, _min, _max, _post_func) \ -ssize_t batadv_store_##_name(struct kobject *kobj, \ - struct attribute *attr, char *buff, \ - size_t count) \ -{ \ - struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ - struct batadv_hard_iface *hard_iface; \ - ssize_t length; \ - \ - hard_iface = batadv_hardif_get_by_netdev(net_dev); \ - if (!hard_iface) \ - return 0; \ - \ - length = __batadv_store_uint_attr(buff, count, _min, _max, \ - _post_func, attr, \ - &hard_iface->_var, net_dev); \ - \ - batadv_hardif_free_ref(hard_iface); \ - return length; \ -} - -#define BATADV_ATTR_HIF_SHOW_UINT(_name, _var) \ -ssize_t batadv_show_##_name(struct kobject *kobj, \ - struct attribute *attr, char *buff) \ -{ \ - struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ - struct batadv_hard_iface *hard_iface; \ - ssize_t length; \ - \ - hard_iface = batadv_hardif_get_by_netdev(net_dev); \ - if (!hard_iface) \ - return 0; \ - \ - length = sprintf(buff, "%i\n", atomic_read(&hard_iface->_var)); \ - \ - batadv_hardif_free_ref(hard_iface); \ - return length; \ -} - -/* Use this, if you are going to set [name] in hard_iface to an - * unsigned integer value - */ -#define BATADV_ATTR_HIF_UINT(_name, _var, _mode, _min, _max, _post_func)\ - static BATADV_ATTR_HIF_STORE_UINT(_name, _var, _min, \ - _max, _post_func) \ - static BATADV_ATTR_HIF_SHOW_UINT(_name, _var) \ - static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ - batadv_store_##_name) - - static int batadv_store_bool_attr(char *buff, size_t count, struct net_device *net_dev, const char *attr_name, atomic_t *attr) -- 1.7.10.4

2 1

[B.A.T.M.A.N.] pull request: batman-adv 2012-10-28
by Antonio Quartulli 29 Oct '12

29 Oct '12

Hello David, this is our first set of changes intended for net-next/linux-3.8. Here you have a patch by Sven Eckelmann that introduces new lockdep classes for batman-adv virtual interfaces. Then a patch by Simon Wunderlich that adds a filter aimed to silently drop ECTP packets (we saw there are still some devices sending them around and then creating problems to our bridge loop avoidance mechanism). The rest are cleanups, minor fixes and a small struct re-shaping. Thank you very much, Antonio The following changes since commit f019948dbb388eacbc0fb61db1d30e686224df77: Merge branch 'master' of git://1984.lsi.us.es/nf-next (2012-10-26 14:40:55 -0400) 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 2186a06ac573db625b5864d1feb963c2bf0dacac: batman-adv: add kernel-doc for enum batadv_dbg_level (2012-10-27 17:06:38 +0200) ---------------------------------------------------------------- included changes: - some code cleanups and minor fixes (3 of them were reported by Coverity) - 'struct hard_iface' re-shaping to improve multi-protocol support - ECTP packets silent drop - transfer the WIFI flag on clients in case of roaming ---------------------------------------------------------------- Antonio Quartulli (8): batman-adv: use check_unicast_packet() in recv_roam_adv() batman-adv: return proper value in case of hash_add failure batman-adv: properly store the roaming time batman-adv: print packets re-routing on DBG_TT and ratelimit it batman-adv: check for more space before accessing the skb batman-adv: properly convert flag into a boolean value batman-adv: pass the WIFI flag from the local to global entry batman-adv: add kernel-doc for enum batadv_dbg_level Marek Lindner (3): batman-adv: split hard_iface struct for each routing protocol batman-adv: separate BATADV_ATTR_HIF_UINT sysfs name from hard-iface variable batman-adv: consolidate duplicated primary_if checking code Simon Wunderlich (1): batman-adv: don't allow ECTP traffic on batman-adv Sven Eckelmann (4): batman-adv: Set special lockdep classes to avoid lockdep warning batman-adv: Remove extra check in batadv_bit_get_packet batman-adv: Check return value of try_module_get batman-adv: Only increase refcounter once for alternate router net/batman-adv/bat_iv_ogm.c | 43 ++++++++++--------- net/batman-adv/bitarray.c | 23 +++++----- net/batman-adv/bridge_loop_avoidance.c | 36 +++------------- net/batman-adv/debugfs.c | 6 ++- net/batman-adv/gateway_client.c | 19 ++------- net/batman-adv/hard-interface.c | 4 +- net/batman-adv/icmp_socket.c | 12 ++++-- net/batman-adv/main.c | 46 +++++++++++++++----- net/batman-adv/main.h | 19 ++++++--- net/batman-adv/originator.c | 19 ++------- net/batman-adv/routing.c | 54 +++++++++--------------- net/batman-adv/soft-interface.c | 56 ++++++++++++++++++++++++- net/batman-adv/sysfs.c | 15 +++---- net/batman-adv/translation-table.c | 77 +++++++++++++++++----------------- net/batman-adv/translation-table.h | 6 +-- net/batman-adv/types.h | 16 +++++-- 16 files changed, 246 insertions(+), 205 deletions(-)

4 20

[B.A.T.M.A.N.] batman for production
by Walter Robert Ditzler 29 Oct '12

29 Oct '12

hi sven, first: sorry about replying that way - i have an account but somehow i couldn't post anything here! second: i have a working test environment running, all works great, but i am not familiar with the update mechanism of batman. I don't want to replace any good version if the latest kernel has already the best possible version of batman. third: here are actually my doubts. to configure a mesh within batman you normally use batctl. so are those patches for batctl or for the batman-adv itself and how can I get the right batctl corresponding to the batman-adv version from kernel.org 3.6.3? or is it even better to configure batman-adv via the sys classes (echo bat0 > /sys/class/net/eth0/batman_adv/mesh_iface)? thanks a lot, walter -----Original Message----- From: Sven Eckelmann [mailto:sven@narfation.org] Sent: Sonntag, 28. Oktober 2012 15:34 To: Walter Robert Ditzler Cc: b.a.t.m.a.n(a)lists.open-mesh.org Subject: Re: Re: [B.A.T.M.A.N.] [PATCH 16/16] batman-adv: add kernel-doc for enum batadv_dbg_level On Sunday 28 October 2012 14:32:46 Walter Robert Ditzler wrote: > hi batman list, > > i recently saw there is a bounce of email in the batman community > regarding patches. Please don't reply to a random posts to start a new topic. And don't write to the Linux networking mailing list and the Linux networking maintainer David S. Miller when you actually want to ask the "b.a.t.m.a.n mailing list". And yes, you will see patches going over this list the whole time. Either because somebody wants to get stuff integrated into some B.A.T.M.A.N. related project or because the patches were sent to our Linux networking god David S. Miller. So nothing unusal happened. > is it safe and reliable to use the version from the open-mesh.org > site: > > - inux 3.6 => batman-adv 2012.3.x (get batctl 2012.3.x from here) Ehrm, ehrm, ehrm, ehrm, oehm, aehm.... I will not guarantee anything. It is safe to use this stuff until anyone proofed it otherwise. But we have some fixes in the maint branch which weren't released yet in form of 2012.3.1 or 2012.4.0. But they are included in the stable releases of Linux 3.6.x > for production use onto the following configuration: > > os: debian 6.0.6 > kernel: 3.6.3, batman activated > arch: geode lx and amd64 Now you baffled me completely. Linux 3.6.3 is the stable release which includes batman-adv 2012.3.0 + stable fixes. And you want to replace it with 2012.3.0 without these stable fixes. Can you give me a reason why this sounded to you like a good idea? Even without these stable fixes... why would you replace the in-kernel module with the out-of-tree module of the same version? Kind regards, Sven

2 2

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