B.A.T.M.A.N November 2023

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

4 participants
5 discussions

[PATCH 0/6] pull request for net-next: batman-adv 2023-11-15
by Simon Wunderlich 18 Nov '23

18 Nov '23

Hi Jakub, hi David, here is a feature/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 89cdf9d556016a54ff6ddd62324aa5ec790c05cc: Merge tag 'net-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2023-11-09 17:09:35 -0800) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20231115 for you to fetch changes up to c3ed16a64c0b0a5b116c9753bf48496d49daffb5: batman-adv: Switch to linux/array_size.h (2023-11-14 08:16:34 +0100) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Implement new multicast packet type, including its transmission, forwarding and parsing, by Linus Lüssing (3 patches) - Switch to new headers for sprintf and array size, by Sven Eckelmann (2 patches) ---------------------------------------------------------------- Linus Lüssing (3): batman-adv: mcast: implement multicast packet reception and forwarding batman-adv: mcast: implement multicast packet generation batman-adv: mcast: shrink tracker packet after scrubbing Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (2): batman-adv: Switch to linux/sprintf.h batman-adv: Switch to linux/array_size.h include/uapi/linux/batadv_packet.h | 45 +- net/batman-adv/Makefile | 1 + net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/fragmentation.c | 8 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/main.c | 5 +- net/batman-adv/main.h | 2 +- net/batman-adv/multicast.c | 129 +++- net/batman-adv/multicast.h | 30 +- net/batman-adv/multicast_forw.c | 1178 ++++++++++++++++++++++++++++++++ net/batman-adv/netlink.c | 2 +- net/batman-adv/originator.c | 28 + net/batman-adv/originator.h | 3 + net/batman-adv/routing.c | 70 ++ net/batman-adv/routing.h | 11 + net/batman-adv/soft-interface.c | 18 +- net/batman-adv/types.h | 70 ++ 17 files changed, 1572 insertions(+), 32 deletions(-) create mode 100644 net/batman-adv/multicast_forw.c

2 7

[PATCH v7 0/3] Implementation of a Stateless Multicast Packet Type
by Linus Lüssing 15 Nov '23

15 Nov '23

