B.A.T.M.A.N February 2016

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

21 participants
73 discussions

[B.A.T.M.A.N.] [Patchv2 0/7] batman-adv: Optimizations for setups running dat and bla

by Andreas Pape

This patchset introduces optimizations for batman-adv in setups having several gateways into a common (switched) Ethernet backbone network especially if dat is additionally enabled. Using the current implementation with bla and dat enabled, several problems can be observed in a real setup: 1. Multiplication of ARP replies from dat enabled gateways and dat enabled mesh nodes leading to an "ARP reply storm" in the common backbone network. 2. In rare corner cases bla does not fully prevent looping of unicast frames in the direction backbone --> mesh --> backbone and looping of multicast frames in the direction mesh --> backbone --> mesh. The latter can lead to temporary confusion in the switched backbone resulting in packet loss and communication timeouts. The observed problems are solved by introduction of additional rules for the dat handling, bla packet forwarding and bla claiming/unclaiming of clients. .................................................................. PHOENIX CONTACT ELECTRONICS GmbH Sitz der Gesellschaft / registered office of the company: 31812 Bad Pyrmont USt-Id-Nr.: DE811742156 Amtsgericht Hannover HRB 100528 / district court Hannover HRB 100528 Geschäftsführer / Executive Board: Roland Bent, Dr. Martin Heubeck ___________________________________________________________________ Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das unerlaubte Kopieren, jegliche anderweitige Verwendung sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet. ---------------------------------------------------------------------------------------------------- This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden. ___________________________________________________________________

7 years

[B.A.T.M.A.N.] How is the metric calculated and interpreted?

by Sutter Nino

Hello there I have some basic Issues which I was not able to solve with the Wiki. How is the metric (?/255) calculated? Concerning the output of "batctl o" below, how can I interpret the following? -What is the meaning when the originator is the same as the next hop (Line 1)? -Is that correct that the originator car 29 will send all packets to car20 directly without a node in-between (Line 2)? -How can the potential nexthops be interpreted? [B.A.T.M.A.N. adv 2015.1, MainIF/MAC: adhoc0/c4:93:00:02:d1:4f (bat0 BATMAN_IV)] Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... car23 0.300s (255) car23 [ wlan0]: car35 ( 0) car24 ( 0) car31 (103) car21 (183) car36 ( 68) car20 (178) car23 (255) car29 0.864s (175) car20 [ wlan0]: car23 ( 0) car36 ( 0) car31 ( 0) car35 ( 0) car21 ( 0) car24 ( 0) car20 (175) car29 ( 0) Thank you for your answers Regards Nino

7 years

[B.A.T.M.A.N.] batctl: page allocation failure

by Philipp Psurek

