Commit aff6f5a6 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Drop deprecated debugfs support 



The debugfs support in batman-adv was marked as deprecated by the commit
00caf6a2 ("batman-adv: Mark debugfs functionality as deprecated") and
scheduled for removal in 2021.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 76e9f276

net/batman-adv/Kconfig

+2 −14
Original line number Diff line number Diff line
@@ -76,26 +76,14 @@ config BATMAN_ADV_MCAST 
	  reduce the air overhead while improving the reliability of

	  multicast messages.



config BATMAN_ADV_DEBUGFS

	bool "batman-adv debugfs entries"

	depends on BATMAN_ADV

	depends on DEBUG_FS

	help

	  Enable this to export routing related debug tables via debugfs.

	  The information for each soft-interface and used hard-interface can be

	  found under batman_adv/



	  If unsure, say N.



config BATMAN_ADV_DEBUG

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

	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 debugfs log or tracing

	  buffer. The output is controlled via the batadv netdev specific

	  log_level setting.

	  outputting debugging information to the 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/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -11,14 +11,12 @@ batman-adv-$(CONFIG_BATMAN_ADV_BATMAN_V) += bat_v_elp.o 
batman-adv-$(CONFIG_BATMAN_ADV_BATMAN_V) += bat_v_ogm.o

batman-adv-y += bitarray.o

batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o

batman-adv-$(CONFIG_BATMAN_ADV_DEBUGFS) += debugfs.o

batman-adv-$(CONFIG_BATMAN_ADV_DAT) += distributed-arp-table.o

batman-adv-y += fragmentation.o

batman-adv-y += gateway_client.o

batman-adv-y += gateway_common.o

batman-adv-y += hard-interface.o

batman-adv-y += hash.o

batman-adv-$(CONFIG_BATMAN_ADV_DEBUGFS) += icmp_socket.o

batman-adv-$(CONFIG_BATMAN_ADV_DEBUG) += log.o

batman-adv-y += main.o

batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o

net/batman-adv/bat_algo.c

+0 −24
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/moduleparam.h>

#include <linux/netlink.h>

#include <linux/printk.h>

#include <linux/seq_file.h>

#include <linux/skbuff.h>

#include <linux/stddef.h>

#include <linux/string.h>
@@ -116,29 +115,6 @@ int batadv_algo_select(struct batadv_priv *bat_priv, const char *name) 
	return 0;

}



#ifdef CONFIG_BATMAN_ADV_DEBUGFS



/**

 * batadv_algo_seq_print_text() - Print the supported algorithms in a seq file

 * @seq: seq file to print on

 * @offset: not used

 *

 * Return: always 0

 */

int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)

{

	struct batadv_algo_ops *bat_algo_ops;



	seq_puts(seq, "Available routing algorithms:\n");



	hlist_for_each_entry(bat_algo_ops, &batadv_algo_list, list) {

		seq_printf(seq, " * %s\n", bat_algo_ops->name);

	}



	return 0;

}

#endif



static int batadv_param_set_ra(const char *val, const struct kernel_param *kp)

{

	struct batadv_algo_ops *bat_algo_ops;

net/batman-adv/bat_algo.h

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



#include <linux/netlink.h>

#include <linux/seq_file.h>

#include <linux/skbuff.h>

#include <linux/types.h>
@@ -21,7 +20,6 @@ void batadv_algo_init(void); 
struct batadv_algo_ops *batadv_algo_get(const char *name);

int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops);

int batadv_algo_select(struct batadv_priv *bat_priv, const char *name);

int batadv_algo_seq_print_text(struct seq_file *seq, void *offset);

int batadv_algo_dump(struct sk_buff *msg, struct netlink_callback *cb);



#endif /* _NET_BATMAN_ADV_BAT_ALGO_H_ */

net/batman-adv/bat_iv_ogm.c

+0 −229
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/random.h>

#include <linux/rculist.h>

#include <linux/rcupdate.h>

#include <linux/seq_file.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/spinlock.h>
@@ -1780,106 +1779,6 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 
	return ret;

}



#ifdef CONFIG_BATMAN_ADV_DEBUGFS

/**

 * batadv_iv_ogm_orig_print_neigh() - print neighbors for the originator table

 * @orig_node: the orig_node for which the neighbors are printed

 * @if_outgoing: outgoing interface for these entries

 * @seq: debugfs table seq_file struct

 *

 * Must be called while holding an rcu lock.

 */

