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.] "wrong count at exit" after spin_lock/_unlock pair
by Sven Eckelmann 28 Oct '10

28 Oct '10

Hi, I use sparse (cgcc) with different kernel versions to do some quick checks on the batman-adv kernel module. I noticed that my change from UP to SMP kernel generated some 'weird' warnings regarding a 'context imbalance' which I couldn't find, but went away when switching from spin_(un)lock to spin_(un)lock_bh - something which doesn't make sense in my mind. I am not quite sure if this is linux-headers or sparse related - so I try to post it here first. I choose 2.6.32 because it is the latest long stable kernel and will be used in by Debian Squeeze. My current test was done like that (on debian squeeze i386): ----------------------------------------------------------- $ cd $MY_v2.6.32 $ make mrproper $ make allnoconfig $ grep -v 'CONFIG_MODULES is not set' .config > .config.tmp; mv .config.tmp \ .config $ grep -v 'CONFIG_NET is not set' .config > .config.tmp; mv .config.tmp \ .config $ grep -v 'CONFIG_SMP is not set' .config > .config.tmp; mv .config.tmp \ .config $ grep -v 'CONFIG_MODULE_UNLOAD is not set' .config > .config.tmp; mv \ .config.tmp .config $ echo 'CONFIG_MODULES=y' >> .config $ echo 'CONFIG_NET=y' >> .config $ echo 'CONFIG_SMP=y' >> .config $ echo 'CONFIG_MODULE_UNLOAD=y' >> .config $ echo 'xy'|make menuconfig $ make prepare $ make modules $ mkdir test $ cd test $ cat << EOF > Makefile obj-m += test.o test-y += main.o EOF $ cat << EOF > main.c #include <linux/module.h> #include <linux/spinlock.h> static DEFINE_SPINLOCK(testlock); static int __init test_init(void) { spin_lock(&testlock); spin_unlock(&testlock); return 0; } static void __exit test_exit(void) { } module_init(test_init); module_exit(test_exit); EOF $ make CC=cgcc -C $MY_v2.6.32/linux-next M=$(pwd) modules make: Entering directory `$MY_v2.6.32' CC [M] $MY_v2.6.32/testmodule/main.o $MY_v2.6.32/test/main.c:6:19: warning: context imbalance in 'test_init' - wrong count at exit LD [M] $MY_v2.6.32/test/test.o Building modules, stage 2. MODPOST 1 modules LD [M] $MY_v2.6.32/test/test.ko make: Leaving directory `$MY_v2.6.32' ----------------------------------------------------------- The sparse version was v0.4.3. It was obtained from git and and build using the current Debian squeeze tools provided by build-essential. It was run from the build dir by specifying it in $PATH $ export PATH=$MY_SPARSE_CHECKOUT:$PATH Best regards, Sven

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: Correct sparse warning about different lock contexts for basic block
by Sven Eckelmann 28 Oct '10

28 Oct '10

