commits May 2021

commits@lists.open-mesh.org

1 participants
75 discussions

[batman-adv] maint's head updated: batman-adv: Avoid WARN_ON timing related checks (5061f9c5)
by postmaster＠open-mesh.org 28 May '21

28 May '21

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: 5061f9c5 batman-adv: Avoid WARN_ON timing related checks

1 0

[batman-adv] master: batman-adv: Avoid WARN_ON timing related checks (5061f9c5)
by postmaster＠open-mesh.org 28 May '21

28 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 5061f9c502d7101912089d8f4a7866e0a926a49a Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue May 18 21:00:27 2021 +0200 batman-adv: Avoid WARN_ON timing related checks The soft/batadv interface for a queued OGM can be changed during the time the OGM was queued for transmission and when the OGM is actually transmitted by the worker. But WARN_ON must be used to denote kernel bugs and not to print simple warnings. A warning can simply be printed using pr_warn. Reported-by: Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> Reported-by: syzbot+c0b807de416427ff3dd1(a)syzkaller.appspotmail.com Fixes: 29b9256e6631 ("batman-adv: consider outgoing interface in OGM sending") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5061f9c502d7101912089d8f4a7866e0a926a49a net/batman-adv/bat_iv_ogm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 789f257b..fc8be490 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -409,8 +409,10 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) if (WARN_ON(!forw_packet->if_outgoing)) return; - if (WARN_ON(forw_packet->if_outgoing->soft_iface != soft_iface)) + if (forw_packet->if_outgoing->soft_iface != soft_iface) { + pr_warn("%s: soft interface switch for queued OGM\n", __func__); return; + } if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE) return;

1 0

[batman-adv] master: Merge branch 'maint' (82ee4c08)
by postmaster＠open-mesh.org 28 May '21

28 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 82ee4c08591c776e4ccab54563e8814a2d19ac15 Merge: 7922293c 5061f9c5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 28 12:02:59 2021 +0200 Merge branch 'maint' >--------------------------------------------------------------- 82ee4c08591c776e4ccab54563e8814a2d19ac15 net/batman-adv/bat_iv_ogm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[batman-adv] master: batman-adv: Remove the repeated declaration (7922293c)
by postmaster＠open-mesh.org 28 May '21

28 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 7922293c6801d1d445828f3ed0c4d0d53a252f3a Author: Shaokun Zhang <zhangshaokun(a)hisilicon.com> Date: Fri May 28 17:56:25 2021 +0800 batman-adv: Remove the repeated declaration Function 'batadv_bla_claim_dump' is declared twice, so remove the repeated declaration. Signed-off-by: Shaokun Zhang <zhangshaokun(a)hisilicon.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7922293c6801d1d445828f3ed0c4d0d53a252f3a net/batman-adv/bridge_loop_avoidance.h | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 5c22955b..8673a265 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -52,7 +52,6 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, 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);

1 0

[linux-merge]linux integration; annotated tag, v5.13-rc3, created. v5.13-rc3
by postmaster＠open-mesh.org 23 May '21

23 May '21