static void

batadv_iv_ogm_orig_print_neigh(struct batadv_orig_node *orig_node,

			       struct batadv_hard_iface *if_outgoing,

			       struct seq_file *seq)

{

	struct batadv_neigh_node *neigh_node;

	struct batadv_neigh_ifinfo *n_ifinfo;



	hlist_for_each_entry_rcu(neigh_node, &orig_node->neigh_list, list) {

		n_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing);

		if (!n_ifinfo)

			continue;



		seq_printf(seq, " %pM (%3i)",

			   neigh_node->addr,

			   n_ifinfo->bat_iv.tq_avg);



		batadv_neigh_ifinfo_put(n_ifinfo);

	}

}



/**

 * batadv_iv_ogm_orig_print() - print the originator table

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

 * @seq: debugfs table seq_file struct

 * @if_outgoing: the outgoing interface for which this should be printed

 */

static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv,

				     struct seq_file *seq,

				     struct batadv_hard_iface *if_outgoing)

{

	struct batadv_neigh_node *neigh_node;

	struct batadv_hashtable *hash = bat_priv->orig_hash;

	int last_seen_msecs, last_seen_secs;

	struct batadv_orig_node *orig_node;

	struct batadv_neigh_ifinfo *n_ifinfo;

	unsigned long last_seen_jiffies;

	struct hlist_head *head;

	int batman_count = 0;

	u32 i;



	seq_puts(seq,

		 "  Originator      last-seen (#/255)           Nexthop [outgoingIF]:   Potential nexthops ...\n");



	for (i = 0; i < hash->size; i++) {

		head = &hash->table[i];



		rcu_read_lock();

		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {

			neigh_node = batadv_orig_router_get(orig_node,

							    if_outgoing);

			if (!neigh_node)

				continue;



			n_ifinfo = batadv_neigh_ifinfo_get(neigh_node,

							   if_outgoing);

			if (!n_ifinfo)

				goto next;



			if (n_ifinfo->bat_iv.tq_avg == 0)

				goto next;



			last_seen_jiffies = jiffies - orig_node->last_seen;

			last_seen_msecs = jiffies_to_msecs(last_seen_jiffies);

			last_seen_secs = last_seen_msecs / 1000;

			last_seen_msecs = last_seen_msecs % 1000;



			seq_printf(seq, "%pM %4i.%03is   (%3i) %pM [%10s]:",

				   orig_node->orig, last_seen_secs,

				   last_seen_msecs, n_ifinfo->bat_iv.tq_avg,

				   neigh_node->addr,

				   neigh_node->if_incoming->net_dev->name);



			batadv_iv_ogm_orig_print_neigh(orig_node, if_outgoing,

						       seq);

			seq_putc(seq, '\n');

			batman_count++;



next:

			batadv_neigh_node_put(neigh_node);

			if (n_ifinfo)

				batadv_neigh_ifinfo_put(n_ifinfo);

		}

		rcu_read_unlock();

	}



	if (batman_count == 0)

		seq_puts(seq, "No batman nodes in range ...\n");

}

#endif



/**

 * batadv_iv_ogm_neigh_get_tq_avg() - Get the TQ average for a neighbour on a

 *  given outgoing interface.
@@ -2109,59 +2008,6 @@ batadv_iv_ogm_orig_dump(struct sk_buff *msg, struct netlink_callback *cb, 
	cb->args[2] = sub;

}



#ifdef CONFIG_BATMAN_ADV_DEBUGFS

/**

 * batadv_iv_hardif_neigh_print() - print a single hop neighbour node

 * @seq: neighbour table seq_file struct

 * @hardif_neigh: hardif neighbour information

 */

static void

batadv_iv_hardif_neigh_print(struct seq_file *seq,

			     struct batadv_hardif_neigh_node *hardif_neigh)

{

	int last_secs, last_msecs;



	last_secs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen) / 1000;

	last_msecs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen) % 1000;



	seq_printf(seq, "   %10s   %pM %4i.%03is\n",

		   hardif_neigh->if_incoming->net_dev->name,

		   hardif_neigh->addr, last_secs, last_msecs);

}



/**

 * batadv_iv_ogm_neigh_print() - print the single hop neighbour list

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

 * @seq: neighbour table seq_file struct

 */

static void batadv_iv_neigh_print(struct batadv_priv *bat_priv,

				  struct seq_file *seq)

