B.A.T.M.A.N

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

15 participants
4308 discussions

[PATCH net-next 0/2] net: bridge: split IPv4/v6 mc router state and export for batman-adv
by Linus Lüssing 25 Apr '21

25 Apr '21

Hi, The following are two patches for the Linux bridge regarding multicast routers. They are rebased on top of the following fix: "net: bridge: mcast: fix broken length + header check for MRDv6 Adv." [0] And should be applied afterwards. The first one splits the so far combined multicast router state into two ones, one for IPv4 and one for IPv6, for a more fine-grained detection of multicast routers. This avoids sending IPv4 multicast packets to an IPv6-only multicast router and avoids sending IPv6 multicast packets to an IPv4-only multicast router. This is also in preparation for the second patch: The second patch exports this now per protocol family multicast router state so that batman-adv can then later make full use of the Multicast Router Discovery (MRD) support in the Linux bridge. The batman-adv protocol format currently expects separate multicast router states for IPv4 and IPv6, therefore it depends on the first patch. batman-adv will then make use of this newly exported functions like this[1]. Regards, Linus [0]: https://patchwork.kernel.org/project/netdevbpf/patch/20210425152736.8421-1-… [1]: https://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/linus/multicas… -> https://git.open-mesh.org/batman-adv.git/commit/d4bed3a92427445708baeb1f2d1…

2 3

[PATCH net-next 0/2] net: bridge: split IPv4/v6 mc router state and export for batman-adv
by Linus Lüssing 25 Apr '21

25 Apr '21

1 0

[RFC PATCH] batman-adv: convert ifmcaddr6 to RCU
by Linus Lüssing 18 Apr '21

18 Apr '21

From: Taehee Yoo <ap420073(a)gmail.com> The ifmcaddr6 has been protected by inet6_dev->lock(rwlock) so that the critical section is atomic context. In order to switch this context, changing locking is needed. The ifmcaddr6 actually already protected by RTNL So if it's converted to use RCU, its control path context can be switched to sleepable. Suggested-by: Cong Wang <xiyou.wangcong(a)gmail.com> Signed-off-by: Taehee Yoo <ap420073(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> [linus.luessing(a)c0d3.blue: Add compat code] Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- @Sven: maybe something like this? Seems to compile fine for me, without warnings and seems to run fine and use the compat code for me. I tried to create and add it to compat-include/net/if_inet6.h, as that would fit better for the "struct ifmcaddr6", but couldn't get that to work, lots of errors. And when adding it to compat.h the compat code does not seem to be used at all. Also let me know if the kernel version is correct or if it should be 5.14 instead? compat-include/net/addrconf.h | 85 +++++++++++++++++++++++++++++++++++ net/batman-adv/multicast.c | 6 +-- 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/compat-include/net/addrconf.h b/compat-include/net/addrconf.h index 30124124..080e1dda 100644 --- a/compat-include/net/addrconf.h +++ b/compat-include/net/addrconf.h @@ -25,4 +25,89 @@ static inline int batadv_ipv6_mc_check_mld(struct sk_buff *skb) #endif /* LINUX_VERSION_IS_LESS(5, 1, 0) */ +#if LINUX_VERSION_IS_LESS(5, 13, 0) + +static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr, + struct hlist_head *mcast_list); + +static inline int +compat_batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, + struct hlist_head *mcast_list, + struct batadv_mcast_mla_flags *flags, + u8 *mcast_addr, + struct batadv_hw_addr *new, + struct inet6_dev *in6_dev) + +{ + struct ifmcaddr6 *pmc6; + int ret = 0; + + if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_IPV6) + return 0; + + rcu_read_lock(); + + in6_dev = __in6_dev_get(dev); + if (!in6_dev) { + rcu_read_unlock(); + return 0; + } + + read_lock_bh(&in6_dev->lock); + for (pmc6 = in6_dev->mc_list; pmc6; pmc6 = pmc6->next) { + if (IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) < + IPV6_ADDR_SCOPE_LINKLOCAL) + continue; + + if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && + ipv6_addr_is_ll_all_nodes(&pmc6->mca_addr)) + continue; + + if (!(flags->tvlv_flags & BATADV_MCAST_WANT_NO_RTR6) && + IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) > + IPV6_ADDR_SCOPE_LINKLOCAL) + continue; + + ipv6_eth_mc_map(&pmc6->mca_addr, mcast_addr); + + if (batadv_mcast_mla_is_duplicate(mcast_addr, mcast_list)) + continue; + + new = kmalloc(sizeof(*new), GFP_ATOMIC); + if (!new) { + ret = -ENOMEM; + break; + } + + ether_addr_copy(new->addr, mcast_addr); + hlist_add_head(&new->list, mcast_list); + ret++; + } + read_unlock_bh(&in6_dev->lock); + rcu_read_unlock(); + + return ret; +} + +#define ifmcaddr6 \ + net_device *orig_dev = dev; \ + return compat_batadv_mcast_mla_softif_get_ipv6(orig_dev, \ + mcast_list, \ + flags, \ + mcast_addr, \ + new = NULL, \ + in6_dev = NULL); \ + } \ + static inline int \ + __unused_batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, \ + struct hlist_head *mcast_list, \ + struct batadv_mcast_mla_flags *flags) \ + { \ + struct batadv_hw_addr *new; \ + struct inet6_dev *in6_dev; \ + u8 mcast_addr[ETH_ALEN]; \ + struct ifmcaddr6 + +#endif /* LINUX_VERSION_IS_LESS(5, 13, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_NET_ADDRCONF_H_ */ diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 28166402..1d63c8cb 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -454,8 +454,9 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, return 0; } - read_lock_bh(&in6_dev->lock); - for (pmc6 = in6_dev->mc_list; pmc6; pmc6 = pmc6->next) { + for (pmc6 = rcu_dereference(in6_dev->mc_list); + pmc6; + pmc6 = rcu_dereference(pmc6->next)) { if (IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) < IPV6_ADDR_SCOPE_LINKLOCAL) continue; @@ -484,7 +485,6 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, hlist_add_head(&new->list, mcast_list); ret++; } - read_unlock_bh(&in6_dev->lock); rcu_read_unlock(); return ret; -- 2.31.0

