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.] pull request: batman-adv 20150108
by Antonio Quartulli 09 Jan '15

09 Jan '15

Hello David, this is a batch of patches intended for net-next. In this patchset you have mostly cleanups and small corrections to issues reported by checkpatch. One notable change is the addition of the DEBUG_FS dependency to the BATMAN_ADV_DEBUG symbol by Markus Pargmann. We add this dependency because all the information provided by the DEBUG feature is accessible only through debugfs. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit 44d84d7272e5848878a96029b8a8b6e86854f146: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2015-01-06 22:29:20 -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 9535395640edb23ba5cec2abb026c4ee51899722: batman-adv: Kconfig, Add missing DEBUG_FS dependency (2015-01-07 22:17:11 +0100) ---------------------------------------------------------------- Included changes: - remove useless return in void functions - remove unused member 'primary_iface' from 'struct orig_node' - improve existing kernel doc - fix several checkpatch complaints - ensure socket's control block is cleared for received skbs - add missing DEBUG_FS dependency to BATMAN_ADV_DEBUG symbol ---------------------------------------------------------------- Antonio Quartulli (7): batman-adv: avoid useless return in void functions batman-adv: checkpatch - else is not generally useful after a break or return batman-adv: checkpatch - No space is necessary after a cast batman-adv: checkpatch - Please use a blank line after declarations batman-adv: checkpatch - Please don't use multiple blank lines batman-adv: checkpatch - remove unnecessary parentheses batman-adv: fix misspelled words Markus Pargmann (1): batman-adv: Kconfig, Add missing DEBUG_FS dependency Martin Hundebøll (5): batman-adv: kernel doc fixes for bat_iv_ogm.c batman-adv: kernel doc fixes for bridge_loop_avoidance.c batman-adv: kernel doc fix for distributed-arp-table.h batman-adv: kernel doc fixes for main.{c, h} batman-adv: clear control block of received socket buffers Simon Wunderlich (2): batman-adv: remove obsolete variable primary_iface from orig_node batman-adv: Start new development cycle net/batman-adv/Kconfig | 1 + net/batman-adv/bat_iv_ogm.c | 15 +++++++-------- net/batman-adv/bitarray.c | 1 - net/batman-adv/bitarray.h | 3 +-- net/batman-adv/bridge_loop_avoidance.c | 17 +++++++---------- net/batman-adv/debugfs.c | 2 +- net/batman-adv/distributed-arp-table.c | 1 + net/batman-adv/distributed-arp-table.h | 4 +--- net/batman-adv/fragmentation.c | 1 - net/batman-adv/fragmentation.h | 3 +-- net/batman-adv/gateway_client.c | 1 + net/batman-adv/main.c | 10 ++++++---- net/batman-adv/main.h | 15 +++++++-------- net/batman-adv/multicast.h | 3 --- net/batman-adv/network-coding.c | 3 +-- net/batman-adv/originator.c | 1 - net/batman-adv/originator.h | 1 - net/batman-adv/packet.h | 5 +++-- net/batman-adv/routing.c | 3 +-- net/batman-adv/soft-interface.c | 1 - net/batman-adv/sysfs.c | 1 - net/batman-adv/translation-table.c | 8 +++----- net/batman-adv/types.h | 4 +--- 23 files changed, 43 insertions(+), 61 deletions(-)

2 16

