B.A.T.M.A.N

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

15 participants
4308 discussions

Re: INFO: trying to register non-static key in l2cap_sock_teardown_cb
by syzbot 11 Jan '21

11 Jan '21

syzbot has bisected this issue to: commit 4680a7ee5db27772af40d83393fa0fb955b745b7 Author: Miklos Szeredi <mszeredi(a)redhat.com> Date: Sat Oct 1 05:32:33 2016 +0000 fuse: remove duplicate cs->offset assignment bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=11fc80e7500000 start commit: 73b7a604 net: dsa: bcm_sf2: support BCM4908's integrated s.. git tree: net-next final oops: https://syzkaller.appspot.com/x/report.txt?x=13fc80e7500000 console output: https://syzkaller.appspot.com/x/log.txt?x=15fc80e7500000 kernel config: https://syzkaller.appspot.com/x/.config?x=9ce34124da4c882b dashboard link: https://syzkaller.appspot.com/bug?extid=a41dfef1d2e04910eb2e syz repro: https://syzkaller.appspot.com/x/repro.syz?x=166ee4cf500000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1337172f500000 Reported-by: syzbot+a41dfef1d2e04910eb2e(a)syzkaller.appspotmail.com Fixes: 4680a7ee5db2 ("fuse: remove duplicate cs->offset assignment") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

1 0

WARNING in rds_rdma_extra_size
by syzbot 09 Jan '21

09 Jan '21

Hello, syzbot found the following issue on: HEAD commit: 6207214a Merge tag 'afs-fixes-04012021' of git://git.kerne.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=146967c0d00000 kernel config: https://syzkaller.appspot.com/x/.config?x=8aa30b9da402d224 dashboard link: https://syzkaller.appspot.com/bug?extid=1bd2b07f93745fa38425 compiler: gcc (GCC) 10.1.0-syz 20200507 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1351c11f500000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1710cb50d00000 The issue was bisected to: commit fdadd04931c2d7cd294dc5b2b342863f94be53a3 Author: Daniel Borkmann <daniel(a)iogearbox.net> Date: Tue Dec 11 11:14:12 2018 +0000 bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=10056f70d00000 final oops: https://syzkaller.appspot.com/x/report.txt?x=12056f70d00000 console output: https://syzkaller.appspot.com/x/log.txt?x=14056f70d00000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+1bd2b07f93745fa38425(a)syzkaller.appspotmail.com Fixes: fdadd04931c2 ("bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K") ------------[ cut here ]------------ WARNING: CPU: 1 PID: 8462 at mm/page_alloc.c:4976 __alloc_pages_nodemask+0x5f8/0x730 mm/page_alloc.c:5011 Modules linked in: CPU: 1 PID: 8462 Comm: syz-executor292 Not tainted 5.11.0-rc2-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:__alloc_pages_nodemask+0x5f8/0x730 mm/page_alloc.c:4976 Code: 00 00 0c 00 0f 85 a7 00 00 00 8b 3c 24 4c 89 f2 44 89 e6 c6 44 24 70 00 48 89 6c 24 58 e8 d0 d7 ff ff 49 89 c5 e9 ea fc ff ff <0f> 0b e9 b5 fd ff ff 89 74 24 14 4c 89 4c 24 08 4c 89 74 24 18 e8 RSP: 0018:ffffc9000169f790 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 1ffff920002d3ef6 RCX: 0000000000000000 RDX: 0000000000000000 RSI: dffffc0000000000 RDI: 0000000000040dc0 RBP: 0000000000040dc0 R08: 0000000000000000 R09: 0000000000000000 R10: ffffffff81b1f7f1 R11: 0000000000000000 R12: 0000000000000018 R13: 0000000000000018 R14: 0000000000000000 R15: 0000000ffffff1f0 FS: 0000000000f3c880(0000) GS:ffff8880b9f00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6b332916c0 CR3: 00000000133c3000 CR4: 0000000000350ee0 Call Trace: alloc_pages_current+0x18c/0x2a0 mm/mempolicy.c:2267 alloc_pages include/linux/gfp.h:547 [inline] kmalloc_order+0x2e/0xb0 mm/slab_common.c:837 kmalloc_order_trace+0x14/0x120 mm/slab_common.c:853 kmalloc_array include/linux/slab.h:592 [inline] kcalloc include/linux/slab.h:621 [inline] rds_rdma_extra_size+0xb2/0x3b0 net/rds/rdma.c:568 rds_rm_size net/rds/send.c:928 [inline] rds_sendmsg+0x20d7/0x3020 net/rds/send.c:1265 sock_sendmsg_nosec net/socket.c:652 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:672 ____sys_sendmsg+0x6e8/0x810 net/socket.c:2345 ___sys_sendmsg+0xf3/0x170 net/socket.c:2399 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2432 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x440359 Code: 18 89 d0 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 7b 13 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007ffe89376b68 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00000000004002c8 RCX: 0000000000440359 RDX: 0000000000000000 RSI: 0000000020001600 RDI: 0000000000000003 RBP: 00000000006ca018 R08: 00000000004002c8 R09: 00000000004002c8 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000401b60 R13: 0000000000401bf0 R14: 0000000000000000 R15: 0000000000000000 --- 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. For information about bisection process see: https://goo.gl/tpsmEJ#bisection syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches

1 0

[PATCH 1/3] alfred: Update copyright years for 2021
by Sven Eckelmann 31 Dec '20

31 Dec '20

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 2 +- alfred.h | 2 +- batadv_query.c | 2 +- batadv_query.h | 2 +- batadv_querynl.c | 2 +- batadv_querynl.h | 2 +- batman_adv.h | 2 +- bitops.h | 2 +- client.c | 2 +- gpsd/Makefile | 2 +- gpsd/alfred-gpsd.c | 2 +- gpsd/alfred-gpsd.h | 2 +- hash.c | 2 +- hash.h | 2 +- main.c | 2 +- netlink.c | 2 +- netlink.h | 2 +- netsock.c | 2 +- packet.h | 2 +- recv.c | 2 +- send.c | 2 +- server.c | 2 +- unix_sock.c | 2 +- util.c | 2 +- vis/Makefile | 2 +- vis/vis.c | 2 +- vis/vis.h | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 6268cb9..57206e0 100755 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # -# Copyright (C) 2012-2020 B.A.T.M.A.N. contributors +# Copyright (C) 2012-2021 B.A.T.M.A.N. contributors # # License-Filename: LICENSES/preferred/GPL-2.0 diff --git a/alfred.h b/alfred.h index a61365d..8a9d244 100644 --- a/alfred.h +++ b/alfred.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.c b/batadv_query.c index 66d3452..410d271 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.h b/batadv_query.h index 291292d..f198de9 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/batadv_querynl.c b/batadv_querynl.c index 2793242..d9a6028 100644 --- a/batadv_querynl.c +++ b/batadv_querynl.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/batadv_querynl.h b/batadv_querynl.h index f684ad8..7f969b9 100644 --- a/batadv_querynl.h +++ b/batadv_querynl.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/batman_adv.h b/batman_adv.h index bdb317f..27d35e7 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: MIT */ -/* Copyright (C) 2016-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2021 B.A.T.M.A.N. contributors: * * Matthias Schiffer */ diff --git a/bitops.h b/bitops.h index 2333aa4..802fc25 100644 --- a/bitops.h +++ b/bitops.h @@ -2,7 +2,7 @@ /* Minimal Linux-like bit manipulation helper functions * (reduced version for alfred) * - * Copyright (c) 2012-2020, Sven Eckelmann <sven(a)narfation.org> + * Copyright (c) 2012-2021, Sven Eckelmann <sven(a)narfation.org> * * License-Filename: LICENSES/preferred/MIT */ diff --git a/client.c b/client.c index b19887d..bd38c2f 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/gpsd/Makefile b/gpsd/Makefile index 0645573..b02404d 100755 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # -# Copyright (C) 2013-2020 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2021 B.A.T.M.A.N. contributors # # License-Filename: LICENSES/preferred/GPL-2.0 diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 47d6a64..ee9e6e8 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2021 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index b5452b4..83d65bc 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2021 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/hash.c b/hash.c index 82a287e..eb7ff1a 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index 32a9e57..0ff887a 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/main.c b/main.c index 5ae8187..37cc5eb 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/netlink.c b/netlink.c index 865ed9f..5470b48 100644 --- a/netlink.c +++ b/netlink.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/netlink.h b/netlink.h index 2964a2b..74c32b5 100644 --- a/netlink.h +++ b/netlink.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/netsock.c b/netsock.c index 9b200d2..28beef1 100644 --- a/netsock.c +++ b/netsock.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/packet.h b/packet.h index 81ecbb9..7e91c58 100644 --- a/packet.h +++ b/packet.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: MIT */ -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * diff --git a/recv.c b/recv.c index 744080b..c4ac7e4 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/send.c b/send.c index de530d9..5afe374 100644 --- a/send.c +++ b/send.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/server.c b/server.c index 37b11fe..5ea6683 100644 --- a/server.c +++ b/server.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/unix_sock.c b/unix_sock.c index 2bbc408..b05b8a2 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/util.c b/util.c index f1dc0dc..c1ee1fa 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/Makefile b/vis/Makefile index 50c8efb..ab79775 100755 --- a/vis/Makefile +++ b/vis/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # -# Copyright (C) 2013-2020 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2021 B.A.T.M.A.N. contributors # # License-Filename: LICENSES/preferred/GPL-2.0 diff --git a/vis/vis.c b/vis/vis.c index 1bb82ab..3b1f37c 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/vis.h b/vis/vis.h index 6f5b839..8033db6 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2021 B.A.T.M.A.N. contributors: * * Simon Wunderlich * -- 2.29.2

