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

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

batman-adv: Allow to disable debugfs support 



The files provided by batman-adv via debugfs are currently converted to
netlink. Tools which are not yet converted to use the netlink interface may
still rely on the old debugfs files. But systems which already upgraded
their tools can save some space by disabling this feature. The default
configuration of batman-adv on amd64 can reduce the size of the module by
around 11% when this feature is disabled.

    $ size net/batman-adv/batman-adv.ko*
       text    data     bss     dec     hex filename
     150507   10395    4160  165062   284c6 net/batman-adv/batman-adv.ko.y
     137106    7099    2112  146317   23b8d net/batman-adv/batman-adv.ko.n

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 06d640c9

net/batman-adv/Kconfig

+13 −2
Original line number Diff line number Diff line
@@ -73,10 +73,21 @@ config BATMAN_ADV_MCAST 
	  reduce the air overhead while improving the reliability of

	  multicast messages.



config BATMAN_ADV_DEBUG

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

config BATMAN_ADV_DEBUGFS

	bool "batman-adv debugfs entries"

	depends on BATMAN_ADV

	depends on DEBUG_FS

	default y

	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 Y.



config BATMAN_ADV_DEBUG

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

	depends on BATMAN_ADV_DEBUGFS

	help

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

	  say N here. This enables compilation of support for

net/batman-adv/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -24,14 +24,14 @@ 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_DEBUG_FS) += debugfs.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-y += icmp_socket.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

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ int batadv_algo_select(struct batadv_priv *bat_priv, char *name) 
	return 0;

}



#ifdef CONFIG_BATMAN_ADV_DEBUGFS

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

{

	struct batadv_algo_ops *bat_algo_ops;
@@ -113,6 +114,7 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) 


	return 0;

}

#endif



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

{

net/batman-adv/bat_iv_ogm.c

+12 −0
Original line number Diff line number Diff line
@@ -1855,6 +1855,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 
	return NET_RX_SUCCESS;

}



#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
@@ -1952,6 +1953,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, 
	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
@@ -2182,6 +2184,7 @@ 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
@@ -2232,6 +2235,7 @@ static void batadv_iv_neigh_print(struct batadv_priv *bat_priv, 
	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
@@ -2618,6 +2622,7 @@ 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,
@@ -2681,6 +2686,7 @@ static void batadv_iv_gw_print(struct batadv_priv *bat_priv, 
	if (gw_count == 0)

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

}

#endif



/**

 * batadv_iv_gw_dump_entry - Dump a gateway into a message
@@ -2798,11 +2804,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,

		.free = batadv_iv_ogm_orig_free,

		.add_if = batadv_iv_ogm_orig_add_if,
@@ -2811,7 +2821,9 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { 
	.gw = {

		.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,

	},

};

net/batman-adv/bat_v.c

+12 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ batadv_v_hardif_neigh_init(struct batadv_hardif_neigh_node *hardif_neigh) 
		  batadv_v_elp_throughput_metric_update);

}



#ifdef CONFIG_BATMAN_ADV_DEBUGFS

/**

 * batadv_v_orig_print_neigh - print neighbors for the originator table

 * @orig_node: the orig_node for which the neighbors are printed
@@ -212,6 +213,7 @@ static void batadv_v_neigh_print(struct batadv_priv *bat_priv, 
	if (batman_count == 0)

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

}

#endif



/**

 * batadv_v_neigh_dump_neigh - Dump a neighbour into a message
@@ -345,6 +347,7 @@ batadv_v_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb, 
	cb->args[1] = idx;

}



#ifdef CONFIG_BATMAN_ADV_DEBUGFS

/**

 * batadv_v_orig_print - print the originator table

 * @bat_priv: the bat priv with all the soft interface information
@@ -411,6 +414,7 @@ static void batadv_v_orig_print(struct batadv_priv *bat_priv, 
	if (batman_count == 0)

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

}

#endif



/**

 * batadv_v_orig_dump_subentry - Dump an originator subentry into a
@@ -827,6 +831,7 @@ static bool batadv_v_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_v_gw_write_buffer_text(struct batadv_priv *bat_priv,

					 struct seq_file *seq,
@@ -896,6 +901,7 @@ static void batadv_v_gw_print(struct batadv_priv *bat_priv, 
	if (gw_count == 0)

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

}

#endif



/**

 * batadv_v_gw_dump_entry - Dump a gateway into a message
@@ -1034,11 +1040,15 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { 
		.hardif_init = batadv_v_hardif_neigh_init,

		.cmp = batadv_v_neigh_cmp,

		.is_similar_or_better = batadv_v_neigh_is_sob,

#ifdef CONFIG_BATMAN_ADV_DEBUGFS

		.print = batadv_v_neigh_print,

#endif

		.dump = batadv_v_neigh_dump,

	},

	.orig = {

#ifdef CONFIG_BATMAN_ADV_DEBUGFS

		.print = batadv_v_orig_print,

#endif

		.dump = batadv_v_orig_dump,

	},

	.gw = {
@@ -1046,7 +1056,9 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { 
		.show_sel_class = batadv_v_show_sel_class,

		.get_best_gw_node = batadv_v_gw_get_best_gw_node,

		.is_eligible = batadv_v_gw_is_eligible,

#ifdef CONFIG_BATMAN_ADV_DEBUGFS

		.print = batadv_v_gw_print,

#endif

		.dump = batadv_v_gw_dump,

	},

};