pull request for net-next: batman-adv 2018-09-19
Subsystems (3)
cover pull request for net-next: batman-adv 2018-09-19
Hi David,
here is a little feature and cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20180919
for you to fetch changes up to a7ea49afcc888dd5aac76774767bfb90be937aad:
batman-adv: Enable LockLess TX for softif (2018-09-15 09:51:10 +0200)
----------------------------------------------------------------
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Inform users about debugfs interface deprecation, by Sven Eckelmann
- Implement tracing, planned to replace debugfs log messages, by Sven Eckelmann
- Move OGM rebroadcasts to per interface struct, by Sven Eckelmann
- Enable LockLess TX to increase throughput, by Sven Eckelmann
----------------------------------------------------------------
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (4):
batman-adv: Mark debugfs functionality as deprecated
batman-adv: Provide debug messages as trace events
batman-adv: Move OGM rebroadcast stats to orig_ifinfo
batman-adv: Enable LockLess TX for softif
net/batman-adv/Kconfig | 11 ++ net/batman-adv/Makefile | 3 + net/batman-adv/bat_iv_ogm.c | 330 ++++++++++++---------------------------- net/batman-adv/debugfs.c | 37 +++++ net/batman-adv/debugfs.h | 6 + net/batman-adv/hard-interface.c | 47 +++--- net/batman-adv/icmp_socket.c | 3 + net/batman-adv/log.c | 20 ++- net/batman-adv/main.h | 2 +- net/batman-adv/originator.c | 107 ------------- net/batman-adv/originator.h | 4 - net/batman-adv/soft-interface.c | 2 +- net/batman-adv/trace.c | 22 +++ net/batman-adv/trace.h | 78 ++++++++++ net/batman-adv/types.h | 62 +++----- 15 files changed, 323 insertions(+), 411 deletions(-) create mode 100644 net/batman-adv/trace.c create mode 100644 net/batman-adv/trace.h
Simon Wunderlich
maintainerPATCH 1/5 batman-adv: Start new development cycle
--- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/main.h +1 -1
@@ -25,7 +25,7 @@#define BATADV_DRIVER_DEVICE "batman-adv"#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2018.2" +#define BATADV_SOURCE_VERSION "2018.4"#endif /* B.A.T.M.A.N. parameters */
Signature · 1 line
2.11.0
Simon Wunderlich
maintainerPATCH 2/5 batman-adv: Mark debugfs functionality as deprecated
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
CONFIG_BATMAN_ADV_DEBUGFS is disabled by default because debugfs is not supported for batman-adv interfaces in any non-default netns. Any remaining users of this interface should still be informed about the deprecation and the generic netlink alternative.
--- net/batman-adv/debugfs.c | 37 +++++++++++++++++++++++++++++++++++++ net/batman-adv/debugfs.h | 6 ++++++ net/batman-adv/icmp_socket.c | 3 +++ net/batman-adv/log.c | 4 ++++ 4 files changed, 50 insertions(+)
net/batman-adv/debugfs.c +37 -0
@@ -47,8 +47,24 @@static struct dentry *batadv_debugfs; +/** +* batadv_debugfs_deprecated() - Log use of deprecated batadv debugfs access +* @file: file which was accessed +* @alt: explanation what can be used as alternative +*/ +void batadv_debugfs_deprecated (struct file *file,const char *alt) +{ +struct dentry *dentry =file_dentry (file); +const char *name = dentry->d_name.name; + +pr_warn_ratelimited (DEPRECATED "%s (pid %d) Use of debugfs file \"%s\".\n%s" , + current->comm,task_pid_nr (current), name, alt); +} +static int batadv_algorithms_open (struct inode *inode,struct file *file) { +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_ROUTING_ALGOS instead\n" );return single_open (file, batadv_algo_seq_print_text,NULL ); }
@@ -56,6 +72,8 @@ static int neighbors_open(struct inode *inode, struct file *file) {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_NEIGHBORS instead\n" );return single_open (file, batadv_hardif_neigh_seq_print_text, net_dev); }
@@ -63,6 +81,8 @@ static int batadv_originators_open(struct inode *inode, struct file *file) {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_ORIGINATORS instead\n" );return single_open (file, batadv_orig_seq_print_text, net_dev); }
@@ -79,6 +99,8 @@ static int batadv_originators_hardif_open(struct inode *inode, {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_HARDIFS instead\n" );return single_open (file, batadv_orig_hardif_seq_print_text, net_dev); }
@@ -86,6 +108,8 @@ static int batadv_gateways_open(struct inode *inode, struct file *file) {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_GATEWAYS instead\n" );return single_open (file, batadv_gw_client_seq_print_text, net_dev); }
@@ -93,6 +117,8 @@ static int batadv_transtable_global_open(struct inode *inode, struct file *file) {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_TRANSTABLE_GLOBAL instead\n" );return single_open (file, batadv_tt_global_seq_print_text, net_dev); }
@@ -101,6 +127,8 @@ static int batadv_bla_claim_table_open(struct inode *inode, struct file *file) {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_BLA_CLAIM instead\n" );return single_open (file, batadv_bla_claim_table_seq_print_text, net_dev); }
@@ -110,6 +138,8 @@ static int batadv_bla_backbone_table_open(struct inode *inode, {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_BLA_BACKBONE instead\n" );return single_open (file, batadv_bla_backbone_table_seq_print_text, net_dev); }
@@ -128,6 +158,8 @@ static int batadv_dat_cache_open(struct inode *inode, struct file *file) {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_DAT_CACHE instead\n" );return single_open (file, batadv_dat_cache_seq_print_text, net_dev); }#endif
@@ -136,6 +168,8 @@ static int batadv_transtable_local_open(struct inode *inode, struct file *file) {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_TRANSTABLE_LOCAL instead\n" );return single_open (file, batadv_tt_local_seq_print_text, net_dev); }
@@ -149,6 +183,7 @@ static int batadv_nc_nodes_open(struct inode *inode, struct file *file) {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file,"" );return single_open (file, batadv_nc_nodes_seq_print_text, net_dev); }#endif
@@ -165,6 +200,8 @@ static int batadv_mcast_flags_open(struct inode *inode, struct file *file) {struct net_device *net_dev = (struct net_device *)inode->i_private; +batadv_debugfs_deprecated (file, +"Use genl command BATADV_CMD_GET_MCAST_FLAGS instead\n" );return single_open (file, batadv_mcast_flags_seq_print_text, net_dev); }#endif
net/batman-adv/debugfs.h +6 -0
@@ -21,12 +21,14 @@#include "main.h" +struct file ;struct net_device ;#define BATADV_DEBUGFS_SUBDIR "batman_adv"#if IS_ENABLED (CONFIG_BATMAN_ADV_DEBUGFS ) +void batadv_debugfs_deprecated (struct file *file,const char *alt);void batadv_debugfs_init (void );void batadv_debugfs_destroy (void );int batadv_debugfs_add_meshif (struct net_device *dev);
@@ -38,6 +40,10 @@ void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface);#else +static inline void batadv_debugfs_deprecated (struct file *file,const char *alt) +{ +} +static inline void batadv_debugfs_init (void ) { }
net/batman-adv/icmp_socket.c +3 -0
@@ -47,6 +47,7 @@#include <linux/wait.h> #include <uapi/linux/batadv_packet.h> +#include "debugfs.h" #include "hard-interface.h" #include "log.h" #include "originator.h"
@@ -74,6 +75,8 @@ static int batadv_socket_open(struct inode *inode, struct file *file)if (!try_module_get (THIS_MODULE ))return -EBUSY ; +batadv_debugfs_deprecated (file,"" ); +nonseekable_open (inode, file); socket_client =kmalloc (sizeof (*socket_client),GFP_KERNEL );
net/batman-adv/log.c +4 -0
@@ -40,6 +40,8 @@#include <linux/wait.h> #include <stdarg.h> +#include "debugfs.h" +#define BATADV_LOG_BUFF_MASK (batadv_log_buff_len - 1)static const int batadv_log_buff_len =BATADV_LOG_BUF_LEN ;
@@ -115,6 +117,8 @@ static int batadv_log_open(struct inode *inode, struct file *file)if (!try_module_get (THIS_MODULE ))return -EBUSY ; +batadv_debugfs_deprecated (file,"" ); +nonseekable_open (inode, file); file->private_data = inode->i_private;return 0 ;
Signature · 1 line
2.11.0
Simon Wunderlich
maintainerPATCH 3/5 batman-adv: Provide debug messages as trace events
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
A private debug logging infrastructure is currently provided via $debug_fs/batman_adv/*/log when CONFIG_BATMAN_ADV_DEBUG is enabled. This is not well integrated in the rest of the tracing infrastructure of the kernel.
Other components (like mac80211 or ath10k) allow to gather the debug messages using generic trace events which are better integrated. This makes it possible to interact with them using the existing userspace tools.
The tracepoint batadv:batadv_dbg will now be available when CONFIG_BATMAN_ADV_DEBUG and CONFIG_BATMAN_ADV_TRACING is activated. The log level mask is still used for filtering as usual.
A full system trace for offline parsing can be created (and read) using:
$ batctl ll all $ trace-cmd record -e batadv:batadv_dbg $ trace-cmd report
The same can also be done without recording to a file
$ batctl ll all $ trace-cmd stream -e batadv:batadv_dbg
The trace infrastructure is especially helpful when tracing processes:
$ batctl ll all
$ ./tools/perf/perf trace --event "batadv:*" batctl p 10.204.32.1
0.000 batadv:batadv_dbg:batman_adv bat0 Parsing outgoing ARP REQUEST
0.045 batadv:batadv_dbg:batman_adv bat0 ARP MSG = [src: a2:64:14:53:f8:22-10.204.32.185 dst: 00:00:00:00:00:00-10.204.32.1]
0.067 batadv:batadv_dbg:batman_adv bat0 Entry updated: 10.204.32.185 a2:64:14:53:f8:22 (vid: -1)
0.099 batadv:batadv_dbg:batman_adv bat0 batadv_dat_select_candidates(): IP=10.204.32.1 hash(IP)=48902
0.757 batadv:batadv_dbg:batman_adv bat0 dat_select_candidates() 0: selected fe:2c:91:68:29:2b addr=48977 dist=65460
1.178 batadv:batadv_dbg:batman_adv bat0 dat_select_candidates() 1: selected fe:81:ab:c5:e3:03 addr=49181 dist=65256
1.809 batadv:batadv_dbg:batman_adv bat0 dat_select_candidates() 2: selected 66:25:a7:48:37:fb addr=49328 dist=65109
1.828 batadv:batadv_dbg:batman_adv bat0 DHT_SEND for 10.204.32.1--- net/batman-adv/Kconfig | 11 +++++++ net/batman-adv/Makefile | 3 ++ net/batman-adv/log.c | 18 ++++++++---- net/batman-adv/trace.c | 22 ++++++++++++++ net/batman-adv/trace.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 net/batman-adv/trace.c create mode 100644 net/batman-adv/trace.h
net/batman-adv/Kconfig +11 -0
@@ -106,3 +106,14 @@ config BATMAN_ADV_DEBUG say N here. This enables compilation of support for outputting debugging information to the kernel log. The output is controlled via the module parameter debug. + +config BATMAN_ADV_TRACING + bool "B.A.T.M.A.N. tracing support" + depends on BATMAN_ADV + depends on EVENT_TRACING + help + This is an option for use by developers; most people should + say N here. Select this option to gather traces like the debug + messages using the generic tracing infrastructure of the kernel. + BATMAN_ADV_DEBUG must also be selected to get trace events for + batadv_dbg.
net/batman-adv/Makefile +3 -0
@@ -42,6 +42,9 @@ batman-adv-y += routing.o batman-adv-y += send.o batman-adv-y += soft-interface.o batman-adv-y += sysfs.o +batman-adv-$(CONFIG_BATMAN_ADV_TRACING) += trace.o batman-adv-y += tp_meter.o batman-adv-y += translation-table.o batman-adv-y += tvlv.o + +CFLAGS_trace.o := -I$(src)
net/batman-adv/log.c +13 -5
@@ -41,6 +41,7 @@#include <stdarg.h> #include "debugfs.h" +#include "trace.h" #define BATADV_LOG_BUFF_MASK (batadv_log_buff_len - 1)
@@ -100,13 +101,19 @@ static int batadv_fdebug_log(struct batadv_priv_debug_log *debug_log,*/ int batadv_debug_log (struct batadv_priv *bat_priv,const char *fmt, ...) { +struct va_format vaf;va_list args; -char tmp_log_buf[256 ];va_start (args, fmt); -vscnprintf (tmp_log_buf,sizeof (tmp_log_buf), fmt, args); -batadv_fdebug_log (bat_priv->debug_log,"[%10u] %s" , -jiffies_to_msecs (jiffies), tmp_log_buf); + + vaf.fmt = fmt; + vaf.va = &args; + +batadv_fdebug_log (bat_priv->debug_log,"[%10u] %pV" , +jiffies_to_msecs (jiffies), &vaf); + +trace_batadv_dbg (bat_priv, &vaf); +va_end (args);return 0 ;
@@ -117,7 +124,8 @@ static int batadv_log_open(struct inode *inode, struct file *file)if (!try_module_get (THIS_MODULE ))return -EBUSY ; -batadv_debugfs_deprecated (file,"" ); +batadv_debugfs_deprecated (file, +"Use tracepoint batadv:batadv_dbg instead\n" );nonseekable_open (inode, file); file->private_data = inode->i_private;
net/batman-adv/trace.c new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2010-2018 B.A.T.M.A.N. contributors: +* +* Sven Eckelmann +* +* 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/>. +*/ + +#include <linux/module.h> + +#define CREATE_TRACE_POINTS +#include "trace.h"
net/batman-adv/trace.h new file +78 -0
78 lines not on this page · raw message
Signature · 1 line
2.11.0
Simon Wunderlich
maintainerPATCH 4/5 batman-adv: Move OGM rebroadcast stats to orig_ifinfo
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
B.A.T.M.A.N. IV requires the number of rebroadcast from a neighboring originator. These statistics are gathered per interface which transmitted the OGM (and then received it again). Since an originator is not interface specific, a resizable array was used in each originator.
This resizable array had an entry for each interface and had to be resizes (for all OGMs) when the number of active interface was modified. This could cause problems when a large number of interface is added and not enough continuous memory is available to allocate the array.
There is already a per interface originator structure "batadv_orig_ifinfo" which can be used to store this information.
--- net/batman-adv/bat_iv_ogm.c | 330 ++++++++++++---------------------------- net/batman-adv/hard-interface.c | 47 +++--- net/batman-adv/originator.c | 107 ------------- net/batman-adv/originator.h | 4 - net/batman-adv/soft-interface.c | 1 - net/batman-adv/types.h | 62 +++----- 6 files changed, 145 insertions(+), 406 deletions(-)
net/batman-adv/bat_iv_ogm.c +96 -234
@@ -138,169 +138,6 @@ static u8 batadv_ring_buffer_avg(const u8 lq_recv[]) }/** -* batadv_iv_ogm_orig_free() - free the private resources allocated for this -* orig_node -* @orig_node: the orig_node for which the resources have to be free'd -*/ -static void batadv_iv_ogm_orig_free (struct batadv_orig_node *orig_node) -{ -kfree (orig_node->bat_iv.bcast_own); -kfree (orig_node->bat_iv.bcast_own_sum); -} - -/** -* batadv_iv_ogm_orig_add_if() - change the private structures of the orig_node -* to include the new hard-interface -* @orig_node: the orig_node that has to be changed -* @max_if_num: the current amount of interfaces -* -* Return: 0 on success, a negative error code otherwise. -*/ -static int batadv_iv_ogm_orig_add_if (struct batadv_orig_node *orig_node, -unsigned int max_if_num) -{ -void *data_ptr; -size_t old_size; -int ret = -ENOMEM ; - -spin_lock_bh (&orig_node->bat_iv.ogm_cnt_lock); - - old_size = (max_if_num -1 ) *sizeof (unsigned long ) *BATADV_NUM_WORDS ; - data_ptr =kmalloc_array (max_if_num, -BATADV_NUM_WORDS *sizeof (unsigned long ), -GFP_ATOMIC ); -if (!data_ptr) - goto unlock; - -memcpy (data_ptr, orig_node->bat_iv.bcast_own, old_size); -kfree (orig_node->bat_iv.bcast_own); - orig_node->bat_iv.bcast_own = data_ptr; - - data_ptr =kmalloc_array (max_if_num,sizeof (u8),GFP_ATOMIC ); -if (!data_ptr) - goto unlock; - -memcpy (data_ptr, orig_node->bat_iv.bcast_own_sum, - (max_if_num -1 ) *sizeof (u8)); -kfree (orig_node->bat_iv.bcast_own_sum); - orig_node->bat_iv.bcast_own_sum = data_ptr; - - ret =0 ; - -unlock: -spin_unlock_bh (&orig_node->bat_iv.ogm_cnt_lock); - -return ret; -} - -/** -* batadv_iv_ogm_drop_bcast_own_entry() - drop section of bcast_own -* @orig_node: the orig_node that has to be changed -* @max_if_num: the current amount of interfaces -* @del_if_num: the index of the interface being removed -*/ -static void -batadv_iv_ogm_drop_bcast_own_entry (struct batadv_orig_node *orig_node, -unsigned int max_if_num, -unsigned int del_if_num) -{ -size_t chunk_size; -size_t if_offset; -void *data_ptr; - -lockdep_assert_held (&orig_node->bat_iv.ogm_cnt_lock); - - chunk_size =sizeof (unsigned long ) *BATADV_NUM_WORDS ; - data_ptr =kmalloc_array (max_if_num, chunk_size,GFP_ATOMIC ); -if (!data_ptr) -/* use old buffer when new one could not be allocated */ - data_ptr = orig_node->bat_iv.bcast_own; - -/* copy first part */ -memmove (data_ptr, orig_node->bat_iv.bcast_own, del_if_num * chunk_size); - -/* copy second part */ - if_offset = (del_if_num +1 ) * chunk_size; -memmove ((char *)data_ptr + del_if_num * chunk_size, - (uint8_t *)orig_node->bat_iv.bcast_own + if_offset, - (max_if_num - del_if_num) * chunk_size); - -/* bcast_own was shrunk down in new buffer; free old one */ -if (orig_node->bat_iv.bcast_own != data_ptr) { -kfree (orig_node->bat_iv.bcast_own); - orig_node->bat_iv.bcast_own = data_ptr; - } -} - -/** -* batadv_iv_ogm_drop_bcast_own_sum_entry() - drop section of bcast_own_sum -* @orig_node: the orig_node that has to be changed -* @max_if_num: the current amount of interfaces -* @del_if_num: the index of the interface being removed -*/ -static void -batadv_iv_ogm_drop_bcast_own_sum_entry (struct batadv_orig_node *orig_node, -unsigned int max_if_num, -unsigned int del_if_num) -{ -size_t if_offset; -void *data_ptr; - -lockdep_assert_held (&orig_node->bat_iv.ogm_cnt_lock); - - data_ptr =kmalloc_array (max_if_num,sizeof (u8),GFP_ATOMIC ); -if (!data_ptr) -/* use old buffer when new one could not be allocated */ - data_ptr = orig_node->bat_iv.bcast_own_sum; - -memmove (data_ptr, orig_node->bat_iv.bcast_own_sum, - del_if_num *sizeof (u8)); - - if_offset = (del_if_num +1 ) *sizeof (u8); -memmove ((char *)data_ptr + del_if_num *sizeof (u8), - orig_node->bat_iv.bcast_own_sum + if_offset, - (max_if_num - del_if_num) *sizeof (u8)); - -/* bcast_own_sum was shrunk down in new buffer; free old one */ -if (orig_node->bat_iv.bcast_own_sum != data_ptr) { -kfree (orig_node->bat_iv.bcast_own_sum); - orig_node->bat_iv.bcast_own_sum = data_ptr; - } -} - -/** -* batadv_iv_ogm_orig_del_if() - change the private structures of the orig_node -* to exclude the removed interface -* @orig_node: the orig_node that has to be changed -* @max_if_num: the current amount of interfaces -* @del_if_num: the index of the interface being removed -* -* Return: 0 on success, a negative error code otherwise. -*/ -static int batadv_iv_ogm_orig_del_if (struct batadv_orig_node *orig_node, -unsigned int max_if_num, -unsigned int del_if_num) -{ -spin_lock_bh (&orig_node->bat_iv.ogm_cnt_lock); - -if (max_if_num ==0 ) { -kfree (orig_node->bat_iv.bcast_own); -kfree (orig_node->bat_iv.bcast_own_sum); - orig_node->bat_iv.bcast_own =NULL ; - orig_node->bat_iv.bcast_own_sum =NULL ; - }else { -batadv_iv_ogm_drop_bcast_own_entry (orig_node, max_if_num, - del_if_num); -batadv_iv_ogm_drop_bcast_own_sum_entry (orig_node, max_if_num, - del_if_num); - } - -spin_unlock_bh (&orig_node->bat_iv.ogm_cnt_lock); - -return 0 ; -} - -/** * batadv_iv_ogm_orig_get() - retrieve or create (if does not exist) an * originator * @bat_priv: the bat priv with all the soft interface information
@@ -315,7 +152,6 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr) {struct batadv_orig_node *orig_node;int hash_added; -size_t size; orig_node =batadv_orig_hash_find (bat_priv, addr);if (orig_node)
@@ -327,16 +163,6 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr)spin_lock_init (&orig_node->bat_iv.ogm_cnt_lock); - size = bat_priv->num_ifaces *sizeof (unsigned long ) *BATADV_NUM_WORDS ; - orig_node->bat_iv.bcast_own =kzalloc (size,GFP_ATOMIC ); -if (!orig_node->bat_iv.bcast_own) - goto free_orig_node; - - size = bat_priv->num_ifaces *sizeof (u8); - orig_node->bat_iv.bcast_own_sum =kzalloc (size,GFP_ATOMIC ); -if (!orig_node->bat_iv.bcast_own_sum) - goto free_orig_node; -kref_get (&orig_node->refcount); hash_added = batadv_hash_add(bat_priv->orig_hash, batadv_compare_orig, batadv_choose_orig, orig_node,
@@ -347,8 +173,9 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr)return orig_node; free_orig_node_hash: +/* reference for batadv_hash_add */ batadv_orig_node_put (orig_node); -free_orig_node: +/* reference from batadv_orig_node_new */ batadv_orig_node_put (orig_node);return NULL ;
@@ -893,26 +720,30 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)struct batadv_hashtable *hash = bat_priv->orig_hash;struct hlist_head *head;struct batadv_orig_node *orig_node; +struct batadv_orig_ifinfo *orig_ifinfo;unsigned long *word;u32 i; -size_t word_index;u8 *w; -unsigned int if_num;for (i =0 ; i < hash->size; i++) { head = &hash->table[i];rcu_read_lock ();hlist_for_each_entry_rcu (orig_node, head, hash_entry) { -spin_lock_bh (&orig_node->bat_iv.ogm_cnt_lock); - word_index = hard_iface->if_num *BATADV_NUM_WORDS ; - word = &orig_node->bat_iv.bcast_own[word_index]; - -batadv_bit_get_packet (bat_priv, word,1 ,0 ); - if_num = hard_iface->if_num; - w = &orig_node->bat_iv.bcast_own_sum[if_num]; - *w =bitmap_weight (word,BATADV_TQ_LOCAL_WINDOW_SIZE ); -spin_unlock_bh (&orig_node->bat_iv.ogm_cnt_lock); +hlist_for_each_entry_rcu (orig_ifinfo, + &orig_node->ifinfo_list, + list) { +if (orig_ifinfo->if_outgoing != hard_iface) +continue ; + +spin_lock_bh (&orig_node->bat_iv.ogm_cnt_lock); + word = orig_ifinfo->bat_iv.bcast_own; +batadv_bit_get_packet (bat_priv, word,1 ,0 ); + w = &orig_ifinfo->bat_iv.bcast_own_sum; + *w =bitmap_weight (word, +BATADV_TQ_LOCAL_WINDOW_SIZE ); +spin_unlock_bh (&orig_node->bat_iv.ogm_cnt_lock); + } }rcu_read_unlock (); }
@@ -1000,6 +831,35 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) }/** +* batadv_iv_orig_ifinfo_sum() - Get bcast_own sum for originator over iterface +* @orig_node: originator which reproadcasted the OGMs directly +* @if_outgoing: interface which transmitted the original OGM and received the +* direct rebroadcast +* +* Return: Number of replied (rebroadcasted) OGMs which were transmitted by +* an originator and directly (without intermediate hop) received by a specific +* interface +*/ +static u8 batadv_iv_orig_ifinfo_sum (struct batadv_orig_node *orig_node, +struct batadv_hard_iface *if_outgoing) +{ +struct batadv_orig_ifinfo *orig_ifinfo; +u8 sum; + + orig_ifinfo =batadv_orig_ifinfo_get (orig_node, if_outgoing); +if (!orig_ifinfo) +return 0 ; + +spin_lock_bh (&orig_node->bat_iv.ogm_cnt_lock); + sum = orig_ifinfo->bat_iv.bcast_own_sum; +spin_unlock_bh (&orig_node->bat_iv.ogm_cnt_lock); + +batadv_orig_ifinfo_put (orig_ifinfo); + +return sum; +} + +/** * batadv_iv_ogm_orig_update() - use OGM to update corresponding data in an * originator * @bat_priv: the bat priv with all the soft interface information
@@ -1026,8 +886,6 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,struct batadv_neigh_node *neigh_node =NULL ;struct batadv_neigh_node *tmp_neigh_node =NULL ;struct batadv_neigh_node *router =NULL ; -struct batadv_orig_node *orig_node_tmp; -unsigned int if_num;u8 sum_orig, sum_neigh;u8 *neigh_addr;u8 tq_avg;
@@ -1132,18 +990,10 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,*/ if (router_ifinfo && neigh_ifinfo->bat_iv.tq_avg == router_ifinfo->bat_iv.tq_avg) { - orig_node_tmp = router->orig_node; -spin_lock_bh (&orig_node_tmp->bat_iv.ogm_cnt_lock); - if_num = router->if_incoming->if_num; - sum_orig = orig_node_tmp->bat_iv.bcast_own_sum[if_num]; -spin_unlock_bh (&orig_node_tmp->bat_iv.ogm_cnt_lock); - - orig_node_tmp = neigh_node->orig_node; -spin_lock_bh (&orig_node_tmp->bat_iv.ogm_cnt_lock); - if_num = neigh_node->if_incoming->if_num; - sum_neigh = orig_node_tmp->bat_iv.bcast_own_sum[if_num]; -spin_unlock_bh (&orig_node_tmp->bat_iv.ogm_cnt_lock); - + sum_orig =batadv_iv_orig_ifinfo_sum (router->orig_node, + router->if_incoming); + sum_neigh =batadv_iv_orig_ifinfo_sum (neigh_node->orig_node, + neigh_node->if_incoming);if (sum_orig >= sum_neigh) goto out; }
@@ -1186,7 +1036,6 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,u8 total_count;u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;unsigned int neigh_rq_inv_cube, neigh_rq_max_cube; -unsigned int if_num;unsigned int tq_asym_penalty, inv_asym_penalty;unsigned int combined_tq;unsigned int tq_iface_penalty;
@@ -1227,9 +1076,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, orig_node->last_seen = jiffies;/* find packet count of corresponding one hop neighbor */ -spin_lock_bh (&orig_neigh_node->bat_iv.ogm_cnt_lock); - if_num = if_incoming->if_num; - orig_eq_count = orig_neigh_node->bat_iv.bcast_own_sum[if_num]; + orig_eq_count =batadv_iv_orig_ifinfo_sum (orig_neigh_node, if_incoming); neigh_ifinfo =batadv_neigh_ifinfo_new (neigh_node, if_outgoing);if (neigh_ifinfo) { neigh_rq_count = neigh_ifinfo->bat_iv.real_packet_count;
@@ -1237,7 +1084,6 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, }else { neigh_rq_count =0 ; } -spin_unlock_bh (&orig_neigh_node->bat_iv.ogm_cnt_lock);/* pay attention to not get a value bigger than 100 % */ if (orig_eq_count > neigh_rq_count)
@@ -1622,6 +1468,49 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, }/** +* batadv_iv_ogm_process_reply() - Check OGM for direct reply and process it +* @ogm_packet: rebroadcast OGM packet to process +* @if_incoming: the interface where this packet was received +* @orig_node: originator which reproadcasted the OGMs +* @if_incoming_seqno: OGM sequence number when rebroadcast was received +*/ +static void batadv_iv_ogm_process_reply (struct batadv_ogm_packet *ogm_packet, +struct batadv_hard_iface *if_incoming, +struct batadv_orig_node *orig_node, +u32 if_incoming_seqno) +{ +struct batadv_orig_ifinfo *orig_ifinfo; +s32 bit_pos; +u8 *weight; + +/* neighbor has to indicate direct link and it has to +* come via the corresponding interface +*/ +if (!(ogm_packet->flags &BATADV_DIRECTLINK )) +return ; + +if (!batadv_compare_eth (if_incoming->net_dev->dev_addr, + ogm_packet->orig)) +return ; + + orig_ifinfo =batadv_orig_ifinfo_get (orig_node, if_incoming); +if (!orig_ifinfo) +return ; + +/* save packet seqno for bidirectional check */ +spin_lock_bh (&orig_node->bat_iv.ogm_cnt_lock); + bit_pos = if_incoming_seqno -2 ; + bit_pos -=ntohl (ogm_packet->seqno); +batadv_set_bit (orig_ifinfo->bat_iv.bcast_own, bit_pos); + weight = &orig_ifinfo->bat_iv.bcast_own_sum; + *weight =bitmap_weight (orig_ifinfo->bat_iv.bcast_own, +BATADV_TQ_LOCAL_WINDOW_SIZE ); +spin_unlock_bh (&orig_node->bat_iv.ogm_cnt_lock); + +batadv_orig_ifinfo_put (orig_ifinfo); +} + +/** * batadv_iv_ogm_process() - process an incoming batman iv OGM * @skb: the skb containing the OGM * @ogm_offset: offset to the OGM which should be processed (for aggregates)
@@ -1705,37 +1594,13 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, }if (is_my_orig) { -unsigned long *word; -size_t offset; -s32 bit_pos; -unsigned int if_num; -u8 *weight; - orig_neigh_node =batadv_iv_ogm_orig_get (bat_priv, ethhdr->h_source);if (!orig_neigh_node)return ; -/* neighbor has to indicate direct link and it has to -* come via the corresponding interface -* save packet seqno for bidirectional check -*/ -if (has_directlink_flag && -batadv_compare_eth (if_incoming->net_dev->dev_addr, - ogm_packet->orig)) { - if_num = if_incoming->if_num; - offset = if_num *BATADV_NUM_WORDS ; - -spin_lock_bh (&orig_neigh_node->bat_iv.ogm_cnt_lock); - word = &orig_neigh_node->bat_iv.bcast_own[offset]; - bit_pos = if_incoming_seqno -2 ; - bit_pos -=ntohl (ogm_packet->seqno); -batadv_set_bit (word, bit_pos); - weight = &orig_neigh_node->bat_iv.bcast_own_sum[if_num]; - *weight =bitmap_weight (word, -BATADV_TQ_LOCAL_WINDOW_SIZE ); -spin_unlock_bh (&orig_neigh_node->bat_iv.ogm_cnt_lock); - } +batadv_iv_ogm_process_reply (ogm_packet, if_incoming, + orig_neigh_node, if_incoming_seqno);batadv_dbg (BATADV_DBG_BATMAN , bat_priv,"Drop packet: originator packet from myself (via neighbor)\n" );
@@ -2844,9 +2709,6 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .print = batadv_iv_ogm_orig_print, #endif .dump = batadv_iv_ogm_orig_dump, - .free = batadv_iv_ogm_orig_free, - .add_if = batadv_iv_ogm_orig_add_if, - .del_if = batadv_iv_ogm_orig_del_if, }, .gw = { .init_sel_class = batadv_iv_init_sel_class,
net/batman-adv/hard-interface.c +28 -19
84 lines not on this page · raw message
net/batman-adv/originator.c +0 -107
116 lines not on this page · raw message
net/batman-adv/originator.h +0 -4
@@ -72,10 +72,6 @@ void batadv_orig_ifinfo_put(struct batadv_orig_ifinfo *orig_ifinfo);int batadv_orig_seq_print_text (struct seq_file *seq,void *offset);int batadv_orig_dump (struct sk_buff *msg,struct netlink_callback *cb);int batadv_orig_hardif_seq_print_text (struct seq_file *seq,void *offset); -int batadv_orig_hash_add_if (struct batadv_hard_iface *hard_iface, -unsigned int max_if_num); -int batadv_orig_hash_del_if (struct batadv_hard_iface *hard_iface, -unsigned int max_if_num);struct batadv_orig_node_vlan *batadv_orig_node_vlan_new (struct batadv_orig_node *orig_node,unsigned short vid);
net/batman-adv/soft-interface.c +0 -1
@@ -833,7 +833,6 @@ static int batadv_softif_init_late(struct net_device *dev)atomic_set (&bat_priv->frag_seqno, random_seqno); bat_priv->primary_if =NULL ; - bat_priv->num_ifaces =0 ;batadv_nc_init_bat_priv (bat_priv);
net/batman-adv/types.h +21 -41
98 lines not on this page · raw message
Signature · 1 line
2.11.0
Simon Wunderlich
maintainerPATCH 5/5 batman-adv: Enable LockLess TX for softif
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
The batadv interfaces are virtual interfaces which just tunnel the traffic over other ethernet compatible interfaces. It doesn't need serialization during the tx phase and is using RCU for most of its internal datastructures. Since it doesn't have actual queues which could be locked independently, the throughput gets significantly reduced by the extra lock in the core net code.
8 parallel TCP connections forwarded by an IPQ4019 based hardware over 5GHz could reach:
* without LLTX: 349 Mibit/s
* with LLTX: 563 Mibit/s
--- net/batman-adv/soft-interface.c | 1 + 1 file changed, 1 insertion(+)
net/batman-adv/soft-interface.c +1 -0
@@ -1050,6 +1050,7 @@ static void batadv_softif_init_early(struct net_device *dev) dev->needs_free_netdev = true; dev->priv_destructor = batadv_softif_free; dev->features |=NETIF_F_HW_VLAN_CTAG_FILTER |NETIF_F_NETNS_LOCAL ; + dev->features |=NETIF_F_LLTX ; dev->priv_flags |=IFF_NO_QUEUE ;/* can't call min_mtu, because the needed variables
Signature · 1 line
2.11.0
[B.A.T.M.A.N.] a dumb question about batman
What does the frame look like nowadays? Does it have an IP header?
Sven Eckelmann
maintainerRe: [B.A.T.M.A.N.] a dumb question about batman
[please avoid replying to a unrelated message when starting a new topic]
Quoted 1 line · On Mittwoch, 19. September 2018 09:47:09 CEST Dave Taht wrote:
What does the frame look like nowadays? Does it have an IP header?
Depends on what you are talking about. batman-adv is still raw ethernet. The encapsulated traffic ("tunnelled traffic) is
1. ethernet header
2. batman-adv header
3. encapsulated ethernet header
4. the rest (IP, ...)
I have attached some small examples which you can open with wireshark. I think the v15 support was added in 2014 - so you should be able to dissect these packets with the wireshark version from a recent Linux distribution.
And the (stagnating) batmand uses IPv4 for the announcements. And it only modifies IPv4 routing tables. For IPv4+IPv6 support, you have to check out bmx.
Kind regards,
Sven
[B.A.T.M.A.N.] Packaging BATMAN
In reply to Simon WunderlichHi all,
I'd like to package an application for RHEL7 which uses BATMAN, but it seems that the module is not distributed by Redhat with their kernel.
Am I going to be stuck with releasing a new package with an updated batman-adv kernel module for every minor update of the OS, or is there a simpler way?...
Any advice/suggestions would be appreciated.
--
A. James Lewis ([email protected])
"Engineering does not require science. Science helps a lot but people built perfectly good brick walls long before they knew why cement works."
David Miller
maintainerFrom: Simon Wunderlich <[email protected]>
Date: Wed, 19 Sep 2018 14:32:33 +0200
Quoted 3 lines
here is a little feature and cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Also pulled, thank you.