Hi all, I've got this error with # batctl -v batctl 2016.0-4-g7a3d563 [batman-adv: 2016.0-83-g884fb2d] on # uname -rmpio 3.4.107-01996-g67bdc52 armv7l ARMv7 Processor rev 4 (v7l) sun7i GNU/Linux I know the kernel is old, I can take a recent one if needed, but maybe this is not necessary. The module has been compiled with CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=n and batctl as usual but without stripping. The problem occurs while calling “batctl o”. There should be an output of 336 lines … Please tell me if you need more information. Thanx in advance and thank you for B.A.T.M.A.N. advanced. Best regards, Philipp ---------------------------------- [Feb28 00:10] batman_adv: B.A.T.M.A.N. advanced 2016.0-83-g884fb2d (compatibility version 15) loaded [ +11,632829] batman_adv: bat0: Adding interface: eth0 [ +0,277590] batman_adv: bat0: The MTU of interface eth0 is too small (1500) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to 1560 would solve the problem. [ +0,058799] batman_adv: bat0: Interface activated: eth0 [ +3,173715] batman_adv: bat0: Adding interface: fastd-wup [ +0,279096] batman_adv: bat0: The MTU of interface fastd-wup is too small (1426) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to 1560 would solve the problem. [ +0,055496] batman_adv: bat0: Interface activated: fastd-wup [ +23,247415] bat0: no IPv6 routers present [Feb28 00:13] batctl: page allocation failure: order:4, mode:0x40d0 [ +0,100723] [<c00153a4>] (unwind_backtrace+0x0/0x134) from [<c00af79c>] (warn_alloc_failed+0xe0/0x118) [ +0,113138] [<c00af79c>] (warn_alloc_failed+0xe0/0x118) from [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) [ +0,110864] [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) from [<c00b22ac>] (__get_free_pages+0x10/0x24) [ +0,094211] [<c00b22ac>] (__get_free_pages+0x10/0x24) from [<c0108bd8>] (seq_read+0x238/0x490) [ +0,084540] [<c0108bd8>] (seq_read+0x238/0x490) from [<c00eb3f4>] (vfs_read+0x98/0x174) [ +0,082817] [<c00eb3f4>] (vfs_read+0x98/0x174) from [<c00eb8a0>] (sys_read+0x38/0x78) [ +0,095673] [<c00eb8a0>] (sys_read+0x38/0x78) from [<c000ecc0>] (ret_fast_syscall+0x0/0x30) [ +0,014683] Mem-info: [ +0,015332] DMA per-cpu: [ +0,042295] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,043583] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,019240] Normal per-cpu: [ +0,042920] CPU 0: hi: 186, btch: 31 usd: 0 [ +0,046456] CPU 1: hi: 186, btch: 31 usd: 1 [ +0,030888] HighMem per-cpu: [ +0,042776] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,046066] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,276204] active_anon:38221 inactive_anon:11325 isolated_anon:0 [ +0,000006] active_file:95385 inactive_file:84158 isolated_file:0 [ +0,000006] unevictable:0 dirty:4 writeback:0 unstable:0 [ +0,000004] free:8954 slab_reclaimable:9981 slab_unreclaimable:2508 [ +0,000005] mapped:2159 shmem:153 pagetables:326 bounce:0 [ +0,467038] DMA free:10956kB min:1180kB low:1472kB high:1768kB active_anon:41260kB inactive_anon:4176kB active_file:96108kB inactive_file:90808kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:260096kB mlocked:0kB dirty:0kB writeback:0kB mapped:3224kB shmem:488kB slab_reclaimable:7228kB slab_unreclaimable:1340kB kernel_stack:176kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,043062] lowmem_reserve[]: 0 500 762 762 [ +0,478788] Normal free:22160kB min:2324kB low:2904kB high:3484kB active_anon:64100kB inactive_anon:10132kB active_file:183792kB inactive_file:159760kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:512064kB mlocked:0kB dirty:16kB writeback:0kB mapped:1472kB shmem:4kB slab_reclaimable:32696kB slab_unreclaimable:8700kB kernel_stack:624kB pagetables:1304kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,041810] lowmem_reserve[]: 0 0 2095 2095 [ +0,485438] HighMem free:2692kB min:260kB low:564kB high:868kB active_anon:47524kB inactive_anon:30992kB active_file:101640kB inactive_file:86064kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:268224kB mlocked:0kB dirty:0kB writeback:0kB mapped:3940kB shmem:120kB slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,041504] lowmem_reserve[]: 0 0 0 0 [ +0,019167] DMA: 1167*4kB 178*8kB 80*16kB 32*32kB 18*64kB 5*128kB 3*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 10956kB [ +0,128889] Normal: 3738*4kB 576*8kB 112*16kB 21*32kB 2*64kB 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 22152kB [ +0,141889] HighMem: 143*4kB 67*8kB 37*16kB 13*32kB 7*64kB 1*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 2692kB [ +0,155726] 179706 total pagecache pages [ +0,031546] 0 pages in swap cache [ +0,075081] Swap cache stats: add 933557, delete 933557, find 273255/316856 [ +0,023894] Free swap = 0kB [ +0,027333] Total swap = 0kB [ +0,039682] 262144 pages of RAM [ +0,020541] 9168 free pages [ +0,024887] 9338 reserved pages [ +0,019097] 9130 slab pages [ +0,025110] 116719 pages shared [ +0,024278] 0 pages swap cached [ +4,207166] batctl: page allocation failure: order:4, mode:0x40d0 [ +0,095872] [<c00153a4>] (unwind_backtrace+0x0/0x134) from [<c00af79c>] (warn_alloc_failed+0xe0/0x118) [ +0,104340] [<c00af79c>] (warn_alloc_failed+0xe0/0x118) from [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) [ +0,102166] [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) from [<c00b22ac>] (__get_free_pages+0x10/0x24) [ +0,087528] [<c00b22ac>] (__get_free_pages+0x10/0x24) from [<c0108bd8>] (seq_read+0x238/0x490) [ +0,080231] [<c0108bd8>] (seq_read+0x238/0x490) from [<c00eb3f4>] (vfs_read+0x98/0x174) [ +0,078142] [<c00eb3f4>] (vfs_read+0x98/0x174) from [<c00eb8a0>] (sys_read+0x38/0x78) [ +0,084396] [<c00eb8a0>] (sys_read+0x38/0x78) from [<c000ecc0>] (ret_fast_syscall+0x0/0x30) [ +0,011576] Mem-info: [ +0,014689] DMA per-cpu: [ +0,041725] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,041762] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,017817] Normal per-cpu: [ +0,041821] CPU 0: hi: 186, btch: 31 usd: 0 [ +0,041736] CPU 1: hi: 186, btch: 31 usd: 0 [ +0,018844] HighMem per-cpu: [ +0,041736] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,041724] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,274703] active_anon:38228 inactive_anon:11330 isolated_anon:0 [ +0,000006] active_file:95390 inactive_file:84151 isolated_file:0 [ +0,000006] unevictable:0 dirty:1 writeback:0 unstable:0 [ +0,000004] free:8958 slab_reclaimable:9981 slab_unreclaimable:2512 [ +0,000005] mapped:2159 shmem:153 pagetables:326 bounce:0 [ +0,449747] DMA free:10956kB min:1180kB low:1472kB high:1768kB active_anon:41260kB inactive_anon:4176kB active_file:96108kB inactive_file:90808kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:260096kB mlocked:0kB dirty:0kB writeback:0kB mapped:3224kB shmem:488kB slab_reclaimable:7228kB slab_unreclaimable:1340kB kernel_stack:176kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,017854] lowmem_reserve[]: 0 500 762 762 [ +0,474747] Normal free:22180kB min:2324kB low:2904kB high:3484kB active_anon:64124kB inactive_anon:10152kB active_file:183800kB inactive_file:159744kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:512064kB mlocked:0kB dirty:0kB writeback:0kB mapped:1472kB shmem:4kB slab_reclaimable:32696kB slab_unreclaimable:8708kB kernel_stack:624kB pagetables:1304kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,017908] lowmem_reserve[]: 0 0 2095 2095 [ +0,460057] HighMem free:2696kB min:260kB low:564kB high:868kB active_anon:47528kB inactive_anon:30992kB active_file:101652kB inactive_file:86052kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:268224kB mlocked:0kB dirty:4kB writeback:0kB mapped:3940kB shmem:120kB slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,017830] lowmem_reserve[]: 0 0 0 0 [ +0,015840] DMA: 1167*4kB 178*8kB 80*16kB 32*32kB 18*64kB 5*128kB 3*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 10956kB [ +0,116928] Normal: 3745*4kB 582*8kB 111*16kB 20*32kB 2*64kB 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 22180kB [ +0,117676] HighMem: 138*4kB 70*8kB 37*16kB 13*32kB 7*64kB 1*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 2696kB [ +0,135363] 179706 total pagecache pages [ +0,024050] 0 pages in swap cache [ +0,067731] Swap cache stats: add 933557, delete 933557, find 273255/316856 [ +0,018842] Free swap = 0kB [ +0,018837] Total swap = 0kB [ +0,034725] 262144 pages of RAM [ +0,017828] 9175 free pages [ +0,021957] 9338 reserved pages [ +0,017803] 9130 slab pages [ +0,021957] 116699 pages shared [ +0,021958] 0 pages swap cached [ +2,546832] batctl: page allocation failure: order:4, mode:0x40d0 [ +0,095887] [<c00153a4>] (unwind_backtrace+0x0/0x134) from [<c00af79c>] (warn_alloc_failed+0xe0/0x118) [ +0,104208] [<c00af79c>] (warn_alloc_failed+0xe0/0x118) from [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) [ +0,102153] [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) from [<c00b22ac>] (__get_free_pages+0x10/0x24) [ +0,087828] [<c00b22ac>] (__get_free_pages+0x10/0x24) from [<c0108bd8>] (seq_read+0x238/0x490) [ +0,080248] [<c0108bd8>] (seq_read+0x238/0x490) from [<c00eb3f4>] (vfs_read+0x98/0x174) [ +0,078215] [<c00eb3f4>] (vfs_read+0x98/0x174) from [<c00eb8a0>] (sys_read+0x38/0x78) [ +0,084403] [<c00eb8a0>] (sys_read+0x38/0x78) from [<c000ecc0>] (ret_fast_syscall+0x0/0x30) [ +0,011576] Mem-info: [ +0,014684] DMA per-cpu: [ +0,041729] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,041796] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,017822] Normal per-cpu: [ +0,041724] CPU 0: hi: 186, btch: 31 usd: 0 [ +0,041730] CPU 1: hi: 186, btch: 31 usd: 0 [ +0,018883] HighMem per-cpu: [ +0,041723] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,041867] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,274716] active_anon:38235 inactive_anon:11327 isolated_anon:0 [ +0,000007] active_file:95391 inactive_file:84152 isolated_file:0 [ +0,000006] unevictable:0 dirty:2 writeback:0 unstable:0 [ +0,000004] free:8953 slab_reclaimable:9981 slab_unreclaimable:2512 [ +0,000005] mapped:2159 shmem:153 pagetables:326 bounce:0 [ +0,449493] DMA free:10956kB min:1180kB low:1472kB high:1768kB active_anon:41260kB inactive_anon:4176kB active_file:96108kB inactive_file:90808kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:260096kB mlocked:0kB dirty:0kB writeback:0kB mapped:3224kB shmem:488kB slab_reclaimable:7228kB slab_unreclaimable:1340kB kernel_stack:176kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,017933] lowmem_reserve[]: 0 500 762 762 [ +0,474739] Normal free:22160kB min:2324kB low:2904kB high:3484kB active_anon:64128kB inactive_anon:10140kB active_file:183804kB inactive_file:159748kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:512064kB mlocked:0kB dirty:4kB writeback:0kB mapped:1472kB shmem:4kB slab_reclaimable:32696kB slab_unreclaimable:8708kB kernel_stack:624kB pagetables:1304kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,017916] lowmem_reserve[]: 0 0 2095 2095 [ +0,460179] HighMem free:2696kB min:260kB low:564kB high:868kB active_anon:47552kB inactive_anon:30992kB active_file:101652kB inactive_file:86052kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:268224kB mlocked:0kB dirty:4kB writeback:0kB mapped:3940kB shmem:120kB slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,017960] lowmem_reserve[]: 0 0 0 0 [ +0,015846] DMA: 1167*4kB 178*8kB 80*16kB 32*32kB 18*64kB 5*128kB 3*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 10956kB [ +0,116798] Normal: 3742*4kB 583*8kB 112*16kB 19*32kB 2*64kB 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 22160kB [ +0,117768] HighMem: 128*4kB 75*8kB 37*16kB 13*32kB 7*64kB 1*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 2696kB [ +0,135597] 179708 total pagecache pages [ +0,024101] 0 pages in swap cache [ +0,067730] Swap cache stats: add 933557, delete 933557, find 273255/316856 [ +0,018843] Free swap = 0kB [ +0,018838] Total swap = 0kB [ +0,034639] 262144 pages of RAM [ +0,017816] 9170 free pages [ +0,021964] 9338 reserved pages [ +0,017874] 9130 slab pages [ +0,021970] 116692 pages shared [ +0,021963] 0 pages swap cached [ +2,795628] batctl: page allocation failure: order:4, mode:0x40d0 [ +0,100163] [<c00153a4>] (unwind_backtrace+0x0/0x134) from [<c00af79c>] (warn_alloc_failed+0xe0/0x118) [ +0,112606] [<c00af79c>] (warn_alloc_failed+0xe0/0x118) from [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) [ +0,109882] [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) from [<c00b22ac>] (__get_free_pages+0x10/0x24) [ +0,092898] [<c00b22ac>] (__get_free_pages+0x10/0x24) from [<c0108bd8>] (seq_read+0x238/0x490) [ +0,081964] [<c0108bd8>] (seq_read+0x238/0x490) from [<c00eb3f4>] (vfs_read+0x98/0x174) [ +0,080373] [<c00eb3f4>] (vfs_read+0x98/0x174) from [<c00eb8a0>] (sys_read+0x38/0x78) [ +0,095661] [<c00eb8a0>] (sys_read+0x38/0x78) from [<c000ecc0>] (ret_fast_syscall+0x0/0x30) [ +0,018246] Mem-info: [ +0,016190] DMA per-cpu: [ +0,042907] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,045696] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,021567] Normal per-cpu: [ +0,043237] CPU 0: hi: 186, btch: 31 usd: 0 [ +0,042809] CPU 1: hi: 186, btch: 31 usd: 1 [ +0,027782] HighMem per-cpu: [ +0,044187] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,044017] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,276192] active_anon:38230 inactive_anon:11333 isolated_anon:0 [ +0,000006] active_file:95396 inactive_file:84156 isolated_file:0 [ +0,000005] unevictable:0 dirty:2 writeback:0 unstable:0 [ +0,000005] free:8953 slab_reclaimable:9981 slab_unreclaimable:2512 [ +0,000005] mapped:2159 shmem:153 pagetables:326 bounce:0 [ +0,467447] DMA free:10956kB min:1180kB low:1472kB high:1768kB active_anon:41260kB inactive_anon:4176kB active_file:96108kB inactive_file:90808kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:260096kB mlocked:0kB dirty:0kB writeback:0kB mapped:3224kB shmem:488kB slab_reclaimable:7228kB slab_unreclaimable:1340kB kernel_stack:176kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,024492] lowmem_reserve[]: 0 500 762 762 [ +0,475389] Normal free:22176kB min:2324kB low:2904kB high:3484kB active_anon:64128kB inactive_anon:10164kB active_file:183824kB inactive_file:159764kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:512064kB mlocked:0kB dirty:4kB writeback:0kB mapped:1472kB shmem:4kB slab_reclaimable:32696kB slab_unreclaimable:8708kB kernel_stack:624kB pagetables:1304kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,024240] lowmem_reserve[]: 0 0 2095 2095 [ +0,461051] HighMem free:2680kB min:260kB low:564kB high:868kB active_anon:47532kB inactive_anon:30992kB active_file:101652kB inactive_file:86052kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:268224kB mlocked:0kB dirty:4kB writeback:0kB mapped:3940kB shmem:120kB slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,023810] lowmem_reserve[]: 0 0 0 0 [ +0,016839] DMA: 1167*4kB 178*8kB 80*16kB 32*32kB 18*64kB 5*128kB 3*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 10956kB [ +0,117735] Normal: 3738*4kB 584*8kB 113*16kB 22*32kB 1*64kB 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 22200kB [ +0,118592] HighMem: 124*4kB 75*8kB 37*16kB 13*32kB 7*64kB 1*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 2680kB [ +0,141032] 179710 total pagecache pages [ +0,024246] 0 pages in swap cache [ +0,067845] Swap cache stats: add 933557, delete 933557, find 273255/316856 [ +0,019040] Free swap = 0kB [ +0,018966] Total swap = 0kB [ +0,035160] 262144 pages of RAM [ +0,017932] 9177 free pages [ +0,022041] 9338 reserved pages [ +0,022998] 9127 slab pages [ +0,022106] 116679 pages shared [ +0,022100] 0 pages swap cached [Feb28 00:14] batctl: page allocation failure: order:4, mode:0x40d0 [ +0,096010] [<c00153a4>] (unwind_backtrace+0x0/0x134) from [<c00af79c>] (warn_alloc_failed+0xe0/0x118) [ +0,105164] [<c00af79c>] (warn_alloc_failed+0xe0/0x118) from [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) [ +0,102095] [<c00b1ff0>] (__alloc_pages_nodemask+0x574/0x7cc) from [<c00b22ac>] (__get_free_pages+0x10/0x24) [ +0,087646] [<c00b22ac>] (__get_free_pages+0x10/0x24) from [<c0108bd8>] (seq_read+0x238/0x490) [ +0,080242] [<c0108bd8>] (seq_read+0x238/0x490) from [<c00eb3f4>] (vfs_read+0x98/0x174) [ +0,078150] [<c00eb3f4>] (vfs_read+0x98/0x174) from [<c00eb8a0>] (sys_read+0x38/0x78) [ +0,084499] [<c00eb8a0>] (sys_read+0x38/0x78) from [<c000ecc0>] (ret_fast_syscall+0x0/0x30) [ +0,011602] Mem-info: [ +0,014690] DMA per-cpu: [ +0,041744] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,041755] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,017817] Normal per-cpu: [ +0,041737] CPU 0: hi: 186, btch: 31 usd: 0 [ +0,041729] CPU 1: hi: 186, btch: 31 usd: 0 [ +0,018845] HighMem per-cpu: [ +0,041735] CPU 0: hi: 90, btch: 15 usd: 0 [ +0,041725] CPU 1: hi: 90, btch: 15 usd: 0 [ +0,274696] active_anon:38218 inactive_anon:11333 isolated_anon:0 [ +0,000005] active_file:95399 inactive_file:84165 isolated_file:0 [ +0,000006] unevictable:0 dirty:3 writeback:0 unstable:0 [ +0,000004] free:8965 slab_reclaimable:9971 slab_unreclaimable:2505 [ +0,000005] mapped:2158 shmem:153 pagetables:326 bounce:0 [ +0,449546] DMA free:11020kB min:1180kB low:1472kB high:1768kB active_anon:41260kB inactive_anon:4176kB active_file:96108kB inactive_file:90808kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:260096kB mlocked:0kB dirty:0kB writeback:0kB mapped:3224kB shmem:488kB slab_reclaimable:7164kB slab_unreclaimable:1340kB kernel_stack:176kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,018135] lowmem_reserve[]: 0 500 762 762 [ +0,474663] Normal free:21940kB min:2324kB low:2904kB high:3484kB active_anon:64128kB inactive_anon:10164kB active_file:183836kB inactive_file:159796kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:512064kB mlocked:0kB dirty:4kB writeback:0kB mapped:1472kB shmem:4kB slab_reclaimable:32672kB slab_unreclaimable:8680kB kernel_stack:632kB pagetables:1304kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,017894] lowmem_reserve[]: 0 0 2095 2095 [ +0,460232] HighMem free:2632kB min:260kB low:564kB high:868kB active_anon:47508kB inactive_anon:30992kB active_file:101652kB inactive_file:86056kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:268224kB mlocked:0kB dirty:8kB writeback:0kB mapped:3936kB shmem:120kB slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB pagetables:0kB unstable:0kB bounce:0kB writeback_tmp:0kB pages_scanned:0 all_unreclaimable? no [ +0,017921] lowmem_reserve[]: 0 0 0 0 [ +0,015956] DMA: 1167*4kB 186*8kB 80*16kB 32*32kB 18*64kB 5*128kB 3*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 11020kB [ +0,116870] Normal: 3667*4kB 586*8kB 112*16kB 23*32kB 1*64kB 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 21948kB [ +0,117813] HighMem: 110*4kB 76*8kB 37*16kB 13*32kB 7*64kB 1*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 2632kB [ +0,135376] 179719 total pagecache pages [ +0,024043] 0 pages in swap cache [ +0,067725] Swap cache stats: add 933557, delete 933557, find 273255/316856 [ +0,018915] Free swap = 0kB [ +0,018849] Total swap = 0kB [ +0,034626] 262144 pages of RAM [ +0,017849] 9194 free pages [ +0,022185] 9338 reserved pages [ +0,017842] 9115 slab pages [ +0,021995] 116689 pages shared [ +0,021957] 0 pages swap cached

