B.A.T.M.A.N

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

15 participants
4308 discussions

[PATCH v2 1/2] batman-adv: Prepare infrastructure for newlink settings
by Sven Eckelmann 11 Oct '20

11 Oct '20

The batadv generic netlink family can be used to retrieve the current state and set various configuration settings. But there are also settings which must be set before the actual interface is created. The rtnetlink already uses IFLA_INFO_DATA to allow net_device families to transfer such configurations. The minimal required functionality for this is now available for the batadv rtnl_link_ops. Also a new IFLA class of attributes will be attached to it because rtnetlink only allows 51 different attributes but batadv_nl_attrs already contains 62 attributes. Cc: Annika Wickert <annika.wickert(a)exaring.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: * don't use compat code for kernel 4.13 and 4.14 compat.h | 11 ++++++++++ include/uapi/linux/batman_adv.h | 20 +++++++++++++++++ net/batman-adv/soft-interface.c | 39 +++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/compat.h b/compat.h index e3220e39..9da9feb7 100644 --- a/compat.h +++ b/compat.h @@ -15,6 +15,17 @@ #include "compat-autoconf.h" +#if LINUX_VERSION_IS_LESS(4, 13, 0) + +#define batadv_softif_validate(__tb, __data, __extack) \ + batadv_softif_validate(__tb, __data) + +#define batadv_softif_newlink(__src_net, __dev, __tb, __data, __extack) \ + batadv_softif_newlink(__src_net, __dev, __tb, __data) + +#endif /* LINUX_VERSION_IS_LESS(4, 13, 0) */ + + #if LINUX_VERSION_IS_LESS(4, 15, 0) #define batadv_softif_slave_add(__dev, __slave_dev, __extack) \ diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index bb0ae945..b05399d8 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -675,4 +675,24 @@ enum batadv_tp_meter_reason { BATADV_TP_REASON_TOO_MANY = 133, }; +/** + * enum batadv_ifla_attrs - batman-adv ifla nested attributes + */ +enum batadv_ifla_attrs { + /** + * @IFLA_BATADV_UNSPEC: unspecified attribute which is not parsed by + * rtnetlink + */ + IFLA_BATADV_UNSPEC, + + /* add attributes above here, update the policy in soft-interface.c */ + + /** + * @__IFLA_BATADV_MAX: internal use + */ + __IFLA_BATADV_MAX, +}; + +#define IFLA_BATADV_MAX (__IFLA_BATADV_MAX - 1) + #endif /* _UAPI_LINUX_BATMAN_ADV_H_ */ diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 82e7ca88..9c7b8968 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -38,6 +38,7 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> +#include <net/netlink.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> @@ -1073,6 +1074,37 @@ static void batadv_softif_init_early(struct net_device *dev) dev->ethtool_ops = &batadv_ethtool_ops; } +/** + * batadv_softif_validate() - validate configuration of new batadv link + * @tb: IFLA_INFO_DATA netlink attributes + * @data: enum batadv_ifla_attrs attributes + * @extack: extended ACK report struct + * + * Return: 0 if successful or error otherwise. + */ +static int batadv_softif_validate(struct nlattr *tb[], struct nlattr *data[], + struct netlink_ext_ack *extack) +{ + return 0; +} + +/** + * batadv_softif_newlink() - pre-initialize and register new batadv link + * @src_net: the applicable net namespace + * @dev: network device to register + * @tb: IFLA_INFO_DATA netlink attributes + * @data: enum batadv_ifla_attrs attributes + * @extack: extended ACK report struct + * + * Return: 0 if successful or error otherwise. + */ +static int batadv_softif_newlink(struct net *src_net, struct net_device *dev, + struct nlattr *tb[], struct nlattr *data[], + struct netlink_ext_ack *extack) +{ + return register_netdevice(dev); +} + /** * batadv_softif_create() - Create and register soft interface * @net: the applicable net namespace @@ -1171,9 +1203,16 @@ bool batadv_softif_is_valid(const struct net_device *net_dev) return false; } +static const struct nla_policy batadv_ifla_policy[IFLA_BATADV_MAX + 1] = { +}; + struct rtnl_link_ops batadv_link_ops __read_mostly = { .kind = "batadv", .priv_size = sizeof(struct batadv_priv), .setup = batadv_softif_init_early, + .maxtype = IFLA_BATADV_MAX, + .policy = batadv_ifla_policy, + .validate = batadv_softif_validate, + .newlink = batadv_softif_newlink, .dellink = batadv_softif_destroy_netlink, }; -- 2.28.0

