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: beautify supported routing algorithm list
by Marek Lindner 19 Jul '15

19 Jul '15

Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 50fc07b..e61c5f3 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -584,7 +584,7 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) seq_puts(seq, "Available routing algorithms:\n"); hlist_for_each_entry(bat_algo_ops, &batadv_algo_list, list) { - seq_printf(seq, "%s\n", bat_algo_ops->name); + seq_printf(seq, " * %s\n", bat_algo_ops->name); } return 0; -- 2.1.4

1 1

[B.A.T.M.A.N.] [PATCH] batctl: list supported and configured routing algorithms
by Marek Lindner 17 Jul '15

17 Jul '15

With this patch, batctl is able to: * list supported routing algorithms * list batX interfaces with their configured routing algorithm * view and alter the selected routing algorithm Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- debug.c | 14 ++++++++++ debug.h | 2 ++ main.c | 5 ++++ sys.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sys.h | 3 +++ 5 files changed, 115 insertions(+) diff --git a/debug.c b/debug.c index a050345..c3959db 100644 --- a/debug.c +++ b/debug.c @@ -219,6 +219,20 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) batctl_debug_tables[debug_table].header_lines); } +int print_routing_algos(void) { + char full_path[MAX_PATH+1]; + char *debugfs_mnt; + + debugfs_mnt = debugfs_mount(NULL); + if (!debugfs_mnt) { + fprintf(stderr, "Error - can't mount or find debugfs\n"); + return -1; + } + + debugfs_make_path(DEBUG_BATIF_PATH_FMT, "", full_path, sizeof(full_path)); + return read_file(full_path, DEBUG_ROUTING_ALGOS, 0, 0, 0, 0); +} + int print_vis_info(char *mesh_iface) { char full_path[MAX_PATH+1]; diff --git a/debug.h b/debug.h index 2bc0ff9..8287b54 100644 --- a/debug.h +++ b/debug.h @@ -28,6 +28,7 @@ #define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s" #define DEBUG_TRANSTABLE_GLOBAL "transtable_global" #define DEBUG_LOG "log" +#define DEBUG_ROUTING_ALGOS "routing_algos" enum batctl_debug_tables { BATCTL_TABLE_ORIGINATORS, @@ -52,6 +53,7 @@ extern const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM]; int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv); int log_print(char *mesh_iface, int argc, char **argv); +int print_routing_algos(void); int print_vis_info(char *mesh_iface); #endif diff --git a/main.c b/main.c index d127cdc..96aea4d 100644 --- a/main.c +++ b/main.c @@ -70,6 +70,7 @@ static void print_usage(void) fprintf(stderr, " \tloglevel|ll [level] \tdisplay or modify the log level\n"); fprintf(stderr, " \tlog|l \tread the log produced by the kernel module\n"); fprintf(stderr, " \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); + fprintf(stderr, " \trouting_algo|ra [mode] \tdisplay or modify the routing algorithm\n"); fprintf(stderr, "\n"); fprintf(stderr, "debug tables: \tdisplay the corresponding debug table\n"); @@ -150,6 +151,10 @@ int main(int argc, char **argv) ret = bisect_iv(argc - 1, argv + 1); #endif + } else if ((strcmp(argv[1], "routing_algo") == 0) || (strcmp(argv[1], "ra") == 0)) { + + ret = handle_ra_setting(argc - 1, argv + 1); + } else if (check_mesh_iface(mesh_iface) < 0) { fprintf(stderr, "Error - interface %s is not present or not a batman-adv interface\n", mesh_iface); exit(EXIT_FAILURE); diff --git a/sys.c b/sys.c index 81b8faf..c04e204 100644 --- a/sys.c +++ b/sys.c @@ -30,6 +30,7 @@ #include "main.h" #include "sys.h" #include "functions.h" +#include "debug.h" #define PATH_BUFF_LEN 200 @@ -563,6 +564,96 @@ out: return res; } +static void ra_mode_usage(void) +{ + fprintf(stderr, "Usage: batctl [options] routing_algo [algorithm]\n"); + fprintf(stderr, "options:\n"); + fprintf(stderr, " \t -h print this help\n"); +} + +int handle_ra_setting(int argc, char **argv) +{ + DIR *iface_base_dir; + struct dirent *iface_dir; + int optchar; + char *path_buff; + int res = EXIT_FAILURE; + int first_iface = 1; + + while ((optchar = getopt(argc, argv, "h")) != -1) { + switch (optchar) { + case 'h': + ra_mode_usage(); + return EXIT_SUCCESS; + default: + ra_mode_usage(); + return EXIT_FAILURE; + } + } + + if (argc == 2) { + res = write_file(SYS_SELECTED_RA_PATH, "", argv[1], NULL); + goto out; + } + + path_buff = malloc(PATH_BUFF_LEN); + if (!path_buff) { + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); + goto out; + } + + iface_base_dir = opendir(SYS_IFACE_PATH); + if (!iface_base_dir) { + fprintf(stderr, "Error - the directory '%s' could not be read: %s\n", + SYS_IFACE_PATH, strerror(errno)); + fprintf(stderr, "Is the batman-adv module loaded and sysfs mounted ?\n"); + goto free_buff; + } + + while ((iface_dir = readdir(iface_base_dir)) != NULL) { + snprintf(path_buff, PATH_BUFF_LEN, SYS_ROUTING_ALGO_FMT, iface_dir->d_name); + res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); + if (res != EXIT_SUCCESS) + continue; + + if (line_ptr[strlen(line_ptr) - 1] == '\n') + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (first_iface) { + first_iface = 0; + printf("Active routing protocol configuration:\n"); + } + + printf(" * %s: %s\n", iface_dir->d_name, line_ptr); + + free(line_ptr); + line_ptr = NULL; + } + + closedir(iface_base_dir); + free(path_buff); + + if (!first_iface) + printf("\n"); + + printf("Selected routing algorithm (used when next batX interface is created):\n"); + res = read_file("", SYS_SELECTED_RA_PATH, USE_READ_BUFF, 0, 0, 0); + if (res != EXIT_SUCCESS) + return EXIT_FAILURE; + + printf(" => %s\n", line_ptr); + free(line_ptr); + line_ptr = NULL; + + print_routing_algos(); + return EXIT_SUCCESS; + +free_buff: + free(path_buff); +out: + return res; +} + int check_mesh_iface(char *mesh_iface) { char *base_dev = NULL; diff --git a/sys.h b/sys.h index 9addd90..13c164e 100644 --- a/sys.h +++ b/sys.h @@ -35,6 +35,8 @@ #define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" #define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" #define SYS_VLAN_PATH SYS_IFACE_PATH"/%s/mesh/vlan%d/" +#define SYS_ROUTING_ALGO_FMT SYS_IFACE_PATH"/%s/mesh/routing_algo" +#define SYS_SELECTED_RA_PATH "/sys/module/batman_adv/parameters/routing_algo" #define VLAN_ID_MAX_LEN 4 enum batctl_settings_list { @@ -72,6 +74,7 @@ int interface(char *mesh_iface, int argc, char **argv); int handle_loglevel(char *mesh_iface, int argc, char **argv); int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv); int handle_gw_setting(char *mesh_iface, int argc, char **argv); +int handle_ra_setting(int argc, char **argv); int check_mesh_iface(char *mesh_iface); int check_mesh_iface_ownership(char *mesh_iface, char *hard_iface); -- 2.1.4

1 0

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Fix conditional statements indentation
by Sven Eckelmann 17 Jul '15

17 Jul '15

29b9256e6631 ("batman-adv: consider outgoing interface in OGM sending") incorrectly indented the interface check code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index df54118..5c12200 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -968,7 +968,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) rcu_read_lock(); list_for_each_entry_rcu(tmp_hard_iface, &batadv_hardif_list, list) { if (tmp_hard_iface->soft_iface != hard_iface->soft_iface) - continue; + continue; batadv_iv_ogm_queue_add(bat_priv, *ogm_buff, *ogm_buff_len, hard_iface, tmp_hard_iface, 1, send_time); -- 2.1.4

1 1

[B.A.T.M.A.N.] [RFC 1/2] batman-adv: Drop support for Linux < 3.2
by Sven Eckelmann 14 Jul '15

14 Jul '15

The Linux Kernel 2.6.32 is reaching its end of life [1] after over 5 years. Instead it is recommended to use at least kernel 3.2 which is also already over 3 years old. All older kernels (v2.6.32 - v3.1) should therefore be dropped to reduce the support overhead. [1] https://lkml.org/lkml/2015/6/3/740 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- README.external | 2 +- compat-include/linux/atomic.h | 29 --------------- compat-include/linux/bug.h | 38 -------------------- compat-include/linux/compiler.h | 40 --------------------- compat-include/linux/if_vlan.h | 15 ++------ compat-include/linux/kconfig.h | 42 ---------------------- compat-include/linux/kernel.h | 29 --------------- compat-include/linux/lockdep.h | 33 ----------------- compat-include/linux/moduleparam.h | 72 -------------------------------------- compat-include/linux/netdevice.h | 55 ----------------------------- compat-include/linux/percpu.h | 48 ------------------------- compat-include/linux/printk.h | 39 --------------------- compat-include/linux/rculist.h | 10 ------ compat-include/linux/rcupdate.h | 54 ---------------------------- compat-include/linux/skbuff.h | 29 --------------- compat.h | 55 ++--------------------------- 16 files changed, 5 insertions(+), 585 deletions(-) delete mode 100644 compat-include/linux/atomic.h delete mode 100644 compat-include/linux/bug.h delete mode 100644 compat-include/linux/compiler.h delete mode 100644 compat-include/linux/kconfig.h delete mode 100644 compat-include/linux/lockdep.h delete mode 100644 compat-include/linux/moduleparam.h delete mode 100644 compat-include/linux/percpu.h delete mode 100644 compat-include/linux/printk.h delete mode 100644 compat-include/linux/rcupdate.h diff --git a/README.external b/README.external index c3fcf3a..b4985e9 100644 --- a/README.external +++ b/README.external @@ -6,7 +6,7 @@ and as external module. The external module allows to get new features without upgrading to a newer kernel version and to get batman-adv specific bugfixes for kernels that are not supported anymore. It compiles against and should work -with Linux 2.6.29 - 4.1. Supporting older versions is not +with Linux 3.2 - 4.1. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) diff --git a/compat-include/linux/atomic.h b/compat-include/linux/atomic.h deleted file mode 100644 index 025c8b1..0000000 --- a/compat-include/linux/atomic.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * 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_ATOMIC_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_ATOMIC_H_ - -#include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -#include_next <linux/atomic.h> -#endif - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ATOMIC_H_ */ diff --git a/compat-include/linux/bug.h b/compat-include/linux/bug.h deleted file mode 100644 index 9b7b571..0000000 --- a/compat-include/linux/bug.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * 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_BUG_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_BUG_H_ - -#include <linux/version.h> -#include_next <linux/bug.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -#undef BUILD_BUG_ON -#ifdef __CHECKER__ -#define BUILD_BUG_ON(condition) (0) -#else /* __CHECKER__ */ -#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2 * !!(condition)])) -#endif /* __CHECKER__ */ - -#endif /* < KERNEL_VERSION(3, 0, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_BUG_H_ */ diff --git a/compat-include/linux/compiler.h b/compat-include/linux/compiler.h deleted file mode 100644 index 29a02ae..0000000 --- a/compat-include/linux/compiler.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * 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_COMPILER_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ - -#include <linux/version.h> -#include_next <linux/compiler.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define __always_unused __attribute__((unused)) -#define __percpu - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -#define __rcu - -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */ diff --git a/compat-include/linux/if_vlan.h b/compat-include/linux/if_vlan.h index 0cbd5c4..4f18fa6 100644 --- a/compat-include/linux/if_vlan.h +++ b/compat-include/linux/if_vlan.h @@ -24,21 +24,10 @@ #include <linux/version.h> #include_next <linux/if_vlan.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define VLAN_PRIO_MASK 0xe000 /* Priority Code Point */ -#define VLAN_PRIO_SHIFT 13 - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -#define vlan_insert_tag(skb, proto, vid) __vlan_put_tag(skb, vid) - -#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) #define vlan_insert_tag(skb, proto, vid) vlan_insert_tag(skb, vid) -#endif /* < KERNEL_VERSION(3, 0, 0) */ +#endif /* < KERNEL_VERSION(3, 10, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IF_VLAN_H_ */ diff --git a/compat-include/linux/kconfig.h b/compat-include/linux/kconfig.h deleted file mode 100644 index a8d0766..0000000 --- a/compat-include/linux/kconfig.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * 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_KCONFIG_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_KCONFIG_H_ - -#include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) -#include_next <linux/kconfig.h> -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) - -#define __ARG_PLACEHOLDER_1 0, -#define config_enabled(cfg) _config_enabled(cfg) -#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value) -#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0) -#define ___config_enabled(__ignored, val, ...) val - -#define IS_ENABLED(option) \ - (config_enabled(option) || config_enabled(option##_MODULE)) - -#endif /* < KERNEL_VERSION(3, 1, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_KCONFIG_H_ */ diff --git a/compat-include/linux/kernel.h b/compat-include/linux/kernel.h index c39cbe8..f98c8dc 100644 --- a/compat-include/linux/kernel.h +++ b/compat-include/linux/kernel.h @@ -24,35 +24,6 @@ #include <linux/version.h> #include_next <linux/kernel.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - -#define kstrtou32(cp, base, v)\ -({\ - unsigned long _v;\ - int _r;\ - _r = strict_strtoul(cp, base, &_v);\ - *(v) = (u32)_v;\ - if ((unsigned long)*(v) != _v)\ - _r = -ERANGE;\ - _r;\ -}) - -#define kstrtou64(cp, base, v)\ -({\ - unsigned long long _v;\ - int _r;\ - _r = strict_strtoull(cp, base, &_v);\ - *(v) = (uint64_t)_v;\ - if ((unsigned long long)*(v) != _v)\ - _r = -ERANGE;\ - _r;\ -}) - -#define kstrtoul strict_strtoul -#define kstrtol strict_strtol - -#endif /* < KERNEL_VERSION(2, 6, 39) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) #define U8_MAX ((u8)~0U) diff --git a/compat-include/linux/lockdep.h b/compat-include/linux/lockdep.h deleted file mode 100644 index e646114..0000000 --- a/compat-include/linux/lockdep.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * 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_LOCKDEP_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ - -#include <linux/version.h> -#include_next <linux/lockdep.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) - -#define lockdep_assert_held(l) do { (void)(l); } while (0) - -#endif /* < KERNEL_VERSION(2, 6, 32) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ */ diff --git a/compat-include/linux/moduleparam.h b/compat-include/linux/moduleparam.h deleted file mode 100644 index c266b9c..0000000 --- a/compat-include/linux/moduleparam.h +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * 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_MODULEPARAM_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_MODULEPARAM_H_ - -#include <linux/version.h> -#include_next <linux/moduleparam.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) - -#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ - __module_param_call(p1, p2, p3, p4, p5, p7) - -#else - -#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ - __module_param_call(p1, p2, p3, p4, p5, p6, p7) - -#endif /* < KERNEL_VERSION(2, 6, 31) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -struct kernel_param_ops { - /* Returns 0, or -errno. arg is in kp->arg. */ - int (*set)(const char *val, const struct kernel_param *kp); - /* Returns length written or -errno. Buffer is 4k (ie. be short!) */ - int (*get)(char *buffer, struct kernel_param *kp); - /* Optional function to free kp->arg when module unloaded. */ - void (*free)(void *arg); -}; - -#define module_param_cb(name, ops, arg, perm) \ - static int __compat_set_param_##name(const char *val, \ - struct kernel_param *kp) \ - { return (ops)->set(val, kp); } \ - static int __compat_get_param_##name(char *buffer, \ - struct kernel_param *kp) \ - { return (ops)->get(buffer, kp); } \ - __compat__module_param_call(MODULE_PARAM_PREFIX, name, \ - __compat_set_param_##name, \ - __compat_get_param_##name, arg, \ - __same_type((arg), bool *), perm) - -static inline int batadv_param_set_copystring(const char *val, - const struct kernel_param *kp) -{ - return param_set_copystring(val, (struct kernel_param *)kp); -} - -#define param_set_copystring batadv_param_set_copystring - -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MODULEPARAM_H_ */ diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index f19f624..5e8d05c 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -30,55 +30,6 @@ #endif /* < KERNEL_VERSION(3, 3, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define unregister_netdevice_queue(dev, head) unregister_netdevice(dev) - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) - -#include <linux/etherdevice.h> - -#undef netdev_for_each_mc_addr -#define netdev_for_each_mc_addr(mclist, dev) \ - for (mclist = (struct batadv_dev_addr_list *)dev->mc_list; mclist; \ - mclist = (struct batadv_dev_addr_list *)mclist->next) - -/* Note, that this breaks the usage of the normal 'struct netdev_hw_addr' - * for kernels < 2.6.35 in batman-adv! - */ -#define netdev_hw_addr batadv_dev_addr_list -struct batadv_dev_addr_list { - struct dev_addr_list *next; - u8 addr[MAX_ADDR_LEN]; - u8 da_addrlen; - u8 da_synced; - int da_users; - int da_gusers; -}; - -#endif /* < KERNEL_VERSION(2, 6, 35) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -#define NET_ADDR_RANDOM 0 - -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - -/* On older kernels net_dev->master is reserved for iface bonding. */ -static inline int batadv_netdev_set_master(struct net_device *slave, - struct net_device *master) -{ - return 0; -} - -#define netdev_set_master batadv_netdev_set_master - -#endif /* < KERNEL_VERSION(2, 6, 39) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) #define netdev_master_upper_dev_link netdev_set_master @@ -99,15 +50,9 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -/* alloc_netdev() was defined differently before 2.6.38 */ #undef alloc_netdev -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) -#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ - alloc_netdev_mq(sizeof_priv, name, setup, 1) -#else #define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1) -#endif /* nested < KERNEL_VERSION(2, 6, 38) */ #endif /* < KERNEL_VERSION(3, 17, 0) */ diff --git a/compat-include/linux/percpu.h b/compat-include/linux/percpu.h deleted file mode 100644 index 0fbcaae..0000000 --- a/compat-include/linux/percpu.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * 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_PERCPU_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_PERCPU_H_ - -#include <linux/version.h> -#include_next <linux/percpu.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) - -#undef __alloc_percpu -#define __alloc_percpu(size, align) \ - percpu_alloc_mask((size), GFP_KERNEL, cpu_possible_map) - -#endif /* < KERNEL_VERSION(2, 6, 30) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define this_cpu_add(x, c) batadv_this_cpu_add(&(x), c) - -static inline void batadv_this_cpu_add(u64 *count_ptr, size_t count) -{ - int cpu = get_cpu(); - *per_cpu_ptr(count_ptr, cpu) += count; - put_cpu(); -} - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PERCPU_H_ */ diff --git a/compat-include/linux/printk.h b/compat-include/linux/printk.h deleted file mode 100644 index 2b31ed1..0000000 --- a/compat-include/linux/printk.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * 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_PRINTK_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_PRINTK_H_ - -#include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -#include_next <linux/printk.h> -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) - -#define pr_warn pr_warning - -#endif - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PRINTK_H_ */ - -#ifndef pr_fmt -#define pr_fmt(fmt) fmt -#endif diff --git a/compat-include/linux/rculist.h b/compat-include/linux/rculist.h index 0b8d7c6..b2f1798 100644 --- a/compat-include/linux/rculist.h +++ b/compat-include/linux/rculist.h @@ -24,16 +24,6 @@ #include <linux/version.h> #include_next <linux/rculist.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) - -#define hlist_first_rcu(head) \ - (*((struct hlist_node __rcu **)(&(head)->first))) - -#define hlist_next_rcu(node) \ - (*((struct hlist_node __rcu **)(&(node)->next))) - -#endif /* < KERNEL_VERSION(2, 6, 37) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) #undef hlist_for_each_entry_rcu diff --git a/compat-include/linux/rcupdate.h b/compat-include/linux/rcupdate.h deleted file mode 100644 index f0d0413..0000000 --- a/compat-include/linux/rcupdate.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * 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_RCUPDATE_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_RCUPDATE_H_ - -#include <linux/version.h> -#include_next <linux/rcupdate.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) - -#define rcu_dereference_protected(p, c) (p) - -#define rcu_dereference_raw(p) ({ \ - typeof(p) _________p1 = ACCESS_ONCE(p); \ - smp_read_barrier_depends(); \ - (_________p1); \ - }) - -#endif /* < KERNEL_VERSION(2, 6, 34) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -#define kfree_rcu(ptr, rcuhead_name) \ - do { \ - void batadv_free_rcu_##ptr(struct rcu_head *rcu) \ - { \ - void *container_ptr; \ - container_ptr = container_of(rcu, typeof(*(ptr)), rcuhead_name); \ - kfree(container_ptr); \ - } \ - call_rcu(&(ptr)->rcuhead_name, batadv_free_rcu_##ptr); \ - } while (0) - -#endif /* < KERNEL_VERSION(3, 0, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_RCUPDATE_H_ */ diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h index d363cc0..1e7a3ef 100644 --- a/compat-include/linux/skbuff.h +++ b/compat-include/linux/skbuff.h @@ -24,35 +24,6 @@ #include <linux/version.h> #include_next <linux/skbuff.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) - -#define consume_skb(_skb) kfree_skb(_skb) - -#endif /* < KERNEL_VERSION(2, 6, 30) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, - unsigned int length) -{ - struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN); - - if (NET_IP_ALIGN && skb) - skb_reserve(skb, NET_IP_ALIGN); - return skb; -} - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -static inline void skb_reset_mac_len(struct sk_buff *skb) -{ - skb->mac_len = skb->network_header - skb->mac_header; -} - -#endif /* < KERNEL_VERSION(3, 0, 0) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) /* hack for not correctly set mac_len. This may happen for some special diff --git a/compat.h b/compat.h index 05fb4f1..4b81300 100644 --- a/compat.h +++ b/compat.h @@ -23,31 +23,11 @@ #include <linux/version.h> /* LINUX_VERSION_CODE */ #include <linux/kconfig.h> - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)) -#include <linux/autoconf.h> -#else #include <generated/autoconf.h> -#endif #include "compat-autoconf.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define skb_iif iif - -#define batadv_softif_destroy_netlink(dev, head) batadv_softif_destroy_netlink(dev) - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -#include <linux/netdevice.h> - -#define netdev_master_upper_dev_get_rcu(dev) \ - (dev->br_port ? dev : NULL); \ - break; -#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) #include <linux/netdevice.h> @@ -55,38 +35,7 @@ (dev->priv_flags & IFF_BRIDGE_PORT ? dev : NULL); \ break; -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -/* hack for dev->addr_assign_type &= ~NET_ADDR_RANDOM; */ -#define addr_assign_type ifindex - -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - -/* Hack for removing ndo_add/del_slave at the end of net_device_ops. - * This is somewhat ugly because it requires that ndo_validate_addr - * is at the end of this struct in soft-interface.c. - */ -#include <linux/netdevice.h> - -#define ndo_validate_addr \ - ndo_validate_addr = eth_validate_addr, \ -}; \ -static const struct { \ - void *ndo_validate_addr; \ - void *ndo_add_slave; \ - void *ndo_del_slave; \ -} __attribute__((unused)) __useless_ops1 = { \ - .ndo_validate_addr - -#define ndo_del_slave ndo_init -#define ndo_init(x, y) ndo_init - master->netdev_ops->ndo_init - EBUSY - -#endif /* < KERNEL_VERSION(2, 6, 39) */ - +#endif /* < KERNEL_VERSION(3, 9, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) -- 2.1.4

1 1

Re: [B.A.T.M.A.N.] Batman advanced receiving packets on bat0 with same source and destination address and performance issues
by Patrick Bosch 13 Jul '15

13 Jul '15

Hi Simon I hope I can make it a bit clearer and not more confusing. ;) I just saw that my drawing looks different in the mail then what is intended. It seems that the Linksys router and the gateway are connected via WiFi, which is not the case. The client and gateway are connected via WiFi. The Linksys router serves as a DHCP server. There are cables from the router to the gateway and to the client. Both are connected to the main port of the Nanostation. The gateway/client notation means the batman-adv gateway feature notation. The gateway has one Vlan in the switch configuration, defined for both ports. So main port and secondary port are reached by eth0.1. This interface is bridged with the bat0 interface. This is what I found on both, the OpenWRT page and batman-adv page as a standard configuration if I want to add the ethernet ports to the mesh. The client has two Vlans, one for each port. Eth0.2 is the main port and eth0.1 is the secondary port. The secondary port is bridged to the bat0 interface and the main port is not. This seems to be the problem. When I tcpdump on the main port (eth0.2), I can see the batman-adv ARP replies broadcasting, which I would not expect to see as this interface is not bridged to bat0. What I would expect is nothing from batman-adv at all. The broadcast is every 10 seconds. I continuously ping both devices from my laptop that is connected to the client. For both devices, pings are lost. For the gateway more than for the client. For the client it is usually 1-3 and for the gateway from 1 up to 10-15. This does not happen regularly. It ranges from around 30 to 120 seconds. When I lose pings, the SSH session is also not responding at all. So, it is not really slow, but it seems that there is packet loss for a few seconds. I hope this example is a bit clearer. I will add the output tomorrow, right now I don't have access to the device. Kind regards Patrick On 13 July 2015 at 17:26, Simon Wunderlich <sw(a)simonwunderlich.de> wrote: > Hi Patrick, > > after reading your text three times I still don't understand your setup. :) > Maybe its just me, but unless someone else answers, maybe you can help me: > > * Where is that Linksys router you have in that network drawing? > * With Client/Gateway mode, are you referring to batman-adv gateway feature? > * Could you perhaps simplify your explanation to one specific case where it > "slow" where you don't expect it to be? Also, it would be helpful to minimize > the network setup for this case and describe it one more time (including all > ports). > * Also, another helpful thing would be to post your "batctl if" output to see > which devices are part of the the batman interface > > > From your explanation, it sounds like you have some kind of bridge loop going > on in your network. Maybe you can check whether you have lots of broadcast > packets coming in (e.g. by using tcpdump or batctl td). > > Thanks, > Simon > > On Thursday 09 July 2015 16:12:12 Patrick Bosch wrote: >> Hello everyone >> >> I'm trying to set up a mesh, but I'm running into some issues, where >> I'm not sure if I'm doing something wrong or if there is a bug hidden >> somewhere. >> >> I'm using the Nanostation M5 XW with OpenWRT Chaos Calmer RC2 and only >> OpenWRT packages. >> The trouble occurs on a Nanostation in client mode, not in gateway mode. >> >> My setup: >> >> Laptop --- Client-mode --- Linksys router --- Gateway-mode >> >> ----------WiFi----------- >> >> Laptop is connected to secondary port. The main port is connected >> through a wire, the interface is not bridged to bat0. On the gateway, >> the main and secondary port are bridged to bat0. The main port is used >> for the connection to the router. >> >> What I'm trying to do is set up a mesh through WiFi and bridged to it >> is the secondary port of the Nanostation. There will be clients >> connected to it at some point. The main port is not bridged as this is >> connected to a network that has to be completely isolated. The main >> port is used for PoE and as a debugging connection with SSH. If I >> bridge it, it simply uses the wired connection, which is not intended. >> But even so, I still see Batman messages on the interface for the main >> port, although it is not bridged. >> If I don't connect any data to the main port, only power, it seems to >> work fine. As soon as I connect it to data, I see two things. First, >> on the bat0 interface messages with the same source and destination >> arrive. Second, the SSH connection to the client Nanostation becomes >> really bad from time to time, but not consistently. My computer is >> connected to the secondary port of the Nanostation. Both of these >> occurrences seem to correlate, but both are not consistent. >> >> As far as I understand it, batman advanced should not use the wired >> interface on the client Nanostation. But it sends packets on that >> interface. I think the problem of the bad performance lies also there, >> but I am not sure. >> I hope somebody can help me. Following are my configurations: >> >> Network: >> >> config interface 'loopback' >> option ifname 'lo' >> option proto 'static' >> option ipaddr '127.0.0.1' >> option netmask '255.0.0.0' >> >> config switch >> option name 'switch0' >> option reset '1' >> option enable_vlan '1' >> >> config switch_vlan >> option device 'switch0' >> option vlan '1' >> option ports '0t 1' >> >> config switch_vlan >> option device 'switch0' >> option vlan '2' >> option ports '0t 5' >> >> config interface 'mesh' >> option mtu '1532' >> option proto 'batadv' >> option mesh 'bat0' >> >> config interface 'bat0' >> option ifname 'bat0' >> option proto 'none' >> option mtu '1532' >> >> config interface 'br' >> option type 'bridge' >> option ifname 'eth0.1 bat0' >> option proto 'static' >> option ipaddr '10.123.0.2' >> option netmask '255.255.255.0' >> >> config interface 'wan' >> option proto 'dhcp' >> option ifname 'eth0.2' >> option hostname 'iFEST2' >> option defaultroute '0' >> >> config interface 'wan6' >> option proto 'dhcpv6' >> option reqaddress 'try' >> option reqprefix 'auto' >> option ifname 'eth0.2' >> >> Wireless: >> >> config wifi-device radio0 >> option type 'mac80211' >> option hwmode '11a' >> option path 'platform/ar934x_wmac' >> option htmode 'HT20' >> option channel '40' >> option txpower '17' >> option country 'BE' >> option disabled '0' >> >> config wifi-iface >> option device 'radio0' >> option ifname 'adhoc0' >> option encryption 'psk2' >> option network 'mesh' >> option ssid 'mySSID' >> option mode 'adhoc' >> option bssid '02:CA:FE:CA:CA:40' >> option mcast_rate '18000' >> option key 'myKey' >> >> Batman: >> >> config 'mesh' 'bat0' >> option 'aggregated_ogms' >> option 'ap_isolation' >> option 'bonding' >> option 'fragmentation' >> option 'gw_bandwidth' >> option 'gw_mode' 'client' >> option 'gw_sel_class' >> option 'log_level' >> option 'orig_interval' >> option 'vis_mode' >> option 'bridge_loop_avoidance' '1' >> option 'distributed_arp_table' >> option 'multicast_mode' >> option 'network_coding' >> option 'hop_penalty' >> option 'isolation_mark' >> >> These are two different translocal tables that I get, >> 04:18:d6:61:81:54 is the MAC of the node in question: >> >> Locally retrieved addresses (from bat0) announced via TT (TTVN: 28): >> Client VID Flags Last seen (CRC ) >> * 9e:90:31:79:cd:b8 -1 [.P....] 0.000 (0x02c4aa75) >> * 9e:90:31:79:cd:b8 0 [.P....] 0.000 (0x4620303d) >> * e8:80:2e:e7:a4:df -1 [......] 0.730 (0x02c4aa75) >> >> Locally retrieved addresses (from bat0) announced via TT (TTVN: 29): >> Client VID Flags Last seen (CRC ) >> * 9e:90:31:79:cd:b8 -1 [.P....] 0.000 (0xd3ed0426) >> * 04:18:d6:61:81:54 -1 [......] 30.370 (0xd3ed0426) >> * 9e:90:31:79:cd:b8 0 [.P....] 0.000 (0x4620303d) >> * e8:80:2e:e7:a4:df -1 [......] 0.010 (0xd3ed0426) >> >> The transglobal one, 04:18:d6:61:81:68 is the MAC of the gateway >> >> Globally announced TT entries received via the mesh bat0 >> Client VID (TTVN) Originator (Curr TTVN) >> (CRC ) Flags >> * da:2b:ea:63:42:38 0 ( 32) via 04:18:d6:60:81:68 ( 71) >> (0x9079f118) [....] >> * 04:18:d6:61:81:54 -1 ( 71) via 04:18:d6:60:81:68 ( 71) >> (0x4bb17292) [....] >> * 04:18:d6:61:81:68 -1 ( 32) via 04:18:d6:60:81:68 ( 71) >> (0x4bb17292) [....] >> * da:2b:ea:63:42:38 -1 ( 32) via 04:18:d6:60:81:68 ( 71) >> (0x4bb17292) [....] >> >> Kind regards >> Patrick -- Patrick Bosch, PhD Student University of Antwerp - iMinds Dept. Mathematics and Computer Science MOSAIC research group Middelheimlaan 1 - Room M.G.215 2020 Antwerpen - Belgium Email: patrick.bosch(a)uantwerpen.be Phone: +3232653858