sparse noticed that if_list_lock is taken in some situations with bottom halfes disabled in some SMP kernels and that we must always lock it with spin_lock_bh. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/hard-interface.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index 37f0f8b..b5514e3 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/hard-interface.c @@ -441,9 +441,9 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) check_known_mac_addr(batman_if->net_dev->dev_addr); - spin_lock(&if_list_lock); + spin_lock_bh(&if_list_lock); list_add_tail_rcu(&batman_if->list, &if_list); - spin_unlock(&if_list_lock); + spin_unlock_bh(&if_list_lock); /* extra reference for return */ kref_get(&batman_if->refcount); @@ -478,11 +478,11 @@ void hardif_remove_interfaces(void) struct batman_if *batman_if, *batman_if_tmp; rtnl_lock(); - spin_lock(&if_list_lock); + spin_lock_bh(&if_list_lock); list_for_each_entry_safe(batman_if, batman_if_tmp, &if_list, list) { hardif_remove_interface(batman_if); } - spin_unlock(&if_list_lock); + spin_unlock_bh(&if_list_lock); rtnl_unlock(); } @@ -508,9 +508,9 @@ static int hard_if_event(struct notifier_block *this, hardif_deactivate_interface(batman_if); break; case NETDEV_UNREGISTER: - spin_lock(&if_list_lock); + spin_lock_bh(&if_list_lock); hardif_remove_interface(batman_if); - spin_unlock(&if_list_lock); + spin_unlock_bh(&if_list_lock); break; case NETDEV_CHANGEMTU: if (batman_if->soft_iface) -- 1.7.2.3

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Convert kbuild version check to preprocessor check
by Sven Eckelmann 25 Oct '10

25 Oct '10

Makefile.kbuild includes a relative unreadable check for a version number to decide if we should compile bat_printk.c to get out own print implementations. This can easily be replaced using a simpler preprocessor check as we know them from compat.h Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/Makefile.kbuild | 6 +++++- batman-adv/bat_printk.c | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/batman-adv/Makefile.kbuild b/batman-adv/Makefile.kbuild index 14e3daa..40ca316 100644 --- a/batman-adv/Makefile.kbuild +++ b/batman-adv/Makefile.kbuild @@ -32,4 +32,8 @@ EXTRA_CFLAGS += -DREVISION_VERSION=\"$(REVISION)\" endif obj-m += batman-adv.o -batman-adv-y := main.o bat_debugfs.o bat_sysfs.o send.o routing.o soft-interface.o icmp_socket.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o gateway_common.o gateway_client.o unicast.o $(shell [ "2" -eq "$(VERSION)" ] 2>&- && [ "6" -eq "$(PATCHLEVEL)" ] 2>&- && [ "$(SUBLEVEL)" -le "28" ] 2>&- && echo bat_printk.o) +batman-adv-y := aggregation.o bat_debugfs.o bat_sysfs.o bitarray.o \ + gateway_client.o gateway_common.o hard-interface.o hash.o \ + icmp_socket.o main.o originator.o ring_buffer.o routing.o \ + send.o soft-interface.o translation-table.o unicast.o vis.o +batman-adv-y += bat_printk.o diff --git a/batman-adv/bat_printk.c b/batman-adv/bat_printk.c index 4fa3e18..6bbeb8b 100644 --- a/batman-adv/bat_printk.c +++ b/batman-adv/bat_printk.c @@ -1,3 +1,7 @@ +#include <linux/version.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) + /* * linux/lib/vsprintf.c * @@ -935,3 +939,5 @@ int bat_snprintf(char *buf, size_t size, const char *fmt, ...) return i; } + +#endif /* < KERNEL_VERSION(2, 6, 29) */ -- 1.7.1

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: add seq_printf() wrapper for older kernels that don't support %pM
by Marek Lindner 25 Oct '10

25 Oct '10

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batman-adv/bat_printk.c | 18 ++++++++++++++++++ batman-adv/compat.h | 3 +++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/batman-adv/bat_printk.c b/batman-adv/bat_printk.c index 4fa3e18..69a7f95 100644 --- a/batman-adv/bat_printk.c +++ b/batman-adv/bat_printk.c @@ -935,3 +935,21 @@ int bat_snprintf(char *buf, size_t size, const char *fmt, ...) return i; } + +int bat_seq_printf(struct seq_file *m, const char *f, ...) +{ + va_list args; + int len; + + if (m->count < m->size) { + va_start(args, f); + len = bat_vsnprintf(m->buf + m->count, m->size - m->count, f, args); + va_end(args); + if (m->count + len < m->size) { + m->count += len; + return 0; + } + } + m->count = m->size; + return -1; +} diff --git a/batman-adv/compat.h b/batman-adv/compat.h index da474e4..b01455f 100644 --- a/batman-adv/compat.h +++ b/batman-adv/compat.h @@ -259,6 +259,9 @@ int bat_sprintf(char *buf, const char *fmt, ...); int bat_snprintf(char *buf, size_t size, const char *fmt, ...); #define snprintf bat_snprintf +int bat_seq_printf(struct seq_file *m, const char *f, ...); +#define seq_printf bat_seq_printf + #endif /* < KERNEL_VERSION(2, 6, 29) */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ -- 1.7.1

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Re-Enable Interface alternating and bonding
by Chris Lang 25 Oct '10

25 Oct '10

