Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'batadv-next-for-davem-20180919' 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

 - 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
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b9d957c5 a7ea49af

net/batman-adv/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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/bat_iv_ogm.c

+96 −234
Original line number Diff line number Diff line
@@ -137,169 +137,6 @@ static u8 batadv_ring_buffer_avg(const u8 lq_recv[]) 
	return (u8)(sum / count);

}



/**

 * 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
@@ -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,27 +720,31 @@ 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];

			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);

			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);

				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();

	}

}
@@ -999,6 +830,35 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) 
		batadv_hardif_put(primary_if);

}



/**

 * 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
@@ -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)
@@ -1621,6 +1467,49 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
	consume_skb(skb_priv);

}



/**

 * 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
@@ -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/debugfs.c

+37 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)

{

}