1 0

[B.A.T.M.A.N.] [PATCHv2] batman-adv: remove obsolete deleted attribute for gateway node
by Simon Wunderlich 13 Jul '15

13 Jul '15

From: Simon Wunderlich <simon(a)open-mesh.com> With rcu, the gateway node deleted attribute is not needed anymore. In fact, it may delay the free of the gateway node and its referenced structures. Therefore remove it altogether and simplify purging as well. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- Changes to PATCH: * iterator through list to remove the element when deleting to avoid possible double list remove --- net/batman-adv/gateway_client.c | 52 +++++++++++++++-------------------------- net/batman-adv/originator.c | 1 - net/batman-adv/types.h | 2 -- 3 files changed, 19 insertions(+), 36 deletions(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 97f7c44..6af5dab 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -165,9 +165,6 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) rcu_read_lock(); hlist_for_each_entry_rcu(gw_node, &bat_priv->gw.list, list) { - if (gw_node->deleted) - continue; - orig_node = gw_node->orig_node; router = batadv_orig_router_get(orig_node, BATADV_IF_DEFAULT); if (!router) @@ -475,9 +472,6 @@ batadv_gw_node_get(struct batadv_priv *bat_priv, if (gw_node_tmp->orig_node != orig_node) continue; - if (gw_node_tmp->deleted) - continue; - if (!atomic_inc_not_zero(&gw_node_tmp->refcount)) continue; @@ -500,7 +494,8 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, struct batadv_tvlv_gateway_data *gateway) { - struct batadv_gw_node *gw_node, *curr_gw = NULL; + struct batadv_gw_node *gw_node, *gw_node_tmp, *curr_gw = NULL; + struct hlist_node *node_tmp; gw_node = batadv_gw_node_get(bat_priv, orig_node); if (!gw_node) { @@ -527,9 +522,7 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, gw_node->bandwidth_down = ntohl(gateway->bandwidth_down); gw_node->bandwidth_up = ntohl(gateway->bandwidth_up); - gw_node->deleted = 0; if (ntohl(gateway->bandwidth_down) == 0) { - gw_node->deleted = jiffies; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Gateway %pM removed from gateway list\n", orig_node->orig); @@ -537,14 +530,26 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, /* Note: We don't need a NULL check here, since curr_gw never * gets dereferenced. */ + spin_lock_bh(&bat_priv->gw.list_lock); + hlist_for_each_entry_safe(gw_node_tmp, node_tmp, + &bat_priv->gw.list, list) { + if (gw_node_tmp != gw_node) + continue; + + hlist_del_rcu(&gw_node->list); + batadv_gw_node_free_ref(gw_node); + } + spin_unlock_bh(&bat_priv->gw.list_lock); + curr_gw = batadv_gw_get_selected_gw_node(bat_priv); if (gw_node == curr_gw) batadv_gw_reselect(bat_priv); + + if (curr_gw) + batadv_gw_node_free_ref(curr_gw); } out: - if (curr_gw) - batadv_gw_node_free_ref(curr_gw); if (gw_node) batadv_gw_node_free_ref(gw_node); } @@ -562,37 +567,21 @@ void batadv_gw_node_delete(struct batadv_priv *bat_priv, void batadv_gw_node_purge(struct batadv_priv *bat_priv) { - struct batadv_gw_node *gw_node, *curr_gw; + struct batadv_gw_node *gw_node; struct hlist_node *node_tmp; - unsigned long timeout = msecs_to_jiffies(2 * BATADV_PURGE_TIMEOUT); - int do_reselect = 0; - curr_gw = batadv_gw_get_selected_gw_node(bat_priv); + if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) + return; spin_lock_bh(&bat_priv->gw.list_lock); - hlist_for_each_entry_safe(gw_node, node_tmp, &bat_priv->gw.list, list) { - if (((!gw_node->deleted) || - (time_before(jiffies, gw_node->deleted + timeout))) && - atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) - continue; - - if (curr_gw == gw_node) - do_reselect = 1; hlist_del_rcu(&gw_node->list); batadv_gw_node_free_ref(gw_node); } spin_unlock_bh(&bat_priv->gw.list_lock); - - /* gw_reselect() needs to acquire the gw_list_lock */ - if (do_reselect) - batadv_gw_reselect(bat_priv); - - if (curr_gw) - batadv_gw_node_free_ref(curr_gw); } /* fails if orig_node has no router */ @@ -656,9 +645,6 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) rcu_read_lock(); hlist_for_each_entry_rcu(gw_node, &bat_priv->gw.list, list) { - if (gw_node->deleted) - continue; - /* fails if orig_node has no router */ if (batadv_write_buffer_text(bat_priv, seq, gw_node) < 0) continue; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 4500e3a..016fc20 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1009,7 +1009,6 @@ static void _batadv_purge_orig(struct batadv_priv *bat_priv) spin_unlock_bh(list_lock); } - batadv_gw_node_purge(bat_priv); batadv_gw_election(bat_priv); } diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index da4c738..002bca4 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -328,7 +328,6 @@ enum batadv_orig_capabilities { * @orig_node: pointer to corresponding orig node * @bandwidth_down: advertised uplink download bandwidth * @bandwidth_up: advertised uplink upload bandwidth - * @deleted: this struct is scheduled for deletion * @refcount: number of contexts the object is used * @rcu: struct used for freeing in an RCU-safe manner */ @@ -337,7 +336,6 @@ struct batadv_gw_node { struct batadv_orig_node *orig_node; u32 bandwidth_down; u32 bandwidth_up; - unsigned long deleted; atomic_t refcount; struct rcu_head rcu; }; -- 2.1.4

2 2

[B.A.T.M.A.N.] Batman advanced receiving packets on bat0 with same source and destination address and performance issues
by Patrick Bosch 13 Jul '15

13 Jul '15

Hello everyone I'm trying to set up a mesh, but I'm running into some issues, where I'm not sure if I'm doing something wrong or if there is a bug hidden somewhere. I'm using the Nanostation M5 XW with OpenWRT Chaos Calmer RC2 and only OpenWRT packages. The trouble occurs on a Nanostation in client mode, not in gateway mode. My setup: Laptop --- Client-mode --- Linksys router --- Gateway-mode | | ----------WiFi----------- Laptop is connected to secondary port. The main port is connected through a wire, the interface is not bridged to bat0. On the gateway, the main and secondary port are bridged to bat0. The main port is used for the connection to the router. What I'm trying to do is set up a mesh through WiFi and bridged to it is the secondary port of the Nanostation. There will be clients connected to it at some point. The main port is not bridged as this is connected to a network that has to be completely isolated. The main port is used for PoE and as a debugging connection with SSH. If I bridge it, it simply uses the wired connection, which is not intended. But even so, I still see Batman messages on the interface for the main port, although it is not bridged. If I don't connect any data to the main port, only power, it seems to work fine. As soon as I connect it to data, I see two things. First, on the bat0 interface messages with the same source and destination arrive. Second, the SSH connection to the client Nanostation becomes really bad from time to time, but not consistently. My computer is connected to the secondary port of the Nanostation. Both of these occurrences seem to correlate, but both are not consistent. As far as I understand it, batman advanced should not use the wired interface on the client Nanostation. But it sends packets on that interface. I think the problem of the bad performance lies also there, but I am not sure. I hope somebody can help me. Following are my configurations: Network: config interface 'loopback' option ifname 'lo' option proto 'static' option ipaddr '127.0.0.1' option netmask '255.0.0.0' config switch option name 'switch0' option reset '1' option enable_vlan '1' config switch_vlan option device 'switch0' option vlan '1' option ports '0t 1' config switch_vlan option device 'switch0' option vlan '2' option ports '0t 5' config interface 'mesh' option mtu '1532' option proto 'batadv' option mesh 'bat0' config interface 'bat0' option ifname 'bat0' option proto 'none' option mtu '1532' config interface 'br' option type 'bridge' option ifname 'eth0.1 bat0' option proto 'static' option ipaddr '10.123.0.2' option netmask '255.255.255.0' config interface 'wan' option proto 'dhcp' option ifname 'eth0.2' option hostname 'iFEST2' option defaultroute '0' config interface 'wan6' option proto 'dhcpv6' option reqaddress 'try' option reqprefix 'auto' option ifname 'eth0.2' Wireless: config wifi-device radio0 option type 'mac80211' option hwmode '11a' option path 'platform/ar934x_wmac' option htmode 'HT20' option channel '40' option txpower '17' option country 'BE' option disabled '0' config wifi-iface option device 'radio0' option ifname 'adhoc0' option encryption 'psk2' option network 'mesh' option ssid 'mySSID' option mode 'adhoc' option bssid '02:CA:FE:CA:CA:40' option mcast_rate '18000' option key 'myKey' Batman: config 'mesh' 'bat0' option 'aggregated_ogms' option 'ap_isolation' option 'bonding' option 'fragmentation' option 'gw_bandwidth' option 'gw_mode' 'client' option 'gw_sel_class' option 'log_level' option 'orig_interval' option 'vis_mode' option 'bridge_loop_avoidance' '1' option 'distributed_arp_table' option 'multicast_mode' option 'network_coding' option 'hop_penalty' option 'isolation_mark' These are two different translocal tables that I get, 04:18:d6:61:81:54 is the MAC of the node in question: Locally retrieved addresses (from bat0) announced via TT (TTVN: 28): Client VID Flags Last seen (CRC ) * 9e:90:31:79:cd:b8 -1 [.P....] 0.000 (0x02c4aa75) * 9e:90:31:79:cd:b8 0 [.P....] 0.000 (0x4620303d) * e8:80:2e:e7:a4:df -1 [......] 0.730 (0x02c4aa75) Locally retrieved addresses (from bat0) announced via TT (TTVN: 29): Client VID Flags Last seen (CRC ) * 9e:90:31:79:cd:b8 -1 [.P....] 0.000 (0xd3ed0426) * 04:18:d6:61:81:54 -1 [......] 30.370 (0xd3ed0426) * 9e:90:31:79:cd:b8 0 [.P....] 0.000 (0x4620303d) * e8:80:2e:e7:a4:df -1 [......] 0.010 (0xd3ed0426) The transglobal one, 04:18:d6:61:81:68 is the MAC of the gateway Globally announced TT entries received via the mesh bat0 Client VID (TTVN) Originator (Curr TTVN) (CRC ) Flags * da:2b:ea:63:42:38 0 ( 32) via 04:18:d6:60:81:68 ( 71) (0x9079f118) [....] * 04:18:d6:61:81:54 -1 ( 71) via 04:18:d6:60:81:68 ( 71) (0x4bb17292) [....] * 04:18:d6:61:81:68 -1 ( 32) via 04:18:d6:60:81:68 ( 71) (0x4bb17292) [....] * da:2b:ea:63:42:38 -1 ( 32) via 04:18:d6:60:81:68 ( 71) (0x4bb17292) [....] Kind regards Patrick -- Patrick Bosch, PhD Student University of Antwerp - iMinds Dept. Mathematics and Computer Science MOSAIC research group Middelheimlaan 1 - Room M.G.215 2020 Antwerpen - Belgium Email: patrick.bosch(a)uantwerpen.be Phone: +3232653858

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: Fix potentially broken skb network header access
by Linus Lüssing 13 Jul '15

13 Jul '15

The two commits noted below added calls to ip_hdr() and ipv6_hdr(). They need a correctly set skb network header. Unfortunately we cannot rely on the device drivers to set it for us. Therefore setting it in the beginning of the according ndo_start_xmit handler. Fixes: 405cc1e5 ("batman-adv: Modified forwarding behaviour for multicast packets") Fixes: 1c090349 ("batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Three notes: * Pending question on netdev, we should probably wait a few more days before applying this patch. * Back in Nov. 2014 for the original multicast bridge patchset Simon suggested moving the skb_set_network_header() call to within the according multicast functions: https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2014-November/012573.html I would like to submit patches for master afterwards though to change some raw skb->data access and hdr_size math to skb_network_header() calls as I think they might be easier to read and safer. (for skb->data you always have to go back the whole call chain and check for any skb pulls etc. to know where skb->data points to, same for hdr_size to know it's value as it's passed through mutliple layers of functions) So I thought it'd be good to have the skb_set_network_header() in a good place for that already. * The "network_offset += VETH_HLEN" is not strictly necessary since the multicast optimizations won't apply for vlans yet and the ip_hdr()/ipv6_hdr() calls are never reached in that case. But again, I thought it would be cleaner that way. soft-interface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index 7841a4b..eb87fd9 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -178,6 +178,7 @@ static int batadv_interface_tx(struct sk_buff *skb, int gw_mode; enum batadv_forw_mode forw_mode; struct batadv_orig_node *mcast_single_orig = NULL; + int network_offset = ETH_HLEN; if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dropped; @@ -190,14 +191,18 @@ static int batadv_interface_tx(struct sk_buff *skb, case ETH_P_8021Q: vhdr = vlan_eth_hdr(skb); - if (vhdr->h_vlan_encapsulated_proto != ethertype) + if (vhdr->h_vlan_encapsulated_proto != ethertype) { + network_offset += VLAN_HLEN; break; + } /* fall through */ case ETH_P_BATMAN: goto dropped; } + skb_set_network_header(skb, network_offset); + if (batadv_bla_tx(bat_priv, skb, vid)) goto dropped; -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCH v2 1/2] batman-adv: Annotate deleting functions with external lock via lockdep
by Sven Eckelmann 10 Jul '15

10 Jul '15

Functions which use (h)list_del* are requiring correct locking when they operate on global lists. Most of the time the search in the list and the delete are done in the same function. All other cases should have it visible that they require a special lock to avoid race conditions. Lockdep asserts can be used to check these problem during runtime when the lockdep functionality is enabled. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: * no change net/batman-adv/main.c | 11 ++++++++--- net/batman-adv/multicast.c | 13 +++++++++++-- net/batman-adv/network-coding.c | 4 ++++ net/batman-adv/translation-table.c | 2 ++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 40750cb..e71166a 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -30,6 +30,7 @@ #include <linux/ipv6.h> #include <linux/kernel.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/netdevice.h> @@ -737,13 +738,17 @@ static u16 batadv_tvlv_container_list_size(struct batadv_priv *bat_priv) /** * batadv_tvlv_container_remove - remove tvlv container from the tvlv container * list + * @bat_priv: the bat priv with all the soft interface information * @tvlv: the to be removed tvlv container * * Has to be called with the appropriate locks being acquired * (tvlv.container_list_lock). */ -static void batadv_tvlv_container_remove(struct batadv_tvlv_container *tvlv) +static void batadv_tvlv_container_remove(struct batadv_priv *bat_priv, + struct batadv_tvlv_container *tvlv) { + lockdep_assert_held(&bat_priv->tvlv.handler_list_lock); + if (!tvlv) return; @@ -768,7 +773,7 @@ void batadv_tvlv_container_unregister(struct batadv_priv *bat_priv, spin_lock_bh(&bat_priv->tvlv.container_list_lock); tvlv = batadv_tvlv_container_get(bat_priv, type, version); - batadv_tvlv_container_remove(tvlv); + batadv_tvlv_container_remove(bat_priv, tvlv); spin_unlock_bh(&bat_priv->tvlv.container_list_lock); } @@ -807,7 +812,7 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv, spin_lock_bh(&bat_priv->tvlv.container_list_lock); tvlv_old = batadv_tvlv_container_get(bat_priv, type, version); - batadv_tvlv_container_remove(tvlv_old); + batadv_tvlv_container_remove(bat_priv, tvlv_old); hlist_add_head(&tvlv_new->list, &bat_priv->tvlv.container_list); spin_unlock_bh(&bat_priv->tvlv.container_list_lock); } diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index c64d9b1..f9190ad 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -31,6 +31,7 @@ #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/rculist.h> #include <linux/rcupdate.h> @@ -103,15 +104,19 @@ static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr, /** * batadv_mcast_mla_list_free - free a list of multicast addresses + * @bat_priv: the bat priv with all the soft interface information * @mcast_list: the list to free * * Removes and frees all items in the given mcast_list. */ -static void batadv_mcast_mla_list_free(struct hlist_head *mcast_list) +static void batadv_mcast_mla_list_free(struct batadv_priv *bat_priv, + struct hlist_head *mcast_list) { struct batadv_hw_addr *mcast_entry; struct hlist_node *tmp; + lockdep_assert_held(&bat_priv->tt.commit_lock); + hlist_for_each_entry_safe(mcast_entry, tmp, mcast_list, list) { hlist_del(&mcast_entry->list); kfree(mcast_entry); @@ -134,6 +139,8 @@ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv, struct batadv_hw_addr *mcast_entry; struct hlist_node *tmp; + lockdep_assert_held(&bat_priv->tt.commit_lock); + hlist_for_each_entry_safe(mcast_entry, tmp, &bat_priv->mcast.mla_list, list) { if (mcast_list && @@ -164,6 +171,8 @@ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv, struct batadv_hw_addr *mcast_entry; struct hlist_node *tmp; + lockdep_assert_held(&bat_priv->tt.commit_lock); + if (!mcast_list) return; @@ -268,7 +277,7 @@ update: batadv_mcast_mla_tt_add(bat_priv, &mcast_list); out: - batadv_mcast_mla_list_free(&mcast_list); + batadv_mcast_mla_list_free(bat_priv, &mcast_list); } /** diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 62defe0..9700223 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -586,6 +586,8 @@ static bool batadv_nc_sniffed_purge(struct batadv_priv *bat_priv, unsigned long timeout = bat_priv->nc.max_buffer_time; bool res = false; + lockdep_assert_held(&nc_path->packet_list_lock); + /* Packets are added to tail, so the remaining packets did not time * out and we can stop processing the current queue */ @@ -622,6 +624,8 @@ static bool batadv_nc_fwd_flush(struct batadv_priv *bat_priv, { unsigned long timeout = bat_priv->nc.max_fwd_delay; + lockdep_assert_held(&nc_path->packet_list_lock); + /* Packets are added to tail, so the remaining packets did not time * out and we can stop processing the current queue */ diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index e96710c..7490006 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1669,6 +1669,8 @@ static void _batadv_tt_global_del_orig_entry(struct batadv_tt_global_entry *tt_global_entry, struct batadv_tt_orig_list_entry *orig_entry) { + lockdep_assert_held(&tt_global_entry->list_lock); + batadv_tt_global_size_dec(orig_entry->orig_node, tt_global_entry->common.vid); atomic_dec(&tt_global_entry->orig_list_count); -- 2.1.4

2 5

[B.A.T.M.A.N.] [PATCH] batman-adv: Add missing include rculist.h
by Sven Eckelmann 10 Jul '15

10 Jul '15

originator.c is using hlist_for_each_entry_rcu but did not include the required header for it. Reported-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/originator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 4500e3a..f51860d 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -26,6 +26,7 @@ #include <linux/list.h> #include <linux/lockdep.h> #include <linux/netdevice.h> +#include <linux/rculist.h> #include <linux/seq_file.h> #include <linux/slab.h> #include <linux/spinlock.h> -- 2.1.4

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