B.A.T.M.A.N

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

15 participants
4308 discussions

[PATCH] batman-adv: ELP - use wifi tx bitrate as fallback throughput
by Marek Lindner 26 Nov '19

26 Nov '19

From: René Treffer <treffer(a)measite.de> Some wifi drivers (e.g. ath10k) provide per-station rx/tx values but no estimated throughput. Setting a better estimate than the default 1 MBit makes these devices work well with B.A.T.M.A.N. V. Signed-off-by: René Treffer <treffer(a)measite.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- net/batman-adv/bat_v_elp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 2614a9ca..1e852d4b 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -107,10 +107,15 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) } if (ret) goto default_throughput; - if (!(sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT))) - goto default_throughput; - return sinfo.expected_throughput / 100; + if (sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)) + return sinfo.expected_throughput / 100; + + /* try to estimate en expected throughput based on reported tx rates */ + if (sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE)) + return cfg80211_calculate_bitrate(&sinfo.txrate) / 3; + + goto default_throughput; } /* if not a wifi interface, check if this device provides data via -- 2.23.0

1 1

INFO: rcu detected stall in dev_ioctl
by syzbot 25 Nov '19

25 Nov '19

Hello, syzbot found the following crash on: HEAD commit: 6b8a7946 Merge tag 'for_linus' of git://git.kernel.org/pub.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=175973cee00000 kernel config: https://syzkaller.appspot.com/x/.config?x=4737c15fc47048f2 dashboard link: https://syzkaller.appspot.com/bug?extid=1a41521b3198c9e15c2f compiler: gcc (GCC) 9.0.0 20181231 (experimental) Unfortunately, I don't have any reproducer for this crash yet. IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+1a41521b3198c9e15c2f(a)syzkaller.appspotmail.com rcu: INFO: rcu_preempt self-detected stall on CPU rcu: 1-....: (1 GPs behind) idle=e6a/1/0x4000000000000002 softirq=14144/14145 fqs=5200 (t=10500 jiffies g=14865 q=1519) NMI backtrace for cpu 1 CPU: 1 PID: 10088 Comm: syz-executor.4 Not tainted 5.4.0-rc8-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x197/0x210 lib/dump_stack.c:118 nmi_cpu_backtrace.cold+0x70/0xb2 lib/nmi_backtrace.c:101 nmi_trigger_cpumask_backtrace+0x23b/0x28b lib/nmi_backtrace.c:62 arch_trigger_cpumask_backtrace+0x14/0x20 arch/x86/kernel/apic/hw_nmi.c:38 trigger_single_cpu_backtrace include/linux/nmi.h:164 [inline] rcu_dump_cpu_stacks+0x183/0x1cf kernel/rcu/tree_stall.h:254 print_cpu_stall kernel/rcu/tree_stall.h:455 [inline] check_cpu_stall kernel/rcu/tree_stall.h:529 [inline] rcu_pending kernel/rcu/tree.c:2795 [inline] rcu_sched_clock_irq.cold+0x4fd/0xc12 kernel/rcu/tree.c:2244 update_process_times+0x2d/0x70 kernel/time/timer.c:1726 tick_sched_handle+0xa2/0x190 kernel/time/tick-sched.c:167 tick_sched_timer+0x53/0x140 kernel/time/tick-sched.c:1299 __run_hrtimer kernel/time/hrtimer.c:1514 [inline] __hrtimer_run_queues+0x364/0xe40 kernel/time/hrtimer.c:1576 hrtimer_interrupt+0x314/0x770 kernel/time/hrtimer.c:1638 local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1110 [inline] smp_apic_timer_interrupt+0x160/0x610 arch/x86/kernel/apic/apic.c:1135 apic_timer_interrupt+0xf/0x20 arch/x86/entry/entry_64.S:830 </IRQ> RIP: 0010:arch_local_irq_restore arch/x86/include/asm/paravirt.h:756 [inline] RIP: 0010:console_unlock+0xbc7/0xf10 kernel/printk/printk.c:2481 Code: f3 88 48 c1 e8 03 42 80 3c 30 00 0f 85 e4 02 00 00 48 83 3d 4a 8f 96 07 00 0f 84 91 01 00 00 e8 3f c2 16 00 48 8b 7d 98 57 9d <0f> 1f 44 00 00 e9 6d ff ff ff e8 2a c2 16 00 48 8b 7d 08 c7 05 dc RSP: 0018:ffff888057b17528 EFLAGS: 00000246 ORIG_RAX: ffffffffffffff13 RAX: 0000000000040000 RBX: 0000000000000200 RCX: ffffc9000e7a9000 RDX: 0000000000040000 RSI: ffffffff815c94e1 RDI: 0000000000000246 RBP: ffff888057b175b0 R08: 1ffffffff14f0134 R09: fffffbfff14f0135 R10: fffffbfff14f0134 R11: ffffffff8a7809a7 R12: 0000000000000000 R13: ffffffff843e6780 R14: dffffc0000000000 R15: ffffffff895db0f0 vprintk_emit+0x2a0/0x700 kernel/printk/printk.c:1996 vprintk_default+0x28/0x30 kernel/printk/printk.c:2023 vprintk_func+0x7e/0x189 kernel/printk/printk_safe.c:386 printk+0xba/0xed kernel/printk/printk.c:2056 batadv_tt_local_resize_to_mtu.cold+0x18/0x1e net/batman-adv/translation-table.c:4202 batadv_update_min_mtu net/batman-adv/hard-interface.c:626 [inline] batadv_hard_if_event+0x64f/0xfa0 net/batman-adv/hard-interface.c:1056 notifier_call_chain+0xc2/0x230 kernel/notifier.c:95 __raw_notifier_call_chain kernel/notifier.c:396 [inline] raw_notifier_call_chain+0x2e/0x40 kernel/notifier.c:403 call_netdevice_notifiers_info+0x3f/0x90 net/core/dev.c:1668 call_netdevice_notifiers_mtu net/core/dev.c:1717 [inline] dev_set_mtu_ext+0x354/0x5a0 net/core/dev.c:8014 dev_set_mtu+0xa5/0x130 net/core/dev.c:8035 dev_ifsioc+0x357/0xa00 net/core/dev_ioctl.c:244 dev_ioctl+0x1b8/0xc70 net/core/dev_ioctl.c:489 sock_do_ioctl+0x1b7/0x2f0 net/socket.c:1061 sock_ioctl+0x3ed/0x790 net/socket.c:1189 vfs_ioctl fs/ioctl.c:46 [inline] file_ioctl fs/ioctl.c:509 [inline] do_vfs_ioctl+0xdb6/0x13e0 fs/ioctl.c:696 ksys_ioctl+0xab/0xd0 fs/ioctl.c:713 __do_sys_ioctl fs/ioctl.c:720 [inline] __se_sys_ioctl fs/ioctl.c:718 [inline] __x64_sys_ioctl+0x73/0xb0 fs/ioctl.c:718 do_syscall_64+0xfa/0x760 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x45a639 Code: ad b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 7b b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007f8b5149ac78 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 000000000045a639 RDX: 0000000020000180 RSI: 0000000000008922 RDI: 0000000000000003 RBP: 000000000075bf20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f8b5149b6d4 R13: 00000000004c6652 R14: 00000000004dbae8 R15: 00000000ffffffff --- This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot.

1 0

[PATCH] batman-adv: Revert "disable ethtool link speed detection when auto negotiation off"
by Sven Eckelmann 25 Nov '19

25 Nov '19

The commit d60b8fc69ef2 ("batman-adv: disable ethtool link speed detection when auto negotiation off") disabled the usage of ethtool's link_ksetting when auto negotation was enabled due to invalid values when used with tun/tap virtual net_devices. According to the patch, automatic measurements should be used for these kind of interfaces. But there are major flaws with this argumentation: * automatic measurements are not implemented * auto negotiation has nothing to do with the validity of the retrieved values The first point has to be fixed by a longer patch series. The "validity" part of the second point must be addressed in the same patch series by dropping the usage of ethtool's link_ksetting (thus always doing automatic measurements over ethernet). Drop the patch again to have more default values for various net_device types/configurations. The user can still overwrite them using the batadv_hardif's BATADV_ATTR_THROUGHPUT_OVERRIDE. Reported-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat-include/linux/ethtool.h | 2 -- net/batman-adv/bat_v_elp.c | 15 +-------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h index e1f39c33..8dcbe02c 100644 --- a/compat-include/linux/ethtool.h +++ b/compat-include/linux/ethtool.h @@ -21,7 +21,6 @@ struct batadv_ethtool_link_ksettings { struct { __u32 speed; __u8 duplex; - __u8 autoneg; } base; }; @@ -42,7 +41,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, return ret; link_ksettings->base.duplex = cmd.duplex; - link_ksettings->base.autoneg = cmd.autoneg; link_ksettings->base.speed = ethtool_cmd_speed(&cmd); return 0; diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 2614a9ca..a39af0ee 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -120,20 +120,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) rtnl_lock(); ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings); rtnl_unlock(); - - /* Virtual interface drivers such as tun / tap interfaces, VLAN, etc - * tend to initialize the interface throughput with some value for the - * sake of having a throughput number to export via ethtool. This - * exported throughput leaves batman-adv to conclude the interface - * throughput is genuine (reflecting reality), thus no measurements - * are necessary. - * - * Based on the observation that those interface types also tend to set - * the link auto-negotiation to 'off', batman-adv shall check this - * setting to differentiate between genuine link throughput information - * and placeholders installed by virtual interfaces. - */ - if (ret == 0 && link_settings.base.autoneg == AUTONEG_ENABLE) { + if (ret == 0) { /* link characteristics might change over time */ if (link_settings.base.duplex == DUPLEX_FULL) hard_iface->bat_v.flags |= BATADV_FULL_DUPLEX; -- 2.20.1

2 2

[B.A.T.M.A.N.] [PATCH v5 0/7] B.A.T.M.A.N. V - fallback to tp meter estimation if throughput otherwise not available
by Marek Lindner 25 Nov '19

25 Nov '19

Under normal circumstances B.A.T.M.A.N. V retrieves the neighbor throughput values to populate its metric tables from the various drivers such as WiFi throughput tables and Ethernet throughput.. Whenever the interface drivers do not export link throughput information manual overrides become necessary. To further automate and thus better support these setups, ELP may call the batman-adv throughput meter to schedule a throughput estimation to be used to populate the metric table. v5: * fix tp_vars refcount on queue_work() failure * squash batadv_tp_start_work() into batadv_tp_start() v4: * read tp measurement result only once v3: * fix ELP tp meter result computation * use batadv_has_timed_out() instead of custom implementation * set ELP tp meter test duration to 1000ms in patch #6 * add comment explaining periodic scheduling v2: * added sysfs attribute to configure tp meter test duration * fixed null pointer dereference in TP meter packet sending routine * fixed storing the measured throughput in the correct variable * checkpatch/kerneldoc/sparse/smatch cleanup Antonio Quartulli (3): batman-adv: tp_meter - prevent concurrent tp_meter sessions by using workqueue batman-adv: tp_meter - don't check for existing session batman-adv: tp_meter - add option to perform one-hop test Marek Lindner (4): batman-adv: tp_meter - allow up to 10 queued sessions batman-adv: tp_meter - add caller distinction batman-adv: ELP - use tp meter to estimate the throughput if otherwise not available batman-adv: ELP - add throughput meter test duration attribute .../ABI/testing/sysfs-class-net-batman-adv | 7 + include/uapi/linux/batadv_packet.h | 2 + net/batman-adv/bat_v.c | 1 + net/batman-adv/bat_v_elp.c | 69 ++- net/batman-adv/bat_v_elp.h | 21 + net/batman-adv/main.c | 10 +- net/batman-adv/main.h | 7 +- net/batman-adv/netlink.c | 3 +- net/batman-adv/routing.c | 6 +- net/batman-adv/sysfs.c | 3 + net/batman-adv/tp_meter.c | 484 +++++++++++------- net/batman-adv/tp_meter.h | 11 +- net/batman-adv/types.h | 36 ++ 13 files changed, 453 insertions(+), 207 deletions(-) -- 2.18.0

2 10

[PATCH] batman-adv: Fix typo metAdata
by Sven Eckelmann 16 Nov '19

16 Nov '19

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 47718a82eaf2..bdf9827b5f63 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -457,7 +457,7 @@ struct batadv_orig_node { /** * @tt_lock: prevents from updating the table while reading it. Table * update is made up by two operations (data structure update and - * metdata -CRC/TTVN-recalculation) and they have to be executed + * metadata -CRC/TTVN-recalculation) and they have to be executed * atomically in order to avoid another thread to read the * table/metadata between those. */ @@ -1011,7 +1011,7 @@ struct batadv_priv_tt { /** * @commit_lock: prevents from executing a local TT commit while reading * the local table. The local TT commit is made up by two operations - * (data structure update and metdata -CRC/TTVN- recalculation) and + * (data structure update and metadata -CRC/TTVN- recalculation) and * they have to be executed atomically in order to avoid another thread * to read the table/metadata between those. */ -- 2.20.1

1 0

Re: BUG: MAX_LOCKDEP_ENTRIES too low!
by syzbot 15 Nov '19

15 Nov '19

syzbot has bisected this bug to: commit ab92d68fc22f9afab480153bd82a20f6e2533769 Author: Taehee Yoo <ap420073(a)gmail.com> Date: Mon Oct 21 18:47:51 2019 +0000 net: core: add generic lockdep keys bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=1126f5c2e00000 start commit: 0e3f1ad8 Remove VirtualBox guest shared folders filesystem git tree: upstream final crash: https://syzkaller.appspot.com/x/report.txt?x=1326f5c2e00000 console output: https://syzkaller.appspot.com/x/log.txt?x=1526f5c2e00000 kernel config: https://syzkaller.appspot.com/x/.config?x=1aab6d4187ddf667 dashboard link: https://syzkaller.appspot.com/bug?extid=cd0ec5211ac07c18c049 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1171546ae00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=133ed206e00000 Reported-by: syzbot+cd0ec5211ac07c18c049(a)syzkaller.appspotmail.com Fixes: ab92d68fc22f ("net: core: add generic lockdep keys") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

1 0

[PATCH] batman-adv: Strip dots from variable macro kerneldoc
by Sven Eckelmann 14 Nov '19

14 Nov '19

The commit 43756e347f21 ("scripts/kernel-doc: Add support for named variable macro arguments") changed the handling of variable macro parameters. The three dots of the argument must no longer be added to the kernel doc. The support for the old format is scheduled to be removed in the future. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/log.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h index 741cfa3719ff..41fd900121c5 100644 --- a/net/batman-adv/log.h +++ b/net/batman-adv/log.h @@ -74,7 +74,7 @@ __printf(2, 3); * @bat_priv: the bat priv with all the soft interface information * @ratelimited: whether output should be rate limited * @fmt: format string - * @arg...: variable arguments + * @arg: variable arguments */ #define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...) \ do { \ @@ -98,7 +98,7 @@ static inline void _batadv_dbg(int type __always_unused, * batadv_dbg() - Store debug output without ratelimiting * @type: type of debug message * @bat_priv: the bat priv with all the soft interface information - * @arg...: format string and variable arguments + * @arg: format string and variable arguments */ #define batadv_dbg(type, bat_priv, arg...) \ _batadv_dbg(type, bat_priv, 0, ## arg) @@ -107,7 +107,7 @@ static inline void _batadv_dbg(int type __always_unused, * batadv_dbg_ratelimited() - Store debug output with ratelimiting * @type: type of debug message * @bat_priv: the bat priv with all the soft interface information - * @arg...: format string and variable arguments + * @arg: format string and variable arguments */ #define batadv_dbg_ratelimited(type, bat_priv, arg...) \ _batadv_dbg(type, bat_priv, 1, ## arg) @@ -116,7 +116,7 @@ static inline void _batadv_dbg(int type __always_unused, * batadv_info() - Store message in debug buffer and print it to kmsg buffer * @net_dev: the soft interface net device * @fmt: format string - * @arg...: variable arguments + * @arg: variable arguments */ #define batadv_info(net_dev, fmt, arg...) \ do { \ @@ -130,7 +130,7 @@ static inline void _batadv_dbg(int type __always_unused, * batadv_err() - Store error in debug buffer and print it to kmsg buffer * @net_dev: the soft interface net device * @fmt: format string - * @arg...: variable arguments + * @arg: variable arguments */ #define batadv_err(net_dev, fmt, arg...) \ do { \ -- 2.20.1

1 0

Any suggestions about configuring batman-adv gateways + modems
by Xuebing Wang 11 Nov '19

11 Nov '19

Hi Marek, Thank you very much for your help. >> When modem at gateway (for WAN uplink) is down and loses internet >> connection (but batman-adv connections with clients are good and dhcp >> server works good), can batman-adv clients know that internet connection is >> lost and "roam" to another gateway with good internet connection? > >Seems you are looking for this: >https://www.open-mesh.org/projects/batman-adv/wiki/Gateways Yes, batman-adv gateway is what I am using. Do I need to write or find a daemon at gateway to sense internet connection, once internet connection is lost (and does not recover within like 2-5 minutes) then advertise batman-adv mesh network by "batctl gw_mode client" to turn this node to be a client? Thanks. Xuebing Wang

2 1

Any suggestions about configuring batman-adv gateways + modems
by Xuebing Wang 11 Nov '19

11 Nov '19

Hi Marek, Thank you for your help, as I did not subscribe to the mailing list, I did not get your reply. I subscribe to the mailing list now and I am writing a new email thread. >> We have been building openwrt 15.05 + batman-adv mesh network for over 2 >> years, they work great. > >hopefully, the batman-adv version you are using is newer than 15.05 ... > > >> 1) My first thought is to use batman-adv gateway (with 4G modem >> connected) as dhcp server, and forward batman-adv interface to wan >> interface (modem). >> >> 1.1) But, there is an issue with this setup. Once a modem is down, >> nodes that are connected to this batman-adv gateway (with modem) can not >> automatically "roam" to another batman-adv gateway (with good modem >> connection). > >Why not ? What should prevent nodes or clients to choose another batman-adv >gateway ? When modem (for WAN uplink) at gateway is down and loses internet connection (but batman-adv connections with clients are good and dhcp server works good), can batman-adv clients know that internet connection at gateway is lost and "roam" to another gateway with good internet connection? Thanks. Xuebing Wang

1 0

Re: Any suggestions about configuring batman-adv gateways + modems
by Marek Lindner 11 Nov '19

11 Nov '19

Hi, > Thank you for your help, as I did not subscribe to the mailing list, I did > not get your reply. I subscribe to the mailing list now and I am writing a > new email thread. apologies, was not aware of that. > When modem at gateway (for WAN uplink) is down and loses internet > connection (but batman-adv connections with clients are good and dhcp > server works good), can batman-adv clients know that internet connection is > lost and "roam" to another gateway with good internet connection? Seems you are looking for this: https://www.open-mesh.org/projects/batman-adv/wiki/Gateways Kind regards, Marek

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