B.A.T.M.A.N May 2010

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

15 participants
27 discussions

[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

[B.A.T.M.A.N.] Win-Installer and Gui
by Max 19 May '10

19 May '10

Hi, when will come a windows 7 installer out and a graphical gui, to scan the wlan users in the neighbourhood, to test, if batman can connect?

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: remove all rcu head initializations
by Sven Eckelmann 17 May '10

17 May '10

From: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Remove all rcu head inits. We don't care about the RCU head state before passing it to call_rcu() anyway. Only leave the "on_stack" variants so debugobjects can keep track of objects on stack. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Signed-off-by: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Cc: Andrew Lunn <andrew(a)lunn.ch> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Sven Eckelmann <sven.eckelmann(a)gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- I've tried to check if the initialisation was always done in call_rcu in all implementations since 2.6.21. This assumption seems to be correct. I've already applied it to the maint branch and it must only be applied to the trunk. hard-interface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index c17ad85..bc2bd12 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -341,7 +341,6 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) batman_if->if_num = -1; batman_if->net_dev = net_dev; batman_if->if_status = IF_NOT_IN_USE; - INIT_RCU_HEAD(&batman_if->rcu); INIT_LIST_HEAD(&batman_if->list); check_known_mac_addr(batman_if->net_dev->dev_addr); -- 1.7.1

2 2

[B.A.T.M.A.N.] [PATCH 00/26] staging:batman-adv
by Andrew Lunn 16 May '10

16 May '10

Hi Greg. Here are a collection of BATMAM Advanced patches for Linux Next. Thanks Andrew Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Andrew Lunn (2): staging:batman-adv: Update TODO file to reflect current state. staging:batman-adv: updating README Dan Carpenter (1): staging:batman-adv: cleanup: change test for end of array Linus Lüssing (2): batman-adv: only modify hna-table on active module staging:batman-adv: Fix aggregation direct-link bug Marek Lindner (9): staging:batman-adv: fix aggregation timing bug staging:batman-adv: fix whitespace style issues staging:batman-adv: convert multiple /proc files to use sysfs staging:batman-adv: convert more files from /proc to /sys staging:batman-adv: move originator interval setting from /proc to /sys staging:batman-adv: remove redundant pointer to originator interface staging:batman-adv: move /proc interface handling to /sys staging:batman-adv: Fix whitespace problems criticized by checkpatch.pl staging:batman-adv: Reduce max characters on a line to 80 Simon Wunderlich (9): staging:batman-adv: Update copyright years staging:batman-adv: remove the beta from main.h for release staging:batman-adv: Remove dead max addr and obsolete VIS_FORMAT strings staging:batman-adv: Add 0.2.1 changes to the CHANGELOG staging:batman-adv: Update README about vis raw output staging:batman-adv: Changing version to 0.2.2-beta staging:batman-adv: Reorganize sequence number handling staging:batman-adv: Limit queue lengths for batman and broadcast packets staging:batman-adv: kfree_skb() in interface_tx() in error case Sven Eckelmann (3): staging: batman-adv: Clone shared bat packets before modifying them staging:batman-adv: fix whitespace style issues staging:batman-adv: Update pointer to ethhdr after skb_copy drivers/staging/batman-adv/CHANGELOG | 14 + drivers/staging/batman-adv/Makefile | 4 +- drivers/staging/batman-adv/README | 255 ++++++--- drivers/staging/batman-adv/TODO | 23 +- drivers/staging/batman-adv/aggregation.c | 45 ++- drivers/staging/batman-adv/aggregation.h | 7 +- drivers/staging/batman-adv/bat_sysfs.c | 484 +++++++++++++++++ drivers/staging/batman-adv/bat_sysfs.h | 29 + drivers/staging/batman-adv/bitarray.c | 76 ++- drivers/staging/batman-adv/bitarray.h | 2 +- drivers/staging/batman-adv/device.c | 37 +- drivers/staging/batman-adv/device.h | 2 +- drivers/staging/batman-adv/hard-interface.c | 531 ++++++++++--------- drivers/staging/batman-adv/hard-interface.h | 20 +- drivers/staging/batman-adv/hash.c | 2 +- drivers/staging/batman-adv/hash.h | 2 +- drivers/staging/batman-adv/main.c | 60 ++- drivers/staging/batman-adv/main.h | 23 +- drivers/staging/batman-adv/originator.c | 295 ++++++++++- drivers/staging/batman-adv/originator.h | 7 +- drivers/staging/batman-adv/packet.h | 2 +- drivers/staging/batman-adv/proc.c | 689 ------------------------ drivers/staging/batman-adv/proc.h | 40 -- drivers/staging/batman-adv/ring_buffer.c | 2 +- drivers/staging/batman-adv/ring_buffer.h | 2 +- drivers/staging/batman-adv/routing.c | 221 ++++++--- drivers/staging/batman-adv/routing.h | 2 +- drivers/staging/batman-adv/send.c | 146 ++++-- drivers/staging/batman-adv/send.h | 6 +- drivers/staging/batman-adv/soft-interface.c | 30 +- drivers/staging/batman-adv/soft-interface.h | 2 +- drivers/staging/batman-adv/translation-table.c | 92 +++- drivers/staging/batman-adv/translation-table.h | 8 +- drivers/staging/batman-adv/types.h | 54 ++- drivers/staging/batman-adv/vis.c | 140 ++++- drivers/staging/batman-adv/vis.h | 21 +- 36 files changed, 1966 insertions(+), 1409 deletions(-) create mode 100644 drivers/staging/batman-adv/bat_sysfs.c create mode 100644 drivers/staging/batman-adv/bat_sysfs.h delete mode 100644 drivers/staging/batman-adv/proc.c delete mode 100644 drivers/staging/batman-adv/proc.h

5 42

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2010