r1765 incidentally disabled bonding of packets first entering the mesh along with also disabling interface alternating regardless of where the packet came from. This re-enables these options. Signed-off-by: Chris Lang <clang(a)gateworks.com> --- routing.c | 12 ++++-------- routing.h | 4 ++-- unicast.c | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/routing.c b/routing.c index 7c9a053..f1012bc 100644 --- a/routing.c +++ b/routing.c @@ -1001,10 +1001,10 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) /* find a suitable router for this originator, and use * bonding if possible. */ -struct neigh_node *find_router(struct orig_node *orig_node, +struct neigh_node *find_router(struct bat_priv *bat_priv, + struct orig_node *orig_node, struct batman_if *recv_if) { - struct bat_priv *bat_priv; struct orig_node *primary_orig_node; struct orig_node *router_orig; struct neigh_node *router, *first_candidate, *best_router; @@ -1020,13 +1020,9 @@ struct neigh_node *find_router(struct orig_node *orig_node, /* without bonding, the first node should * always choose the default router. */ - if (!recv_if) - return orig_node->router; - - bat_priv = netdev_priv(recv_if->soft_iface); bonding_enabled = atomic_read(&bat_priv->bonding_enabled); - if (!bonding_enabled) + if (!recv_if && !bonding_enabled) return orig_node->router; router_orig = orig_node->router->orig_node; @@ -1155,7 +1151,7 @@ static int route_unicast_packet(struct sk_buff *skb, orig_node = ((struct orig_node *) hash_find(bat_priv->orig_hash, unicast_packet->dest)); - router = find_router(orig_node, recv_if); + router = find_router(bat_priv, orig_node, recv_if); if (!router) { spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags); diff --git a/routing.h b/routing.h index 06ea99d..92674c8 100644 --- a/routing.h +++ b/routing.h @@ -38,8 +38,8 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if); int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if); int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if); int recv_bat_packet(struct sk_buff *skb, struct batman_if *recv_if); -struct neigh_node *find_router(struct orig_node *orig_node, - struct batman_if *recv_if); +struct neigh_node *find_router(struct bat_priv *bat_priv, + struct orig_node *orig_node, struct batman_if *recv_if); void update_bonding_candidates(struct bat_priv *bat_priv, struct orig_node *orig_node); diff --git a/unicast.c b/unicast.c index 0dac50d..0459413 100644 --- a/unicast.c +++ b/unicast.c @@ -224,7 +224,7 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) if (!orig_node) orig_node = transtable_search(bat_priv, ethhdr->h_dest); - router = find_router(orig_node, NULL); + router = find_router(bat_priv, orig_node, NULL); if (!router) goto unlock; -- 1.7.3

2 3

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Include compat.h only once
by Sven Eckelmann 25 Oct '10

25 Oct '10

