B.A.T.M.A.N May 2017

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

9 participants
17 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: handle race condition for claims also in batadv_bla_rx
by Simon Wunderlich 02 Jul '19

02 Jul '19

From: Andreas Pape <apape(a)phoenixcontact.com> Like in the case of the patch for batadv_bla_tx to handle a race condition when claiming a mac address for bla, a similar situation can occur when claiming is triggered via batadv_bla_rx. This patch solves this with a similar approach as for batadv_bla_tx. Signed-off-by: Andreas Pape <apape(a)phoenixcontact.com> --- net/batman-adv/bridge_loop_avoidance.c | 31 ++++++++++++++++++++----------- net/batman-adv/translation-table.c | 26 ++++++++++++++++++++++++++ net/batman-adv/translation-table.h | 3 +++ 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index d07e89e..cab8980 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1847,19 +1847,28 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, if (!claim) { /* possible optimization: race for a claim */ - /* No claim exists yet, claim it for us! + /* Make sure this packet is not looping back + * from our own backbone. */ - batadv_dbg(BATADV_DBG_BLA, bat_priv, - "bla_rx(): Unclaimed MAC %pM found. Claim it. Local: %s\n", - ethhdr->h_source, - batadv_is_my_client(bat_priv, - ethhdr->h_source, vid) ? - "yes" : "no"); - batadv_handle_claim(bat_priv, primary_if, - primary_if->net_dev->dev_addr, - ethhdr->h_source, vid); - goto allow; + if (batadv_tt_local_has_timed_out(bat_priv, ethhdr->h_source, + vid, 100)) { + /* No claim exists yet, claim it for us! + */ + batadv_dbg(BATADV_DBG_BLA, bat_priv, + "bla_rx(): Unclaimed MAC %pM found. Claim it. Local: %s\n", + ethhdr->h_source, + batadv_is_my_client(bat_priv, + ethhdr->h_source, vid) ? + "yes" : "no"); + + batadv_handle_claim(bat_priv, primary_if, + primary_if->net_dev->dev_addr, + ethhdr->h_source, vid); + goto allow; + } else { + goto handled; + } } /* if it is our own claim ... */ diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index e75b493..b908195 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -4380,3 +4380,29 @@ void batadv_tt_cache_destroy(void) kmem_cache_destroy(batadv_tt_req_cache); kmem_cache_destroy(batadv_tt_roam_cache); } + +bool batadv_tt_local_has_timed_out(struct batadv_priv *bat_priv, + const u8 *addr, unsigned short vid, + unsigned int timeout) +{ + struct batadv_tt_local_entry *tt_local_entry; + bool ret = true; + + tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid); + if (!tt_local_entry) + goto out; + /* Check if the client has been logically deleted (but is kept for + * consistency purpose) + */ + if ((tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING) || + (tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM)) + goto out; + /* Check that the tt_local_entry has a certain age */ + if (!batadv_has_timed_out(tt_local_entry->last_seen, timeout)) + ret = false; + +out: + if (tt_local_entry) + batadv_tt_local_entry_put(tt_local_entry); + return ret; +} diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 411d586..b05d0d8 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -65,5 +65,8 @@ bool batadv_tt_global_is_isolated(struct batadv_priv *bat_priv, int batadv_tt_cache_init(void); void batadv_tt_cache_destroy(void); +bool batadv_tt_local_has_timed_out(struct batadv_priv *bat_priv, + const u8 *addr, unsigned short vid, + unsigned int timeout); #endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */ -- 1.7.0.4

3 5

[B.A.T.M.A.N.] [PATCH 00/17] pull request for net-next: batman-adv 2016-10-27
by Simon Wunderlich 04 Aug '18

04 Aug '18

Hi David, this is our first feature pull request for batman-adv (mostly containing code cleanup stuff), there are at least two more to come. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 29fbff8698fc0ac1a1d74584b258e0bf18b469f9: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2016-10-13 21:40:23 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20161027 for you to fetch changes up to 4c7da0f6dbcde2431d773ce03cde5e7abede54e0: batman-adv: Avoid precedence issues in macros (2016-10-19 08:37:54 +0200) ---------------------------------------------------------------- This code cleanup patchset includes the following changes (chronological order): - bump version strings, by Simon Wunderlich - README updates/clean up, by Sven Eckelmann (4 patches) - Code clean up and restructuring by Sven Eckelmann (2 patches) - Kerneldoc fix in forw_packet structure, by Linus Luessing - Remove unused argument in dbg_arp, by Antonio Quartulli - Add support to build batman-adv without wireless, by Linus Luessing - Restructure error handling for is_ap_isolated, by Markus Elfring - Remove unused initialization in various functions, by Sven Eckelmann - Use better names for fragment and gateway list heads, by Sven Eckelmann (2 patches) - Convert to octal permissions for files, by Sven Eckelmann - Avoid precedence issues for some macros, by Sven Eckelmann ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: remove unsed argument from batadv_dbg_arp() function Linus Lüssing (2): batman-adv: fix batadv_forw_packet kerneldoc for list attribute batman-adv: Allow selecting BATMAN V if CFG80211 is not built Markus Elfring (1): batman-adv: Less function calls in batadv_is_ap_isolated() after error detection Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (12): batman-adv: Add B.A.T.M.A.N. V sysfs files to README batman-adv: Add network_coding and mcast sysfs files to README batman-adv: Add dat, mcast, nc and neighbor debugfs files to README batman-adv: Document new nc, mcast and tpmeter log levels batman-adv: Remove unused function batadv_hash_delete batman-adv: Move batadv_sum_counter to soft-interface.c batman-adv: Remove unused batadv_icmp_user_cmd_type batman-adv: Remove needless init of variables on stack batman-adv: Use proper name for fragments list head batman-adv: Use proper name for gateway list head batman-adv: Use octal permissions instead of macros batman-adv: Avoid precedence issues in macros Documentation/networking/batman-adv.txt | 35 ++++++++++++---------- net/batman-adv/Kconfig | 2 +- net/batman-adv/bat_iv_ogm.c | 6 ++-- net/batman-adv/bat_v.c | 8 ++--- net/batman-adv/bat_v_ogm.c | 4 +-- net/batman-adv/debugfs.c | 26 ++++++++-------- net/batman-adv/distributed-arp-table.c | 17 ++++------- net/batman-adv/fragmentation.c | 18 +++++------ net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 9 +++--- net/batman-adv/hash.h | 30 ------------------- net/batman-adv/icmp_socket.c | 5 ++-- net/batman-adv/log.c | 4 +-- net/batman-adv/log.h | 12 ++++---- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 27 ++--------------- net/batman-adv/network-coding.c | 8 ++--- net/batman-adv/originator.c | 10 +++---- net/batman-adv/packet.h | 12 +------- net/batman-adv/send.c | 2 +- net/batman-adv/soft-interface.c | 21 +++++++++++++ net/batman-adv/sysfs.c | 53 ++++++++++++++------------------- net/batman-adv/translation-table.c | 25 +++++++--------- net/batman-adv/types.h | 16 +++++----- 24 files changed, 149 insertions(+), 205 deletions(-)

7 35

Re: [B.A.T.M.A.N.] limit of if per batman
by Sven Eckelmann 03 Feb '18

03 Feb '18

On Mittwoch, 25. Januar 2017 03:18:10 CET jens wrote: > On 24.01.2017 14:39, Sven Eckelmann wrote: > > There is no artificial limit added by batman-adv. But transmitting a lot of > > broadcasts over 255 virtual links sharing the same physical link > > might get interesting (independent of batman-adv). > > this made me curious , and i modified your script a bit - turns out > after the 127. IF you add to batman-adv you get an Error - > all 510 gretap links was succesfully build ... > # ifconfig |grep gre| wc -l > 515 > # batctl if|sort|wc -l > 127 > the error is mainly > *Error - can't write to file > '/sys/class/net/gre128/batman_adv/mesh_iface': Cannot allocate memory [...] > [113990.684947] [<ffffffff8107c16e>] ? __warn+0xbe/0xe0 [113990.684955] > [<ffffffffc017a804>] ? batadv_orig_hash_add_if+0x94/0x140 [batman_adv] > [113990.684961] [<ffffffff811a7b10>] ? kmalloc_slab+0x90/0xa0 > [113990.684966] [<ffffffff811e08c5>] ? __kmalloc+0x25/0x580 > [113990.684971] [<ffffffff815ef9d7>] ? _raw_spin_lock_irqsave+0x17/0x39 > [113990.684977] [<ffffffff81432c11>] ? _crng_backtrack_protect+0x31/0x70 > [113990.684981] [<ffffffff811e0ebc>] ? kmem_cache_alloc_trace+0x9c/0x540 > [113990.684986] [<ffffffff814340b7>] ? get_random_bytes+0xe7/0x1c0 > [113990.684991] [<ffffffffc017a804>] ? [...] I would guess that your system mostly fails becauseit cannot handle the allocation of the "large" arrays which store: * @bcast_own: set of bitfields (one per hard-interface) where each one counts * the number of our OGMs this orig_node rebroadcasted "back" to us (relative * to last_real_seqno). Every bitfield is BATADV_TQ_LOCAL_WINDOW_SIZE bits long. * @bcast_own_sum: sum of bcast_own Kind regards, Sven

1 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Deinline batadv_orig_hash_find, save 9024 bytes
by Denys Vlasenko 23 Oct '17

23 Oct '17

This function compiles to 473 bytes of machine code. 21 callsites. text data bss dec hex filename 95903266 20860288 35991552 152755106 91adba2 vmlinux_before 95894242 20860288 35991552 152746082 91ab862 vmlinux Signed-off-by: Denys Vlasenko <dvlasenk(a)redhat.com> CC: Marek Lindner <mareklindner(a)neomailbox.ch> CC: Simon Wunderlich <sw(a)simonwunderlich.de> CC: Antonio Quartulli <a(a)unstable.cc> CC: Sven Eckelmann <sven(a)narfation.org> CC: b.a.t.m.a.n(a)lists.open-mesh.org CC: linux-kernel(a)vger.kernel.org --- net/batman-adv/originator.c | 29 +++++++++++++++++++++++++++++ net/batman-adv/originator.h | 31 ++----------------------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index e4cbb07..bcf78f1 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -47,6 +47,36 @@ /* hash class keys */ static struct lock_class_key batadv_orig_hash_lock_class_key; +struct batadv_orig_node * +batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data) +{ + struct batadv_hashtable *hash = bat_priv->orig_hash; + struct hlist_head *head; + struct batadv_orig_node *orig_node, *orig_node_tmp = NULL; + int index; + + if (!hash) + return NULL; + + index = batadv_choose_orig(data, hash->size); + head = &hash->table[index]; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, head, hash_entry) { + if (!batadv_compare_eth(orig_node, data)) + continue; + + if (!kref_get_unless_zero(&orig_node->refcount)) + continue; + + orig_node_tmp = orig_node; + break; + } + rcu_read_unlock(); + + return orig_node_tmp; +} + static void batadv_purge_orig(struct work_struct *work); /** diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 4e8b67f..db7a87d 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -96,34 +96,7 @@ static inline u32 batadv_choose_orig(const void *data, u32 size) return hash % size; } -static inline struct batadv_orig_node * -batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data) -{ - struct batadv_hashtable *hash = bat_priv->orig_hash; - struct hlist_head *head; - struct batadv_orig_node *orig_node, *orig_node_tmp = NULL; - int index; - - if (!hash) - return NULL; - - index = batadv_choose_orig(data, hash->size); - head = &hash->table[index]; - - rcu_read_lock(); - hlist_for_each_entry_rcu(orig_node, head, hash_entry) { - if (!batadv_compare_eth(orig_node, data)) - continue; - - if (!kref_get_unless_zero(&orig_node->refcount)) - continue; - - orig_node_tmp = orig_node; - break; - } - rcu_read_unlock(); - - return orig_node_tmp; -} +struct batadv_orig_node * +batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data); #endif /* _NET_BATMAN_ADV_ORIGINATOR_H_ */ -- 1.8.1.4