The annotated tag, v5.13-rc3 has been created at 9e8e06c7a2169db945749f338334cd2042e08799 (tag) tagging c4681547bcce777daf576925a966ffa824edd09d (commit) replaces v5.13-rc2 tagged by Linus Torvalds on Sun May 23 11:42:48 2021 -1000 - Shortlog ------------------------------------------------------------ Linux 5.13-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmCqzFgeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGIgQH/3nAV/fYbUCubEQe RXUcjMGznIpdHeMiY/hPezObYnpBI3UAi2JwHCvQfoE8ckbx4tq8Xp+TUWebsdaf zpDhKXDj2jHha1f5AixHCn1UFxiqOSn3d2muY2Bh1Nhg7iJuzU8xjIMCcOdss+fp 8e4wqidOHkpWvGJ96CQ5zCNxeXI+/f7VX2IgdJ+RCDwzbqJlIvvXwAkg1KrguUEz EPmhpODqjPbVVc/mhtguMLMWl78WKCTBOSHCcYBolatXfm2ojsnX1hXprypWY4Mg vKXxF/91AS8InCC08Jw+puz+fXDBx1jtNmFFhDOFTyz/TvwPaKZiWbAeXOZFJA2Z Wm4su7g= =cqxg -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Always send iface index+name in genlmsg (77c7d626)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 77c7d62618259f22f36427eaa62668e6e1c43090 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:05:42 2021 +0200 batman-adv: Always send iface index+name in genlmsg The batman-adv netlink messages often contain the interface index and interface name in the same message. This makes it easy for the receiver to operate on the incoming data when it either needs to print something or needs to operate on the interface index. But one of the attributes was missing for: * neighbor table dumps * originator table dumps * gateway list dumps * query of hardif information * query of vid information The userspace therefore had to implement special workarounds using SIOCGIFNAME or SIOCGIFINDEX depending on what was actually provided. Providing both information simplifies the userspace code massively without adding a lot of extra overhead in the kernel portion. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 77c7d62618259f22f36427eaa62668e6e1c43090 net/batman-adv/bat_iv_ogm.c | 6 ++++++ net/batman-adv/bat_v.c | 10 ++++++++++ net/batman-adv/netlink.c | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 789f257b..680def80 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1849,6 +1849,8 @@ batadv_iv_ogm_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq, orig_node->orig) || nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN, neigh_node->addr) || + nla_put_string(msg, BATADV_ATTR_HARD_IFNAME, + neigh_node->if_incoming->net_dev->name) || nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, neigh_node->if_incoming->net_dev->ifindex) || nla_put_u8(msg, BATADV_ATTR_TQ, tq_avg) || @@ -2078,6 +2080,8 @@ batadv_iv_ogm_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq, if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN, hardif_neigh->addr) || + nla_put_string(msg, BATADV_ATTR_HARD_IFNAME, + hardif_neigh->if_incoming->net_dev->name) || nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, hardif_neigh->if_incoming->net_dev->ifindex) || nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS, @@ -2459,6 +2463,8 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, router->addr) || nla_put_string(msg, BATADV_ATTR_HARD_IFNAME, router->if_incoming->net_dev->name) || + nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, + router->if_incoming->net_dev->ifindex) || nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN, gw_node->bandwidth_down) || nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_UP, diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index e1ca2b8c..b98aea95 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -146,6 +146,8 @@ batadv_v_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq, if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN, hardif_neigh->addr) || + nla_put_string(msg, BATADV_ATTR_HARD_IFNAME, + hardif_neigh->if_incoming->net_dev->name) || nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, hardif_neigh->if_incoming->net_dev->ifindex) || nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS, @@ -298,6 +300,8 @@ batadv_v_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq, if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, orig_node->orig) || nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN, neigh_node->addr) || + nla_put_string(msg, BATADV_ATTR_HARD_IFNAME, + neigh_node->if_incoming->net_dev->name) || nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, neigh_node->if_incoming->net_dev->ifindex) || nla_put_u32(msg, BATADV_ATTR_THROUGHPUT, throughput) || @@ -739,6 +743,12 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, goto out; } + if (nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, + router->if_incoming->net_dev->ifindex)) { + genlmsg_cancel(msg, hdr); + goto out; + } + if (nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN, gw_node->bandwidth_down)) { genlmsg_cancel(msg, hdr); diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index f317d206..b6cc746e 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -814,6 +814,10 @@ static int batadv_netlink_hardif_fill(struct sk_buff *msg, bat_priv->soft_iface->ifindex)) goto nla_put_failure; + if (nla_put_string(msg, BATADV_ATTR_MESH_IFNAME, + bat_priv->soft_iface->name)) + goto nla_put_failure; + if (nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, net_dev->ifindex) || nla_put_string(msg, BATADV_ATTR_HARD_IFNAME, @@ -1045,6 +1049,10 @@ static int batadv_netlink_vlan_fill(struct sk_buff *msg, bat_priv->soft_iface->ifindex)) goto nla_put_failure; + if (nla_put_string(msg, BATADV_ATTR_MESH_IFNAME, + bat_priv->soft_iface->name)) + goto nla_put_failure; + if (nla_put_u32(msg, BATADV_ATTR_VLANID, vlan->vid & VLAN_VID_MASK)) goto nla_put_failure;

1 0

