B.A.T.M.A.N October 2016

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

17 participants
57 discussions

[B.A.T.M.A.N.] [PATCH v2 0/11] batman-adv: Support for complex compat patches
by Sven Eckelmann 18 Oct '16

18 Oct '16

Hi, some patches (like patch 3+4) require special code modifications that cannot be handled (reasonable) with the compat headers. One of these patches (3) is already in linux-next and thus should also be in batman-adv.git. I am proposing in this patchset two different solutions. The first one is the easiest and most likely the best for the upcoming release. It uses a simple shell script to patch the problematic lines in a copy of the source code. The second solution uses parts of the first solution but replaces the simple shell script with unified and semantic patch files. Patch 5-11 should therefore be used as an example how coccinelle/spatch can be used to clean up some of the "interesting" hacks in the compat headers. Changes in v2: - remove second replacement.sh line which basically does nothing (thanks Linus) - added patch 4 to also mark batadv_netlink_ops as const - introduce patch 5-11 to show usage of coccinelle (I personally recommend patch 9 to get familiar with the idea) Kind regards, Sven

1 14

[B.A.T.M.A.N.] [PATCH maint] batman-adv: Modify neigh_list only with rcu-list functions
by Sven Eckelmann 18 Oct '16

18 Oct '16

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: fed2826b490c ("batman-adv: add list of unique single hop neighbors per hard-interface") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> --- net/batman-adv/originator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 3940b5d..3e9667e 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -537,7 +537,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); -- 2.9.3

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: remove unsed argument from batadv_dbg_arp() function
by Antonio Quartulli 18 Oct '16

18 Oct '16