3 5

[B.A.T.M.A.N.] [batctl] compiling with gcc 7.1.0: there are some notes and warnings
by Philipp Psurek 13 Jun '17

13 Jun '17

Hi all, it's nothing to worry about but since 2011 I always noticed a clean compile run of your code. Now with gcc 7.1.0 there are some warnings and notes that might interest you: ~ LANG=C make CC bat-hosts.o CC debugfs.o CC debug.o CC functions.o CC genl.o CC hash.o CC icmp_helper.o CC interface.o CC ioctl.o CC main.o CC netlink.o CC ping.o CC sys.o In file included from sys.c:37:0: sys.c: In function 'handle_ra_setting': sys.h:33:25: warning: '%s' directive output may be truncated writing up to 255 bytes into a region of size 185 [-Wformat-truncation=] #define SYS_IFACE_PATH "/sys/class/net" ^ sys.h:38:30: note: in expansion of macro 'SYS_IFACE_PATH' #define SYS_ROUTING_ALGO_FMT SYS_IFACE_PATH"/%s/mesh/routing_algo" ^~~~~~~~~~~~~~ sys.c:480:38: note: in expansion of macro 'SYS_ROUTING_ALGO_FMT' snprintf(path_buff, PATH_BUFF_LEN, SYS_ROUTING_ALGO_FMT, iface_dir->d_name); ^~~~~~~~~~~~~~~~~~~~ sys.h:38:46: note: format string is defined here #define SYS_ROUTING_ALGO_FMT SYS_IFACE_PATH"/%s/mesh/routing_algo" ^~ sys.c:480:3: note: 'snprintf' output between 34 and 289 bytes into a destination of size 200 snprintf(path_buff, PATH_BUFF_LEN, SYS_ROUTING_ALGO_FMT, iface_dir->d_name); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC tcpdump.o CC tp_meter.o tp_meter.c: In function 'tp_meter': tp_meter.c:502:3: warning: this statement may fall through [-Wimplicit-fallthrough=] printf("CANCEL received: test aborted\n"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tp_meter.c:504:2: note: here case BATADV_TP_REASON_COMPLETE: ^~~~ CC traceroute.o CC translate.o LD batctl # batctl -v batctl 2017.1-1-g3069ca8 [batman-adv: 2017.1-4-g2149d80d] It's really nothing bad at all. gcc 7.1.0 is somehow a little bit capricious but with more suggestions to make cleaner code. best regards Philipp

