B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: Only fail in debugfs when kernel has debugfs support
by Sven Eckelmann 22 May '10

22 May '10

Linux allows to call debugfs related functions even when it is not compiled in. The return codes will always be failure return codes and we would fail to load the batman-adv module even when debugfs isn't a hard dependency. We can simply return a success error code when the debugfs stub returned a error code and the kernel was compiled without debugfs support. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/bat_debugfs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/batman-adv-kernelland/bat_debugfs.c b/batman-adv-kernelland/bat_debugfs.c index 9113601..bc1591f 100644 --- a/batman-adv-kernelland/bat_debugfs.c +++ b/batman-adv-kernelland/bat_debugfs.c @@ -141,7 +141,11 @@ rem_attr: debugfs_remove_recursive(bat_priv->debug_dir); bat_priv->debug_dir = NULL; out: +#ifdef CONFIG_DEBUG_FS return -ENOMEM; +#else + return 0; +#endif /* CONFIG_DEBUG_FS */ } void debugfs_del_meshif(struct net_device *dev) -- 1.7.1

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
by Sven Eckelmann 22 May '10

22 May '10

From: Tejun Heo <tj(a)kernel.org> percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj(a)kernel.org> Guess-its-ok-by: Christoph Lameter <cl(a)linux-foundation.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn(a)hp.com> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/icmp_socket.c | 1 + batman-adv-kernelland/main.h | 1 + batman-adv-kernelland/soft-interface.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/batman-adv-kernelland/icmp_socket.c b/batman-adv-kernelland/icmp_socket.c index becbb5b..bad87fd 100644 --- a/batman-adv-kernelland/icmp_socket.c +++ b/batman-adv-kernelland/icmp_socket.c @@ -20,6 +20,7 @@ */ #include <linux/debugfs.h> +#include <linux/slab.h> #include "main.h" #include "icmp_socket.h" #include "send.h" diff --git a/batman-adv-kernelland/main.h b/batman-adv-kernelland/main.h index ef2cbfd..4d7cc2a 100644 --- a/batman-adv-kernelland/main.h +++ b/batman-adv-kernelland/main.h @@ -121,6 +121,7 @@ extern int bat_debug_type(int type); #include <linux/kthread.h> /* kernel threads */ #include <linux/pkt_sched.h> /* schedule types */ #include <linux/workqueue.h> /* workqueue */ +#include <linux/slab.h> #include <net/sock.h> /* struct sock */ #include <linux/jiffies.h> #include <linux/seq_file.h> diff --git a/batman-adv-kernelland/soft-interface.c b/batman-adv-kernelland/soft-interface.c index b51e2cf..e7a440e 100644 --- a/batman-adv-kernelland/soft-interface.c +++ b/batman-adv-kernelland/soft-interface.c @@ -27,6 +27,7 @@ #include "translation-table.h" #include "types.h" #include "hash.h" +#include <linux/slab.h> #include "gateway_client.h" #include <linux/ethtool.h> #include <linux/etherdevice.h> -- 1.7.1

2 1

[B.A.T.M.A.N.] sysfs & debugfs
by Marek Lindner 22 May '10

22 May '10

Hi, thanks to Sven's patches we made the transition to debugfs rather quickly. All batman tables (originator table / gateway table / translation tables) and the vis data output have been relocated to debugfs. Even the former batman device (used for layer2 icmp data) has been moved to debugfs which brings us an important step closer to the multiple mesh support. @Andrew: I attached the revised sysfs ABI files. Do you think it is feasible to get these last patches into 2.6.35 ? Cheers, Marek

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Don't allocate icmp packet with GFP_KERNEL
by Sven Eckelmann 21 May '10

21 May '10