1 2

[PATCH] batman-adv: Avoid sizeof on flexible structure
by Sven Eckelmann 29 Dec '20

29 Dec '20

The batadv_dhcp_packet is used to read in parts of the DHCP packet and extract relevant information for the distributed arp table. But the structure contained the flexible member "options" which is no where used in the code. A sizeof on this kind of type would return the size of everything except the flexible member. But sparse will detect this kind of sizeof and warn with warning: using sizeof on a flexible structure This can be avoided by dropping the unused flexible member. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/distributed-arp-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index fd7ba6bb..d2ec419d 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -87,7 +87,7 @@ struct batadv_dhcp_packet { __u8 sname[64]; __u8 file[128]; __be32 magic; - __u8 options[]; + /* __u8 options[]; */ }; #define BATADV_DHCP_YIADDR_LEN sizeof(((struct batadv_dhcp_packet *)0)->yiaddr) -- 2.29.2

1 0

Routing Announcement Alfred Through
by nybash110998＠gmail.com 19 Dec '20

19 Dec '20

Hello Everyone! I want to present to the community my idea about spreading static ipv4 routes between mesh nodes. So, it is my first project in C, before I only have an experience in bash. I know, it might have some weird methods (first painting cannot be good), but I am trying my best. You can see what I suggest on my github page: https://github.com/nickbash11/raat , there you will find comprehensive information about what and how. It just tries to recap the "community" mode in BMX6/BMX7 but with ALFRED. For now I test it between some virtualbox machines with OpenWRT 18/19. This time I do not have hardware resources (routers) to test it on the real network :( All my devices are busy with qMp and I want to try some "pure" in the future, but I really used to see that each node has its own network behind it. Maybe, I have invented a bicycle... don't no, anyway, check me out.

1 0

[PATCH 0/8] pull request for net-next: batman-adv 2020-12-04
by Simon Wunderlich 05 Dec '20

05 Dec '20