3 20

[B.A.T.M.A.N.] [PATCH v2 0/6] batman-adv: broadcast packet aggregation
by Linus Lüssing 13 Jun '17

13 Jun '17

Hi, Here is a first patchset to reintroduce aggregation support for BATMAN V, too - as well as any other packet type with a broadcast destination. Branch: * https://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/linus/aggregat… Regards, Linus PS: Requires: "batman-adv: Introduce packet type independent TVLV handler API" (40e5c9e798ec, available on patchwork or linus/aggregation branch) --- Changelog: v2: * reset skb->cb on the soft-iface reception path, too [PATCH 5/6] (thanks Sven!) RFC->v1: * removed tvlv (un)pack ctx wrappers * fixed a crash when deaggregating ARP packets * now compile tested down to 3.2, too (no issues found) * now stress tested with multicast traffic of a larger, public mesh setup

2 9

[B.A.T.M.A.N.] [PATCH net] net: batman-adv: Fix possible memleaks when fail to register_netdevice
by gfree.wind＠foxmail.com 09 Jun '17

09 Jun '17

From: Gao Feng <fgao(a)ikuai8.com> Because the func batadv_softif_init_late allocate some resources and it would be invoked in register_netdevice. So we need to invoke the func batadv_softif_free instead of free_netdev to cleanup when fail to register_netdevice. Signed-off-by: Gao Feng <fgao(a)ikuai8.com> --- net/batman-adv/soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index d042c99..90bf990 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1011,7 +1011,7 @@ struct net_device *batadv_softif_create(struct net *net, const char *name) if (ret < 0) { pr_err("Unable to register the batman interface '%s': %i\n", name, ret); - free_netdev(soft_iface); + batadv_softif_free(soft_iface); return NULL; } -- 1.9.1