1 1

[PATCH 1/2] batman-adv: Prepare infrastructure for newlink settings
by Sven Eckelmann 11 Oct '20

11 Oct '20

The batadv generic netlink family can be used to retrieve the current state and set various configuration settings. But there are also settings which must be set before the actual interface is created. The rtnetlink already uses IFLA_INFO_DATA to allow net_device families to transfer such configurations. The minimal required functionality for this is now available for the batadv rtnl_link_ops. Also a new IFLA class of attributes will be attached to it because rtnetlink only allows 51 different attributes but batadv_nl_attrs already contains 62 attributes. Cc: Annika Wickert <annika.wickert(a)exaring.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat.h | 6 +++++ include/uapi/linux/batman_adv.h | 20 +++++++++++++++++ net/batman-adv/soft-interface.c | 39 +++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/compat.h b/compat.h index e3220e39..3f772754 100644 --- a/compat.h +++ b/compat.h @@ -20,6 +20,12 @@ #define batadv_softif_slave_add(__dev, __slave_dev, __extack) \ batadv_softif_slave_add(__dev, __slave_dev) +#define batadv_softif_validate(__tb, __data, __extack) \ + batadv_softif_validate(__tb, __data) + +#define batadv_softif_newlink(__src_net, __dev, __tb, __data, __extack) \ + batadv_softif_newlink(__src_net, __dev, __tb, __data) + #endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ #endif /* __KERNEL__ */ diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index bb0ae945..b05399d8 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -675,4 +675,24 @@ enum batadv_tp_meter_reason { BATADV_TP_REASON_TOO_MANY = 133, }; +/** + * enum batadv_ifla_attrs - batman-adv ifla nested attributes + */ +enum batadv_ifla_attrs { + /** + * @IFLA_BATADV_UNSPEC: unspecified attribute which is not parsed by + * rtnetlink + */ + IFLA_BATADV_UNSPEC, + + /* add attributes above here, update the policy in soft-interface.c */ + + /** + * @__IFLA_BATADV_MAX: internal use + */ + __IFLA_BATADV_MAX, +}; + +#define IFLA_BATADV_MAX (__IFLA_BATADV_MAX - 1) + #endif /* _UAPI_LINUX_BATMAN_ADV_H_ */ diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 82e7ca88..9c7b8968 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -38,6 +38,7 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> +#include <net/netlink.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> @@ -1073,6 +1074,37 @@ static void batadv_softif_init_early(struct net_device *dev) dev->ethtool_ops = &batadv_ethtool_ops; } +/** + * batadv_softif_validate() - validate configuration of new batadv link + * @tb: IFLA_INFO_DATA netlink attributes + * @data: enum batadv_ifla_attrs attributes + * @extack: extended ACK report struct + * + * Return: 0 if successful or error otherwise. + */ +static int batadv_softif_validate(struct nlattr *tb[], struct nlattr *data[], + struct netlink_ext_ack *extack) +{ + return 0; +} + +/** + * batadv_softif_newlink() - pre-initialize and register new batadv link + * @src_net: the applicable net namespace + * @dev: network device to register + * @tb: IFLA_INFO_DATA netlink attributes + * @data: enum batadv_ifla_attrs attributes + * @extack: extended ACK report struct + * + * Return: 0 if successful or error otherwise. + */ +static int batadv_softif_newlink(struct net *src_net, struct net_device *dev, + struct nlattr *tb[], struct nlattr *data[], + struct netlink_ext_ack *extack) +{ + return register_netdevice(dev); +} + /** * batadv_softif_create() - Create and register soft interface * @net: the applicable net namespace @@ -1171,9 +1203,16 @@ bool batadv_softif_is_valid(const struct net_device *net_dev) return false; } +static const struct nla_policy batadv_ifla_policy[IFLA_BATADV_MAX + 1] = { +}; + struct rtnl_link_ops batadv_link_ops __read_mostly = { .kind = "batadv", .priv_size = sizeof(struct batadv_priv), .setup = batadv_softif_init_early, + .maxtype = IFLA_BATADV_MAX, + .policy = batadv_ifla_policy, + .validate = batadv_softif_validate, + .newlink = batadv_softif_newlink, .dellink = batadv_softif_destroy_netlink, }; -- 2.28.0

1 2