compat.h is included in all files which may need newer functionality than the target kernel has. This include is may forgotton when new changes are made to the sources. The compat.h can also be included in main.h which is included by all source files. In theory also all header files must include main.h. This is currently not and hopefully will never be necessary. It is also important that all header files which declare functions which are redefined in compat.h to be included before compat.h is included. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/bat_debugfs.c | 1 - batman-adv/bat_printk.c | 3 ++- batman-adv/bat_sysfs.c | 1 - batman-adv/gateway_client.c | 1 - batman-adv/gateway_common.c | 1 - batman-adv/hard-interface.c | 2 -- batman-adv/icmp_socket.c | 3 --- batman-adv/main.c | 1 - batman-adv/main.h | 5 +++++ batman-adv/originator.c | 1 - batman-adv/routing.c | 1 - batman-adv/send.c | 2 -- batman-adv/soft-interface.c | 1 - batman-adv/translation-table.c | 1 - batman-adv/vis.c | 1 - 15 files changed, 7 insertions(+), 18 deletions(-) diff --git a/batman-adv/bat_debugfs.c b/batman-adv/bat_debugfs.c index 3fcb102..2c4a247 100644 --- a/batman-adv/bat_debugfs.c +++ b/batman-adv/bat_debugfs.c @@ -32,7 +32,6 @@ #include "soft-interface.h" #include "vis.h" #include "icmp_socket.h" -#include "compat.h" static struct dentry *bat_debugfs; diff --git a/batman-adv/bat_printk.c b/batman-adv/bat_printk.c index 6615876..4fa3e18 100644 --- a/batman-adv/bat_printk.c +++ b/batman-adv/bat_printk.c @@ -30,7 +30,8 @@ #include <asm/page.h> /* for PAGE_SIZE */ #include <asm/div64.h> #include <asm/sections.h> /* for dereference_function_descriptor() */ -#include "compat.h" + +#include "main.h" /* Works only for digits and letters, but small and fast */ #define TOLOWER(x) ((x) | 0x20) diff --git a/batman-adv/bat_sysfs.c b/batman-adv/bat_sysfs.c index dbb0208..075fcc2 100644 --- a/batman-adv/bat_sysfs.c +++ b/batman-adv/bat_sysfs.c @@ -27,7 +27,6 @@ #include "gateway_common.h" #include "gateway_client.h" #include "vis.h" -#include "compat.h" #define to_dev(obj) container_of(obj, struct device, kobj) #define kobj_to_netdev(obj) to_net_dev(to_dev(obj->parent)) diff --git a/batman-adv/gateway_client.c b/batman-adv/gateway_client.c index ae1ab1e..49cd0cd 100644 --- a/batman-adv/gateway_client.c +++ b/batman-adv/gateway_client.c @@ -23,7 +23,6 @@ #include "gateway_client.h" #include "gateway_common.h" #include "hard-interface.h" -#include "compat.h" #include <linux/ip.h> #include <linux/udp.h> #include <linux/if_vlan.h> diff --git a/batman-adv/gateway_common.c b/batman-adv/gateway_common.c index 3851930..a88ce41 100644 --- a/batman-adv/gateway_common.c +++ b/batman-adv/gateway_common.c @@ -22,7 +22,6 @@ #include "main.h" #include "gateway_common.h" #include "gateway_client.h" -#include "compat.h" /* calculates the gateway class from kbit */ static void kbit_to_gw_srv_class(int down, int up, long *gw_srv_class) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index 3c59209..2ce2f3b 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/hard-interface.c @@ -31,8 +31,6 @@ #include <linux/if_arp.h> -#include "compat.h" - #define MIN(x, y) ((x) < (y) ? (x) : (y)) /* protect update critical side of if_list - but not the content */ diff --git a/batman-adv/icmp_socket.c b/batman-adv/icmp_socket.c index aa64ff8..3a2bcfc 100644 --- a/batman-adv/icmp_socket.c +++ b/batman-adv/icmp_socket.c @@ -28,9 +28,6 @@ #include "hash.h" #include "hard-interface.h" -#include "compat.h" - - static struct socket_client *socket_client_hash[256]; static void bat_socket_add_packet(struct socket_client *socket_client, diff --git a/batman-adv/main.c b/batman-adv/main.c index 6ecee49..8cc196e 100644 --- a/batman-adv/main.c +++ b/batman-adv/main.c @@ -33,7 +33,6 @@ #include "types.h" #include "vis.h" #include "hash.h" -#include "compat.h" struct list_head if_list; diff --git a/batman-adv/main.h b/batman-adv/main.h index cc42eb4..18d8a56 100644 --- a/batman-adv/main.h +++ b/batman-adv/main.h @@ -88,6 +88,9 @@ /* * Debug Messages */ +#ifdef pr_fmt +#undef pr_fmt +#endif #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt /* Append 'batman-adv: ' before * kernel messages */ @@ -123,6 +126,8 @@ #include <linux/seq_file.h> #include "types.h" +#include "compat.h" + #ifndef REVISION_VERSION #define REVISION_VERSION_STR "" #else diff --git a/batman-adv/originator.c b/batman-adv/originator.c index 6868a2a..ca52fe9 100644 --- a/batman-adv/originator.c +++ b/batman-adv/originator.c @@ -26,7 +26,6 @@ #include "hash.h" #include "translation-table.h" #include "routing.h" -#include "compat.h" #include "gateway_client.h" #include "hard-interface.h" #include "unicast.h" diff --git a/batman-adv/routing.c b/batman-adv/routing.c index cc8b77f..612493f 100644 --- a/batman-adv/routing.c +++ b/batman-adv/routing.c @@ -32,7 +32,6 @@ #include "ring_buffer.h" #include "vis.h" #include "aggregation.h" -#include "compat.h" #include "gateway_client.h" #include "unicast.h" diff --git a/batman-adv/send.c b/batman-adv/send.c index 180e18b..830533f 100644 --- a/batman-adv/send.c +++ b/batman-adv/send.c @@ -30,8 +30,6 @@ #include "aggregation.h" #include "gateway_common.h" -#include "compat.h" - static void send_outstanding_bcast_packet(struct work_struct *work); /* apply hop penalty for a normal link */ diff --git a/batman-adv/soft-interface.c b/batman-adv/soft-interface.c index 7a899b5..cdf8c24 100644 --- a/batman-adv/soft-interface.c +++ b/batman-adv/soft-interface.c @@ -36,7 +36,6 @@ #include <linux/ethtool.h> #include <linux/etherdevice.h> #include <linux/if_vlan.h> -#include "compat.h" #include "unicast.h" #include "routing.h" diff --git a/batman-adv/translation-table.c b/batman-adv/translation-table.c index 0bb9f6f..3bc7521 100644 --- a/batman-adv/translation-table.c +++ b/batman-adv/translation-table.c @@ -24,7 +24,6 @@ #include "soft-interface.h" #include "types.h" #include "hash.h" -#include "compat.h" static void hna_local_purge(struct work_struct *work); static void _hna_global_del_orig(struct bat_priv *bat_priv, diff --git a/batman-adv/vis.c b/batman-adv/vis.c index ddfdcd8..6b102a3 100644 --- a/batman-adv/vis.c +++ b/batman-adv/vis.c @@ -26,7 +26,6 @@ #include "soft-interface.h" #include "hard-interface.h" #include "hash.h" -#include "compat.h" #define MAX_VIS_PACKET_SIZE 1000 -- 1.7.2.3

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove useless braces
by Sven Eckelmann 25 Oct '10