4 8

[B.A.T.M.A.N.] MAC addresses of loop detect frames in global translation-table
by Andreas Pape 01 Jun '17

01 Jun '17

Hello, I stumbled across some weired MAC addresses starting with ba:be in the global translation-table when running batman-adv-2017.0.1. I run my setup with bla enabled. Most of the entries in the global tt of my devices consist of these mac addresses. Looking through the code they come from frames which seem to be used for loop detection. Adding such MAC addresses to the local tt is prevented with the help of the batadv_bla_is_loopdetect_mac function. I wonder why adding these macs to the global tt is not prevented in a simliar way. Would it be possible to add a corresponding check to batadv_tt_global_add to prevent these macs from being added to the global tt? Or is there a specific reason why these mac addresses must occur in the global tt and which I have not understood so far? Best regards, Andreas .................................................................. PHOENIX CONTACT ELECTRONICS GmbH Sitz der Gesellschaft / registered office of the company: 31812 Bad Pyrmont USt-Id-Nr.: DE811742156 Amtsgericht Hannover HRB 100528 / district court Hannover HRB 100528 Geschäftsführer / Executive Board: Ulrich Leidecker, Christoph Leifer __________________________________________________________________ Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das unerlaubte Kopieren, jegliche anderweitige Verwendung sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet. ---------------------------------------------------------------------------------------------------- This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden. ___________________________________________________________________