[batman-adv] master: batman-adv: mcast: add MRD + routable IPv4 multicast with bridges support (e65e26c6)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit e65e26c67ffc9dd99eccdb08b3bd064bc7cdbd17 Author: Linus L��ssing <linus.luessing(a)c0d3.blue> Date: Sat May 15 17:22:08 2021 +0200 batman-adv: mcast: add MRD + routable IPv4 multicast with bridges support This adds support for routable IPv4 multicast addresses (224.0.0.0/4, excluding 224.0.0.0/24) in bridged setups. This utilizes the Multicast Router Discovery (MRD, RFC4286) support in the Linux bridge. batman-adv will now query the Linux bridge for IPv4 multicast routers, which the bridge has previously learned about via MRD. This allows us to then safely send routable IPv4 multicast packets in bridged setups to multicast listeners and multicast routers only. Before we had to flood such packets to avoid potential multicast packet loss to IPv4 multicast routers, which we were not able to detect before. With the bridge MRD integration, we are now also able to perform more fine-grained detection of IPv6 multicast routers in bridged setups: Before we were "guessing" IPv6 multicast routers by looking up multicast listeners for the link-local All Routers multicast address (ff02::2), which every IPv6 multicast router is listening to. However this would also include more nodes than necessary: For instance nodes which are just a router for unicast, but not multicast would be included, too. Signed-off-by: Linus L��ssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e65e26c67ffc9dd99eccdb08b3bd064bc7cdbd17 compat-include/linux/if_bridge.h | 42 ++++++++++++++++++++++++++++++++++++++++ net/batman-adv/multicast.c | 41 +++++---------------------------------- 2 files changed, 47 insertions(+), 36 deletions(-) diff --git a/compat-include/linux/if_bridge.h b/compat-include/linux/if_bridge.h index da00c8b0..dfc4a092 100644 --- a/compat-include/linux/if_bridge.h +++ b/compat-include/linux/if_bridge.h @@ -53,4 +53,46 @@ inline void __batadv_br_ip_list_check(void) #endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */ +#if LINUX_VERSION_IS_LESS(5, 14, 0) + +#include <net/addrconf.h> + +#if IS_ENABLED(CONFIG_IPV6) +static inline bool +br_multicast_has_router_adjacent(struct net_device *dev, int proto) +{ + struct list_head bridge_mcast_list = LIST_HEAD_INIT(bridge_mcast_list); + struct br_ip_list *br_ip_entry, *tmp; + int ret; + + if (proto != ETH_P_IPV6) + return true; + + ret = br_multicast_list_adjacent(dev, &bridge_mcast_list); + if (ret < 0) + return true; + + ret = false; + + list_for_each_entry_safe(br_ip_entry, tmp, &bridge_mcast_list, list) { + if (br_ip_entry->addr.proto == htons(ETH_P_IPV6) && + ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6)) + ret = true; + + list_del(&br_ip_entry->list); + kfree(br_ip_entry); + } + + return ret; +} +#else +static inline bool +br_multicast_has_router_adjacent(struct net_device *dev, int proto) +{ + return true; +} +#endif + +#endif /* LINUX_VERSION_IS_LESS(5, 14, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ */ diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 1d63c8cb..923e2197 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -193,53 +193,22 @@ static u8 batadv_mcast_mla_rtr_flags_softif_get(struct batadv_priv *bat_priv, * BATADV_MCAST_WANT_NO_RTR6: No IPv6 multicast router is present * The former two OR'd: no multicast router is present */ -#if IS_ENABLED(CONFIG_IPV6) static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv, struct net_device *bridge) { - struct list_head bridge_mcast_list = LIST_HEAD_INIT(bridge_mcast_list); struct net_device *dev = bat_priv->soft_iface; - struct br_ip_list *br_ip_entry, *tmp; - u8 flags = BATADV_MCAST_WANT_NO_RTR6; - int ret; + u8 flags = BATADV_NO_FLAGS; if (!bridge) return BATADV_MCAST_WANT_NO_RTR4 | BATADV_MCAST_WANT_NO_RTR6; - /* TODO: ask the bridge if a multicast router is present (the bridge - * is capable of performing proper RFC4286 multicast router - * discovery) instead of searching for a ff02::2 listener here - */ - ret = br_multicast_list_adjacent(dev, &bridge_mcast_list); - if (ret < 0) - return BATADV_NO_FLAGS; - - list_for_each_entry_safe(br_ip_entry, tmp, &bridge_mcast_list, list) { - /* the bridge snooping does not maintain IPv4 link-local - * addresses - therefore we won't find any IPv4 multicast router - * address here, only IPv6 ones - */ - if (br_ip_entry->addr.proto == htons(ETH_P_IPV6) && - ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6)) - flags &= ~BATADV_MCAST_WANT_NO_RTR6; - - list_del(&br_ip_entry->list); - kfree(br_ip_entry); - } + if (!br_multicast_has_router_adjacent(dev, ETH_P_IP)) + flags |= BATADV_MCAST_WANT_NO_RTR4; + if (!br_multicast_has_router_adjacent(dev, ETH_P_IPV6)) + flags |= BATADV_MCAST_WANT_NO_RTR6; return flags; } -#else -static inline u8 -batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv, - struct net_device *bridge) -{ - if (bridge) - return BATADV_NO_FLAGS; - else - return BATADV_MCAST_WANT_NO_RTR4 | BATADV_MCAST_WANT_NO_RTR6; -} -#endif /** * batadv_mcast_mla_rtr_flags_get() - get multicast router flags

1 0

[alfred] tag 'v2021.1' created
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/alfred New tag : v2021.1 Referencing: 4a6a129d6a636eaa8b16bb6e82f99cf0cdaa959d

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (f54a497)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit f54a497fc2de321ce9a21277b2b0d0ec0f19d581 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue May 18 16:57:26 2021 +0200 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- f54a497fc2de321ce9a21277b2b0d0ec0f19d581 CHANGELOG.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 52817c9..73db3e1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,11 @@ .. SPDX-License-Identifier: GPL-2.0 +2021.1 (2021-05-18) +=================== + +* Allow to force of alfred startup when the interfaces don't work/exist (yet) +* coding style cleanups and refactoring + 2021.0 (2021-01-28) ===================

1 0

[alfred] master: alfred: Start new development cycle (71d57e8)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit 71d57e8b0618b72ac1fc300377f561ed1d0ca6c4 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue May 18 16:57:48 2021 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 71d57e8b0618b72ac1fc300377f561ed1d0ca6c4 alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index ac08253..69932f5 100644 --- a/alfred.h +++ b/alfred.h @@ -7,7 +7,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2021.1" +#define SOURCE_VERSION "2021.2" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 3445bac..ac35c90 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -25,7 +25,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2021.1" +#define SOURCE_VERSION "2021.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 5a6ef5b..dd2cde7 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -14,7 +14,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2021.1" +#define SOURCE_VERSION "2021.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2021