B.A.T.M.A.N January 2017

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

17 participants
34 discussions

[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.] Duplicate #include guards with make-kpkg / out-of-tree compile errors
by Linus Lüssing 24 Apr '17

24 Apr '17

Hi Ben and others, Recently we stumbled upon some compile errors when trying to build a backport version of the batman-adv kernel module for a 4.5 kernel [0]: "implicit declaration of function ‘G_TC_AT’" It seems VirtualBox has stumbled over this issue, too [1]. When trying to find the cause of these errors we noticed that the headers directory created via "$ make-kpkg kernel_headers" for 4.5 kernel resulted in two differing header files with the same guard, namely __LINUX_PKT_CLS_H: https://metameute.de/~tux/batman-adv/net-sched-issues/linux-headers-4.5.0%2… https://metameute.de/~tux/batman-adv/net-sched-issues/linux-headers-4.5.0%2… The latter, the non-uapi version, has the "#ifdef __KERNEL__" section stripped, causing the compile issue if it is included before the uapi variant. Removing this non-uapi version from the unpacked linux-headers .deb package manually afterwards lets a batman-adv compilation succeed again. Daniel (CC) has helped a lot with debugging so far and he expressed the suspicion that maybe make-kpkg might install "$ make headers_install" into the wrong directory? Regards, Linus [0]: https://www.open-mesh.org/issues/322 [1]: https://www.virtualbox.org/ticket/15327 PS: make-kpkg was invoked on a Debian Jessie (kernel-package 13.014+nmu1).

3 3

[B.A.T.M.A.N.] [PATCH v7 1/5] batman-adv: prevent multiple ARP replies sent by gateways if dat enabled
by Sven Eckelmann 16 Feb '17

16 Feb '17

From: Andreas Pape <APape(a)phoenixcontact.com> If dat is enabled it must be made sure that only the backbone gw which has claimed the remote destination for the ARP request answers the ARP request directly if the MAC address is known due to the local dat table. This prevents multiple ARP replies in a common backbone if more than one gateway already knows the remote mac searched for in the ARP request. Signed-off-by: Andreas Pape <apape(a)phoenixcontact.com> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> [sven(a)narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bridge_loop_avoidance.c | 49 ++++++++++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 11 ++++++++ net/batman-adv/distributed-arp-table.c | 15 +++++++++++ 3 files changed, 75 insertions(+) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index e7f690b..41ab4a6 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -2450,3 +2450,52 @@ out: return ret; } + +#ifdef CONFIG_BATMAN_ADV_DAT +/** + * batadv_bla_check_claim - check if address is claimed + * + * @bat_priv: the bat priv with all the soft interface information + * @addr: mac address of which the claim status is checked + * @vid: the VLAN ID + * + * addr is checked if this address is claimed by the local device itself. + * + * Return: true if bla is disabled or the mac is claimed by the device, + * false if the device addr is already claimed by another gateway + */ +bool batadv_bla_check_claim(struct batadv_priv *bat_priv, + u8 *addr, unsigned short vid) +{ + struct batadv_bla_claim search_claim; + struct batadv_bla_claim *claim = NULL; + struct batadv_hard_iface *primary_if = NULL; + bool ret = true; + + if (!atomic_read(&bat_priv->bridge_loop_avoidance)) + return ret; + + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if) + return ret; + + /* First look if the mac address is claimed */ + ether_addr_copy(search_claim.addr, addr); + search_claim.vid = vid; + + claim = batadv_claim_hash_find(bat_priv, &search_claim); + + /* If there is a claim and we are not owner of the claim, + * return false. + */ + if (claim) { + if (!batadv_compare_eth(claim->backbone_gw->orig, + primary_if->net_dev->dev_addr)) + ret = false; + batadv_claim_put(claim); + } + + batadv_hardif_put(primary_if); + return ret; +} +#endif diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 1ae93e4..86b8740 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -51,6 +51,10 @@ void batadv_bla_status_update(struct net_device *net_dev); int batadv_bla_init(struct batadv_priv *bat_priv); void batadv_bla_free(struct batadv_priv *bat_priv); int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb); +#ifdef CONFIG_BATMAN_ADV_DAT +bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr, + unsigned short vid); +#endif #define BATADV_BLA_CRC_INIT 0 #else /* ifdef CONFIG_BATMAN_ADV_BLA */ @@ -127,6 +131,13 @@ static inline int batadv_bla_backbone_dump(struct sk_buff *msg, return -EOPNOTSUPP; } +static inline +bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr, + unsigned short vid) +{ + return true; +} + #endif /* ifdef CONFIG_BATMAN_ADV_BLA */ #endif /* ifndef _NET_BATMAN_ADV_BLA_H_ */ diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e257efd..cf53404 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -43,6 +43,7 @@ #include <linux/workqueue.h> #include <net/arp.h> +#include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" #include "log.h" @@ -1007,6 +1008,20 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, goto out; } + /* If BLA is enabled, only send ARP replies if we have claimed + * the destination for the ARP request or if no one else of + * the backbone gws belonging to our backbone has claimed the + * destination. + */ + if (!batadv_bla_check_claim(bat_priv, + dat_entry->mac_addr, vid)) { + batadv_dbg(BATADV_DBG_DAT, bat_priv, + "Device %pM claimed by another backbone gw. Don't send ARP reply!", + dat_entry->mac_addr); + ret = true; + goto out; + } + skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, bat_priv->soft_iface, ip_dst, hw_src, dat_entry->mac_addr, hw_src); -- 2.9.3