3 7

[B.A.T.M.A.N.] [PATCH 0/5] alfred: TQ query optimizations
by Sven Eckelmann 01 Jun '17

01 Jun '17

Hi, alfred uses the TQ from batman-adv to find its best alfred neighbor. This best neighbor information is used by slave servers to request/publish data. This is done for each server announcement packet by: * requesting the global translation table (netlink or debugfs) and then searching in it for the MAC address of the detected alfred server to find its originator address * requesting the originator table (netlink or debugfs) and then searching it it for the originator address of the detected alfred server to find its TQ value This was previously done whenever a new announcement packet received by alfred. We've observed that this can be a problem on networks with a lot of master servers (~100) which can see each other, large translation tables and slow CPUs. alfred still worked but the CPU load by alfred was rather high (~20% on an 560MHz AR9344). The idea is now to avoid this lookup for master servers. And (for slave servers) to process all servers at once. This is done before the wants to push its local data to a master server in an sync interval. The process which was described earlier was now changed to: * requesting the global translation table (netlink or debugfs) and then put MAC address and corresponding originator address in tg hash * requesting the originator table (netlink or debugfs) and then put originator address and corresponding TQ value orig hash * got through all servers: - search in tg hash for for the MAC address of the alfred server to find its originator address - search in orig hash for for the originator address of the alfred server to find its TQ value These changes reduced the load on the previously mentioned devices significantly. Kind regards, Sven Sven Eckelmann (5): alfred: Move alfred specific netlink code in separate file alfred: Only query tq of remote master in slave mode alfred: Check the TQ of master servers before pushing data alfred: Cache the TQ values for each originator alfred: Cache the global translation table entries Makefile | 1 + alfred.h | 1 - batadv_query.c | 227 +++++++++++++++++++++++++++++++++++++++++-------------- batadv_query.h | 25 +++++- batadv_querynl.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++ batadv_querynl.h | 34 +++++++++ netlink.c | 195 ----------------------------------------------- netlink.h | 7 -- recv.c | 15 +--- server.c | 56 +++++++++++++- 10 files changed, 501 insertions(+), 276 deletions(-) create mode 100644 batadv_querynl.c create mode 100644 batadv_querynl.h

2 7

[B.A.T.M.A.N.] B.A.T.M.A.N. Agenda for BattleMesh
by Linus Lüssing 31 May '17

31 May '17

Hi, Thought it might be a good idea to collect the topics we could/should discuss or work on at the BattleMesh in Vienna concerning B.A.T.M.A.N. I started with a list of things I'd be interested in in the link below - feel free to add yours, too: https://etherpad.wikimedia.org/p/batman-wbm10 Regards, Linus PS: If you are adding discussion topics, ideally you'd be in Vienna, too ;).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2017