In-Reply-To: Hi, The following patchset implements a stateless, TVLV capable batman-adv multicast packet type. The new batman-adv multicast packet type allows to contain several originator destination MAC addresses within a TVLV. Routers on the way will potentially split the batman-adv multicast packet and adjust its tracker TVLV contents. Routing decisions are still based on the selected BATMAN IV or BATMAN V routing algorithm. So this new batman-adv multicast packet type retains the same loop-free properties. The purpose of this new packet type is to allow to forward an IP multicast packet with less transmissions / overhead than the multicast-via-multiple-unicasts approach. Or to reach a lot more destinations (currently up to 196, depending on the payload size, see Wiki documentation for details) than with the default multicast fanout for the via-unicasts approach. This will allow using applications like mDNS again in several Freifunk communities. And with less transmissions will also make more bulky multicast applications, like media streaming (to an assessable amount of receivers) a lot more feasible. This approach is way simpler than the original multicast (tracker) packet approach we envisioned years ago. As it involves no maintenance of an extra, state based multicast routing table. However the TVLV capability should allow to extend things later, to split control and data plane a bit more for instance, to further increase the number of destinations, to further reduce overhead. A compact overview can be found in the Wiki here, including limitations: https://www.open-mesh.org/projects/batman-adv/wiki/Multicast-Packet-Type Regards, Linus --- Changelog v7: * PATCH 1/3: * rebased to current main/master branch (resolved net/multicast/routing.h) * renamed batadv_mcast_forw_orig_to_neigh() to batadv_orig_to_router() and moved it to originator.c, for reuse in fragmentation.c * added a SKB_LINEAR_ASSERT() to batadv_mcast_forw_packet() * adjusted batadv_mcast_forw_scrub_dests(): added a new macro that updates two dest pointers to avoid confusion due to two different updating methods, removed goto's and a little reordering * PATCH 2/3: * added SKB_LINEAR_ASSERT() to batadv_mcast_forw_scrape() * PATCH 3/3: * simplified batadv_mcast_forw_shrink_pack_dests(): moved parts to new sub function batadv_mcast_forw_shrink_fill(), removed keeping track of filler over the whole function (might be slower, as we might check+skip the same zero MAC entry multiple times, for each slot, but a lot easier to read - and we don't prioritize performance with this patchset yet) Changelog v6: * PATCH 2/3: * add missing include of linux/compiler.h for the newly added likely() in v5 * added kerneldoc for @num_dests_pushed to the in v5 newly added batadv_mcast_forw_push_adjust_padding() * updated kerneldoc of batadv_mcast_forw_push_adjust_padding(), original text was wrongly copy & pasted from batadv_mcast_forw_push_est_padding() without adjustments * PATCH 3/3: * added missing "static" attribute to the newly added batadv_mcast_forw_shrink_align_offset() in v5 Changelog v5: * removed patches 1/5 + 2/5, as they were already applied * rebased to current main branch * changed padding behaviour: * now 2 bytes padding on the end of the multicast tracker TVLV, if number of destination nodes is even * as number of destination nodes might change between initial check until after pushing them, functions to post-adjust padding after pushing were added * added/fixed TTL handling * removed skb_pull() bailing from sub-functions of batadv_mcast_forw_push(), to only have a single skb_pull() to keep track of in batadv_mcast_forw_push() to revert the changes to the skb; instead a "unsigned short *tvlv_len" is passsed along in batadv_mcast_.*push.*() functions to keep track of how many bytes were pushed * moved + verified skb->ip_summed invalidation * batadv_mcast_forw_shrink_tracker() xmas tree ordering * reword batadv_mcast_forw_push_dest() "Return:" kerneldoc * fixed spelling: outter -> outer Changelog v4: * PATCH 4/5: * add missing include for linux/types.h in multicast.h * add missing kerneldoc for @bat_priv in batadv_mcast_forw_push_dest() and batadv_mcast_forw_push_tvlvs() * use sizeof_field(type, field) instead of sizeof(((type *)0)->field) in batadv_mcast_forw_push_dest() * PATCH 5/5: * rename num_dests_remove to num_dests_reduce in batadv_mcast_forw_shrink_align_offse() to fix kerneldocs and for consistency * fix typo in kerneldoc in batadv_mcast_forw_shrink_update_headers() -> @num_dest_reduce -> @num_dests_reduce * use sizeof_field(type, field) instead of sizeof(((type *)0)->field) in batadv_mcast_forw_shrink_align_offset() Changelog v3: * PATCH 1/5: * remove now obsolete includes * PATCH 2/5: * fix batadv_tvlv_handler_register() in network-coding.c * add missing include for linux/skbuff.h * move variable declarations out of the switch case in batadv_tvlv_call_handler() * PATCH 3/5: * remove unnecessary include of multicast.h in routing.c * add a few missing includes to multicast_forw.c (linux/byteorder/generic.h, linux/errno.h, linux/gfp.h, linux/stddef.h uapi/linux/batadv_packet.h, multicast.h) * PATCH 4/5: * add missing rcu_read_unlock() in error case before returning in batadv_mcast_forw_push_dests_list() * remove unnecessary include of soft-interface.h in multicast_forw.c * add a few missing includes to multicast_forw.c (linux/bug.h, linux/build_bug.h, linux/limits.h, linux/rculist.h, linux/rcupdate.h, linux/string.h) * make batadv_mcast_forw_mode_by_count() static * fix return types in the declaration of batadv_mcast_forw_packet_hdrlen() and batadv_mcast_forw_push() in multicast.h * fix typo in commit message: "that the are capable of" -> "that the*y* are capable of" * PATCH 5/5: * make batadv_mcast_forw_shrink_pack_dests() adhere to 80 characters per line for consistency * add a "continue" statement after the jump label in batadv_mcast_forw_shrink_pack_dests() to silence the sparse error "error: label at end of compound statement" Changelog v2: * Add "[PATCH v2 0/5]" prefix to title of cover letter, so that Patchwork can hopefully find it - no other changes

3 6

Re: [syzbot] [batman?] INFO: rcu detected stall in worker_thread (9)
by syzbot 14 Nov '23

14 Nov '23