The argument "type" passed to the batadv_dbg_arp() function is never used. Remove it. Signed-off-by: Antonio Quartulli <a(a)unstable.cc> --- net/batman-adv/distributed-arp-table.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e257efd..cbb4f32 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -369,12 +369,11 @@ out: * batadv_dbg_arp - print a debug message containing all the ARP packet details * @bat_priv: the bat priv with all the soft interface information * @skb: ARP packet - * @type: ARP type * @hdr_size: size of the possible header before the ARP packet * @msg: message to print together with the debugging information */ static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb, - u16 type, int hdr_size, char *msg) + int hdr_size, char *msg) { struct batadv_unicast_4addr_packet *unicast_4addr_packet; struct batadv_bcast_packet *bcast_pkt; @@ -441,7 +440,7 @@ static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb, #else static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb, - u16 type, int hdr_size, char *msg) + int hdr_size, char *msg) { } @@ -983,8 +982,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, if (type != ARPOP_REQUEST) goto out; - batadv_dbg_arp(bat_priv, skb, type, hdr_size, - "Parsing outgoing ARP REQUEST"); + batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing outgoing ARP REQUEST"); ip_src = batadv_arp_ip_src(skb, hdr_size); hw_src = batadv_arp_hw_src(skb, hdr_size); @@ -1075,8 +1073,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, ip_src = batadv_arp_ip_src(skb, hdr_size); ip_dst = batadv_arp_ip_dst(skb, hdr_size); - batadv_dbg_arp(bat_priv, skb, type, hdr_size, - "Parsing incoming ARP REQUEST"); + batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing incoming ARP REQUEST"); batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid); @@ -1149,8 +1146,7 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, if (type != ARPOP_REPLY) return; - batadv_dbg_arp(bat_priv, skb, type, hdr_size, - "Parsing outgoing ARP REPLY"); + batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing outgoing ARP REPLY"); hw_src = batadv_arp_hw_src(skb, hdr_size); ip_src = batadv_arp_ip_src(skb, hdr_size); @@ -1195,8 +1191,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, if (type != ARPOP_REPLY) goto out; - batadv_dbg_arp(bat_priv, skb, type, hdr_size, - "Parsing incoming ARP REPLY"); + batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing incoming ARP REPLY"); hw_src = batadv_arp_hw_src(skb, hdr_size); ip_src = batadv_arp_ip_src(skb, hdr_size); -- 2.10.0

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Allow selecting BATMAN V if CFG80211 is not built
by Linus Lüssing 18 Oct '16

18 Oct '16

With the new stub for cfg80211_get_station(), we can now build the BATMAN V protocol even with a kernel that was built without any wireless support. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- compat-include/net/cfg80211.h | 24 ++++++++++++++++++++++++ net/batman-adv/Kconfig | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 compat-include/net/cfg80211.h diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h new file mode 100644 index 0000000..8dbbf0e --- /dev/null +++ b/compat-include/net/cfg80211.h @@ -0,0 +1,24 @@ +#ifndef _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ +#define _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ + +#include <linux/version.h> +#include_next <net/cfg80211.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) + +#if !IS_ENABLED(CONFIG_CFG80211) + +#define cfg80211_get_station(dev, mac_addr, sinfo) \ + batadv_cfg80211_get_station(dev, mac_addr, sinfo) + +static inline int batadv_cfg80211_get_station(struct net_device *dev, + const u8 *mac_addr, + struct station_info *sinfo) +{ + return -ENOENT; +} +#endif + +#endif /* < KERNEL_VERSION(4, 8, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ */ diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index f20742c..b73b96a 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -17,7 +17,7 @@ config BATMAN_ADV config BATMAN_ADV_BATMAN_V bool "B.A.T.M.A.N. V protocol (experimental)" - depends on BATMAN_ADV && CFG80211=y || (CFG80211=m && BATMAN_ADV=m) + depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y) default n help This option enables the B.A.T.M.A.N. V protocol, the successor -- 2.1.4

2 2

[B.A.T.M.A.N.] [PATCH next] batman-adv: remove redundant #include <linux/kconfig.h>
by Sven Eckelmann 18 Oct '16

18 Oct '16

From: Masahiro Yamada <yamada.masahiro(a)socionext.com> Kernel source files need not include <linux/kconfig.h> explicitly because the top Makefile forces to include it with: -include $(srctree)/include/linux/kconfig.h Link: http://lkml.kernel.org/r/1473656164-11929-1-git-send-email-yamada.masahiro@… Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/debugfs.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index c68ff3d..e49121e 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -20,8 +20,6 @@ #include "main.h" -#include <linux/kconfig.h> - struct net_device; #define BATADV_DEBUGFS_SUBDIR "batman_adv" -- 2.9.3

1 1

[B.A.T.M.A.N.] [PATCH v2] batman-adv: fix batadv_forw_packet kerneldoc for list attribute
by Linus Lüssing 18 Oct '16

18 Oct '16

The forw_packet list node is wrongly attributed to the icmp socket code. Reviewed-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changes in v2: * "Reviewed-by:" added * detached from patchset net/batman-adv/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 2.1.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove unused function batadv_hash_delete
by Sven Eckelmann 18 Oct '16

18 Oct '16

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/hash.h | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index cbbf870..557a704 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@ -61,36 +61,6 @@ void batadv_hash_set_lock_class(struct batadv_hashtable *hash, /* free only the hashtable and the hash itself. */ void batadv_hash_destroy(struct batadv_hashtable *hash); -/* remove the hash structure. if hashdata_free_cb != NULL, this function will be - * called to remove the elements inside of the hash. if you don't remove the - * elements, memory might be leaked. - */ -static inline void batadv_hash_delete(struct batadv_hashtable *hash, - batadv_hashdata_free_cb free_cb, - void *arg) -{ - struct hlist_head *head; - struct hlist_node *node, *node_tmp; - spinlock_t *list_lock; /* spinlock to protect write access */ - u32 i; - - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; - - spin_lock_bh(list_lock); - hlist_for_each_safe(node, node_tmp, head) { - hlist_del_rcu(node); - - if (free_cb) - free_cb(node, arg); - } - spin_unlock_bh(list_lock); - } - - batadv_hash_destroy(hash); -} - /** * batadv_hash_add - adds data to the hashtable * @hash: storage hash table

1 5

[B.A.T.M.A.N.] [PATCH 1/5] batman-adv: Add BATADV_DBG_TP_METER to BATADV_DBG_ALL
by Sven Eckelmann 18 Oct '16

18 Oct '16

The BATADV_DBG_ALL has to contain the bit of BATADV_DBG_TP_METER to really support all available debug messages. Fixes: 98d7a766b645 ("batman-adv: throughput meter implementation") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/log.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.8.1

1 9

[B.A.T.M.A.N.] [PATCH] alfred: vis: Fix netlink function fallback
by Sven Eckelmann 14 Oct '16

14 Oct '16

The netlink functions return -EOPNOTSUPP when the kernel doesn't support the netlink command. The caller can then fall back to debugfs. So check for -EOPNOTSUPP and not EOPNOTSUPP. Fixes: bca55a86fecd ("alfred: vis: Add support for netlink") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- vis/vis.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vis/vis.c b/vis/vis.c index b865508..677f8aa 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -361,7 +361,7 @@ static int parse_transtable_local(struct globals *globals) int ret; ret = parse_transtable_local_netlink(globals); - if (ret != EOPNOTSUPP) + if (ret != -EOPNOTSUPP) return ret; return parse_transtable_local_debugfs(globals); @@ -602,7 +602,7 @@ static int parse_orig_list(struct globals *globals) int ret; ret = parse_orig_list_netlink(globals); - if (ret != EOPNOTSUPP) + if (ret != -EOPNOTSUPP) return ret; return parse_orig_list_debugfs(globals); -- 2.9.3

2 1

[B.A.T.M.A.N.] [PATCH] alfred: vis: Fix direct neighbors detection with netlink query
by Sven Eckelmann 14 Oct '16

14 Oct '16

Only entries in the originator table with the destination address equal to the originator address should be handled by alfred as actual neighbors. Fixes: bca55a86fecd ("alfred: vis: Add support for netlink") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- vis/vis.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vis/vis.c b/vis/vis.c index 94e583e..f4d13c7 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -453,6 +453,7 @@ err: static const int parse_orig_list_mandatory[] = { BATADV_ATTR_ORIG_ADDRESS, + BATADV_ATTR_NEIGH_ADDRESS, BATADV_ATTR_TQ, BATADV_ATTR_HARD_IFINDEX, }; @@ -466,6 +467,7 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg) struct genlmsghdr *ghdr; struct vis_list_entry *v_entry; uint8_t *orig; + uint8_t *neigh; uint8_t tq; uint32_t hardif; @@ -493,12 +495,16 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg) return NL_OK; orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); + neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]); tq = nla_get_u8(attrs[BATADV_ATTR_TQ]); hardif = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]); if (tq < 1) return NL_OK; + if (memcmp(orig, neigh, ETH_ALEN) != 0) + return NL_OK; + v_entry = malloc(sizeof(*v_entry)); if (!v_entry) return NL_OK; -- 2.9.3

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N October 2016