1 2

[RFC PATCH] batman-adv: convert ifmcaddr6 to RCU
by Sven Eckelmann 17 Apr '21

17 Apr '21

1 0

Problems with Multiple Interfaces
by joe＠careyhome.org 13 Apr '21

13 Apr '21

Hi Everybody, I'm running BATMAN v 2019.2 with ath10k on OpenWRT. The particular router I'm using has two interfaces, 2.4 GHz and 5GHz. With each router using single interface (e.g. 2.4 GHz), it works fine. When I add a second interface (e.g. 5GHz), it sometimes hangs. I know that BATMAN is expected to alternate between the two interfaces, but that doesn't seem to be working. As you probably know, using two interfaces should dramatically improve throughput if you need to make a hop through another mesh node. To verify this is the problem, I did a test where I ran three routers, 2.4G <> Dual (2.4G & 5G) <> 5G. I would try to ping between the two routers that were using just a single interface. Obviously, that must hop through the dual radio router. The dual radio router has both interfaces on the bat0 master, and batctl reports they're both active. The system would sometimes lose link, although batctl would report getting neighbor messages. Even using the batctl ping function doesn't get through. I can see traffic flowing on both the 2.4 GHz and 5GHz interfaces. I'm happy to provide lots of configuration detail, but I thought I'd start with a high level description in case this is a known problem. Any assistance is appreciated. Thank you, --Joe

5 6

Re: [syzbot] WARNING in ieee802154_del_seclevel
by Dmitry Vyukov 13 Apr '21

13 Apr '21

On Thu, Apr 1, 2021 at 3:30 PM Alan Stern <stern(a)rowland.harvard.edu> wrote: > > On Wed, Mar 31, 2021 at 02:03:08PM -0700, syzbot wrote: > > syzbot has bisected this issue to: > > > > commit 416dacb819f59180e4d86a5550052033ebb6d72c > > Author: Alan Stern <stern(a)rowland.harvard.edu> > > Date: Wed Aug 21 17:27:12 2019 +0000 > > > > HID: hidraw: Fix invalid read in hidraw_ioctl > > > > bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=127430fcd00000 > > start commit: 6e5a03bc ethernet/netronome/nfp: Fix a use after free in n.. > > git tree: net > > final oops: https://syzkaller.appspot.com/x/report.txt?x=117430fcd00000 > > console output: https://syzkaller.appspot.com/x/log.txt?x=167430fcd00000 > > kernel config: https://syzkaller.appspot.com/x/.config?x=daeff30c2474a60f > > dashboard link: https://syzkaller.appspot.com/bug?extid=fbf4fc11a819824e027b > > syz repro: https://syzkaller.appspot.com/x/repro.syz?x=13bfe45ed00000 > > C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1188e31ad00000 > > > > Reported-by: syzbot+fbf4fc11a819824e027b(a)syzkaller.appspotmail.com > > Fixes: 416dacb819f5 ("HID: hidraw: Fix invalid read in hidraw_ioctl") > > > > For information about bisection process see: https://goo.gl/tpsmEJ#bisection > > It seems likely that the bisection ran off the rails here. This commit > could not have caused a problem, although it may have revealed a > pre-existing problem that previously was hidden. Hi Alan, Yes, bisection log shows it was derailed by: KASAN: use-after-free Read in batadv_iv_ogm_queue_add and: BUG: MAX_LOCKDEP_CHAIN_HLOCKS too low! https://syzkaller.appspot.com/x/bisect.txt?x=127430fcd00000 > By the way, what happened to the annotated stack dumps that syzkaller > used to provide in its bug reports? Nothing has changed in this respect, they are still in bug reports: https://lore.kernel.org/lkml/00000000000073afff05bbe9a54d@google.com/

1 0

[PATCH 0/3] pull request for net-next: batman-adv 2021-04-08
by Simon Wunderlich 08 Apr '21

08 Apr '21