syzbot has found a reproducer for the following issue on: HEAD commit: 9bacdd8996c7 Merge tag 'for-6.7-rc1-tag' of git://git.kern.. git tree: upstream console+strace: https://syzkaller.appspot.com/x/log.txt?x=13e932ff680000 kernel config: https://syzkaller.appspot.com/x/.config?x=d05dd66e2eb2c872 dashboard link: https://syzkaller.appspot.com/bug?extid=225bfad78b079744fd5e compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1041f91f680000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=10cc7b98e80000 Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/8e9d5e2b6665/disk-9bacdd89.raw… vmlinux: https://storage.googleapis.com/syzbot-assets/b8ee67db540d/vmlinux-9bacdd89.… kernel image: https://storage.googleapis.com/syzbot-assets/3477230ef7a9/bzImage-9bacdd89.… The issue was bisected to: commit c2368b19807affd7621f7c4638cd2e17fec13021 Author: Jiri Pirko <jiri(a)nvidia.com> Date: Fri Jul 29 07:10:35 2022 +0000 net: devlink: introduce "unregistering" mark and use it during devlinks iteration bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=1758e1e3680000 final oops: https://syzkaller.appspot.com/x/report.txt?x=14d8e1e3680000 console output: https://syzkaller.appspot.com/x/log.txt?x=10d8e1e3680000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+225bfad78b079744fd5e(a)syzkaller.appspotmail.com Fixes: c2368b19807a ("net: devlink: introduce "unregistering" mark and use it during devlinks iteration") rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: rcu: 0-...!: (1 ticks this GP) idle=3b94/1/0x4000000000000000 softirq=6057/6057 fqs=9 rcu: (detected by 1, t=10502 jiffies, g=6949, q=188 ncpus=2) Sending NMI from CPU 1 to CPUs 0: NMI backtrace for cpu 0 CPU: 0 PID: 8 Comm: kworker/0:0 Not tainted 6.7.0-rc1-syzkaller-00012-g9bacdd8996c7 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/10/2023 Workqueue: events_power_efficient gc_worker RIP: 0010:pv_queued_spin_unlock arch/x86/include/asm/paravirt.h:591 [inline] RIP: 0010:queued_spin_unlock arch/x86/include/asm/qspinlock.h:57 [inline] RIP: 0010:do_raw_spin_unlock+0x117/0x8b0 kernel/locking/spinlock_debug.c:141 Code: 49 c7 45 00 ff ff ff ff 0f b6 04 2b 84 c0 0f 85 c9 03 00 00 41 c7 06 ff ff ff ff 48 c7 c0 60 b8 79 8d 48 c1 e8 03 80 3c 28 00 <74> 0c 48 c7 c7 60 b8 79 8d e8 9b d3 7b 00 48 83 3d 73 30 0b 0c 00 RSP: 0018:ffffc90000007c20 EFLAGS: 00000046 RAX: 1ffffffff1af370c RBX: 1ffff110042eac5e RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffff8880217562e8 RBP: dffffc0000000000 R08: ffff8880217562eb R09: 1ffff110042eac5d R10: dffffc0000000000 R11: ffffed10042eac5e R12: 1ffff110042eac5f R13: ffff8880217562f8 R14: ffff8880217562f0 R15: ffff8880217562e8 FS: 0000000000000000(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000600 CR3: 000000000d730000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <NMI> </NMI> <IRQ> __raw_spin_unlock include/linux/spinlock_api_smp.h:142 [inline] _raw_spin_unlock+0x1e/0x40 kernel/locking/spinlock.c:186 spin_unlock include/linux/spinlock.h:391 [inline] advance_sched+0x9bd/0xcb0 net/sched/sch_taprio.c:992 __run_hrtimer kernel/time/hrtimer.c:1688 [inline] __hrtimer_run_queues+0x59f/0xd20 kernel/time/hrtimer.c:1752 hrtimer_interrupt+0x396/0x980 kernel/time/hrtimer.c:1814 local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1065 [inline] __sysvec_apic_timer_interrupt+0x104/0x3a0 arch/x86/kernel/apic/apic.c:1082 sysvec_apic_timer_interrupt+0x92/0xb0 arch/x86/kernel/apic/apic.c:1076 </IRQ> <TASK> asm_sysvec_apic_timer_interrupt+0x1a/0x20 arch/x86/include/asm/idtentry.h:645 RIP: 0010:lock_acquire+0x25a/0x530 kernel/locking/lockdep.c:5757 Code: 2b 00 74 08 4c 89 f7 e8 04 33 7d 00 f6 44 24 61 02 0f 85 8a 01 00 00 41 f7 c7 00 02 00 00 74 01 fb 48 c7 44 24 40 0e 36 e0 45 <4b> c7 44 25 00 00 00 00 00 43 c7 44 25 09 00 00 00 00 43 c7 44 25 RSP: 0018:ffffc900000d7940 EFLAGS: 00000206 RAX: 0000000000000001 RBX: 1ffff9200001af34 RCX: 0000000000000001 RDX: dffffc0000000000 RSI: ffffffff8b6ac0c0 RDI: ffffffff8bbdf300 RBP: ffffc900000d7a88 R08: ffffffff90dd4367 R09: 1ffffffff21ba86c R10: dffffc0000000000 R11: fffffbfff21ba86d R12: 1ffff9200001af30 R13: dffffc0000000000 R14: ffffc900000d79a0 R15: 0000000000000246 rcu_lock_acquire include/linux/rcupdate.h:301 [inline] rcu_read_lock include/linux/rcupdate.h:747 [inline] gc_worker+0x28c/0x15a0 net/netfilter/nf_conntrack_core.c:1488 process_one_work kernel/workqueue.c:2630 [inline] process_scheduled_works+0x90f/0x1420 kernel/workqueue.c:2703 worker_thread+0xa5f/0x1000 kernel/workqueue.c:2784 kthread+0x2d3/0x370 kernel/kthread.c:388 ret_from_fork+0x48/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:242 </TASK> INFO: NMI handler (nmi_cpu_backtrace_handler) took too long to run: 1.422 msecs rcu: rcu_preempt kthread starved for 9734 jiffies! g6949 f0x0 RCU_GP_WAIT_FQS(5) ->state=0x0 ->cpu=1 rcu: Unless rcu_preempt kthread gets sufficient CPU time, OOM is now expected behavior. rcu: RCU grace-period kthread stack dump: task:rcu_preempt state:R running task stack:26576 pid:17 tgid:17 ppid:2 flags:0x00004000 Call Trace: <TASK> context_switch kernel/sched/core.c:5376 [inline] __schedule+0x1961/0x4ab0 kernel/sched/core.c:6688 __schedule_loop kernel/sched/core.c:6763 [inline] schedule+0x149/0x260 kernel/sched/core.c:6778 schedule_timeout+0x1bd/0x300 kernel/time/timer.c:2167 rcu_gp_fqs_loop+0x30a/0x1500 kernel/rcu/tree.c:1631 rcu_gp_kthread+0xa7/0x3b0 kernel/rcu/tree.c:1830 kthread+0x2d3/0x370 kernel/kthread.c:388 ret_from_fork+0x48/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:242 </TASK> rcu: Stack dump where RCU GP kthread last ran: CPU: 1 PID: 1272 Comm: kworker/u4:6 Not tainted 6.7.0-rc1-syzkaller-00012-g9bacdd8996c7 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/10/2023 Workqueue: events_unbound toggle_allocation_gate RIP: 0010:csd_lock_wait kernel/smp.c:311 [inline] RIP: 0010:smp_call_function_many_cond+0x1832/0x2940 kernel/smp.c:855 Code: 45 8b 65 00 44 89 e6 83 e6 01 31 ff e8 97 88 0b 00 41 83 e4 01 49 bc 00 00 00 00 00 fc ff df 75 07 e8 d2 84 0b 00 eb 38 f3 90 <42> 0f b6 04 23 84 c0 75 11 41 f7 45 00 01 00 00 00 74 1e e8 b6 84 RSP: 0018:ffffc9000562f720 EFLAGS: 00000293 RAX: ffffffff8182f9fa RBX: 1ffff110173087c5 RCX: ffff8880201a0000 RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000000 RBP: ffffc9000562f920 R08: ffffffff8182f9c9 R09: 1ffffffff21ba86c R10: dffffc0000000000 R11: fffffbfff21ba86d R12: dffffc0000000000 R13: ffff8880b9843e28 R14: ffff8880b993d480 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8880b9900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffe63960000 CR3: 000000000d730000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <IRQ> </IRQ> <TASK> on_each_cpu_cond_mask+0x3f/0x80 kernel/smp.c:1023 on_each_cpu include/linux/smp.h:71 [inline] text_poke_sync arch/x86/kernel/alternative.c:2006 [inline] text_poke_bp_batch+0x352/0xb30 arch/x86/kernel/alternative.c:2216 text_poke_flush arch/x86/kernel/alternative.c:2407 [inline] text_poke_finish+0x30/0x50 arch/x86/kernel/alternative.c:2414 arch_jump_label_transform_apply+0x1c/0x30 arch/x86/kernel/jump_label.c:146 static_key_enable_cpuslocked+0x132/0x260 kernel/jump_label.c:205 static_key_enable+0x1a/0x20 kernel/jump_label.c:218 toggle_allocation_gate+0xb5/0x250 mm/kfence/core.c:830 process_one_work kernel/workqueue.c:2630 [inline] process_scheduled_works+0x90f/0x1420 kernel/workqueue.c:2703 worker_thread+0xa5f/0x1000 kernel/workqueue.c:2784 kthread+0x2d3/0x370 kernel/kthread.c:388 ret_from_fork+0x48/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:242 </TASK> --- If you want syzbot to run the reproducer, reply with: #syz test: git://repo/address.git branch-or-commit-hash If you attach or paste a git patch, syzbot will apply it before testing.

