B.A.T.M.A.N November 2011

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

17 participants
45 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: use unregister_netdevice() when softif_create fails
by Simon Wunderlich 08 Nov '11

08 Nov '11

When entering softif_create(), the rtnl lock has already been acquired by store_mesh_iface(). (store_mesh_iface() -> hardif_enable_interface() -> softif_create) In case of an error, we should therefore call unregister_netdevice() instead of unregister_netdev(). unregister_netdev() tries to acquire the rtnl lock itself and deadlocks in this situation. unregister_netdevice() assumes that the rtnl lock is already been held. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- soft-interface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index 45297c8..987c75a 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -874,7 +874,7 @@ unreg_debugfs: unreg_sysfs: sysfs_del_meshif(soft_iface); unreg_soft_iface: - unregister_netdev(soft_iface); + unregister_netdevice(soft_iface); return NULL; free_soft_iface: -- 1.7.7.1

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: check return value for hash_add()
by Simon Wunderlich 08 Nov '11

08 Nov '11

if hash_add() fails, we should remove the structure to avoid memory leaks. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- As this was the last unchecked occurence, this should close bug #136 in the open-mesh.org redmine bugtracker. v2 fixes some remarks from Antonio, and most importantly it gets the hash_added evaluation right - there was a negation error in the first version --- translation-table.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/translation-table.c b/translation-table.c index 5b60aba..92f9a15 100644 --- a/translation-table.c +++ b/translation-table.c @@ -190,6 +190,7 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, struct bat_priv *bat_priv = netdev_priv(soft_iface); struct tt_local_entry *tt_local_entry = NULL; struct tt_global_entry *tt_global_entry = NULL; + int hash_added; tt_local_entry = tt_local_hash_find(bat_priv, addr); @@ -217,6 +218,16 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (compare_eth(addr, soft_iface->dev_addr)) tt_local_entry->common.flags |= TT_CLIENT_NOPURGE; + hash_added = hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig, + &tt_local_entry->common, + &tt_local_entry->common.hash_entry); + + if (unlikely(hash_added != 0)) { + /* remove the reference for the hash */ + tt_local_entry_free_ref(tt_local_entry); + goto out; + } + tt_local_event(bat_priv, addr, tt_local_entry->common.flags); /* The local entry has to be marked as NEW to avoid to send it in @@ -224,9 +235,6 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, * (consistency check) */ tt_local_entry->common.flags |= TT_CLIENT_NEW; - hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig, - &tt_local_entry->common, &tt_local_entry->common.hash_entry); - /* remove address from global hash if present */ tt_global_entry = tt_global_hash_find(bat_priv, addr); @@ -499,6 +507,7 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, struct tt_global_entry *tt_global_entry; struct orig_node *orig_node_tmp; int ret = 0; + int hash_added; tt_global_entry = tt_global_hash_find(bat_priv, tt_addr); @@ -518,9 +527,15 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, tt_global_entry->ttvn = ttvn; tt_global_entry->roam_at = 0; - hash_add(bat_priv->tt_global_hash, compare_tt, - choose_orig, &tt_global_entry->common, - &tt_global_entry->common.hash_entry); + hash_added = hash_add(bat_priv->tt_global_hash, compare_tt, + choose_orig, &tt_global_entry->common, + &tt_global_entry->common.hash_entry); + + if (unlikely(hash_added != 0)) { + /* remove the reference for the hash */ + tt_global_entry_free_ref(tt_global_entry); + goto out_remove; + } atomic_inc(&orig_node->tt_size); } else { if (tt_global_entry->orig_node != orig_node) { @@ -543,6 +558,7 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, "Creating new global tt entry: %pM (via %pM)\n", tt_global_entry->common.addr, orig_node->orig); +out_remove: /* remove address from local hash if present */ tt_local_remove(bat_priv, tt_global_entry->common.addr, "global tt received", roaming); -- 1.7.7.1

3 2

[B.A.T.M.A.N.] [PATCH] batctl: Human readable log levels instead of bitmasks
by Martin Hundebøll 08 Nov '11

08 Nov '11