7 years

[B.A.T.M.A.N.] [RFC next] batman-adv: ELP - use new ethtool_link_get_ksettings API

by Antonio Quartulli

The ethtool API is changing in linux-4.6 and the B.A.T.M.A.N. V code has to be changed accordingly. Fixes: 5c3245172c01 ("batman-adv: ELP - compute the metric based on the estimated throughput") Signed-off-by: Antonio Quartulli <a(a)unstable.cc> --- This patch contains some compat code which is an attempt to implement backward compatibility with kernel <4.6. Unfortunately my attempt does not work because it is not possible to redefine something like link_settings.base.speed to something else (due to the '.' in the string). Any suggestion? :) compat-include/linux/ethtool.h | 35 +++++++++++++++++++++++++++++++++++ net/batman-adv/bat_v_elp.c | 12 ++++++------ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 compat-include/linux/ethtool.h diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h new file mode 100644 index 0000000..b11524d --- /dev/null +++ b/compat-include/linux/ethtool.h @@ -0,0 +1,35 @@ +/* Copyright (C) 2016 B.A.T.M.A.N. contributors: + * + * Antonio Quartulli + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ + +#include <linux/version.h> +#include_next <linux/ethtool.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) + +#define ethtool_link_ksettings ethtool_cmd +#define __ethtool_get_link_ksettings __ethtool_get_settings +#define link_settings.base.speed ethtool_cmd_speed(&link_settings) + +#endif /* < KERNEL_VERSION(4, 6, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ */ diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index e94b4a0..3844e7e 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -73,8 +73,8 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface) static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) { struct batadv_hard_iface *hard_iface = neigh->if_incoming; + struct ethtool_link_ksettings link_settings; struct station_info sinfo; - struct ethtool_cmd cmd; u32 throughput; int ret; @@ -110,19 +110,19 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) /* if not a wifi interface, check if this device provides data via * ethtool (e.g. an Ethernet adapter) */ - memset(&cmd, 0, sizeof(cmd)); + memset(&link_settings, 0, sizeof(link_settings)); rtnl_lock(); - ret = __ethtool_get_settings(hard_iface->net_dev, &cmd); + ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings); rtnl_unlock(); if (ret == 0) { /* link characteristics might change over time */ - if (cmd.duplex == DUPLEX_FULL) + if (link_settings.base.duplex == DUPLEX_FULL) hard_iface->bat_v.flags |= BATADV_FULL_DUPLEX; else hard_iface->bat_v.flags &= ~BATADV_FULL_DUPLEX; - throughput = ethtool_cmd_speed(&cmd); - if (throughput && throughput != SPEED_UNKNOWN) + throughput = link_settings.base.speed; + if (throughput && (throughput != SPEED_UNKNOWN)) return throughput * 10; } -- 2.7.2