1 0

[PATCH] batman-adv: Switch to linux/array_size.h
by Sven Eckelmann 13 Nov '23

13 Nov '23

The commit 3cd39bc3b11b ("kernel.h: Move ARRAY_SIZE() to a separate header") introduced a new header for the ARRAY_SIZE macro which was previously exposed via linux/kernel.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat-include/linux/array_size.h | 20 ++++++++++++++++++++ net/batman-adv/main.c | 2 +- net/batman-adv/netlink.c | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/compat-include/linux/array_size.h b/compat-include/linux/array_size.h new file mode 100644 index 00000000..824ad011 --- /dev/null +++ b/compat-include/linux/array_size.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 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_ARRAY_SIZE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ + +#include <linux/version.h> +#if LINUX_VERSION_IS_GEQ(6, 7, 0) +#include_next <linux/array_size.h> +#else +#include <linux/kernel.h> +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ */ diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index e8a44991..357b3a6a 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -6,6 +6,7 @@ #include "main.h" +#include <linux/array_size.h> #include <linux/atomic.h> #include <linux/build_bug.h> #include <linux/byteorder/generic.h> @@ -20,7 +21,6 @@ #include <linux/init.h> #include <linux/ip.h> #include <linux/ipv6.h> -#include <linux/kernel.h> #include <linux/kobject.h> #include <linux/kref.h> #include <linux/list.h> diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 2b3da616..cda99753 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -7,6 +7,7 @@ #include "netlink.h" #include "main.h" +#include <linux/array_size.h> #include <linux/atomic.h> #include <linux/bitops.h> #include <linux/bug.h> @@ -20,7 +21,6 @@ #include <linux/if_ether.h> #include <linux/if_vlan.h> #include <linux/init.h> -#include <linux/kernel.h> #include <linux/limits.h> #include <linux/list.h> #include <linux/minmax.h> --- base-commit: 5fecd4a389cea1b9719e9ec480d7257887e0dfdf change-id: 20231113-new-6-7-headers-2ac8803d5292 Best regards, -- Sven Eckelmann <sven(a)narfation.org>

