Commit 5aa25c05 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-next-for-davem-20181114' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
This feature/cleanup patchset includes the following patches:

 - Bump version strings, by Simon Wunderlich

 - Fixup includes, by Sven Eckelmann (3 patches)

 - Separate BATMAN_ADV_DEBUG from DEBUGFS, by Sven Eckelmann

 - Fixup tracing log documentation, by Sven Eckelmann

 - Use exclusive locks to secure netlink information dump transfers,
   by Sven Eckelmann (8 patches)

 - Move CRC16 dependency, by Sven Eckelmann

 - Enable MCAST by default, by Linus Luessing
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 45cf7959 016fd285

net/batman-adv/Kconfig

+6 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
config BATMAN_ADV

	tristate "B.A.T.M.A.N. Advanced Meshing Protocol"

	depends on NET

	select CRC16

	select LIBCRC32C

	help

          B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is
@@ -48,6 +47,7 @@ config BATMAN_ADV_BATMAN_V 
config BATMAN_ADV_BLA

	bool "Bridge Loop Avoidance"

	depends on BATMAN_ADV && INET

	select CRC16

	default y

	help

	  This option enables BLA (Bridge Loop Avoidance), a mechanism
@@ -82,6 +82,7 @@ config BATMAN_ADV_NC 
config BATMAN_ADV_MCAST

	bool "Multicast optimisation"

	depends on BATMAN_ADV && INET && !(BRIDGE=m && BATMAN_ADV=y)

	default y

	help

	  This option enables the multicast optimisation which aims to

	  reduce the air overhead while improving the reliability of
@@ -100,12 +101,13 @@ config BATMAN_ADV_DEBUGFS 


config BATMAN_ADV_DEBUG

	bool "B.A.T.M.A.N. debugging"

	depends on BATMAN_ADV_DEBUGFS

	depends on BATMAN_ADV

	help

	  This is an option for use by developers; most people should

	  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.

	  outputting debugging information to the debugfs log or tracing

	  buffer. The output is controlled via the batadv netdev specific

	  log_level setting.



config BATMAN_ADV_TRACING

	bool "B.A.T.M.A.N. tracing support"

net/batman-adv/bat_iv_ogm.c

+15 −10
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <linux/kernel.h>

#include <linux/kref.h>

#include <linux/list.h>

#include <linux/lockdep.h>

#include <linux/netdevice.h>

#include <linux/netlink.h>

#include <linux/pkt_sched.h>
@@ -2585,13 +2584,14 @@ static void batadv_iv_gw_print(struct batadv_priv *bat_priv, 
 * batadv_iv_gw_dump_entry() - Dump a gateway into a message

 * @msg: Netlink message to dump into

 * @portid: Port making netlink request

 * @seq: Sequence number of netlink message

 * @cb: Control block containing additional options

 * @bat_priv: The bat priv with all the soft interface information

 * @gw_node: Gateway to be dumped

 *

 * Return: Error code, or 0 on success

 */

static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,

static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid,

				   struct netlink_callback *cb,

				   struct batadv_priv *bat_priv,

				   struct batadv_gw_node *gw_node)

{
@@ -2611,13 +2611,16 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, 


	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);



	hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,

			  NLM_F_MULTI, BATADV_CMD_GET_GATEWAYS);

	hdr = genlmsg_put(msg, portid, cb->nlh->nlmsg_seq,

			  &batadv_netlink_family, NLM_F_MULTI,

			  BATADV_CMD_GET_GATEWAYS);

	if (!hdr) {

		ret = -ENOBUFS;

		goto out;

	}



	genl_dump_check_consistent(cb, hdr);



	ret = -EMSGSIZE;



	if (curr_gw == gw_node)