Hi David, hi Jakub, here is a late 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 992b03b88e36254e26e9a4977ab948683e21bd9f: batman-adv: Don't always reallocate the fragmentation skb head (2020-11-27 08:02:55 +0100) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20201204 for you to fetch changes up to 34a14c2e6310a348a3f23af6e95bf9ea040f3ec8: batman-adv: Drop unused soft-interface.h include in fragmentation.c (2020-12-04 08:41:16 +0100) ---------------------------------------------------------------- This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - update include for min/max helpers, by Sven Eckelmann - add infrastructure and netlink functions for routing algo selection, by Sven Eckelmann (2 patches) - drop deprecated debugfs and sysfs support and obsoleted functionality, by Sven Eckelmann (3 patches) - drop unused include in fragmentation.c, by Simon Wunderlich ---------------------------------------------------------------- Simon Wunderlich (2): batman-adv: Start new development cycle batman-adv: Drop unused soft-interface.h include in fragmentation.c Sven Eckelmann (6): batman-adv: Add new include for min/max helpers batman-adv: Prepare infrastructure for newlink settings batman-adv: Allow selection of routing algorithm over rtnetlink batman-adv: Drop deprecated sysfs support batman-adv: Drop deprecated debugfs support batman-adv: Drop legacy code for auto deleting mesh interfaces .../ABI/obsolete/sysfs-class-net-batman-adv | 32 - Documentation/ABI/obsolete/sysfs-class-net-mesh | 110 -- MAINTAINERS | 2 - include/uapi/linux/batman_adv.h | 26 + net/batman-adv/Kconfig | 27 +- net/batman-adv/Makefile | 3 - net/batman-adv/bat_algo.c | 34 +- net/batman-adv/bat_algo.h | 5 +- net/batman-adv/bat_iv_ogm.c | 229 ---- net/batman-adv/bat_v.c | 247 +--- net/batman-adv/bat_v_elp.c | 1 + net/batman-adv/bat_v_ogm.c | 1 + net/batman-adv/bridge_loop_avoidance.c | 130 -- net/batman-adv/bridge_loop_avoidance.h | 16 - net/batman-adv/debugfs.c | 442 ------- net/batman-adv/debugfs.h | 73 -- net/batman-adv/distributed-arp-table.c | 55 - net/batman-adv/distributed-arp-table.h | 2 - net/batman-adv/fragmentation.c | 3 +- net/batman-adv/gateway_client.c | 39 - net/batman-adv/gateway_client.h | 2 - net/batman-adv/hard-interface.c | 35 +- net/batman-adv/hard-interface.h | 25 +- net/batman-adv/icmp_socket.c | 392 ------ net/batman-adv/icmp_socket.h | 38 - net/batman-adv/log.c | 209 ---- net/batman-adv/main.c | 46 +- net/batman-adv/main.h | 5 +- net/batman-adv/multicast.c | 111 -- net/batman-adv/multicast.h | 3 - net/batman-adv/netlink.c | 1 + net/batman-adv/network-coding.c | 87 -- net/batman-adv/network-coding.h | 13 - net/batman-adv/originator.c | 121 -- net/batman-adv/originator.h | 4 - net/batman-adv/routing.c | 10 - net/batman-adv/soft-interface.c | 137 +-- net/batman-adv/soft-interface.h | 1 - net/batman-adv/sysfs.c | 1272 -------------------- net/batman-adv/sysfs.h | 93 -- net/batman-adv/tp_meter.c | 1 + net/batman-adv/translation-table.c | 212 ---- net/batman-adv/translation-table.h | 3 - net/batman-adv/types.h | 66 - 44 files changed, 121 insertions(+), 4243 deletions(-) delete mode 100644 Documentation/ABI/obsolete/sysfs-class-net-batman-adv delete mode 100644 Documentation/ABI/obsolete/sysfs-class-net-mesh delete mode 100644 net/batman-adv/debugfs.c delete mode 100644 net/batman-adv/debugfs.h delete mode 100644 net/batman-adv/icmp_socket.c delete mode 100644 net/batman-adv/icmp_socket.h delete mode 100644 net/batman-adv/sysfs.c delete mode 100644 net/batman-adv/sysfs.h

2 9

[PATCH 1/2] vxlan: Add needed_headroom for lower device
by Sven Eckelmann 01 Dec '20

01 Dec '20

