linux-merge November 2016

linux-merge@lists.open-mesh.org

3 participants
80 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20161108
by batman＠open-mesh.org 08 Nov '16

08 Nov '16

The following commit has been merged in the master branch: commit c408c1b9d49077bd6f0e267292fd35624bac76fb Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jul 22 01:30:10 2016 +0200 batman-adv: Move batadv_sum_counter to soft-interface.c The function batadv_sum_counter is only used in soft-interface.c and has no special relevance for main.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 8b0979b..6a2328d 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -185,7 +185,6 @@ enum batadv_uev_type { #include <linux/bitops.h> /* for packet.h */ #include <linux/compiler.h> -#include <linux/cpumask.h> #include <linux/etherdevice.h> #include <linux/if_ether.h> /* for packet.h */ #include <linux/if_vlan.h> @@ -284,26 +283,6 @@ static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, #define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1) -/** - * batadv_sum_counter - Sum the cpu-local counters for index 'idx' - * @bat_priv: the bat priv with all the soft interface information - * @idx: index of counter to sum up - * - * Return: sum of all cpu-local counters - */ -static inline u64 batadv_sum_counter(struct batadv_priv *bat_priv, size_t idx) -{ - u64 *counters, sum = 0; - int cpu; - - for_each_possible_cpu(cpu) { - counters = per_cpu_ptr(bat_priv->bat_counters, cpu); - sum += counters[idx]; - } - - return sum; -} - /* Define a macro to reach the control buffer of the skb. The members of the * control buffer are defined in struct batadv_skb_cb in types.h. * The macro is inspired by the similar macro TCP_SKB_CB() in tcp.h. diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 49e16b6..f37c1c7 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -22,6 +22,7 @@ #include <linux/byteorder/generic.h> #include <linux/cache.h> #include <linux/compiler.h> +#include <linux/cpumask.h> #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/ethtool.h> @@ -116,6 +117,26 @@ static int batadv_interface_release(struct net_device *dev) return 0; } +/** + * batadv_sum_counter - Sum the cpu-local counters for index 'idx' + * @bat_priv: the bat priv with all the soft interface information + * @idx: index of counter to sum up + * + * Return: sum of all cpu-local counters + */ +static u64 batadv_sum_counter(struct batadv_priv *bat_priv, size_t idx) +{ + u64 *counters, sum = 0; + int cpu; + + for_each_possible_cpu(cpu) { + counters = per_cpu_ptr(bat_priv->bat_counters, cpu); + sum += counters[idx]; + } + + return sum; +} + static struct net_device_stats *batadv_interface_stats(struct net_device *dev) { struct batadv_priv *bat_priv = netdev_priv(dev); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20161108
by batman＠open-mesh.org 08 Nov '16

08 Nov '16

The following commit has been merged in the master branch: commit bf093191db672b2ba6b769f8f7e21519348ab7fd Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jul 22 01:30:11 2016 +0200 batman-adv: Remove unused batadv_icmp_user_cmd_type Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 6afc0b8..d2e9bbd 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -252,16 +252,6 @@ struct batadv_elp_packet { #define BATADV_ELP_HLEN sizeof(struct batadv_elp_packet) /** - * enum batadv_icmp_user_cmd_type - types for batman-adv icmp cmd modes - * @BATADV_TP_START: start a throughput meter run - * @BATADV_TP_STOP: stop a throughput meter run - */ -enum batadv_icmp_user_cmd_type { - BATADV_TP_START = 0, - BATADV_TP_STOP = 2, -}; - -/** * struct batadv_icmp_header - common members among all the ICMP packets * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20161108
by batman＠open-mesh.org 08 Nov '16

08 Nov '16

The following commit has been merged in the master branch: commit 6020a86a4a208485640f7e17742835755c557676 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Aug 23 03:13:16 2016 +0200 batman-adv: fix batadv_forw_packet kerneldoc for list attribute The forw_packet list node is wrongly attributed to the icmp socket code. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index b3dd1a3..97336ec 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1363,7 +1363,7 @@ struct batadv_skb_cb { /** * struct batadv_forw_packet - structure for bcast packets to be sent/forwarded - * @list: list node for batadv_socket_client::queue_list + * @list: list node for batadv_priv::forw_{bat,bcast}_list * @send_time: execution time for delayed_work (packet sending) * @own: bool for locally generated packets (local OGMs are re-scheduled after * sending) -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20161108
by batman＠open-mesh.org 08 Nov '16

08 Nov '16

The following commit has been merged in the master branch: commit 9ca488dd53088d4fcc97258aeeccf21f63b7da1e Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Thu Sep 29 17:22:58 2016 +0200 batman-adv: Modify neigh_list only with rcu-list functions The batadv_hard_iface::neigh_list is accessed via rcu based primitives. Thus all operations done on it have to fulfill the requirements by RCU. So using non-RCU mechanisms like hlist_add_head is not allowed because it misses the barriers required to protect concurrent readers when accessing the data behind the pointer. Fixes: cef63419f7db ("batman-adv: add list of unique single hop neighbors per hard-interface") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Acked-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 5f3bfc4..7c8d160 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -544,7 +544,7 @@ batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface, if (bat_priv->algo_ops->neigh.hardif_init) bat_priv->algo_ops->neigh.hardif_init(hardif_neigh); - hlist_add_head(&hardif_neigh->list, &hard_iface->neigh_list); + hlist_add_head_rcu(&hardif_neigh->list, &hard_iface->neigh_list); out: spin_unlock_bh(&hard_iface->neigh_list_lock); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20161108
by batman＠open-mesh.org 08 Nov '16

08 Nov '16

The following commit has been merged in the master branch: commit 611b975b5c868639b7cb0e89e22d1c8c561bf3a1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 16 21:30:20 2016 +0200 batman-adv: Add BATADV_DBG_TP_METER to BATADV_DBG_ALL The BATADV_DBG_ALL has to contain the bit of BATADV_DBG_TP_METER to really support all available debug messages. Fixes: 33a3bb4a3345 ("batman-adv: throughput meter implementation") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h index e0e1a88..d2905a8 100644 --- a/net/batman-adv/log.h +++ b/net/batman-adv/log.h @@ -63,7 +63,7 @@ enum batadv_dbg_level { BATADV_DBG_NC = BIT(5), BATADV_DBG_MCAST = BIT(6), BATADV_DBG_TP_METER = BIT(7), - BATADV_DBG_ALL = 127, + BATADV_DBG_ALL = 255, }; #ifdef CONFIG_BATMAN_ADV_DEBUG -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20161108
by batman＠open-mesh.org 08 Nov '16

08 Nov '16

The following commit has been merged in the master branch: commit c2059d8582191304308c8573ead6585d25d085a6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 16 21:30:21 2016 +0200 batman-adv: Add B.A.T.M.A.N. V sysfs files to README Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index 8a8d3d9..d414e60 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -32,7 +32,7 @@ compatible interfaces. Once found, it will create subfolders in the /sys directories of each supported interface, e.g. # ls /sys/class/net/eth0/batman_adv/ -# iface_status mesh_iface +# elp_interval iface_status mesh_iface throughput_override If an interface does not have the "batman_adv" subfolder it prob- ably is not supported. Not supported interfaces are: loopback, -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20161108
by batman＠open-mesh.org 08 Nov '16

08 Nov '16

The following commit has been merged in the master branch: commit 1ed0359f1556e4c57778933f1e1104ca2cff4994 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 16 21:30:22 2016 +0200 batman-adv: Add network_coding and mcast sysfs files to README Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index d414e60..8afa991 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -71,10 +71,11 @@ All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ -#aggregated_ogms distributed_arp_table gw_sel_class orig_interval -#ap_isolation fragmentation hop_penalty routing_algo -#bonding gw_bandwidth isolation_mark vlan0 -#bridge_loop_avoidance gw_mode log_level +# aggregated_ogms fragmentation isolation_mark routing_algo +# ap_isolation gw_bandwidth log_level vlan0 +# bonding gw_mode multicast_mode +# bridge_loop_avoidance gw_sel_class network_coding +# distributed_arp_table hop_penalty orig_interval There is a special folder for debugging information: -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20161108
by batman＠open-mesh.org 08 Nov '16

08 Nov '16

The following commit has been merged in the master branch: commit 204fa42c6fc9f20e4142bd1309e0a5065966d64e Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 16 21:32:01 2016 +0200 batman-adv: Add dat, mcast, nc and neighbor debugfs files to README Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index 8afa991..a918131 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -80,9 +80,10 @@ folder: There is a special folder for debugging information: # ls /sys/kernel/debug/batman_adv/bat0/ -# bla_backbone_table log transtable_global -# bla_claim_table originators transtable_local -# gateways socket +# bla_backbone_table log neighbors transtable_local +# bla_claim_table mcast_flags originators +# dat_cache nc socket +# gateways nc_nodes transtable_global Some of the files contain all sort of status information regard- ing the mesh network. For example, you can view the table of -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20161108
by batman＠open-mesh.org 08 Nov '16

08 Nov '16

The following commit has been merged in the master branch: commit 4a2d09e31d4b4c9306177390de8911e7a56539c2 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Oct 17 14:08:36 2016 +0200 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 09af21e..8b0979b 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2016.4" +#define BATADV_SOURCE_VERSION "2016.5" #endif /* B.A.T.M.A.N. parameters */ -- LinuxNextTracking

1 0

Coverity Scan: Analysis completed for alfred
by scan-admin＠coverity.com 08 Nov '16

08 Nov '16

Your request for analysis of alfred has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V0… Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge November 2016