7 years

[B.A.T.M.A.N.] Patchwork on open-mesh.org

by Sven Eckelmann

Hi, I've used my free time in the last week to look over the 5246 patches which were sent to the B.A.T.M.A.N. mailing list. These patches were categorized as * Accepted: committed to the respective repository at git.open-mesh.org * Rejected: Either rejected by the Maintainer(s) or withdrawn by the Author because they turned out to be a bad idea * RFC patches which were just posted to get comments * Not applicable patches which were not really for a repository at git.open-mesh.org (for example patches which are forwarded to net-next.git/net.git) * Changes requested Patch had flaws but these could be fixed but the author of the patch hasn't sent a new version of the patch * Superseded New version of the patch(set) was sent which makes the old version obsolete The result can now be found at https://patchwork.open-mesh.org/ You may wonder why are there patches with the state "New" + "Delegate" set to some person. These are the patches which have not yet been applied in their respective repository at git.open-mesh.org, not yet rejected and not yet replaced by a different patch. Ok, these are most likely not all still waiting to be applied but I just didn't know their state and thus the maintainer(s) have to look over the remaining patches and change their state. Until then, these are added to the TODO list of the maintainer [1]. Patchwork is currently configured to read the mails which are sent to b.a.t.m.a.n(a)lists.open-mesh.org and add each patch + its comments to the patchwork database. Maintainers can then update their state, download the patches and bundle them (which then can be downloaded again). A heuristic was installed in the post-receive hook that tries to find the correct commit for a newly applied patch in the master branch and automatically mark them as Accepted. The author of an patch will be automatically informed about changes to the state of his patch. I have already started to assign the patches with the state "New" to the maintainers. This is also the reason why Marek, Simon and Elektra will not be able to create their own account and instead will receive a mail from me with their account data. But also other people can help here. They can register to set the state of their own patches. This is for example helpful when they've just submitted a new patchset and want to mark the old patchset as superseded. But they can of course also disable the notification mails. I hope this helps to better keep track on the incoming patches and make it harder to forget one. Kind regards, Sven [1] https://patchwork.open-mesh.org/user/todo/

7 years

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix integer overflow in batadv_iv_ogm_calc_tq

by Sven Eckelmann

From: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> The undefined behavior sanatizer detected an signed integer overflow in a setup with near perfect link quality UBSAN: Undefined behaviour in net/batman-adv/bat_iv_ogm.c:1246:25 signed integer overflow: 8713350 * 255 cannot be represented in type 'int' The problems happens because the calculation of mixed unsigned and signed integers resulted in an integer multiplication. batadv_ogm_packet::tq (u8 255) * tq_own (u8 255) * tq_asym_penalty (int 134; max 255) * tq_iface_penalty (int 255; max 255) The tq_iface_penalty, tq_asym_penalty and inv_asym_penalty can just be changed to unsigned int because they are not expected to become negative. Fixes: 46e44fdb96ef ("batman-adv: add WiFi penalty") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> --- net/batman-adv/bat_iv_ogm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index cb2d1b9..b71b57e 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1147,9 +1147,10 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, u8 total_count; u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own; unsigned int neigh_rq_inv_cube, neigh_rq_max_cube; - int tq_asym_penalty, inv_asym_penalty, if_num, ret = 0; + int if_num, ret = 0; + unsigned int tq_asym_penalty, inv_asym_penalty; unsigned int combined_tq; - int tq_iface_penalty; + unsigned int tq_iface_penalty; /* find corresponding one hop neighbor */ rcu_read_lock(); -- 2.7.0

7 years

[B.A.T.M.A.N.] [PATCH] batman-adv: Use bool as return type for boolean functions

by Sven Eckelmann