3 10

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

09 Feb '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) --- 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 8

[B.A.T.M.A.N.] [PATCH] batman-adv: decrease maximum fragment size
by Linus Lüssing 31 Jan '17

31 Jan '17

From: Matthias Schiffer <mschiffer(a)universe-factory.net> With this patch the maximum fragment size is reduced from 1400 to 1280 bytes. Fragmentation v2 correctly uses the smaller of 1400 and the interface MTU, thus generally supporting interfaces with an MTU < 1400 bytes, too. However, currently "Fragmentation v2" does not support re-fragmentation. Which means that once a packet is split into two packets of 1400 + x bytes for instance and the next hop provides an interface with an even smaller MTU of 1280 bytes, then the larger fragment is lost. A maximum fragment size of 1280 bytes is a safer option as this is the minimum MTU required by IPv6, making interfaces with an MTU < 1280 rather exotic. Regarding performance, this should have no negative impact on unicast traffic: Having some more bytes in the smaller and some less in the larger does not change the sum of both fragments. Concerning TT, choosing 1280 bytes fragments might result in more TT messages than necessary when a large network is bridged into batman-adv. However, the TT overhead in general is marginal due to its reactive nature, therefore such a performance impact on TT should not be noticeable for a user. Cc: Matthias Schiffer <mschiffer(a)universe-factory.net> [linus.luessing(a)c0d3.blue: Added commit message] Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- This patch is currently used in Gluon [1] because we stumbled over this issue in setups where batman-adv first fragmented to 1400 bytes for a wired, 1500B MTU connection and the larger fragment then being lost on the next hop's VPN interface with an MTU of 1280 bytes. [1]: https://github.com/freifunk-gluon/gluon/tree/master/patches/packages/routing net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 57a8103..81c6a38 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -168,7 +168,7 @@ enum batadv_uev_type { /* Maximum number of fragments for one packet */ #define BATADV_FRAG_MAX_FRAGMENTS 16 /* Maxumim size of each fragment */ -#define BATADV_FRAG_MAX_FRAG_SIZE 1400 +#define BATADV_FRAG_MAX_FRAG_SIZE 1280 /* Time to keep fragments while waiting for rest of the fragments */ #define BATADV_FRAG_TIMEOUT 10000 -- 2.1.4

2 2

[B.A.T.M.A.N.] [PATCH 0/2] pull request for net-next: batman-adv 2017-01-28
by Simon Wunderlich 30 Jan '17

30 Jan '17

Hi David, here is another pull request for batman-adv in net-next. One of them fixes a regression introduced by a patch in the previous pull request two days ago. Please pull or let me know of any problem! Thank you, Simon The following changes since commit c33705188c493b7de3b8dc2956d67de91b444727: batman-adv: Treat NET_XMIT_CN as transmit successfully (2017-01-26 08:41:18 +0100) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20170128 for you to fetch changes up to 3e7514afc7d728dd47c5fe9d7a1f5216fe659cda: batman-adv: Fix includes for IS_ERR/ERR_PTR (2017-01-28 10:40:35 +0100) ---------------------------------------------------------------- Here are two fixes for batman-adv for net-next: - fix double call of dev_queue_xmit(), caused by the recent introduction of net_xmit_eval(), by Sven Eckelmann - Fix includes for IS_ERR/ERR_PTR, by Sven Eckelmann ---------------------------------------------------------------- Sven Eckelmann (2): batman-adv: Fix double call of dev_queue_xmit batman-adv: Fix includes for IS_ERR/ERR_PTR net/batman-adv/debugfs.c | 2 +- net/batman-adv/send.c | 4 +++- net/batman-adv/tp_meter.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)

3 4

[B.A.T.M.A.N.] [PATCH] alfred: Avoid buffer overflow while querying ARP cache
by Sven Eckelmann 30 Jan '17

30 Jan '17

The arpreq.arp_dev is a limited buffer (16 bytes). Avoid that more bytes from the interface name are copied into this buffer by switching from strcpy to strncpy. Fixes: c7da798113a2 ("alfred: IPv4 multicast distribution support.") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util.c b/util.c index 84ab3af..ed83895 100644 --- a/util.c +++ b/util.c @@ -92,7 +92,9 @@ int ipv4_arp_request(struct interface *interface, const alfred_addr *addr, sin->sin_family = AF_INET; sin->sin_addr.s_addr = addr->ipv4.s_addr; - strcpy(arpreq.arp_dev, interface->interface); + strncpy(arpreq.arp_dev, interface->interface, sizeof(arpreq.arp_dev)); + arpreq.arp_dev[sizeof(arpreq.arp_dev) - 1] = '\0'; + if (ioctl(interface->netsock, SIOCGARP, &arpreq) < 0) return -1; -- 2.11.0

3 3

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

29 Jan '17

Hi, Here is a first patchset to reintroduce aggregation support for BATMAN V, too. And while at it, for BATMAN VI, VII... etc, as well - in fact, it allows aggregating any batman packet with a broadcast destination ;). I am sending it as an RFC for now as compat code is still missing. And although it was tested in VMs, I still need to do some stress testing on some embedded routers. Regards, Linus PS: Requires: "batman-adv: Introduce packet type independent TVLV handler API" (1ddd189528fc, available on patchwork or linus/aggregation branch)

2 9

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2017