[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

[B.A.T.M.A.N.] [PATCH] batman-adv: Unify fragment size calculation
by Sven Eckelmann 29 Dec '14

29 Dec '14

The fragmentation code was replaced in 9b3eab61754d74a93c9840c296013fe3b4a1b606 ("batman-adv: Receive fragmented packets and merge") by an implementation which can handle up to 16 fragments of a packet. The packet is prepared for the split in fragments by the function batadv_frag_send_packet and the actual split is done by batadv_frag_create. Both functions calculate the size of a fragment themself. But their calculation differs because batadv_frag_send_packet also subtracts ETH_HLEN. Therefore, the check in batadv_frag_send_packet if a full fragment can be created may return true even when batadv_frag_create cannot create a full fragment. The function batadv_frag_create doesn't check the size of the skb before splitting it and therefore might try to create a larger fragment than the remaining buffer. This creates an integer underflow and an invalid len is given to skb_split. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- fragmentation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragmentation.c b/fragmentation.c index 0ab228f..9e06457 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -433,7 +433,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb, * fragments larger than BATADV_FRAG_MAX_FRAG_SIZE */ mtu = min_t(unsigned, mtu, BATADV_FRAG_MAX_FRAG_SIZE); - max_fragment_size = (mtu - header_size - ETH_HLEN); + max_fragment_size = mtu - header_size; max_packet_size = max_fragment_size * BATADV_FRAG_MAX_FRAGMENTS; /* Don't even try to fragment, if we need more than 16 fragments */ -- 2.1.3

3 2

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: fix misspelled words
by Antonio Quartulli 29 Dec '14

29 Dec '14

Reported-by: checkpatch Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- CHANGELOG | 2 +- bridge_loop_avoidance.c | 4 ++-- main.c | 2 +- packet.h | 4 ++-- routing.c | 2 +- translation-table.c | 2 +- types.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a91e233..affb823 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -248,7 +248,7 @@ batman-adv 2011.4.0: batman-adv 2011.3.1: * don't send all packets to selected gateway as broadcast -* prevent translation table corruptions caused by unintialized memory and +* prevent translation table corruptions caused by uninitialized memory and invalid sizes send through client announcement mechanism -- Tue, 18 Oct 2011 20:40:59 +0200 diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 4fc6cab..ac4b96e 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -244,7 +244,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) spin_unlock_bh(list_lock); } - /* all claims gone, intialize CRC */ + /* all claims gone, initialize CRC */ backbone_gw->crc = BATADV_BLA_CRC_INIT; } @@ -1328,7 +1328,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, goto out; } /* not found, add a new entry (overwrite the oldest entry) - * and allow it, its the first occurence. + * and allow it, its the first occurrence. */ curr = (bat_priv->bla.bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1); curr %= BATADV_DUPLIST_SIZE; diff --git a/main.c b/main.c index d4079cd..6f48cdb 100644 --- a/main.c +++ b/main.c @@ -795,7 +795,7 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv, } /** - * batadv_tvlv_realloc_packet_buff - reallocate packet buffer to accomodate + * batadv_tvlv_realloc_packet_buff - reallocate packet buffer to accommodate * requested packet size * @packet_buff: packet buffer * @packet_buff_len: packet buffer size diff --git a/packet.h b/packet.h index facd1fe..b81fbbf 100644 --- a/packet.h +++ b/packet.h @@ -377,7 +377,7 @@ struct batadv_frag_packet { uint8_t reserved:4; uint8_t no:4; #else -#error "unknown bitfield endianess" +#error "unknown bitfield endianness" #endif uint8_t dest[ETH_ALEN]; uint8_t orig[ETH_ALEN]; @@ -453,7 +453,7 @@ struct batadv_coded_packet { * @src: address of the source * @dst: address of the destination * @tvlv_len: length of tvlv data following the unicast tvlv header - * @align: 2 bytes to align the header to a 4 byte boundry + * @align: 2 bytes to align the header to a 4 byte boundary */ struct batadv_unicast_tvlv_packet { uint8_t packet_type; diff --git a/routing.c b/routing.c index 3a6764d..e5f2ccd 100644 --- a/routing.c +++ b/routing.c @@ -454,7 +454,7 @@ batadv_find_router(struct batadv_priv *bat_priv, * the last chosen bonding candidate (next_candidate). If no such * router is found, use the first candidate found (the previously * chosen bonding candidate might have been the last one in the list). - * If this can't be found either, return the previously choosen + * If this can't be found either, return the previously chosen * router - obviously there are no other candidates. */ rcu_read_lock(); diff --git a/translation-table.c b/translation-table.c index 84e6f01..07b263a 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2852,7 +2852,7 @@ static void batadv_tt_update_changes(struct batadv_priv *bat_priv, /** * batadv_is_my_client - check if a client is served by the local node * @bat_priv: the bat priv with all the soft interface information - * @addr: the mac adress of the client to check + * @addr: the mac address of the client to check * @vid: VLAN identifier * * Returns true if the client is served by this node, false otherwise. diff --git a/types.h b/types.h index 462a70c..9398c3f 100644 --- a/types.h +++ b/types.h @@ -968,7 +968,7 @@ struct batadv_tt_orig_list_entry { }; /** - * struct batadv_tt_change_node - structure for tt changes occured + * struct batadv_tt_change_node - structure for tt changes occurred * @list: list node for batadv_priv_tt::changes_list * @change: holds the actual translation table diff data */ -- 2.1.3

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: move misplaced compat code
by Antonio Quartulli 29 Dec '14

29 Dec '14

consume_skb() has to be re-defined only for kernels <2.6.30 but the macro was accidentally placed right above any #ifdef block causing the function to be always redefined. Fix this by moving the macro to the proper #ifdef block. Introduced by: 15fb0fab51a3695738f65dfaab045e979fc89dce ("batman-adv add compat code for consume_skb") Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index ed5b815..8de2010 100644 --- a/compat.h +++ b/compat.h @@ -23,10 +23,10 @@ #include <linux/version.h> /* LINUX_VERSION_CODE */ -#define consume_skb(_skb) kfree_skb(_skb) - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) +#define consume_skb(_skb) kfree_skb(_skb) + #undef __alloc_percpu #define __alloc_percpu(size, align) \ percpu_alloc_mask((size), GFP_KERNEL, cpu_possible_map) -- 2.0.4

2 1

[B.A.T.M.A.N.] Out-of-date batman-adv module in Linux Mint (Ubuntu)
by Melroy van den Berg 16 Dec '14

16 Dec '14

Hi devs, I found out that the batman-adv kernel modules is quite out-dated in Linux Mint (and probably also Ubuntu/Debian unstable). Using 'lsmod batman-adv' it says: version 2013.5.0. But the current version is 2014.3.0. Is it on the planning to update to the newest version? Or what could we / I do to update the package(s)? Thanks! Kind regards, Melroy van den Berg

2 1

Re: [B.A.T.M.A.N.] batman-adv: Fix dmesg | grep, use batman_adv (instead of batman-adv)
by Marek Lindner 13 Dec '14

13 Dec '14

Hi, the mail below went to the wrong mailing list (commits@ is read-only). Cheers, Marek On Friday 12 December 2014 22:04:10 Melroy van den Berg wrote: > Hi, > > This is my first patch :). This is small one, but it's a bug. > > From 414638b05aacdfb111c8f4bf0e35d63b65b8ebdf Mon Sep 17 00:00:00 2001 > From: Melroy van den Berg <webmaster1989(a)gmail.com> > Date: Fri, 12 Dec 2014 21:56:32 +0100 > Subject: [PATCH] batman-adv: Use batman_adv (instead of batman-adv) to grep > in > dmesg, because batman_adv is the real module name. > > Signed-off-by: Melroy van den Berg <webmaster1989(a)gmail.com> > --- > README | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/README b/README > index 58e4904..4f401e5 100644 > --- a/README > +++ b/README > @@ -135,7 +135,7 @@ mands: dmesg, logread, or looking in the files > /var/log/kern.log > or /var/log/syslog. All batman-adv messages are prefixed with > "batman-adv:" So to see just these messages try > > -# dmesg | grep batman-adv > +# dmesg | grep batman_adv > > When investigating problems with your mesh network it is some- > times necessary to see more detail debug messages. This must be

1 0

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