25 Oct '10

54466268785c9892d6e2af2ac2a54a684face022 added changes to vis.c which trigger a checkpatch.pl warning about braces which are not necessary anymore. WARNING: braces {} are not necessary for any arm of this statement + if (entry->primary) [...] + else { [...] Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/vis.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/batman-adv/vis.c b/batman-adv/vis.c index bde423a..5aea153 100644 --- a/batman-adv/vis.c +++ b/batman-adv/vis.c @@ -136,9 +136,8 @@ static ssize_t vis_data_read_prim_sec(char *buff, struct hlist_head *if_list) hlist_for_each_entry(entry, pos, if_list, list) { if (entry->primary) len += sprintf(buff + len, "PRIMARY, "); - else { + else len += sprintf(buff + len, "SEC %pM, ", entry->addr); - } } return len; -- 1.7.1

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix crash on mesh cleanup in bridge loop avoidance code
by Marek Lindner 25 Oct '10

25 Oct '10

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batman-adv/soft-interface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/batman-adv/soft-interface.c b/batman-adv/soft-interface.c index a13276b..5ae26e8 100644 --- a/batman-adv/soft-interface.c +++ b/batman-adv/soft-interface.c @@ -114,7 +114,6 @@ void softif_neigh_purge(struct bat_priv *bat_priv) hlist_del_rcu(&softif_neigh->list); if (bat_priv->softif_neigh == softif_neigh) { - bat_priv->softif_neigh = NULL; bat_dbg(DBG_ROUTES, bat_priv, "Current mesh exit point '%pM' vanished " "(vid: %d).\n", -- 1.7.1

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: remove obsolete flags variable to avoid kernel warnings
by Marek Lindner 23 Oct '10

23 Oct '10

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batman-adv/bat_debugfs.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/batman-adv/bat_debugfs.c b/batman-adv/bat_debugfs.c index 11e5f65..934c879 100644 --- a/batman-adv/bat_debugfs.c +++ b/batman-adv/bat_debugfs.c @@ -57,7 +57,6 @@ static int fdebug_log(struct debug_log *debug_log, char *fmt, ...) va_list args; static char debug_log_buf[256]; char *p; - unsigned long flags; if (!debug_log) return 0; @@ -113,7 +112,6 @@ static ssize_t log_read(struct file *file, char __user *buf, struct debug_log *debug_log = bat_priv->debug_log; int error, i = 0; char c; - unsigned long flags; if ((file->f_flags & O_NONBLOCK) && !(debug_log->log_end - debug_log->log_start)) -- 1.7.1

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Add missing space in originator.c
by Sven Eckelmann 23 Oct '10

23 Oct '10

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv/originator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv/originator.c b/batman-adv/originator.c index afac4eb..15bf037 100644 --- a/batman-adv/originator.c +++ b/batman-adv/originator.c @@ -177,7 +177,7 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr) goto free_bcast_own_sum; if (bat_priv->orig_hash->elements * 4 > bat_priv->orig_hash->size) { - swaphash = hash_resize(bat_priv->orig_hash,choose_orig, + swaphash = hash_resize(bat_priv->orig_hash, choose_orig, bat_priv->orig_hash->size * 2); if (!swaphash) -- 1.7.2.3

2 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