As the number of log levels increases, it becomes less user friendly to assign a log level, as this is given as a bitmask in decimal form. This commit changes this, so that one or more log levels can be given as human readable words (e.g. "batctl ll batman routes"). --- sys.c | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 3 deletions(-) diff --git a/sys.c b/sys.c index 4f2b2c5..1fefc6d 100644 --- a/sys.c +++ b/sys.c @@ -174,16 +174,24 @@ err: static void log_level_usage(void) { - printf("Usage: batctl [options] loglevel [level]\n"); + printf("Usage: batctl [options] loglevel [level[ level[ level]...]\n"); printf("options:\n"); printf(" \t -h print this help\n"); + printf("levels:\n"); + printf(" \t none Debug logging is disabled\n"); + printf(" \t all Print messages from all below\n"); + printf(" \t batman Messages related to routing / flooding / broadcasting\n"); + printf(" \t routes Messages related to route added / changed / deleted\n"); + printf(" \t tt Messages related to translation table operations\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) { int optchar, res; - int log_level; + int log_level = 0; char *path_buff; + char str[4]; + int i; while ((optchar = getopt(argc, argv, "h")) != -1) { switch (optchar) { @@ -200,7 +208,25 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); if (argc != 1) { - res = write_file(path_buff, SYS_LOG_LEVEL, argv[1], NULL); + for (i = 1; i < argc; i++) { + if (strcmp(argv[i], "none") == 0) { + log_level = 0; + break; + } else if (strcmp(argv[i], "all") == 0) { + log_level = 15; + break; + } else if (strcmp(argv[i], "batman") == 0) + log_level |= (1 << 0); + else if (strcmp(argv[i], "routes") == 0) + log_level |= (1 << 1); + else if (strcmp(argv[i], "tt") == 0) + log_level |= (1 << 2); + else + log_level_usage(); + } + + snprintf(str, 4, "%u", log_level); + res = write_file(path_buff, SYS_LOG_LEVEL, str, NULL); goto out; } -- 1.7.7.2

2 3

[B.A.T.M.A.N.] [PATCH 1/2] batctl: version also prints the kernel module version if available
by Marek Lindner 08 Nov '11

08 Nov '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- main.c | 15 ++++++++++++++- man/batctl.8 | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index a1e6f4d..7f6d1a3 100644 --- a/main.c +++ b/main.c @@ -36,9 +36,11 @@ #include "tcpdump.h" #include "bisect.h" #include "vis.h" +#include "functions.h" #include <err.h> char mesh_dfl_iface[] = "bat0"; +char module_ver_path[] = "/sys/module/batman_adv/version"; void print_usage(void) { printf("Usage: batctl [options] commands \n"); @@ -96,7 +98,18 @@ int main(int argc, char **argv) goto err; if (strcmp(argv[1], "-v") == 0) { - printf("batctl %s\n", SOURCE_VERSION); + printf("batctl %s [batman-adv: ", SOURCE_VERSION); + + ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0); + if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (ret == EXIT_SUCCESS) + printf("%s]\n", line_ptr); + else + printf("module not loaded]\n"); + + free(line_ptr); exit(EXIT_SUCCESS); } diff --git a/man/batctl.8 b/man/batctl.8 index b0c6fc6..928c7e3 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -51,7 +51,7 @@ protocol. .br \-h print general batctl help .br -\-v print batctl version +\-v print batctl version and batman-adv version (if the module is loaded) .br .TP .I \fBcommands: -- 1.7.5.4

1 3

[B.A.T.M.A.N.] [PATCH] batman-adv: generalise tt_local_reset_flags()
by Antonio Quartulli 08 Nov '11

08 Nov '11

The tt_local_reset_flags() is actually used for one use case only. It is not generalised enough to be used indifferent situations. This patch make it general enough in order to let other code use it whenever a flag flip is requested over the whole hash table (passed as parameter). Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- This patch depends on: batman-adv: create a common substructure for tt_global/local_entry translation-table.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/translation-table.c b/translation-table.c index 76134bc..5b60aba 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1695,19 +1695,20 @@ void tt_free(struct bat_priv *bat_priv) kfree(bat_priv->tt_buff); } -/* This function will reset the specified flags from all the entries in - * the given hash table and will increment num_local_tt for each involved - * entry */ -static void tt_local_reset_flags(struct bat_priv *bat_priv, uint16_t flags) +/* This function will flip to new_value (if not already) the specified flags for + * all the entries in the given hash table and returns the number of modified + * entries */ +static uint16_t tt_flip_flags(struct hashtable_t *hash, uint16_t flags, + uint8_t new_value) { uint32_t i; - struct hashtable_t *hash = bat_priv->tt_local_hash; + uint16_t changed_num = 0; struct hlist_head *head; struct hlist_node *node; struct tt_common_entry *tt_common_entry; if (!hash) - return; + goto out; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -1715,14 +1716,18 @@ static void tt_local_reset_flags(struct bat_priv *bat_priv, uint16_t flags) rcu_read_lock(); hlist_for_each_entry_rcu(tt_common_entry, node, head, hash_entry) { - if (!(tt_common_entry->flags & flags)) + if ((tt_common_entry->flags & flags) != new_value) continue; - tt_common_entry->flags &= ~flags; - atomic_inc(&bat_priv->num_local_tt); + /* depending on 'new_value', enable or disable the flags + * pointed by 'flags' */ + tt_common_entry->flags &= + (~flags | (new_value ? flags : NO_FLAGS)); + changed_num++; } rcu_read_unlock(); } - +out: + return changed_num; } /* Purge out all the tt local entries marked with TT_CLIENT_PENDING */ @@ -1766,7 +1771,11 @@ static void tt_local_purge_pending_clients(struct bat_priv *bat_priv) void tt_commit_changes(struct bat_priv *bat_priv) { - tt_local_reset_flags(bat_priv, TT_CLIENT_NEW); + uint16_t changed_num = tt_flip_flags(bat_priv->tt_local_hash, + TT_CLIENT_NEW, 0); + /* all the reset entries have now to be effectively counted as local + * entries */ + atomic_add(changed_num, &bat_priv->num_local_tt); tt_local_purge_pending_clients(bat_priv); /* Increment the TTVN only once per OGM interval */ -- 1.7.3.4

3 5

[B.A.T.M.A.N.] Fwd: MTU issue
by Wayne Abroue 06 Nov '11

06 Nov '11

---------- Forwarded message ---------- From: Wayne Abroue <plettpc(a)gmail.com> Date: Sun, Nov 6, 2011 at 5:46 PM Subject: Re: [B.A.T.M.A.N.] MTU issue To: Marek Lindner <lindner_marek(a)yahoo.de> Hi Marek Thank you for answering, I am sorry I did not supply more info as I had already moved to a older release and everything just worked. I have 35 units all running on my mesh with bat-adv and all are working quite fine. However using the latest trunk Openwrt, batman-adv it simply does not communicate via the bat0 interface. bat0 is up, batctl confirms correct interface, MTU set at 1527 or 1528 or even a touch higher still does not produce batctl pings or originator lists. Thus I was wondering if anybody has had the same problem, to assist me compiling WRT trunk with a older version, I tried the Wiki procedure for older version editing makefile to 2010.2.0 which produced a error , " can;t remove /usr/sbin/batcl ;permissions at the build stage. Any help would be appreciated, Wayne On Sun, Nov 6, 2011 at 3:57 PM, Marek Lindner <lindner_marek(a)yahoo.de> wrote: > > Hi, > >> I had the same issue previously, but 1528 did not do it. >> I have since changed build on that unit and can't remember the actual >> value I used, But it was larger. >> >> All I did was increase the value until the warning disappeared, and >> everything started working as advertised. > > what do you mean with "working as advertised" ? It should work even if you get > this warning. All it does is fragmenting your traffic. > > Setting the MTU to 1528 works for me. Without providing more information about > your setup and giving us the number which seemingly "fixed" it for you nobody > can help you. > > Regards, > Marek >

3 3

[B.A.T.M.A.N.] [PATCH 1/5] net/batman-adv: use kstrtoul, etc
by Julia Lawall 06 Nov '11

06 Nov '11

From: Julia Lawall <julia(a)diku.dk> Use kstrtoul, etc instead of the now deprecated strict_strtoul, etc. A semantic patch rule for the kstrtoul case is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression a,b; {int,long} *c; @@ -strict_strtoul +kstrtoul (a,b,c) // </smpl> Signed-off-by: Julia Lawall <julia(a)diku.dk> --- net/batman-adv/bat_sysfs.c | 4 ++-- net/batman-adv/gateway_common.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff -u -p a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -174,7 +174,7 @@ static int store_uint_attr(const char *b unsigned long uint_val; int ret; - ret = strict_strtoul(buff, 10, &uint_val); + ret = kstrtoul(buff, 10, &uint_val); if (ret) { bat_info(net_dev, "%s: Invalid parameter received: %s\n", @@ -239,7 +239,7 @@ static ssize_t store_vis_mode(struct kob unsigned long val; int ret, vis_mode_tmp = -1; - ret = strict_strtoul(buff, 10, &val); + ret = kstrtoul(buff, 10, &val); if (((count == 2) && (!ret) && (val == VIS_TYPE_CLIENT_UPDATE)) || (strncmp(buff, "client", 6) == 0) || diff -u -p a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -97,7 +97,7 @@ static bool parse_gw_bandwidth(struct ne *tmp_ptr = '\0'; } - ret = strict_strtol(buff, 10, &ldown); + ret = kstrtol(buff, 10, &ldown); if (ret) { bat_err(net_dev, "Download speed of gateway mode invalid: %s\n", @@ -122,7 +122,7 @@ static bool parse_gw_bandwidth(struct ne *tmp_ptr = '\0'; } - ret = strict_strtol(slash_ptr + 1, 10, &lup); + ret = kstrtol(slash_ptr + 1, 10, &lup); if (ret) { bat_err(net_dev, "Upload speed of gateway mode invalid: "

2 1

[B.A.T.M.A.N.] MTU issue
by Wayne Abroue 06 Nov '11

06 Nov '11

Hi All We are having a small isue with mtu, on certain builds, could be only the latest, we are getting this error in wrt. batman_adv: bat0: The MTU of interface wlan0 is too small (1527) 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 1528 would solve the problem. I had the same issue previously, but 1528 did not do it. I have since changed build on that unit and can't remember the actual value I used, But it was larger. All I did was increase the value until the warning disappeared, and everything started working as advertised. Any idea's? Wayne A

2 1

[B.A.T.M.A.N.] batman miss crc16 module after nico commit
by Gioacchino Mazzurco 04 Nov '11

04 Nov '11

Hi all! After nico commit [0] batman-adv stopped working in openwrt backfire ( the crc16 modules is still kmod-crc16 in openwrt stable ) the batman-adv module refuse to load without error message on stdout but saying that crc16 is missing on dmesg selecting manually kernel modules -> other modules -> kmod-crc16 it work again [0] https://dev.openwrt.org/changeset/28657/packages/net/batman-adv/Makefile

2 7

[B.A.T.M.A.N.] [RFC 00/11] bridge loop avoidance II
by Simon Wunderlich 04 Nov '11

04 Nov '11

This series of patches is a request for comments on the redesigned bridge loop avoidance. The general concept is described in the wiki [1]. I've already performed a few testcases [2] which worked fine in my kvm environment. No crashes while running or unloading the extension either. The last patch in the series uses the cached address of the primary interface (the originator address known through the mesh) to save some code at various positions, there may be side effects I don't see however (e.g. implicit checking whether the module was configured correctly was removed). Marek already pointed quite a few issues out, these changes are reflected in the respective commit logs. These commit comments will be removed in the final version. Any comments and suggestions are appreciated. Thanks Simon [1] http://www.open-mesh.org/wiki/batman-adv/Bridge-loop-avoidance-II [2] http://www.open-mesh.org/wiki/batman-adv/Bridge-loop-avoidance-Testcases Simon Wunderlich (11): batman-adv: remove old bridge loop avoidance code batman-adv: add basic bridge loop avoidance code batman-adv: make bridge loop avoidance switchable batman-adv: export claim tables through debugfs batman-adv: allow multiple entries in tt_global_entries batman-adv: don't let backbone gateways exchange tt entries batman-adv: add broadcast duplicate check batman-adv: drop STP over batman batman-adv: form groups in the bridge loop avoidance batman-adv: Update README and sysfs description [RFC] batman-adv: get primaries address through bat_priv->own_orig Makefile.kbuild | 1 + README | 28 +- bat_debugfs.c | 18 +- bat_sysfs.c | 4 +- bridge_loop_avoidance.c | 1509 +++++++++++++++++++++++++++++++++++++++++++++++ bridge_loop_avoidance.h | 34 ++ compat.c | 16 +- compat.h | 3 +- hard-interface.c | 8 +- icmp_socket.c | 12 +- main.c | 9 +- main.h | 9 +- originator.c | 3 +- packet.h | 16 + routing.c | 41 +- soft-interface.c | 490 +--------------- soft-interface.h | 2 - sysfs-class-net-mesh | 9 + translation-table.c | 366 ++++++++---- types.h | 70 ++- unicast.c | 9 +- vis.c | 20 +- 22 files changed, 1965 insertions(+), 712 deletions(-) create mode 100644 bridge_loop_avoidance.c create mode 100644 bridge_loop_avoidance.h -- 1.7.7.1

2 20

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2011