@@ -2668,13 +2671,15 @@ static void batadv_iv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb, 
	int idx_skip = cb->args[0];

	int idx = 0;



	rcu_read_lock();

	hlist_for_each_entry_rcu(gw_node, &bat_priv->gw.gateway_list, list) {

	spin_lock_bh(&bat_priv->gw.list_lock);

	cb->seq = bat_priv->gw.generation << 1 | 1;



	hlist_for_each_entry(gw_node, &bat_priv->gw.gateway_list, list) {

		if (idx++ < idx_skip)

			continue;



		if (batadv_iv_gw_dump_entry(msg, portid, cb->nlh->nlmsg_seq,

					    bat_priv, gw_node)) {

		if (batadv_iv_gw_dump_entry(msg, portid, cb, bat_priv,

					    gw_node)) {

			idx_skip = idx - 1;

			goto unlock;

		}
@@ -2682,7 +2687,7 @@ static void batadv_iv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb, 


	idx_skip = idx;

unlock:

	rcu_read_unlock();

	spin_unlock_bh(&bat_priv->gw.list_lock);



	cb->args[0] = idx_skip;

}

net/batman-adv/bat_v.c

+17 −9
Original line number Diff line number Diff line
@@ -27,11 +27,13 @@ 
#include <linux/jiffies.h>

#include <linux/kernel.h>

#include <linux/kref.h>

#include <linux/list.h>

#include <linux/netdevice.h>

#include <linux/netlink.h>

#include <linux/rculist.h>

#include <linux/rcupdate.h>

#include <linux/seq_file.h>

#include <linux/spinlock.h>

#include <linux/stddef.h>

#include <linux/types.h>

#include <linux/workqueue.h>
@@ -915,13 +917,14 @@ static void batadv_v_gw_print(struct batadv_priv *bat_priv, 
 * batadv_v_gw_dump_entry() - Dump a gateway into a message

 * @msg: Netlink message to dump into

 * @portid: Port making netlink request

 * @seq: Sequence number of netlink message

 * @cb: Control block containing additional options

 * @bat_priv: The bat priv with all the soft interface information

 * @gw_node: Gateway to be dumped

 *

 * Return: Error code, or 0 on success

 */

static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,

static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid,

				  struct netlink_callback *cb,

				  struct batadv_priv *bat_priv,

				  struct batadv_gw_node *gw_node)

{
@@ -941,13 +944,16 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, 


	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);



	hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,

			  NLM_F_MULTI, BATADV_CMD_GET_GATEWAYS);

	hdr = genlmsg_put(msg, portid, cb->nlh->nlmsg_seq,

			  &batadv_netlink_family, NLM_F_MULTI,

			  BATADV_CMD_GET_GATEWAYS);

	if (!hdr) {

		ret = -ENOBUFS;

		goto out;

	}



	genl_dump_check_consistent(cb, hdr);



	ret = -EMSGSIZE;



	if (curr_gw == gw_node) {
@@ -1018,13 +1024,15 @@ static void batadv_v_gw_dump(struct sk_buff *msg, struct netlink_callback *cb, 
	int idx_skip = cb->args[0];

	int idx = 0;



	rcu_read_lock();

	hlist_for_each_entry_rcu(gw_node, &bat_priv->gw.gateway_list, list) {

	spin_lock_bh(&bat_priv->gw.list_lock);

	cb->seq = bat_priv->gw.generation << 1 | 1;



	hlist_for_each_entry(gw_node, &bat_priv->gw.gateway_list, list) {

		if (idx++ < idx_skip)

			continue;



		if (batadv_v_gw_dump_entry(msg, portid, cb->nlh->nlmsg_seq,

					   bat_priv, gw_node)) {

		if (batadv_v_gw_dump_entry(msg, portid, cb, bat_priv,

					   gw_node)) {

			idx_skip = idx - 1;

			goto unlock;

		}
@@ -1032,7 +1040,7 @@ static void batadv_v_gw_dump(struct sk_buff *msg, struct netlink_callback *cb, 


	idx_skip = idx;

unlock:

	rcu_read_unlock();

	spin_unlock_bh(&bat_priv->gw.list_lock);



	cb->args[0] = idx_skip;

}

net/batman-adv/bridge_loop_avoidance.c

+46 −36
Original line number Diff line number Diff line
@@ -2094,14 +2094,15 @@ out: 
 * to a netlink socket

 * @msg: buffer for the message

 * @portid: netlink port

 * @seq: Sequence number of netlink message

 * @cb: Control block containing additional options

 * @primary_if: primary interface

 * @claim: entry to dump

 *

 * Return: 0 or error code.

 */

static int

batadv_bla_claim_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,

batadv_bla_claim_dump_entry(struct sk_buff *msg, u32 portid,

			    struct netlink_callback *cb,

			    struct batadv_hard_iface *primary_if,

			    struct batadv_bla_claim *claim)

{
@@ -2111,13 +2112,16 @@ batadv_bla_claim_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, 
	void *hdr;

	int ret = -EINVAL;



	hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,

			  NLM_F_MULTI, BATADV_CMD_GET_BLA_CLAIM);

	hdr = genlmsg_put(msg, portid, cb->nlh->nlmsg_seq,

			  &batadv_netlink_family, NLM_F_MULTI,

			  BATADV_CMD_GET_BLA_CLAIM);

	if (!hdr) {

		ret = -ENOBUFS;

		goto out;

	}



	genl_dump_check_consistent(cb, hdr);



	is_own = batadv_compare_eth(claim->backbone_gw->orig,

				    primary_addr);
@@ -2153,28 +2157,33 @@ out: 
 * to a netlink socket

 * @msg: buffer for the message

 * @portid: netlink port

 * @seq: Sequence number of netlink message

 * @cb: Control block containing additional options

 * @primary_if: primary interface

 * @head: bucket to dump

 * @hash: hash to dump

 * @bucket: bucket index to dump

 * @idx_skip: How many entries to skip

 *

 * Return: always 0.

 */

static int

batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,

batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid,

			     struct netlink_callback *cb,

			     struct batadv_hard_iface *primary_if,

			     struct hlist_head *head, int *idx_skip)

			     struct batadv_hashtable *hash, unsigned int bucket,

			     int *idx_skip)

{

	struct batadv_bla_claim *claim;

	int idx = 0;

	int ret = 0;



	rcu_read_lock();

	hlist_for_each_entry_rcu(claim, head, hash_entry) {

	spin_lock_bh(&hash->list_locks[bucket]);

	cb->seq = atomic_read(&hash->generation) << 1 | 1;



	hlist_for_each_entry(claim, &hash->table[bucket], hash_entry) {

		if (idx++ < *idx_skip)

			continue;



		ret = batadv_bla_claim_dump_entry(msg, portid, seq,

		ret = batadv_bla_claim_dump_entry(msg, portid, cb,

						  primary_if, claim);

		if (ret) {

			*idx_skip = idx - 1;
@@ -2184,7 +2193,7 @@ batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, 


	*idx_skip = 0;

unlock:

	rcu_read_unlock();

	spin_unlock_bh(&hash->list_locks[bucket]);

	return ret;

}
@@ -2204,7 +2213,6 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb) 
	struct batadv_hashtable *hash;

	struct batadv_priv *bat_priv;

	int bucket = cb->args[0];

	struct hlist_head *head;

	int idx = cb->args[1];

	int ifindex;

	int ret = 0;
@@ -2230,11 +2238,8 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb) 
	}



	while (bucket < hash->size) {

		head = &hash->table[bucket];



		if (batadv_bla_claim_dump_bucket(msg, portid,

						 cb->nlh->nlmsg_seq,

						 primary_if, head, &idx))

		if (batadv_bla_claim_dump_bucket(msg, portid, cb, primary_if,

						 hash, bucket, &idx))

			break;

		bucket++;

	}
@@ -2325,14 +2330,15 @@ out: 
 *  netlink socket

 * @msg: buffer for the message

 * @portid: netlink port

 * @seq: Sequence number of netlink message

 * @cb: Control block containing additional options

 * @primary_if: primary interface

 * @backbone_gw: entry to dump

 *

 * Return: 0 or error code.

 */

static int

batadv_bla_backbone_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,

batadv_bla_backbone_dump_entry(struct sk_buff *msg, u32 portid,

			       struct netlink_callback *cb,

			       struct batadv_hard_iface *primary_if,

			       struct batadv_bla_backbone_gw *backbone_gw)

{
@@ -2343,13 +2349,16 @@ batadv_bla_backbone_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, 
	void *hdr;

	int ret = -EINVAL;



	hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,

			  NLM_F_MULTI, BATADV_CMD_GET_BLA_BACKBONE);

	hdr = genlmsg_put(msg, portid, cb->nlh->nlmsg_seq,

			  &batadv_netlink_family, NLM_F_MULTI,

			  BATADV_CMD_GET_BLA_BACKBONE);

	if (!hdr) {

		ret = -ENOBUFS;

		goto out;

	}



	genl_dump_check_consistent(cb, hdr);



	is_own = batadv_compare_eth(backbone_gw->orig, primary_addr);



	spin_lock_bh(&backbone_gw->crc_lock);
@@ -2386,28 +2395,33 @@ out: 
 *  a netlink socket

 * @msg: buffer for the message

 * @portid: netlink port

 * @seq: Sequence number of netlink message

 * @cb: Control block containing additional options

 * @primary_if: primary interface

 * @head: bucket to dump

 * @hash: hash to dump

 * @bucket: bucket index to dump

 * @idx_skip: How many entries to skip

 *

 * Return: always 0.

 */

static int

batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,

batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid,

				struct netlink_callback *cb,

				struct batadv_hard_iface *primary_if,

				struct hlist_head *head, int *idx_skip)

				struct batadv_hashtable *hash,

				unsigned int bucket, int *idx_skip)

{

	struct batadv_bla_backbone_gw *backbone_gw;

	int idx = 0;

	int ret = 0;



	rcu_read_lock();

	hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) {

	spin_lock_bh(&hash->list_locks[bucket]);

	cb->seq = atomic_read(&hash->generation) << 1 | 1;



	hlist_for_each_entry(backbone_gw, &hash->table[bucket], hash_entry) {

		if (idx++ < *idx_skip)

			continue;



		ret = batadv_bla_backbone_dump_entry(msg, portid, seq,

		ret = batadv_bla_backbone_dump_entry(msg, portid, cb,

						     primary_if, backbone_gw);

		if (ret) {

			*idx_skip = idx - 1;
@@ -2417,7 +2431,7 @@ batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, 


	*idx_skip = 0;

unlock:

	rcu_read_unlock();

	spin_unlock_bh(&hash->list_locks[bucket]);

	return ret;

}
@@ -2437,7 +2451,6 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb) 
	struct batadv_hashtable *hash;

	struct batadv_priv *bat_priv;

	int bucket = cb->args[0];

	struct hlist_head *head;

	int idx = cb->args[1];

	int ifindex;

	int ret = 0;
@@ -2463,11 +2476,8 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb) 
	}



	while (bucket < hash->size) {

		head = &hash->table[bucket];



		if (batadv_bla_backbone_dump_bucket(msg, portid,

						    cb->nlh->nlmsg_seq,

						    primary_if, head, &idx))

		if (batadv_bla_backbone_dump_bucket(msg, portid, cb, primary_if,

						    hash, bucket, &idx))

			break;

		bucket++;

	}

net/batman-adv/debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "debugfs.h"

#include "main.h"



#include <asm/current.h>

#include <linux/dcache.h>

#include <linux/debugfs.h>

#include <linux/err.h>
@@ -27,6 +28,7 @@ 
#include <linux/fs.h>

#include <linux/netdevice.h>

#include <linux/printk.h>

#include <linux/sched.h>

#include <linux/seq_file.h>

#include <linux/stat.h>

#include <linux/stddef.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE