B.A.T.M.A.N January 2015

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

12 participants
24 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: Kconfig, Add missing DEBUG_FS dependency
by Markus Pargmann 07 Jan '15

07 Jan '15

BATMAN_ADV_DEBUG is using debugfs files for the debugging log. So it depends on DEBUG_FS which is missing as dependency in the Kconfig file. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> --- net/batman-adv/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index 11660a3aab5a..c6fc8f756c9a 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -62,6 +62,7 @@ config BATMAN_ADV_MCAST config BATMAN_ADV_DEBUG bool "B.A.T.M.A.N. debugging" depends on BATMAN_ADV + depends on DEBUG_FS help This is an option for use by developers; most people should say N here. This enables compilation of support for -- 2.1.3

2 4

[B.A.T.M.A.N.] pull request [net]: batman-adv 20150106
by Antonio Quartulli 06 Jan '15

06 Jan '15

Hello David, here you have some small fixes for your 'net' tree. Patch 1 fixes a regression in the "bonding" code introduced while implementing the multi-interface optimization feature, by Simon Wunderlich. Patch 2 ensures that the "last-seen" timestamp for a newly created originator object is properly initialised in order to avoid a non-critical race condition, by Linus Lüssing. Patch 3 avoids false positive splats when lockdep is enabled by assigning the proper lock class to locks used by the network coding feature, by Martin Hundebøll. Patches 4 and 5 fix the code counting the amount of multicast-disabled nodes in the network (used to avoid to enable the multicast optimisation when not possible), by Linus Lüssing. Patch 6 fixes a memory leak in the Translation Table code that can be triggered by doubling the current originator interval, by Linus Lüssing. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit 7ce67a38f799d1fb332f672b117efbadedaa5352: net: ethernet: cpsw: fix hangs with interrupts (2015-01-04 22:18:34 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to 9d31b3ce81683ce3c9fd10afa70892e373b21067: batman-adv: fix potential TT client + orig-node memory leak (2015-01-06 11:07:01 +0100) ---------------------------------------------------------------- Included changes: - ensure bonding is used (if enabled) for packets coming in the soft interface - fix race condition to avoid orig_nodes to be deleted right after being added - avoid false positive lockdep splats by assigning lockclass to the proper hashtable lock objects - avoid miscounting of multicast 'disabled' nodes in the network - fix memory leak in the Global Translation Table in case of originator interval change ---------------------------------------------------------------- Linus Lüssing (4): batman-adv: fix delayed foreign originator recognition batman-adv: fix counter for multicast supporting nodes batman-adv: fix multicast counter when purging originators batman-adv: fix potential TT client + orig-node memory leak Martin Hundebøll (1): batman-adv: fix lock class for decoding hash in network-coding.c Simon Wunderlich (1): batman-adv: fix and simplify condition when bonding should be used net/batman-adv/multicast.c | 11 +++++++---- net/batman-adv/network-coding.c | 2 +- net/batman-adv/originator.c | 7 ++++--- net/batman-adv/routing.c | 6 ++++-- 4 files changed, 16 insertions(+), 10 deletions(-)

2 7

[B.A.T.M.A.N.] get a list of IP addresses to all neighbor nodes
by Moritz Warning 05 Jan '15

05 Jan '15

Hi, I try to display a list of IPv6-Addresses of all neighbors on each node so users can jump/click from a nodes HTTP status page to another (sounds like fun!). The basic approach would be to use an IPv6 ULA address (prefix+ some MAC address) for the node and to somehow get the MAC part from batman. A list might generate by this: for mac in $(batctl o -H | grep 'No' -v | cut -b 37-53 | sort | uniq); do addr="$(ula_addr $prefix $mac)" echo " <li><h3><a href=\"http://[$addr]\">$mac</a></h3></li>" done The problem is now to understand where this MAC comes from. Does it belong to a node or client (we do not want clients displayed)? Afaik, the MAC is the address of the interface of the neighbor node, which might be one of several belonging to that node. A solution might be to give a node an ULA-address for each interface batman-adv uses. Is there a nicer solution?

1 0

[B.A.T.M.A.N.] [PATCH maint] batman-adv: fix potential TT client + orig-node memory leak
by Linus Lüssing 05 Jan '15

05 Jan '15

This patch fixes a potential memory leak which can occur once an originator times out. On timeout the according global translation table entry might not get purged correctly. Furthermore, the non purged TT entry will cause its orig-node to leak, too. Which additionally can lead to the new multicast optimization feature not kicking in because of a therefore bogus counter. In the wild with larger mesh networks we saw this leak quite regularly, resulting in routers to reboot or killed processes. This was because of a combination of two bugs: The bug fixed by commit "batman-adv: fix delayed foreign originator recognition" (8a2ad5204674) amplified this memory leak heavily. Since that commit I'd expect it to happen rarely, probably only in paused and resumed VMs and devices previously in stand-by. The issue this patch fixes is caused by batadv_orig_node_free_rcu() never being called because of not yet released references to the orig-node. References which were supposed to be released through batadv_orig_node_free_rcu()->batadv_tt_global_del_orig(). Fixing the issue by moving batadv_tt_global_del_orig() out of the rcu callback. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- originator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/originator.c b/originator.c index 648bdba..bea8198 100644 --- a/originator.c +++ b/originator.c @@ -570,9 +570,6 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu) batadv_frag_purge_orig(orig_node, NULL); - batadv_tt_global_del_orig(orig_node->bat_priv, orig_node, -1, - "originator timed out"); - if (orig_node->bat_priv->bat_algo_ops->bat_orig_free) orig_node->bat_priv->bat_algo_ops->bat_orig_free(orig_node); @@ -978,6 +975,9 @@ static void _batadv_purge_orig(struct batadv_priv *bat_priv) if (batadv_purge_orig_node(bat_priv, orig_node)) { batadv_gw_node_delete(bat_priv, orig_node); hlist_del_rcu(&orig_node->hash_entry); + batadv_tt_global_del_orig(orig_node->bat_priv, + orig_node, -1, + "originator timed out"); batadv_orig_node_free_ref(orig_node); continue; } -- 1.7.10.4

3 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 January 2015