It was observed that sending data via batadv over vxlan (on top of wireguard) reduced the performance massively compared to raw ethernet or batadv on raw ethernet. A check of perf data showed that the vxlan_build_skb was calling all the time pskb_expand_head to allocate enough headroom for: min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len + VXLAN_HLEN + iphdr_len; But the vxlan_config_apply only requested needed headroom for: lowerdev->hard_header_len + VXLAN6_HEADROOM or VXLAN_HEADROOM So it completely ignored the needed_headroom of the lower device. The first caller of net_dev_xmit could therefore never make sure that enough headroom was allocated for the rest of the transmit path. Cc: Annika Wickert <annika.wickert(a)exaring.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- drivers/net/vxlan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 236fcc55a5fd..25b5b5a2dfea 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -3799,6 +3799,7 @@ static void vxlan_config_apply(struct net_device *dev, dev->gso_max_segs = lowerdev->gso_max_segs; needed_headroom = lowerdev->hard_header_len; + needed_headroom += lowerdev->needed_headroom; max_mtu = lowerdev->mtu - (use_ipv6 ? VXLAN6_HEADROOM : VXLAN_HEADROOM); -- 2.29.2

3 3

[PATCH 0/3] pull request for net: batman-adv 2020-11-27
by Simon Wunderlich 28 Nov '20

28 Nov '20

Hi David, hi Jakub, here are some more bugfixes for batman-adv which we would like to have integrated into net. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 14a2e551faea53d45bc11629a9dac88f88950ca7: batman-adv: set .owner to THIS_MODULE (2020-11-15 11:43:56 +0100) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-net-pullrequest-20201127 for you to fetch changes up to 992b03b88e36254e26e9a4977ab948683e21bd9f: batman-adv: Don't always reallocate the fragmentation skb head (2020-11-27 08:02:55 +0100) ---------------------------------------------------------------- Here are some batman-adv bugfixes: - Fix head/tailroom issues for fragments, by Sven Eckelmann (3 patches) ---------------------------------------------------------------- Sven Eckelmann (3): batman-adv: Consider fragmentation for needed_headroom batman-adv: Reserve needed_*room for fragments batman-adv: Don't always reallocate the fragmentation skb head net/batman-adv/fragmentation.c | 26 ++++++++++++++++---------- net/batman-adv/hard-interface.c | 3 +++ 2 files changed, 19 insertions(+), 10 deletions(-)

2 4

[PATCH] batman-adv: Consider fragmentation for needed_headroom
by Sven Eckelmann 26 Nov '20

26 Nov '20

If a batman-adv packets has to be fragmented, then the original batman-adv packet header is not stripped away. Instead, only a new header is added in front of the packet after it was splitted. This size must be considered to avoid cost intensive reallocations during the transmission through the various device layers. Reported-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/hard-interface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index f122e448..bbedb9a4 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -553,6 +553,9 @@ static void batadv_hardif_recalc_extra_skbroom(struct net_device *soft_iface) needed_headroom = lower_headroom + (lower_header_len - ETH_HLEN); needed_headroom += batadv_max_header_len(); + /* fragmentation headers don't strip the unicast/... header */ + needed_headroom += sizeof(struct batadv_frag_packet); + soft_iface->needed_headroom = needed_headroom; soft_iface->needed_tailroom = lower_tailroom; } -- 2.29.2

1 1

[PATCH] batman-adv: Don't always reallocate the fragmentation skb head
by Sven Eckelmann 26 Nov '20

26 Nov '20

When a packet is fragmented by batman-adv, the original batman-adv header is not modified. Only a new fragmentation is inserted between the original one and the ethernet header. The code must therefore make sure that it has a writable region of this size in the skbuff head. But it is not useful to always reallocate the skbuff by this size even when there would be more than enough headroom still in the skb. The reallocation is just to costly during in this codepath. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/fragmentation.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 8a73804d..59ebd731 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -527,13 +527,14 @@ int batadv_frag_send_packet(struct sk_buff *skb, frag_header.no++; } - /* Make room for the fragment header. */ - if (batadv_skb_head_push(skb, header_size) < 0 || - pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) { - ret = -ENOMEM; + /* make sure that there is at least enough head for the fragmentation + * and ethernet headers + */ + ret = skb_cow_head(skb, ETH_HLEN + header_size); + if (ret < 0) goto put_primary_if; - } + skb_push(skb, header_size); memcpy(skb->data, &frag_header, header_size); /* Send the last fragment */ -- 2.29.2

1 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