{

	struct net_device *net_dev = (struct net_device *)seq->private;

	struct batadv_hardif_neigh_node *hardif_neigh;

	struct batadv_hard_iface *hard_iface;

	int batman_count = 0;



	seq_puts(seq, "           IF        Neighbor      last-seen\n");



	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

		if (hard_iface->soft_iface != net_dev)

			continue;



		hlist_for_each_entry_rcu(hardif_neigh,

					 &hard_iface->neigh_list, list) {

			batadv_iv_hardif_neigh_print(seq, hardif_neigh);

			batman_count++;

		}

	}

	rcu_read_unlock();



	if (batman_count == 0)

		seq_puts(seq, "No batman nodes in range ...\n");

}

#endif



/**

 * batadv_iv_ogm_neigh_diff() - calculate tq difference of two neighbors

 * @neigh1: the first neighbor object of the comparison
@@ -2557,72 +2403,6 @@ static bool batadv_iv_gw_is_eligible(struct batadv_priv *bat_priv, 
	return ret;

}



#ifdef CONFIG_BATMAN_ADV_DEBUGFS

/* fails if orig_node has no router */

static int batadv_iv_gw_write_buffer_text(struct batadv_priv *bat_priv,

					  struct seq_file *seq,

					  const struct batadv_gw_node *gw_node)

{

	struct batadv_gw_node *curr_gw;

	struct batadv_neigh_node *router;

	struct batadv_neigh_ifinfo *router_ifinfo = NULL;

	int ret = -1;



	router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT);

	if (!router)

		goto out;



	router_ifinfo = batadv_neigh_ifinfo_get(router, BATADV_IF_DEFAULT);

	if (!router_ifinfo)

		goto out;



	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);



	seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %u.%u/%u.%u MBit\n",

		   (curr_gw == gw_node ? "=>" : "  "),

		   gw_node->orig_node->orig,

		   router_ifinfo->bat_iv.tq_avg, router->addr,

		   router->if_incoming->net_dev->name,

		   gw_node->bandwidth_down / 10,

		   gw_node->bandwidth_down % 10,

		   gw_node->bandwidth_up / 10,

		   gw_node->bandwidth_up % 10);

	ret = seq_has_overflowed(seq) ? -1 : 0;



	if (curr_gw)

		batadv_gw_node_put(curr_gw);

out:

	if (router_ifinfo)

		batadv_neigh_ifinfo_put(router_ifinfo);

	if (router)

		batadv_neigh_node_put(router);

	return ret;

}



static void batadv_iv_gw_print(struct batadv_priv *bat_priv,

			       struct seq_file *seq)

{

	struct batadv_gw_node *gw_node;

	int gw_count = 0;



	seq_puts(seq,

		 "      Gateway      (#/255)           Nexthop [outgoingIF]: advertised uplink bandwidth\n");



	rcu_read_lock();

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

		/* fails if orig_node has no router */

		if (batadv_iv_gw_write_buffer_text(bat_priv, seq, gw_node) < 0)

			continue;



		gw_count++;

	}

	rcu_read_unlock();



	if (gw_count == 0)

		seq_puts(seq, "No gateways in range ...\n");

}

#endif



/**

 * batadv_iv_gw_dump_entry() - Dump a gateway into a message

 * @msg: Netlink message to dump into
@@ -2747,24 +2527,15 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { 
	.neigh = {

		.cmp = batadv_iv_ogm_neigh_cmp,

		.is_similar_or_better = batadv_iv_ogm_neigh_is_sob,

#ifdef CONFIG_BATMAN_ADV_DEBUGFS

		.print = batadv_iv_neigh_print,

#endif

		.dump = batadv_iv_ogm_neigh_dump,

	},

	.orig = {

#ifdef CONFIG_BATMAN_ADV_DEBUGFS

		.print = batadv_iv_ogm_orig_print,

#endif

		.dump = batadv_iv_ogm_orig_dump,

	},

	.gw = {

		.init_sel_class = batadv_iv_init_sel_class,

		.get_best_gw_node = batadv_iv_gw_get_best_gw_node,

		.is_eligible = batadv_iv_gw_is_eligible,

#ifdef CONFIG_BATMAN_ADV_DEBUGFS

		.print = batadv_iv_gw_print,

#endif

		.dump = batadv_iv_gw_dump,

	},

};