It is easier to understand that the returned value of a specific function doesn't have to be 0 when the functions was successful when the actual return type is bool. This is especially true when all surrounding functions with return type int use negative values to return the error code. Reported-by: Nicholas Krause <xerofoify(a)gmail.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bat_iv_ogm.c | 23 ++--- net/batman-adv/bitarray.c | 16 +-- net/batman-adv/bitarray.h | 14 +-- net/batman-adv/bridge_loop_avoidance.c | 175 +++++++++++++++++---------------- net/batman-adv/bridge_loop_avoidance.h | 43 ++++---- net/batman-adv/debugfs.c | 2 +- net/batman-adv/distributed-arp-table.c | 6 +- net/batman-adv/hard-interface.c | 15 ++- net/batman-adv/hash.h | 6 +- net/batman-adv/main.h | 2 +- net/batman-adv/network-coding.c | 12 +-- net/batman-adv/originator.c | 4 +- net/batman-adv/originator.h | 2 +- net/batman-adv/routing.c | 37 +++---- net/batman-adv/routing.h | 6 +- net/batman-adv/soft-interface.c | 6 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/translation-table.c | 31 +++--- 18 files changed, 203 insertions(+), 199 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index cb2d1b9..d626842 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1133,13 +1133,13 @@ out: * @if_incoming: interface where the packet was received * @if_outgoing: interface for which the retransmission should be considered * - * Return: 1 if the link can be considered bidirectional, 0 otherwise + * Return: true if the link can be considered bidirectional, false otherwise */ -static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, - struct batadv_orig_node *orig_neigh_node, - struct batadv_ogm_packet *batadv_ogm_packet, - struct batadv_hard_iface *if_incoming, - struct batadv_hard_iface *if_outgoing) +static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, + struct batadv_orig_node *orig_neigh_node, + struct batadv_ogm_packet *batadv_ogm_packet, + struct batadv_hard_iface *if_incoming, + struct batadv_hard_iface *if_outgoing) { struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node; @@ -1147,9 +1147,10 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, u8 total_count; u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own; unsigned int neigh_rq_inv_cube, neigh_rq_max_cube; - int tq_asym_penalty, inv_asym_penalty, if_num, ret = 0; + int tq_asym_penalty, inv_asym_penalty, if_num; unsigned int combined_tq; int tq_iface_penalty; + bool ret = false; /* find corresponding one hop neighbor */ rcu_read_lock(); @@ -1261,7 +1262,7 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, * consider it bidirectional */ if (batadv_ogm_packet->tq >= BATADV_TQ_TOTAL_BIDRECT_LIMIT) - ret = 1; + ret = true; out: if (neigh_node) @@ -1290,9 +1291,9 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, struct batadv_orig_ifinfo *orig_ifinfo = NULL; struct batadv_neigh_node *neigh_node; struct batadv_neigh_ifinfo *neigh_ifinfo; - int is_dup; + bool is_dup; s32 seq_diff; - int need_update = 0; + bool need_update = false; int set_mark; enum batadv_dup_status ret = BATADV_NO_DUP; u32 seqno = ntohl(batadv_ogm_packet->seqno); @@ -1402,7 +1403,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, struct sk_buff *skb_priv; struct ethhdr *ethhdr; u8 *prev_sender; - int is_bidirect; + bool is_bidirect; /* create a private copy of the skb, as some functions change tq value * and/or flags. diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index b56bb00..a0c7913 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c @@ -38,11 +38,11 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, s32 n) * the last sequence number * @set_mark: whether this packet should be marked in seq_bits * - * Return: 1 if the window was moved (either new or very old), - * 0 if the window was not moved/shifted. + * Return: true if the window was moved (either new or very old), + * false if the window was not moved/shifted. */ -int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, s32 seq_num_diff, - int set_mark) +bool batadv_bit_get_packet(void *priv, unsigned long *seq_bits, + s32 seq_num_diff, int set_mark) { struct batadv_priv *bat_priv = priv; @@ -52,7 +52,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, s32 seq_num_diff, if (seq_num_diff <= 0 && seq_num_diff > -BATADV_TQ_LOCAL_WINDOW_SIZE) { if (set_mark) batadv_set_bit(seq_bits, -seq_num_diff); - return 0; + return false; } /* sequence number is slightly newer, so we shift the window and @@ -63,7 +63,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, s32 seq_num_diff, if (set_mark) batadv_set_bit(seq_bits, 0); - return 1; + return true; } /* sequence number is much newer, probably missed a lot of packets */ @@ -75,7 +75,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, s32 seq_num_diff, bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE); if (set_mark) batadv_set_bit(seq_bits, 0); - return 1; + return true; } /* received a much older packet. The other host either restarted @@ -94,5 +94,5 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, s32 seq_num_diff, if (set_mark) batadv_set_bit(seq_bits, 0); - return 1; + return true; } diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index 3e41bb8..f93cbc7 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -31,17 +31,17 @@ * @last_seqno: latest sequence number in seq_bits * @curr_seqno: sequence number to test for * - * Return: 1 if the corresponding bit in the given seq_bits indicates true - * and curr_seqno is within range of last_seqno. Otherwise returns 0. + * Return: true if the corresponding bit in the given seq_bits indicates true + * and curr_seqno is within range of last_seqno. Otherwise returns false. */ -static inline int batadv_test_bit(const unsigned long *seq_bits, - u32 last_seqno, u32 curr_seqno) +static inline bool batadv_test_bit(const unsigned long *seq_bits, + u32 last_seqno, u32 curr_seqno) { s32 diff; diff = last_seqno - curr_seqno; if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE) - return 0; + return false; return test_bit(diff, seq_bits) != 0; } @@ -55,7 +55,7 @@ static inline void batadv_set_bit(unsigned long *seq_bits, s32 n) set_bit(n, seq_bits); /* turn the position on */ } -int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, s32 seq_num_diff, - int set_mark); +bool batadv_bit_get_packet(void *priv, unsigned long *seq_bits, + s32 seq_num_diff, int set_mark); #endif /* _NET_BATMAN_ADV_BITARRAY_H_ */ diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 0a6c8b8..2170aa1 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -100,10 +100,10 @@ static inline u32 batadv_choose_backbone_gw(const void *data, u32 size) * @node: list node of the first entry to compare * @data2: pointer to the second backbone gateway * - * Return: 1 if the backbones have the same data, 0 otherwise + * Return: true if the backbones have the same data, false otherwise */ -static int batadv_compare_backbone_gw(const struct hlist_node *node, - const void *data2) +static bool batadv_compare_backbone_gw(const struct hlist_node *node, + const void *data2) { const void *data1 = container_of(node, struct batadv_bla_backbone_gw, hash_entry); @@ -111,12 +111,12 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, const struct batadv_bla_backbone_gw *gw2 = data2; if (!batadv_compare_eth(gw1->orig, gw2->orig)) - return 0; + return false; if (gw1->vid != gw2->vid) - return 0; + return false; - return 1; + return true; } /** @@ -124,10 +124,10 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, * @node: list node of the first entry to compare * @data2: pointer to the second claims * - * Return: 1 if the claim have the same data, 0 otherwise + * Return: true if the claim have the same data, 0 otherwise */ -static int batadv_compare_claim(const struct hlist_node *node, - const void *data2) +static bool batadv_compare_claim(const struct hlist_node *node, + const void *data2) { const void *data1 = container_of(node, struct batadv_bla_claim, hash_entry); @@ -135,12 +135,12 @@ static int batadv_compare_claim(const struct hlist_node *node, const struct batadv_bla_claim *cl2 = data2; if (!batadv_compare_eth(cl1->addr, cl2->addr)) - return 0; + return false; if (cl1->vid != cl2->vid) - return 0; + return false; - return 1; + return true; } /** @@ -735,22 +735,22 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, * @backbone_addr: originator address of the sender (Ethernet source MAC) * @vid: the VLAN ID of the frame * - * Return: 1 if handled + * Return: true if handled */ -static int batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, - u8 *backbone_addr, unsigned short vid) +static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, + u8 *backbone_addr, unsigned short vid) { struct batadv_bla_backbone_gw *backbone_gw; u16 backbone_crc, crc; if (memcmp(an_addr, batadv_announce_mac, 4) != 0) - return 0; + return false; backbone_gw = batadv_bla_get_backbone_gw(bat_priv, backbone_addr, vid, false); if (unlikely(!backbone_gw)) - return 1; + return true; /* handle as ANNOUNCE frame */ backbone_gw->lasttime = jiffies; @@ -783,7 +783,7 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, } batadv_backbone_gw_put(backbone_gw); - return 1; + return true; } /** @@ -794,29 +794,29 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, * @ethhdr: ethernet header of a packet * @vid: the VLAN ID of the frame * - * Return: 1 if handled + * Return: true if handled */ -static int batadv_handle_request(struct batadv_priv *bat_priv, - struct batadv_hard_iface *primary_if, - u8 *backbone_addr, struct ethhdr *ethhdr, - unsigned short vid) +static bool batadv_handle_request(struct batadv_priv *bat_priv, + struct batadv_hard_iface *primary_if, + u8 *backbone_addr, struct ethhdr *ethhdr, + unsigned short vid) { /* check for REQUEST frame */ if (!batadv_compare_eth(backbone_addr, ethhdr->h_dest)) - return 0; + return false; /* sanity check, this should not happen on a normal switch, * we ignore it in this case. */ if (!batadv_compare_eth(ethhdr->h_dest, primary_if->net_dev->dev_addr)) - return 1; + return true; batadv_dbg(BATADV_DBG_BLA, bat_priv, "handle_request(): REQUEST vid %d (sent by %pM)...\n", BATADV_PRINT_VID(vid), ethhdr->h_source); batadv_bla_answer_request(bat_priv, primary_if, vid); - return 1; + return true; } /** @@ -827,12 +827,12 @@ static int batadv_handle_request(struct batadv_priv *bat_priv, * @claim_addr: Client to be unclaimed (ARP sender HW MAC) * @vid: the VLAN ID of the frame * - * Return: 1 if handled + * Return: true if handled */ -static int batadv_handle_unclaim(struct batadv_priv *bat_priv, - struct batadv_hard_iface *primary_if, - u8 *backbone_addr, u8 *claim_addr, - unsigned short vid) +static bool batadv_handle_unclaim(struct batadv_priv *bat_priv, + struct batadv_hard_iface *primary_if, + u8 *backbone_addr, u8 *claim_addr, + unsigned short vid) { struct batadv_bla_backbone_gw *backbone_gw; @@ -845,7 +845,7 @@ static int batadv_handle_unclaim(struct batadv_priv *bat_priv, backbone_gw = batadv_backbone_hash_find(bat_priv, backbone_addr, vid); if (!backbone_gw) - return 1; + return true; /* this must be an UNCLAIM frame */ batadv_dbg(BATADV_DBG_BLA, bat_priv, @@ -854,7 +854,7 @@ static int batadv_handle_unclaim(struct batadv_priv *bat_priv, batadv_bla_del_claim(bat_priv, claim_addr, vid); batadv_backbone_gw_put(backbone_gw); - return 1; + return true; } /** @@ -865,12 +865,12 @@ static int batadv_handle_unclaim(struct batadv_priv *bat_priv, * @claim_addr: client mac address to be claimed (ARP sender HW MAC) * @vid: the VLAN ID of the frame * - * Return: 1 if handled + * Return: true if handled */ -static int batadv_handle_claim(struct batadv_priv *bat_priv, - struct batadv_hard_iface *primary_if, - u8 *backbone_addr, u8 *claim_addr, - unsigned short vid) +static bool batadv_handle_claim(struct batadv_priv *bat_priv, + struct batadv_hard_iface *primary_if, + u8 *backbone_addr, u8 *claim_addr, + unsigned short vid) { struct batadv_bla_backbone_gw *backbone_gw; @@ -880,7 +880,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv, false); if (unlikely(!backbone_gw)) - return 1; + return true; /* this must be a CLAIM frame */ batadv_bla_add_claim(bat_priv, claim_addr, vid, backbone_gw); @@ -891,7 +891,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv, /* TODO: we could call something like tt_local_del() here. */ batadv_backbone_gw_put(backbone_gw); - return 1; + return true; } /** @@ -975,12 +975,12 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, * @primary_if: the primary hard interface of this batman soft interface * @skb: the frame to be checked * - * Return: 1 if it was a claim frame, otherwise return 0 to + * Return: true if it was a claim frame, otherwise return false to * tell the callee that it can use the frame on its own. */ -static int batadv_bla_process_claim(struct batadv_priv *bat_priv, - struct batadv_hard_iface *primary_if, - struct sk_buff *skb) +static bool batadv_bla_process_claim(struct batadv_priv *bat_priv, + struct batadv_hard_iface *primary_if, + struct sk_buff *skb) { struct batadv_bla_claim_dst *bla_dst, *bla_dst_own; u8 *hw_src, *hw_dst; @@ -1011,7 +1011,7 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, vhdr = skb_header_pointer(skb, headlen, VLAN_HLEN, &vhdr_buf); if (!vhdr) - return 0; + return false; proto = vhdr->h_vlan_encapsulated_proto; headlen += VLAN_HLEN; @@ -1020,12 +1020,12 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, } if (proto != htons(ETH_P_ARP)) - return 0; /* not a claim frame */ + return false; /* not a claim frame */ /* this must be a ARP frame. check if it is a claim. */ if (unlikely(!pskb_may_pull(skb, headlen + arp_hdr_len(skb->dev)))) - return 0; + return false; /* pskb_may_pull() may have modified the pointers, get ethhdr again */ ethhdr = eth_hdr(skb); @@ -1035,13 +1035,13 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, * IP information */ if (arphdr->ar_hrd != htons(ARPHRD_ETHER)) - return 0; + return false; if (arphdr->ar_pro != htons(ETH_P_IP)) - return 0; + return false; if (arphdr->ar_hln != ETH_ALEN) - return 0; + return false; if (arphdr->ar_pln != 4) - return 0; + return false; hw_src = (u8 *)arphdr + sizeof(struct arphdr); hw_dst = hw_src + ETH_ALEN + 4; @@ -1051,14 +1051,14 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, /* check if it is a claim frame in general */ if (memcmp(bla_dst->magic, bla_dst_own->magic, sizeof(bla_dst->magic)) != 0) - return 0; + return false; /* check if there is a claim frame encapsulated deeper in (QinQ) and * drop that, as this is not supported by BLA but should also not be * sent via the mesh. */ if (vlan_depth > 1) - return 1; + return true; /* check if it is a claim frame. */ ret = batadv_check_claim_group(bat_priv, primary_if, hw_src, hw_dst, @@ -1070,7 +1070,7 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, hw_dst); if (ret < 2) - return ret; + return !!ret; /* become a backbone gw ourselves on this vlan if not happened yet */ batadv_bla_update_own_backbone_gw(bat_priv, primary_if, vid); @@ -1080,30 +1080,30 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, case BATADV_CLAIM_TYPE_CLAIM: if (batadv_handle_claim(bat_priv, primary_if, hw_src, ethhdr->h_source, vid)) - return 1; + return true; break; case BATADV_CLAIM_TYPE_UNCLAIM: if (batadv_handle_unclaim(bat_priv, primary_if, ethhdr->h_source, hw_src, vid)) - return 1; + return true; break; case BATADV_CLAIM_TYPE_ANNOUNCE: if (batadv_handle_announce(bat_priv, hw_src, ethhdr->h_source, vid)) - return 1; + return true; break; case BATADV_CLAIM_TYPE_REQUEST: if (batadv_handle_request(bat_priv, primary_if, hw_src, ethhdr, vid)) - return 1; + return true; break; } batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_process_claim(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n", ethhdr->h_source, BATADV_PRINT_VID(vid), hw_src, hw_dst); - return 1; + return true; } /** @@ -1442,15 +1442,16 @@ int batadv_bla_init(struct batadv_priv *bat_priv) * sent by another host, drop it. We allow equal packets from * the same host however as this might be intended. * - * Return: 1 if a packet is in the duplicate list, 0 otherwise. + * Return: true if a packet is in the duplicate list, false otherwise. */ -int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, - struct sk_buff *skb) +bool batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, + struct sk_buff *skb) { - int i, curr, ret = 0; + int i, curr; __be32 crc; struct batadv_bcast_packet *bcast_packet; struct batadv_bcast_duplist_entry *entry; + bool ret = false; bcast_packet = (struct batadv_bcast_packet *)skb->data; @@ -1478,9 +1479,9 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, continue; /* this entry seems to match: same crc, not too old, - * and from another gw. therefore return 1 to forbid it. + * and from another gw. therefore return true to forbid it. */ - ret = 1; + ret = true; goto out; } /* not found, add a new entry (overwrite the oldest entry) @@ -1546,21 +1547,21 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig, * @orig_node: the orig_node of the frame * @hdr_size: maximum length of the frame * - * Return: 1 if the orig_node is also a gateway on the soft interface, otherwise - * it returns 0. + * Return: true if the orig_node is also a gateway on the soft interface, + * otherwise it returns false. */ -int batadv_bla_is_backbone_gw(struct sk_buff *skb, - struct batadv_orig_node *orig_node, int hdr_size) +bool batadv_bla_is_backbone_gw(struct sk_buff *skb, + struct batadv_orig_node *orig_node, int hdr_size) { struct batadv_bla_backbone_gw *backbone_gw; unsigned short vid; if (!atomic_read(&orig_node->bat_priv->bridge_loop_avoidance)) - return 0; + return false; /* first, find out the vid. */ if (!pskb_may_pull(skb, hdr_size + ETH_HLEN)) - return 0; + return false; vid = batadv_get_vid(skb, hdr_size); @@ -1568,10 +1569,10 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, backbone_gw = batadv_backbone_hash_find(orig_node->bat_priv, orig_node->orig, vid); if (!backbone_gw) - return 0; + return false; batadv_backbone_gw_put(backbone_gw); - return 1; + return true; } /** @@ -1614,16 +1615,16 @@ void batadv_bla_free(struct batadv_priv *bat_priv) * * in these cases, the skb is further handled by this function * - * Return: 1 if handled, otherwise it returns 0 and the caller shall further - * process the skb. + * Return: true if handled, otherwise it returns false and the caller shall + * further process the skb. */ -int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, - unsigned short vid, bool is_bcast) +bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid, bool is_bcast) { struct ethhdr *ethhdr; struct batadv_bla_claim search_claim, *claim = NULL; struct batadv_hard_iface *primary_if; - int ret; + bool ret; ethhdr = eth_hdr(skb); @@ -1682,12 +1683,12 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, } allow: batadv_bla_update_own_backbone_gw(bat_priv, primary_if, vid); - ret = 0; + ret = false; goto out; handled: kfree_skb(skb); - ret = 1; + ret = true; out: if (primary_if) @@ -1711,16 +1712,16 @@ out: * * This call might reallocate skb data. * - * Return: 1 if handled, otherwise it returns 0 and the caller shall further - * process the skb. + * Return: true if handled, otherwise it returns false and the caller shall + * further process the skb. */ -int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, - unsigned short vid) +bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid) { struct ethhdr *ethhdr; struct batadv_bla_claim search_claim, *claim = NULL; struct batadv_hard_iface *primary_if; - int ret = 0; + bool ret = false; primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) @@ -1774,10 +1775,10 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, } allow: batadv_bla_update_own_backbone_gw(bat_priv, primary_if, vid); - ret = 0; + ret = false; goto out; handled: - ret = 1; + ret = true; out: if (primary_if) batadv_hardif_put(primary_if); diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 579f0fa..0f01dae 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -27,19 +27,20 @@ struct seq_file; struct sk_buff; #ifdef CONFIG_BATMAN_ADV_BLA -int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, - unsigned short vid, bool is_bcast); -int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, - unsigned short vid); -int batadv_bla_is_backbone_gw(struct sk_buff *skb, - struct batadv_orig_node *orig_node, int hdr_size); +bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid, bool is_bcast); +bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid); +bool batadv_bla_is_backbone_gw(struct sk_buff *skb, + struct batadv_orig_node *orig_node, + int hdr_size); int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset); bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig, unsigned short vid); -int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, - struct sk_buff *skb); +bool batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, + struct sk_buff *skb); void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, struct batadv_hard_iface *primary_if, struct batadv_hard_iface *oldif); @@ -50,24 +51,24 @@ void batadv_bla_free(struct batadv_priv *bat_priv); #define BATADV_BLA_CRC_INIT 0 #else /* ifdef CONFIG_BATMAN_ADV_BLA */ -static inline int batadv_bla_rx(struct batadv_priv *bat_priv, - struct sk_buff *skb, unsigned short vid, - bool is_bcast) +static inline bool batadv_bla_rx(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + bool is_bcast) { - return 0; + return false; } -static inline int batadv_bla_tx(struct batadv_priv *bat_priv, - struct sk_buff *skb, unsigned short vid) +static inline bool batadv_bla_tx(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid) { - return 0; + return false; } -static inline int batadv_bla_is_backbone_gw(struct sk_buff *skb, - struct batadv_orig_node *orig_node, - int hdr_size) +static inline bool batadv_bla_is_backbone_gw(struct sk_buff *skb, + struct batadv_orig_node *orig_node, + int hdr_size) { - return 0; + return false; } static inline int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, @@ -88,11 +89,11 @@ static inline bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, return false; } -static inline int +static inline bool batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct sk_buff *skb) { - return 0; + return false; } static inline void diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 48253cf..3dc5208 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -134,7 +134,7 @@ static int batadv_log_release(struct inode *inode, struct file *file) return 0; } -static int batadv_log_empty(struct batadv_priv_debug_log *debug_log) +static bool batadv_log_empty(struct batadv_priv_debug_log *debug_log) { return !(debug_log->log_start - debug_log->log_end); } diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e96d7c7..919a8d2 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -165,14 +165,14 @@ static void batadv_dat_purge(struct work_struct *work) * @node: node in the local table * @data2: second object to compare the node to * - * Return: 1 if the two entries are the same, 0 otherwise. + * Return: true if the two entries are the same, false otherwise. */ -static int batadv_compare_dat(const struct hlist_node *node, const void *data2) +static bool batadv_compare_dat(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_dat_entry, hash_entry); - return memcmp(data1, data2, sizeof(__be32)) == 0 ? 1 : 0; + return memcmp(data1, data2, sizeof(__be32)) == 0; } /** diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index b22b277..3240a67 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -146,22 +146,22 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) return ret; } -static int batadv_is_valid_iface(const struct net_device *net_dev) +static bool batadv_is_valid_iface(const struct net_device *net_dev) { if (net_dev->flags & IFF_LOOPBACK) - return 0; + return false; if (net_dev->type != ARPHRD_ETHER) - return 0; + return false; if (net_dev->addr_len != ETH_ALEN) - return 0; + return false; /* no batman over batman */ if (batadv_is_on_batman_iface(net_dev)) - return 0; + return false; - return 1; + return true; } /** @@ -650,8 +650,7 @@ batadv_hardif_add_interface(struct net_device *net_dev) ASSERT_RTNL(); - ret = batadv_is_valid_iface(net_dev); - if (ret != 1) + if (!batadv_is_valid_iface(net_dev)) goto out; dev_hold(net_dev); diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index 9bb57b8..cbbf870 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@ -32,10 +32,10 @@ struct lock_class_key; /* callback to a compare function. should compare 2 element datas for their * keys * - * Return: 0 if same and not 0 if not same + * Return: true if same and false if not same */ -typedef int (*batadv_hashdata_compare_cb)(const struct hlist_node *, - const void *); +typedef bool (*batadv_hashdata_compare_cb)(const struct hlist_node *, + const void *); /* the hashfunction * diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index db45336..e602408 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -288,7 +288,7 @@ static inline void _batadv_dbg(int type __always_unused, * * note: can't use ether_addr_equal() as it requires aligned memory * - * Return: 1 if they are the same ethernet addr + * Return: true if they are the same ethernet addr */ static inline bool batadv_compare_eth(const void *data1, const void *data2) { diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index b41719b..32f9fa1 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -510,10 +510,10 @@ static u32 batadv_nc_hash_choose(const void *data, u32 size) * @node: node in the local table * @data2: second object to compare the node to * - * Return: 1 if the two entry are the same, 0 otherwise + * Return: true if the two entry are the same, false otherwise */ -static int batadv_nc_hash_compare(const struct hlist_node *node, - const void *data2) +static bool batadv_nc_hash_compare(const struct hlist_node *node, + const void *data2) { const struct batadv_nc_path *nc_path1, *nc_path2; @@ -523,13 +523,13 @@ static int batadv_nc_hash_compare(const struct hlist_node *node, /* Return 1 if the two keys are identical */ if (memcmp(nc_path1->prev_hop, nc_path2->prev_hop, sizeof(nc_path1->prev_hop)) != 0) - return 0; + return false; if (memcmp(nc_path1->next_hop, nc_path2->next_hop, sizeof(nc_path1->next_hop)) != 0) - return 0; + return false; - return 1; + return true; } /** diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index e4cbb07..e63d6a5 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -54,9 +54,9 @@ static void batadv_purge_orig(struct work_struct *work); * @node: node in the local table * @data2: second object to compare the node to * - * Return: 1 if they are the same originator + * Return: true if they are the same originator */ -int batadv_compare_orig(const struct hlist_node *node, const void *data2) +bool batadv_compare_orig(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_orig_node, hash_entry); diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 4e8b67f..64a8951 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -33,7 +33,7 @@ struct seq_file; -int batadv_compare_orig(const struct hlist_node *node, const void *data2); +bool batadv_compare_orig(const struct hlist_node *node, const void *data2); int batadv_originator_init(struct batadv_priv *bat_priv); void batadv_originator_free(struct batadv_priv *bat_priv); void batadv_purge_orig_ref(struct batadv_priv *bat_priv); diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 4dd646a..45093c6 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -154,18 +154,18 @@ out: * doesn't change otherwise. * * Return: - * 0 if the packet is to be accepted. - * 1 if the packet is to be ignored. + * false if the packet is to be accepted. + * true if the packet is to be ignored. */ -int batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff, - s32 seq_old_max_diff, unsigned long *last_reset, - bool *protection_started) +bool batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff, + s32 seq_old_max_diff, unsigned long *last_reset, + bool *protection_started) { if (seq_num_diff <= -seq_old_max_diff || seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) { if (!batadv_has_timed_out(*last_reset, BATADV_RESET_PROTECTION_MS)) - return 1; + return true; *last_reset = jiffies; if (protection_started) @@ -174,7 +174,7 @@ int batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff, "old packet received, start protection\n"); } - return 0; + return false; } bool batadv_check_management_packet(struct sk_buff *skb, @@ -709,8 +709,9 @@ out: return ret; } -static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, - struct sk_buff *skb, int hdr_len) { +static bool batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, + struct sk_buff *skb, int hdr_len) +{ struct batadv_unicast_packet *unicast_packet; struct batadv_hard_iface *primary_if; struct batadv_orig_node *orig_node; @@ -721,11 +722,11 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, /* check if there is enough data before accessing it */ if (!pskb_may_pull(skb, hdr_len + ETH_HLEN)) - return 0; + return false; /* create a copy of the skb (in case of for re-routing) to modify it. */ if (skb_cow(skb, sizeof(*unicast_packet)) < 0) - return 0; + return false; unicast_packet = (struct batadv_unicast_packet *)skb->data; vid = batadv_get_vid(skb, hdr_len); @@ -749,7 +750,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, * table. If not, let the packet go untouched anyway because * there is nothing the node can do */ - return 1; + return true; } /* retrieve the TTVN known by this node for the packet destination. This @@ -765,7 +766,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, * not be possible to deliver it */ if (!orig_node) - return 0; + return false; curr_ttvn = (u8)atomic_read(&orig_node->last_ttvn); batadv_orig_node_put(orig_node); @@ -776,7 +777,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, */ is_old_ttvn = batadv_seq_before(unicast_packet->ttvn, curr_ttvn); if (!is_old_ttvn) - return 1; + return true; old_ttvn = unicast_packet->ttvn; /* the packet was forged based on outdated network information. Its @@ -789,7 +790,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n", unicast_packet->dest, ethhdr->h_dest, old_ttvn, curr_ttvn); - return 1; + return true; } /* the packet has not been re-routed: either the destination is @@ -797,14 +798,14 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, * it is possible to drop the packet */ if (!batadv_is_my_client(bat_priv, ethhdr->h_dest, vid)) - return 0; + return false; /* update the header in order to let the packet be delivered to this * node's soft interface */ primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) - return 0; + return false; ether_addr_copy(unicast_packet->dest, primary_if->net_dev->dev_addr); @@ -812,7 +813,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, unicast_packet->ttvn = curr_ttvn; - return 1; + return true; } /** diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 02a5caa..05c3ff4 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h @@ -51,8 +51,8 @@ struct batadv_neigh_node * batadv_find_router(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, struct batadv_hard_iface *recv_if); -int batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff, - s32 seq_old_max_diff, unsigned long *last_reset, - bool *protection_started); +bool batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff, + s32 seq_old_max_diff, unsigned long *last_reset, + bool *protection_started); #endif /* _NET_BATMAN_ADV_ROUTING_H_ */ diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 0710379..7679f3a 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1025,12 +1025,12 @@ static void batadv_softif_destroy_netlink(struct net_device *soft_iface, unregister_netdevice_queue(soft_iface, head); } -int batadv_softif_is_valid(const struct net_device *net_dev) +bool batadv_softif_is_valid(const struct net_device *net_dev) { if (net_dev->netdev_ops->ndo_start_xmit == batadv_interface_tx) - return 1; + return true; - return 0; + return false; } struct rtnl_link_ops batadv_link_ops __read_mostly = { diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 9ae2657..417d30a 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -31,7 +31,7 @@ void batadv_interface_rx(struct net_device *soft_iface, int hdr_size, struct batadv_orig_node *orig_node); struct net_device *batadv_softif_create(const char *name); void batadv_softif_destroy_sysfs(struct net_device *soft_iface); -int batadv_softif_is_valid(const struct net_device *net_dev); +bool batadv_softif_is_valid(const struct net_device *net_dev); extern struct rtnl_link_ops batadv_link_ops; int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid); void batadv_softif_vlan_put(struct batadv_softif_vlan *softif_vlan); diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0b43e86..2ed55f4 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -76,9 +76,9 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, * * Compare the MAC address and the VLAN ID of the two TT entries and check if * they are the same TT client. - * Return: 1 if the two TT clients are the same, 0 otherwise + * Return: true if the two TT clients are the same, false otherwise */ -static int batadv_compare_tt(const struct hlist_node *node, const void *data2) +static bool batadv_compare_tt(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_tt_common_entry, hash_entry); @@ -2388,19 +2388,19 @@ unlock: * @entry_ptr: to be checked local tt entry * @data_ptr: not used but definition required to satisfy the callback prototype * - * Return: 1 if the entry is a valid, 0 otherwise. + * Return: true if the entry is a valid, false otherwise. */ -static int batadv_tt_local_valid(const void *entry_ptr, const void *data_ptr) +static bool batadv_tt_local_valid(const void *entry_ptr, const void *data_ptr) { const struct batadv_tt_common_entry *tt_common_entry = entry_ptr; if (tt_common_entry->flags & BATADV_TT_CLIENT_NEW) - return 0; - return 1; + return false; + return true; } -static int batadv_tt_global_valid(const void *entry_ptr, - const void *data_ptr) +static bool batadv_tt_global_valid(const void *entry_ptr, + const void *data_ptr) { const struct batadv_tt_common_entry *tt_common_entry = entry_ptr; const struct batadv_tt_global_entry *tt_global_entry; @@ -2408,7 +2408,7 @@ static int batadv_tt_global_valid(const void *entry_ptr, if (tt_common_entry->flags & BATADV_TT_CLIENT_ROAM || tt_common_entry->flags & BATADV_TT_CLIENT_TEMP) - return 0; + return false; tt_global_entry = container_of(tt_common_entry, struct batadv_tt_global_entry, @@ -2430,7 +2430,8 @@ static int batadv_tt_global_valid(const void *entry_ptr, static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, struct batadv_hashtable *hash, void *tvlv_buff, u16 tt_len, - int (*valid_cb)(const void *, const void *), + bool (*valid_cb)(const void *, + const void *), void *cb_data) { struct batadv_tt_common_entry *tt_common_entry; @@ -2579,11 +2580,11 @@ static void batadv_tt_global_update_crc(struct batadv_priv *bat_priv, * * Return: true if the TT Request was sent, false otherwise */ -static int batadv_send_tt_request(struct batadv_priv *bat_priv, - struct batadv_orig_node *dst_orig_node, - u8 ttvn, - struct batadv_tvlv_tt_vlan_data *tt_vlan, - u16 num_vlan, bool full_table) +static bool batadv_send_tt_request(struct batadv_priv *bat_priv, + struct batadv_orig_node *dst_orig_node, + u8 ttvn, + struct batadv_tvlv_tt_vlan_data *tt_vlan, + u16 num_vlan, bool full_table) { struct batadv_tvlv_tt_data *tvlv_tt_data = NULL; struct batadv_tt_req_node *tt_req_node = NULL;

7 years

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix kerneldoc for batadv_compare_claim

by Sven Eckelmann

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bridge_loop_avoidance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 0a6c8b8..ac42504 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -120,7 +120,7 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, } /** - * batadv_compare_backbone_gw - compare address and vid of two claims + * batadv_compare_claim - compare address and vid of two claims * @node: list node of the first entry to compare * @data2: pointer to the second claims * -- 2.7.0

7 years

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Fix unexpected free of bcast_own on add_if error

by Sven Eckelmann

The function batadv_iv_ogm_orig_add_if allocates new buffers for bcast_own and bcast_own_sum. It is expected that these buffers are unchanged in case either bcast_own or bcast_own_sum couldn't be resized. But the error handling of this function frees the already resized buffer for bcast_own when the allocation of the new bcast_own_sum buffer failed. This will lead to an invalid memory access when some code will try to access bcast_own. Instead the resized new bcast_own buffer has to be kept. This will not lead to problems because the size of the buffer was only increased and therefore no user of the buffer will try to access bytes outside of the new buffer. Fixes: fdafa7d29ace ("batman-adv: provide orig_node routing API") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bat_iv_ogm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index cb2d1b9..af8bd86 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -156,10 +156,8 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, orig_node->bat_iv.bcast_own = data_ptr; data_ptr = kmalloc_array(max_if_num, sizeof(u8), GFP_ATOMIC); - if (!data_ptr) { - kfree(orig_node->bat_iv.bcast_own); + if (!data_ptr) goto unlock; - } memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, (max_if_num - 1) * sizeof(u8)); -- 2.7.0

7 years

[B.A.T.M.A.N.] [RFC 0/5] batman-adv: Throughput meter

by Sven Eckelmann

Hi, do you still remember GSOC 2012? Yes, it is really long ago. It was a time when winters were still cold, summers still hot and it was still politically correct to say "bandwidth meter" when you actually meant "throughput meter". Three students tried their best to implement some of the ideas floating around in the B.A.T.M.A.N. advanced community. And after some more work, most of the features reached the finishing line. TVLV [1] and the fragmentation v2 [2] were both integrated as part of the COMPAT 15 bump. But the "bandwidth meter" [3] was never ready to being merged. Nevertheless, the lessons learned in the first implementation [4] inspired different people to continue working on it. Especially Antonio Quartulli worked on his own version to increase its usefulness. And this feature makes even more sense since we reached the new "throughput based metric" time epoch with the introduction of B.A.T.M.A.N. V. I hope we can reignite interest in this feature with a rebased and refurbished version of this patchset. Both the batman-adv and batctl patches are based on the newest revision in their respective master branches. Also a branch called "tp_meter" was created in the batctl.git and batman-adv.git repository with these patches already applied. batman-adv ========== Antonio Quartulli (2): batman-adv: return netdev status in the TX path batman-adv: use another ICMP packet when sending command from userspace batman-adv: throughput meter implementation Sven Eckelmann (1): batman-adv: Add compatibility code for to_delayed_work compat-include/linux/netdevice.h | 17 + compat-include/linux/workqueue.h | 46 ++ net/batman-adv/Makefile | 1 + net/batman-adv/fragmentation.c | 41 +- net/batman-adv/fragmentation.h | 6 +- net/batman-adv/icmp_socket.c | 225 +++--- net/batman-adv/icmp_socket.h | 5 +- net/batman-adv/main.c | 6 +- net/batman-adv/main.h | 24 +- net/batman-adv/packet.h | 120 ++++ net/batman-adv/routing.c | 33 +- net/batman-adv/send.c | 25 +- net/batman-adv/soft-interface.c | 2 + net/batman-adv/tp_meter.c | 1451 ++++++++++++++++++++++++++++++++++++++ net/batman-adv/tp_meter.h | 34 + net/batman-adv/types.h | 113 +++ 16 files changed, 2005 insertions(+), 144 deletions(-) batctl ====== Antonio Quartulli (1): batctl: introduce throughput meter support Makefile | 2 +- main.c | 6 ++ man/batctl.8 | 24 ++++++- packet.h | 120 +++++++++++++++++++++++++++++++ tcpdump.c | 14 +++- tp_meter.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tp_meter.h | 22 ++++++ 7 files changed, 411 insertions(+), 4 deletions(-) Kind regards, Sven [1] https://www.open-mesh.org/projects/open-mesh/wiki/2012-10-01-GSoC-2012-Spyr… [2] https://www.open-mesh.org/projects/open-mesh/wiki/2012-09-24-GSoC-2012-Mart… [3] https://www.open-mesh.org/projects/open-mesh/wiki/2012-10-06-GSoC-2012-Edo-… [4] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2012-August/007924.html

7 years

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N February 2016