1 0

[PATCH RFC] batman-adv: Drop support for Linux < 4.19
by Sven Eckelmann 04 Nov '23

04 Nov '23

The Linux Kernel 4.14 reached its end of life [1] after 6 years. Instead it is recommended to use at least kernel 4.19. It is also over 5 years old but still maintained by the stable kernel team. All older kernels (4.14 - v4.18) will be dropped to reduce the support overhead. [1] TODO: https://lore.kernel.org/r/ Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- The last 4.14 version was not yet released but is announced to be in Jan, 2024: https://kernel.org/category/releases.html --- README.external.rst | 2 +- compat-include/linux/netdevice.h | 8 -------- compat-include/linux/stddef.h | 24 ------------------------ compat-include/net/cfg80211.h | 40 ---------------------------------------- compat-include/net/genetlink.h | 18 ------------------ compat.h | 7 ------- 6 files changed, 1 insertion(+), 98 deletions(-) diff --git a/README.external.rst b/README.external.rst index 58e8fc7a..62a8cf06 100644 --- a/README.external.rst +++ b/README.external.rst @@ -12,7 +12,7 @@ and as an external module. The external module allows to get new features without upgrading to a newer kernel version and to get batman-adv specific bug fixes for kernels that are not supported anymore. It compiles against and should work -with Linux 4.14 - 6.5. Supporting older versions is not +with Linux 4.19 - 6.5. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 3188ad3d..a489ac9b 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -13,14 +13,6 @@ #include <linux/version.h> #include_next <linux/netdevice.h> -#if LINUX_VERSION_IS_LESS(4, 15, 0) - -#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ - netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) - -#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ - - #if LINUX_VERSION_IS_LESS(5, 15, 0) static inline void batadv_dev_put(struct net_device *dev) diff --git a/compat-include/linux/stddef.h b/compat-include/linux/stddef.h deleted file mode 100644 index c4558f81..00000000 --- a/compat-include/linux/stddef.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 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_STDDEF_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ - -#include <linux/version.h> -#include_next <linux/stddef.h> - -#if LINUX_VERSION_IS_LESS(4, 16, 0) - -#ifndef sizeof_field -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) -#endif - -#endif /* LINUX_VERSION_IS_LESS(4, 16, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ */ diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h deleted file mode 100644 index 4bfcd5a3..00000000 --- a/compat-include/net/cfg80211.h +++ /dev/null @@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 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_NET_CFG80211_H_ -#define _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ - -#include <linux/version.h> -#include_next <net/cfg80211.h> - - -#if LINUX_VERSION_IS_LESS(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) - -/* cfg80211 fix: https://patchwork.kernel.org/patch/10449857/ */ -static inline int batadv_cfg80211_get_station(struct net_device *dev, - const u8 *mac_addr, - struct station_info *sinfo) -{ - memset(sinfo, 0, sizeof(*sinfo)); - return cfg80211_get_station(dev, mac_addr, sinfo); -} - -#define cfg80211_get_station(dev, mac_addr, sinfo) \ - batadv_cfg80211_get_station(dev, mac_addr, sinfo) - -#endif /* LINUX_VERSION_IS_LESS(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) */ - - -#if LINUX_VERSION_IS_LESS(4, 18, 0) - -#define cfg80211_sinfo_release_content(sinfo) - -#endif /* LINUX_VERSION_IS_LESS(4, 18, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ */ diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index 05c57ce0..85376044 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -13,24 +13,6 @@ #include <linux/version.h> #include_next <net/genetlink.h> -#if LINUX_VERSION_IS_LESS(4, 15, 0) - -static inline -void batadv_genl_dump_check_consistent(struct netlink_callback *cb, - void *user_hdr) -{ - struct genl_family genl_family = { - .hdrsize = 0, - }; - - genl_dump_check_consistent(cb, user_hdr, &genl_family); -} - -#define genl_dump_check_consistent batadv_genl_dump_check_consistent - -#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ - - #if LINUX_VERSION_IS_LESS(5, 10, 0) #if LINUX_VERSION_IS_LESS(5, 2, 0) diff --git a/compat.h b/compat.h index 8e19f9bb..638bfc54 100644 --- a/compat.h +++ b/compat.h @@ -16,13 +16,6 @@ #include "compat-autoconf.h" -#if LINUX_VERSION_IS_LESS(4, 15, 0) - -#define batadv_softif_slave_add(__dev, __slave_dev, __extack) \ - batadv_softif_slave_add(__dev, __slave_dev) - -#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ - #endif /* __KERNEL__ */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ --- base-commit: 5fecd4a389cea1b9719e9ec480d7257887e0dfdf change-id: 20231104-drop-compat-4-14-1bba04bac963 Best regards, -- Sven Eckelmann <sven(a)narfation.org>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2023