[PATCH] batman-adv: genetlink: move to smaller ops wherever possible
by Sven Eckelmann 08 Oct '20

08 Oct '20

From: Jakub Kicinski <kuba(a)kernel.org> Bulk of the genetlink users can use smaller ops, move them. Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Reviewed-by: Johannes Berg <johannes(a)sipsolutions.net> Signed-off-by: David S. Miller <davem(a)davemloft.net> [sven(a)narfation.org: Add compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat-include/net/genetlink.h | 38 +++++++++++++++++++++------------- net/batman-adv/netlink.c | 6 +++--- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index d1f80cd8..f16355fe 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -31,15 +31,17 @@ void batadv_genl_dump_check_consistent(struct netlink_callback *cb, #endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ -#if LINUX_VERSION_IS_LESS(5, 2, 0) +#if LINUX_VERSION_IS_LESS(5, 10, 0) +#if LINUX_VERSION_IS_LESS(5, 2, 0) enum genl_validate_flags { GENL_DONT_VALIDATE_STRICT = BIT(0), GENL_DONT_VALIDATE_DUMP = BIT(1), GENL_DONT_VALIDATE_DUMP_STRICT = BIT(2), }; +#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */ -struct batadv_genl_ops { +struct batadv_genl_small_ops { int (*doit)(struct sk_buff *skb, struct genl_info *info); int (*dumpit)(struct sk_buff *skb, @@ -68,9 +70,9 @@ struct batadv_genl_family { struct genl_info *info); void (*post_doit)(const struct genl_ops *ops, struct sk_buff *skb, struct genl_info *info); - const struct batadv_genl_ops *ops; + const struct batadv_genl_small_ops *small_ops; const struct genl_multicast_group *mcgrps; - unsigned int n_ops; + unsigned int n_small_ops; unsigned int n_mcgrps; struct module *module; @@ -94,24 +96,32 @@ static inline int batadv_genl_register_family(struct batadv_genl_family *family) family->family.pre_doit = family->pre_doit; family->family.post_doit = family->post_doit; family->family.mcgrps = family->mcgrps; - family->family.n_ops = family->n_ops; + family->family.n_ops = family->n_small_ops; family->family.n_mcgrps = family->n_mcgrps; family->family.module = family->module; - ops = kzalloc(sizeof(*ops) * family->n_ops, GFP_KERNEL); + ops = kzalloc(sizeof(*ops) * family->n_small_ops, GFP_KERNEL); if (!ops) return -ENOMEM; for (i = 0; i < family->family.n_ops; i++) { - ops[i].doit = family->ops[i].doit; - ops[i].dumpit = family->ops[i].dumpit; - ops[i].done = family->ops[i].done; - ops[i].cmd = family->ops[i].cmd; - ops[i].internal_flags = family->ops[i].internal_flags; - ops[i].flags = family->ops[i].flags; + ops[i].doit = family->small_ops[i].doit; + ops[i].dumpit = family->small_ops[i].dumpit; + ops[i].done = family->small_ops[i].done; + ops[i].cmd = family->small_ops[i].cmd; + ops[i].internal_flags = family->small_ops[i].internal_flags; + ops[i].flags = family->small_ops[i].flags; +#if LINUX_VERSION_IS_GEQ(5, 2, 0) + ops[i].validate = family->small_ops[i].validate; +#else ops[i].policy = family->policy; +#endif } +#if LINUX_VERSION_IS_GEQ(5, 2, 0) + family->family.policy = family->policy; +#endif + family->family.ops = ops; family->copy_ops = ops; @@ -126,7 +136,7 @@ typedef struct genl_ops batadv_genl_ops_old; #define batadv_post_doit(__x, __y, __z) \ batadv_post_doit(const batadv_genl_ops_old *ops, __y, __z) -#define genl_ops batadv_genl_ops +#define genl_small_ops batadv_genl_small_ops #define genl_family batadv_genl_family #define genl_register_family(family) \ @@ -150,6 +160,6 @@ batadv_genl_unregister_family(struct batadv_genl_family *family) genlmsg_multicast_netns(&(_family)->family, _net, _skb, _portid, \ _group, _flags) -#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */ +#endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_NET_GENETLINK_H_ */ diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index dc193618..c7a55647 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -1350,7 +1350,7 @@ static void batadv_post_doit(const struct genl_ops *ops, struct sk_buff *skb, } } -static const struct genl_ops batadv_netlink_ops[] = { +static const struct genl_small_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_GET_MESH, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, @@ -1484,8 +1484,8 @@ struct genl_family batadv_netlink_family __ro_after_init = { .pre_doit = batadv_pre_doit, .post_doit = batadv_post_doit, .module = THIS_MODULE, - .ops = batadv_netlink_ops, - .n_ops = ARRAY_SIZE(batadv_netlink_ops), + .small_ops = batadv_netlink_ops, + .n_small_ops = ARRAY_SIZE(batadv_netlink_ops), .mcgrps = batadv_netlink_mcgrps, .n_mcgrps = ARRAY_SIZE(batadv_netlink_mcgrps), }; -- 2.28.0

1 0

Re: WARNING in drv_bss_info_changed
by syzbot 03 Oct '20

03 Oct '20

syzbot has bisected this issue to: commit 489b30b53f0540b9f8e391cbb2839cea48b5d1c1 Author: Kirill Tkhai <ktkhai(a)virtuozzo.com> Date: Thu Mar 15 09:10:57 2018 +0000 net: Convert l2tp_net_ops bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=175b598f900000 start commit: fcadab74 Merge tag 'drm-fixes-2020-10-01-1' of git://anong.. git tree: upstream final oops: https://syzkaller.appspot.com/x/report.txt?x=14db598f900000 console output: https://syzkaller.appspot.com/x/log.txt?x=10db598f900000 kernel config: https://syzkaller.appspot.com/x/.config?x=89ab6a0c48f30b49 dashboard link: https://syzkaller.appspot.com/bug?extid=4cf3e4e092f2f4120a52 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=145eb667900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=15422c1f900000 Reported-by: syzbot+4cf3e4e092f2f4120a52(a)syzkaller.appspotmail.com Fixes: 489b30b53f05 ("net: Convert l2tp_net_ops") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

1 0

Does batman choose DHCP server by random?
by MK 02 Oct '20

02 Oct '20

Hi meshing list. We are running a batman 2020.2 based mesh network. Clients connect to one gateway but pull IPv4 addresses from _another_ gateway. This leads to packets flowing between gateways instead of leaving the mesh on the shortest route possible. Is this intended behaviour? Is it random? Is there a config option to alter this packet flow? gw_mode is set to "server" on all gateways, bandwith announcement is the same on all gateways (10/10 MBit). So no imbalance here. Regards, Martin

3 7

Re: WARNING in cfg80211_connect
by syzbot 02 Oct '20

02 Oct '20

syzbot has bisected this issue to: commit 16d4d43595b4780daac8fcea6d042689124cb094 Author: Christoph Hellwig <hch(a)lst.de> Date: Wed Jul 20 01:38:55 2016 +0000 xfs: split direct I/O and DAX path bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=14f662b7900000 start commit: 87d5034d Merge tag 'mlx5-updates-2020-09-30' of git://git... git tree: net-next final oops: https://syzkaller.appspot.com/x/report.txt?x=16f662b7900000 console output: https://syzkaller.appspot.com/x/log.txt?x=12f662b7900000 kernel config: https://syzkaller.appspot.com/x/.config?x=7b5cc8ec2218e99d dashboard link: https://syzkaller.appspot.com/bug?extid=5f9392825de654244975 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1100d333900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1414c997900000 Reported-by: syzbot+5f9392825de654244975(a)syzkaller.appspotmail.com Fixes: 16d4d43595b4 ("xfs: split direct I/O and DAX path") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

3 2

KMSAN: uninit-value in batadv_nc_worker
by syzbot 01 Oct '20

01 Oct '20

Hello, syzbot found the following issue on: HEAD commit: 5edb1df2 kmsan: drop the _nosanitize string functions git tree: https://github.com/google/kmsan.git master console output: https://syzkaller.appspot.com/x/log.txt?x=10cc55a7900000 kernel config: https://syzkaller.appspot.com/x/.config?x=4991d22eb136035c dashboard link: https://syzkaller.appspot.com/bug?extid=da9194708de785081f11 compiler: clang version 10.0.0 (https://github.com/llvm/llvm-project/ c2443155a0fb245c8f17f2c1c72b6ea391e86e81) Unfortunately, I don't have any reproducer for this issue yet. IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+da9194708de785081f11(a)syzkaller.appspotmail.com ===================================================== BUG: KMSAN: uninit-value in batadv_nc_purge_orig_hash net/batman-adv/network-coding.c:408 [inline] BUG: KMSAN: uninit-value in batadv_nc_worker+0x1c0/0x1d70 net/batman-adv/network-coding.c:718 CPU: 0 PID: 7 Comm: kworker/u4:0 Not tainted 5.9.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: bat_events batadv_nc_worker Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x21c/0x280 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:122 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:201 batadv_nc_purge_orig_hash net/batman-adv/network-coding.c:408 [inline] batadv_nc_worker+0x1c0/0x1d70 net/batman-adv/network-coding.c:718 process_one_work+0x1688/0x2140 kernel/workqueue.c:2269 worker_thread+0x10bc/0x2730 kernel/workqueue.c:2415 kthread+0x551/0x590 kernel/kthread.c:293 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294 Uninit was created at: kmsan_save_stack_with_flags mm/kmsan/kmsan.c:143 [inline] kmsan_internal_poison_shadow+0x66/0xd0 mm/kmsan/kmsan.c:126 kmsan_slab_alloc+0x8a/0xe0 mm/kmsan/kmsan_hooks.c:80 slab_alloc_node mm/slub.c:2907 [inline] slab_alloc mm/slub.c:2916 [inline] __kmalloc+0x2bb/0x4b0 mm/slub.c:3982 kmalloc_array+0x90/0x140 include/linux/slab.h:594 batadv_hash_new+0x129/0x530 net/batman-adv/hash.c:52 batadv_originator_init+0x9b/0x370 net/batman-adv/originator.c:211 batadv_mesh_init+0x4dc/0x9d0 net/batman-adv/main.c:204 batadv_softif_init_late+0x6d8/0xa30 net/batman-adv/soft-interface.c:857 register_netdevice+0xbbc/0x37d0 net/core/dev.c:9760 __rtnl_newlink net/core/rtnetlink.c:3454 [inline] rtnl_newlink+0x2e77/0x3ed0 net/core/rtnetlink.c:3500 rtnetlink_rcv_msg+0x142b/0x18c0 net/core/rtnetlink.c:5563 netlink_rcv_skb+0x6d7/0x7e0 net/netlink/af_netlink.c:2470 rtnetlink_rcv+0x50/0x60 net/core/rtnetlink.c:5581 netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline] netlink_unicast+0x11c8/0x1490 net/netlink/af_netlink.c:1330 netlink_sendmsg+0x173a/0x1840 net/netlink/af_netlink.c:1919 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:671 [inline] __sys_sendto+0x9dc/0xc80 net/socket.c:1992 __do_sys_sendto net/socket.c:2004 [inline] __se_sys_sendto+0x107/0x130 net/socket.c:2000 __x64_sys_sendto+0x6e/0x90 net/socket.c:2000 do_syscall_64+0x9f/0x140 arch/x86/entry/common.c:48 entry_SYSCALL_64_after_hwframe+0x44/0xa9 ===================================================== --- This report 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 issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot.

2 1

Re: INFO: rcu detected stall in batadv_nc_worker (3)
by Dmitry Vyukov 01 Oct '20

01 Oct '20

On Thu, Oct 1, 2020 at 12:35 PM syzbot <syzbot+69904c3b4a09e8fa2e1b(a)syzkaller.appspotmail.com> wrote: > > Hello, > > syzbot found the following issue on: > > HEAD commit: fffe3ae0 Merge tag 'for-linus-hmm' of git://git.kernel.org.. > git tree: upstream > console output: https://syzkaller.appspot.com/x/log.txt?x=17e03342900000 > kernel config: https://syzkaller.appspot.com/x/.config?x=226c7a97d80bec54 > dashboard link: https://syzkaller.appspot.com/bug?extid=69904c3b4a09e8fa2e1b > compiler: clang version 10.0.0 (https://github.com/llvm/llvm-project/ c2443155a0fb245c8f17f2c1c72b6ea391e86e81) > > Unfortunately, I don't have any reproducer for this issue yet. > > IMPORTANT: if you fix the issue, please add the following tag to the commit: > Reported-by: syzbot+69904c3b4a09e8fa2e1b(a)syzkaller.appspotmail.com +batadv maintainers May be related to: KMSAN: uninit-value in batadv_nc_worker https://syzkaller.appspot.com/bug?extid=da9194708de785081f11 > rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: > rcu: 0-...!: (1 GPs behind) idle=22e/1/0x4000000000000000 softirq=85361/85365 fqs=8 > (detected by 1, t=10502 jiffies, g=114061, q=1511) > Sending NMI from CPU 1 to CPUs 0: > NMI backtrace for cpu 0 > CPU: 0 PID: 194 Comm: kworker/u4:4 Not tainted 5.8.0-syzkaller #0 > Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 > Workqueue: bat_events batadv_nc_worker > RIP: 0010:arch_local_save_flags arch/x86/include/asm/paravirt.h:765 [inline] > RIP: 0010:arch_local_irq_save arch/x86/include/asm/paravirt.h:787 [inline] > RIP: 0010:__raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:108 [inline] > RIP: 0010:_raw_spin_lock_irqsave+0x3c/0xc0 kernel/locking/spinlock.c:159 > Code: 03 49 bf 00 00 00 00 00 fc ff df 42 80 3c 38 00 74 0c 48 c7 c7 b0 d5 4b 89 e8 a0 97 92 f9 48 83 3d 38 61 2a 01 00 74 79 9c 58 <0f> 1f 44 00 00 49 89 c6 48 c7 c0 c0 d5 4b 89 48 c1 e8 03 42 80 3c > RSP: 0018:ffffc90000007d40 EFLAGS: 00000082 > RAX: 0000000000000082 RBX: ffffffff8ba182b8 RCX: 000000000000d6e0 > RDX: 0000000080010001 RSI: ffffffff894eec80 RDI: ffffffff8ba182b8 > RBP: ffffffff894eec80 R08: ffffffff816542f4 R09: fffff52000000fb0 > R10: fffff52000000fb0 R11: 0000000000000000 R12: dffffc0000000000 > R13: 1ffff11015d04ed2 R14: dffffc0000000000 R15: dffffc0000000000 > FS: 0000000000000000(0000) GS:ffff8880ae800000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 00000000004ddaf0 CR3: 0000000090ca1000 CR4: 00000000001506f0 > DR0: 0000000020000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000600 > Call Trace: > <IRQ> > debug_object_activate+0x62/0x5f0 lib/debugobjects.c:636 > debug_hrtimer_activate kernel/time/hrtimer.c:416 [inline] > debug_activate kernel/time/hrtimer.c:476 [inline] > enqueue_hrtimer kernel/time/hrtimer.c:965 [inline] > __run_hrtimer kernel/time/hrtimer.c:1537 [inline] > __hrtimer_run_queues+0x510/0x930 kernel/time/hrtimer.c:1584 > hrtimer_interrupt+0x373/0xd60 kernel/time/hrtimer.c:1646 > local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1080 [inline] > __sysvec_apic_timer_interrupt+0xf0/0x260 arch/x86/kernel/apic/apic.c:1097 > asm_call_on_stack+0xf/0x20 arch/x86/entry/entry_64.S:706 > </IRQ> > __run_on_irqstack arch/x86/include/asm/irq_stack.h:22 [inline] > run_on_irqstack_cond arch/x86/include/asm/irq_stack.h:48 [inline] > sysvec_apic_timer_interrupt+0x94/0xf0 arch/x86/kernel/apic/apic.c:1091 > asm_sysvec_apic_timer_interrupt+0x12/0x20 arch/x86/include/asm/idtentry.h:581 > RIP: 0010:arch_local_irq_restore arch/x86/include/asm/paravirt.h:770 [inline] > RIP: 0010:lock_release+0x3c4/0x750 kernel/locking/lockdep.c:5026 > Code: 48 c1 e8 03 42 80 3c 28 00 74 0c 48 c7 c7 b8 d5 4b 89 e8 3f 0b 5a 00 48 83 3d df d4 f1 07 00 0f 84 5c 03 00 00 4c 89 e7 57 9d <0f> 1f 44 00 00 65 48 8b 04 25 28 00 00 00 48 3b 44 24 50 0f 85 40 > RSP: 0018:ffffc90001037bf8 EFLAGS: 00000282 > RAX: 1ffffffff1297ab7 RBX: 1ffff110151d2949 RCX: ffff8880a8e94180 > RDX: ffff8880a8e94a48 RSI: ffffffff894ea290 RDI: 0000000000000282 > RBP: 9644b5a36c253f0c R08: dffffc0000000000 R09: fffffbfff131b08e > R10: fffffbfff131b08e R11: 0000000000000000 R12: 0000000000000282 > R13: dffffc0000000000 R14: dffffc0000000000 R15: ffff8880a8e94a4c > rcu_read_unlock include/linux/rcupdate.h:688 [inline] > batadv_nc_purge_orig_hash net/batman-adv/network-coding.c:411 [inline] > batadv_nc_worker+0x261/0x5c0 net/batman-adv/network-coding.c:718 > process_one_work+0x789/0xfc0 kernel/workqueue.c:2269 > worker_thread+0xaa4/0x1460 kernel/workqueue.c:2415 > kthread+0x37e/0x3a0 drivers/block/aoe/aoecmd.c:1234 > ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294 > rcu: rcu_preempt kthread starved for 10486 jiffies! g114061 f0x0 RCU_GP_WAIT_FQS(5) ->state=0x402 ->cpu=1 > rcu: Unless rcu_preempt kthread gets sufficient CPU time, OOM is now expected behavior. > rcu: RCU grace-period kthread stack dump: > rcu_preempt I28608 10 2 0x00004000 > Call Trace: > context_switch kernel/sched/core.c:3778 [inline] > __schedule+0x979/0xce0 kernel/sched/core.c:4527 > > > --- > This report 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 issue. See: > https://goo.gl/tpsmEJ#status for how to communicate with syzbot. > > -- > You received this message because you are subscribed to the Google Groups "syzkaller-bugs" group. > To unsubscribe from this group and stop receiving emails from it, send an email to syzkaller-bugs+unsubscribe(a)googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/syzkaller-bugs/0000000000009d327505b09992….

1 0

[PATCH v2] net: bridge: mcast: rename br_ip's u member to dst
by Linus Lüssing 28 Sep '20

28 Sep '20

From: Nikolay Aleksandrov <nikolay(a)nvidia.com> Since now we have src in br_ip, u no longer makes sense so rename it to dst. No functional changes. v2: fix build with CONFIG_BATMAN_ADV_MCAST 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 Signed-off-by: Nikolay Aleksandrov <nikolay(a)nvidia.com> [linus.luessing(a)c0d3.blue: Add compat code] Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Compat v2: * added BUILD_BUG_ON size+offset checks as suggested by Sven (thanks!) compat-include/linux/if_bridge.h | 56 ++++++++++++++++++++++++++++++++ net/batman-adv/multicast.c | 14 ++++---- 2 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 compat-include/linux/if_bridge.h diff --git a/compat-include/linux/if_bridge.h b/compat-include/linux/if_bridge.h new file mode 100644 index 00000000..45585003 --- /dev/null +++ b/compat-include/linux/if_bridge.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ + +#include <linux/version.h> +#include_next <linux/if_bridge.h> + +#if LINUX_VERSION_IS_LESS(5, 10, 0) + +struct batadv_br_ip { + union { + __be32 ip4; +#if IS_ENABLED(CONFIG_IPV6) + struct in6_addr ip6; +#endif + } dst; + __be16 proto; + __u16 vid; +}; + +struct batadv_br_ip_list { + struct list_head list; + struct batadv_br_ip addr; +}; + +/* "static" dropped to force compiler to evaluate it as part of multicast.c + * might need to be added again and then called in some kind of dummy + * compat.c in case this header is included in multiple files. + */ +inline void __batadv_br_ip_list_check(void) +{ + BUILD_BUG_ON(sizeof(struct batadv_br_ip_list) != sizeof(struct br_ip_list)); + BUILD_BUG_ON(offsetof(struct batadv_br_ip_list, list) != offsetof(struct br_ip_list, list)); + BUILD_BUG_ON(offsetof(struct batadv_br_ip_list, addr) != offsetof(struct br_ip_list, addr)); + + BUILD_BUG_ON(sizeof(struct batadv_br_ip) != sizeof(struct br_ip)); + BUILD_BUG_ON(offsetof(struct batadv_br_ip, dst.ip4) != offsetof(struct br_ip, u.ip4)); + BUILD_BUG_ON(offsetof(struct batadv_br_ip, dst.ip6) != offsetof(struct br_ip, u.ip6)); + BUILD_BUG_ON(offsetof(struct batadv_br_ip, proto) != offsetof(struct br_ip, proto)); + BUILD_BUG_ON(offsetof(struct batadv_br_ip, vid) != offsetof(struct br_ip, vid)); +} + +#define br_ip batadv_br_ip +#define br_ip_list batadv_br_ip_list + +#endif /* LINUX_VERSION_IS_LESS(5, 10, 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 0746fe2c..9af99c39 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -221,7 +221,7 @@ static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv, * 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.u.ip6)) + ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6)) flags &= ~BATADV_MCAST_WANT_NO_RTR6; list_del(&br_ip_entry->list); @@ -562,10 +562,10 @@ batadv_mcast_mla_softif_get(struct net_device *dev, static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src) { if (src->proto == htons(ETH_P_IP)) - ip_eth_mc_map(src->u.ip4, dst); + ip_eth_mc_map(src->dst.ip4, dst); #if IS_ENABLED(CONFIG_IPV6) else if (src->proto == htons(ETH_P_IPV6)) - ipv6_eth_mc_map(&src->u.ip6, dst); + ipv6_eth_mc_map(&src->dst.ip6, dst); #endif else eth_zero_addr(dst); @@ -609,11 +609,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev, continue; if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && - ipv4_is_local_multicast(br_ip_entry->addr.u.ip4)) + ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4)) continue; if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR4) && - !ipv4_is_local_multicast(br_ip_entry->addr.u.ip4)) + !ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4)) continue; } @@ -623,11 +623,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev, continue; if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && - ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.u.ip6)) + ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.dst.ip6)) continue; if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR6) && - IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.u.ip6) > + IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.dst.ip6) > IPV6_ADDR_SCOPE_LINKLOCAL) continue; } -- 2.28.0

1 0

[PATCH] net: bridge: mcast: rename br_ip's u member to dst
by Linus Lüssing 28 Sep '20

28 Sep '20

From: Nikolay Aleksandrov <nikolay(a)nvidia.com> Since now we have src in br_ip, u no longer makes sense so rename it to dst. No functional changes. v2: fix build with CONFIG_BATMAN_ADV_MCAST 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 Signed-off-by: Nikolay Aleksandrov <nikolay(a)nvidia.com> [linus.luessing(a)c0d3.blue: Add compat code] Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- compat-include/linux/if_bridge.h | 39 ++++++++++++++++++++++++++++++++ net/batman-adv/multicast.c | 14 ++++++------ 2 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 compat-include/linux/if_bridge.h diff --git a/compat-include/linux/if_bridge.h b/compat-include/linux/if_bridge.h new file mode 100644 index 00000000..c4f9bc08 --- /dev/null +++ b/compat-include/linux/if_bridge.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ + +#include <linux/version.h> +#include_next <linux/if_bridge.h> + +#if LINUX_VERSION_IS_LESS(5, 10, 0) + +struct batadv_br_ip { + union { + __be32 ip4; +#if IS_ENABLED(CONFIG_IPV6) + struct in6_addr ip6; +#endif + } dst; + __be16 proto; + __u16 vid; +}; + +struct batadv_br_ip_list { + struct list_head list; + struct batadv_br_ip addr; +}; + +#define br_ip batadv_br_ip +#define br_ip_list batadv_br_ip_list + +#endif /* LINUX_VERSION_IS_LESS(5, 10, 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 0746fe2c..9af99c39 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -221,7 +221,7 @@ static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv, * 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.u.ip6)) + ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6)) flags &= ~BATADV_MCAST_WANT_NO_RTR6; list_del(&br_ip_entry->list); @@ -562,10 +562,10 @@ batadv_mcast_mla_softif_get(struct net_device *dev, static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src) { if (src->proto == htons(ETH_P_IP)) - ip_eth_mc_map(src->u.ip4, dst); + ip_eth_mc_map(src->dst.ip4, dst); #if IS_ENABLED(CONFIG_IPV6) else if (src->proto == htons(ETH_P_IPV6)) - ipv6_eth_mc_map(&src->u.ip6, dst); + ipv6_eth_mc_map(&src->dst.ip6, dst); #endif else eth_zero_addr(dst); @@ -609,11 +609,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev, continue; if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && - ipv4_is_local_multicast(br_ip_entry->addr.u.ip4)) + ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4)) continue; if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR4) && - !ipv4_is_local_multicast(br_ip_entry->addr.u.ip4)) + !ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4)) continue; } @@ -623,11 +623,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev, continue; if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && - ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.u.ip6)) + ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.dst.ip6)) continue; if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR6) && - IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.u.ip6) > + IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.dst.ip6) > IPV6_ADDR_SCOPE_LINKLOCAL) continue; } -- 2.28.0

2 1

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