A new buffer for a packet is created when a icmp packet is received. This happens in a context with disabled irq. Thus we are not allowed to sleep or call function which might sleep. kmalloc must be called with GFP_ATOMIC instead of GFP_KERNEL to ensure that it does not sleep. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/icmp_socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv-kernelland/icmp_socket.c b/batman-adv-kernelland/icmp_socket.c index 33d2714..becbb5b 100644 --- a/batman-adv-kernelland/icmp_socket.c +++ b/batman-adv-kernelland/icmp_socket.c @@ -292,7 +292,7 @@ static void bat_socket_add_packet(struct socket_client *socket_client, struct socket_packet *socket_packet; unsigned long flags; - socket_packet = kmalloc(sizeof(struct socket_packet), GFP_KERNEL); + socket_packet = kmalloc(sizeof(struct socket_packet), GFP_ATOMIC); if (!socket_packet) return; -- 1.7.1

2 2

[B.A.T.M.A.N.] Converting from /dev to debugfs
by Sven Eckelmann 21 May '10

21 May '10

Hi, we had decided that different files must move from sysfs to debugfs in recent discussion with gregkh. But their was also the problem that we currently use /dev/batman-adv to send special batman-adv "icmp" packets to the mesh. This file is maybe a problem when we want to support different batX interfaces on a single machine. So we have the problem that we want to move different files to debugfs and get support for it in batctl. It seemed to be easier (better readable) for me to first start to get a single file to debugfs and then build on top of the created infrastructure in batctl/batman-adv-kernelland to move more files. My choice was /dev/batman-adv as we had some open question how good it works with debugfs. Unfortunately I am not able to continue it today, but don't want to stop other people working on similar things. I will attach v0 (aka works for me, but maybe not perfect/good enough) versions of these patches to support them. Please feel free to discuss the patches. Best regards, Sven

2 15

[B.A.T.M.A.N.] [PATCH] batman-adv: Don't call free_netdev twice
by Sven Eckelmann 21 May '10

21 May '10

Free_netdev is registered as destructor in interface_setup for every soft_device. This destructor is automatically called from unregister_netdev and we must not call it again for the freed net_device. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/batman-adv-kernelland/main.c b/batman-adv-kernelland/main.c index 51856a7..c9132c0 100644 --- a/batman-adv-kernelland/main.c +++ b/batman-adv-kernelland/main.c @@ -130,6 +130,9 @@ unreg_sysfs: sysfs_del_meshif(soft_device); unreg_soft_device: unregister_netdev(soft_device); + soft_device = NULL; + return -ENOMEM; + free_soft_device: free_netdev(soft_device); soft_device = NULL; -- 1.7.1

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Call unregister_netdev on failures to get rtnl lock
by Sven Eckelmann 21 May '10

21 May '10

We must call unregister_netdev when we couldn't initialise the batman-adv module and the soft_device was registered. There are two version of the function which we can use: * unregister_netdevice - removes device * unregister_netdev - takes rtnl semaphore and remove device We don't hold the semaphore in a error case. So we must use unregister_netdev. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv-kernelland/main.c b/batman-adv-kernelland/main.c index cbabba6..51856a7 100644 --- a/batman-adv-kernelland/main.c +++ b/batman-adv-kernelland/main.c @@ -129,7 +129,7 @@ int init_module(void) unreg_sysfs: sysfs_del_meshif(soft_device); unreg_soft_device: - unregister_netdevice(soft_device); + unregister_netdev(soft_device); free_soft_device: free_netdev(soft_device); soft_device = NULL; -- 1.7.1

2 2

[B.A.T.M.A.N.] [PATCHv3] batctl: Correct mdev calculation in ping subcommand
by Daniel Seither 21 May '10

21 May '10

Fixes the calculation of the mean absolute deviation (mdev) of the roundtrip times. mdev was previously calculated by computing the difference of maximum and minimum round trip times. The calculation is now done using the same formula as in the iputils ping program. Signed-off-by: Daniel Seither <post(a)tiwoc.de> --- Index: Makefile =================================================================== --- Makefile (revision 1659) +++ Makefile (working copy) @@ -28,7 +28,7 @@ CC = gcc CFLAGS += -pedantic -Wall -W -g3 -std=gnu99 -Os -fno-strict-aliasing EXTRA_CFLAGS = -DREVISION_VERSION=$(REVISION_VERSION) -LDFLAGS += +LDFLAGS += -lm SBINDIR = $(INSTALL_PREFIX)/usr/sbin Index: ping.c =================================================================== --- ping.c (revision 1659) +++ ping.c (working copy) @@ -29,6 +29,7 @@ #include <signal.h> #include <fcntl.h> #include <string.h> +#include <math.h> #include "main.h" #include "ping.h" @@ -76,7 +77,7 @@ unsigned int seq_counter = 0, packets_out = 0, packets_in = 0, packets_loss; char *dst_string, *mac_string, *rr_string; double time_delta; - float min = 0.0, max = 0.0, avg = 0.0; + float min = 0.0, max = 0.0, avg = 0.0, mdev = 0.0; uint8_t last_rr_cur = 0, last_rr[BAT_RR_LEN][ETH_ALEN]; size_t packet_len; @@ -260,6 +261,7 @@ if (time_delta > max) max = time_delta; avg += time_delta; + mdev += time_delta * time_delta; packets_in++; break; case DESTINATION_UNREACHABLE: @@ -289,11 +291,24 @@ else packets_loss = ((packets_out - packets_in) * 100) / packets_out; + if (packets_in) { + avg /= packets_in; + mdev /= packets_in; + mdev = mdev - avg * avg; + if (mdev > 0.0) + mdev = sqrt(mdev); + else + mdev = 0.0; + } else { + avg = 0.0; + mdev = 0.0; + } + printf("--- %s ping statistics ---\n", dst_string); printf("%u packets transmitted, %u received, %u%% packet loss\n", packets_out, packets_in, packets_loss); printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n", - min, (packets_in ? (avg / packets_in) : 0.000), max, (max - min)); + min, avg, max, mdev); ret = EXIT_SUCCESS;

3 2

[B.A.T.M.A.N.] [PATCHv2] batctl: Correct mdev calculation in ping subcommand
by Daniel Seither 20 May '10

20 May '10

Fixes the calculation of the mean absolute deviation (mdev) of the roundtrip times. mdev was previously calculated by computing the difference of maximum and minimum round trip times. The calculation is now done using the same formula as in the iputils ping program. Signed-off-by: Daniel Seither <post(a)tiwoc.de> --- Index: Makefile =================================================================== --- Makefile (revision 1659) +++ Makefile (working copy) @@ -28,7 +28,7 @@ CC = gcc CFLAGS += -pedantic -Wall -W -g3 -std=gnu99 -Os -fno-strict-aliasing EXTRA_CFLAGS = -DREVISION_VERSION=$(REVISION_VERSION) -LDFLAGS += +LDFLAGS += -lm SBINDIR = $(INSTALL_PREFIX)/usr/sbin Index: ping.c =================================================================== --- ping.c (revision 1659) +++ ping.c (working copy) @@ -29,6 +29,7 @@ #include <signal.h> #include <fcntl.h> #include <string.h> +#include <math.h> #include "main.h" #include "ping.h" @@ -76,7 +77,7 @@ unsigned int seq_counter = 0, packets_out = 0, packets_in = 0, packets_loss; char *dst_string, *mac_string, *rr_string; double time_delta; - float min = 0.0, max = 0.0, avg = 0.0; + float min = 0.0, max = 0.0, avg = 0.0, mdev = 0.0; uint8_t last_rr_cur = 0, last_rr[BAT_RR_LEN][ETH_ALEN]; size_t packet_len; @@ -260,6 +261,7 @@ if (time_delta > max) max = time_delta; avg += time_delta; + mdev += time_delta * time_delta; packets_in++; break; case DESTINATION_UNREACHABLE: @@ -289,11 +291,20 @@ else packets_loss = ((packets_out - packets_in) * 100) / packets_out; + if (packets_in) { + avg /= packets_in; + mdev /= packets_in; + mdev = sqrt(mdev - avg * avg); + } else { + avg = 0.0; + mdev = 0.0; + } + printf("--- %s ping statistics ---\n", dst_string); printf("%u packets transmitted, %u received, %u%% packet loss\n", packets_out, packets_in, packets_loss); printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n", - min, (packets_in ? (avg / packets_in) : 0.000), max, (max - min)); + min, avg, max, mdev); ret = EXIT_SUCCESS;

2 4

[B.A.T.M.A.N.] [PATCH] batctl: Correct mdev calculation in ping subcommand
by Daniel Seither 20 May '10

20 May '10

Fixes the calculation of the mean absolute deviation (mdev) of the roundtrip times. mdev was previously calculated by computing the difference of maximum and minimum round trip times. The calculation is now done using the same formula as in the iputils ping program. Signed-off-by: Daniel Seither <post(a)tiwoc.de> --- Index: ping.c =================================================================== --- ping.c (revision 1659) +++ ping.c (working copy) @@ -76,7 +76,7 @@ unsigned int seq_counter = 0, packets_out = 0, packets_in = 0, packets_loss; char *dst_string, *mac_string, *rr_string; double time_delta; - float min = 0.0, max = 0.0, avg = 0.0; + float min = 0.0, max = 0.0, avg = 0.0, mdev = 0.0; uint8_t last_rr_cur = 0, last_rr[BAT_RR_LEN][ETH_ALEN]; size_t packet_len; @@ -260,6 +260,7 @@ if (time_delta > max) max = time_delta; avg += time_delta; + mdev += time_delta * time_delta; packets_in++; break; case DESTINATION_UNREACHABLE: @@ -289,11 +290,20 @@ else packets_loss = ((packets_out - packets_in) * 100) / packets_out; + if (packets_in) { + avg /= packets_in; + mdev /= packets_in; + mdev = sqrt(mdev - avg * avg); + } else { + avg = 0.0; + mdev = 0.0; + } + printf("--- %s ping statistics ---\n", dst_string); printf("%u packets transmitted, %u received, %u%% packet loss\n", packets_out, packets_in, packets_loss); printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n", - min, (packets_in ? (avg / packets_in) : 0.000), max, (max - min)); + min, avg, max, mdev); ret = EXIT_SUCCESS;

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