Hi Jakub, hi David, here is a little cleanup pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit b1de0f01b0115575982cf24c88b35106449e9aa7: batman-adv: Use netif_rx_any_context(). (2021-02-13 18:08:40 +0100) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20210408 for you to fetch changes up to 35796c1d343871fa75a6e6b0f4584182cbeae6ac: batman-adv: Fix misspelled "wont" (2021-03-30 21:19:50 +0200) ---------------------------------------------------------------- This cleanup patchset includes the following patches: - for kerneldoc in batadv_priv, by Linus Luessing - drop unused header preempt.h, by Sven Eckelmann - Fix misspelled "wont", by Sven Eckelmann ---------------------------------------------------------------- Linus Lüssing (1): batman-adv: Fix order of kernel doc in batadv_priv Sven Eckelmann (2): batman-adv: Drop unused header preempt.h batman-adv: Fix misspelled "wont" net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bridge_loop_avoidance.c | 1 - net/batman-adv/types.h | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-)

2 4

Batman-adv On Raspberry Pi Zero
by giuseppedv＠gmail.com 08 Apr '21

08 Apr '21

Hi all, I have to create a Mesh Ad-Hoc Wireless Network using a certain number of Raspberry Pi Zero. I have decided to use Pi Zero Wireless card in ad-hoc mode and use the batman-adv module to create the mesh over the ad-hoc wireless network. Here my systems: - Raspberries Pi Zero W V1.1. - Raspbian Buster: 2021-03-04-raspios-buster-armhf-lite.img - Kernel: 5.10.17+ - Batman-adv: built-in kernel module. No problems to create the ad-hoc wireless network between the Zeroes, even if the mtu needed for Batman-adv complains: [quote]# ip link set dev wlan0 mtu 1532 Error: mtu greater than device maximum[/quote] Problems arise when I try to add the wlan0 interface to batman handler (the batman-adv module is loaded correctly with modprobe or at boot time) batctl if add wlan0 <--- OK No Problems but if I want to request the wlan0 status I receive [quote]batctl if wlan0: <error reading status> [/quote] Anyone experienced the same issues?

2 1

IPv4/IPv6 separation in bridge code for multicast routers
by Linus Lüssing 06 Apr '21

06 Apr '21

Hi, I wanted to add the remaining pieces for batman-adv to support IPv4 multicast groups in bridged setups, next to the IPv6 support already in place. For which we'd need MRD support. So once more I'd tap into the bridge for this information from batman-adv. Then I realized again that the bridge keeps track of the IGMP/MLD querier per protocol family but not for the multicast router ports. For the latter we only have one list right now. For batman-adv we have the multicast router flags and logic already separate though. I started separating the router list for IPv4 and IPv6 in the bridge, but it seems there are already external users for the protocol family unaware router list right now: netlink and switchdev. Now I'm wondering: A) For netlink: Would it be fine to just add a MDBA_ROUTER_PATTR_FAMILY with either the value PF_INET or PF_INET6? The downside would be that a userspace application which does not know this new attribute yet would potentially see or list a duplicate. Another option would be to add two separate attributes: MDBA_ROUTER_PATTR_{INET,INET6}. Which looks a bit more clumsy and and inflexible to me. But would have a better compatiblity when userspace requests a router ports dump. For events there'd still be the same issue of duplicates though, as IPv4 and IPv6 routers might appear or disappear asynchronously. B) For switchdev: I'm not that familiar with switchdev. Should it generally be possible to separate the protocol family here? Or would it be better to add a few more lines to the bridge code to only call switchdev_port_attr_set() when transitioning between v4-rtr, v6-rtr: (off, off) <=> (on, on) | (on, off) | (off, on)? At least for a start, maybe? C) Or am I missing something in the MRD RFC (RFC4286) which implies that a Multicast router Advertisement should be interpreted across protocol families? Any ideas what might be the best way to tackle this? Regards, Linus

1 0

Re: [syzbot] WARNING in ieee802154_del_seclevel
by syzbot 31 Mar '21

31 Mar '21

syzbot has bisected this issue to: commit 416dacb819f59180e4d86a5550052033ebb6d72c Author: Alan Stern <stern(a)rowland.harvard.edu> Date: Wed Aug 21 17:27:12 2019 +0000 HID: hidraw: Fix invalid read in hidraw_ioctl bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=127430fcd00000 start commit: 6e5a03bc ethernet/netronome/nfp: Fix a use after free in n.. git tree: net final oops: https://syzkaller.appspot.com/x/report.txt?x=117430fcd00000 console output: https://syzkaller.appspot.com/x/log.txt?x=167430fcd00000 kernel config: https://syzkaller.appspot.com/x/.config?x=daeff30c2474a60f dashboard link: https://syzkaller.appspot.com/bug?extid=fbf4fc11a819824e027b syz repro: https://syzkaller.appspot.com/x/repro.syz?x=13bfe45ed00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1188e31ad00000 Reported-by: syzbot+fbf4fc11a819824e027b(a)syzkaller.appspotmail.com Fixes: 416dacb819f5 ("HID: hidraw: Fix invalid read in hidraw_ioctl") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

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