Repository : ssh://git@open-mesh.org/openwrt-feed-devel

On branch : master

commit 00e9b8873cfb55ff0902920d90ef58325f81a521 Author: Sven Eckelmann sven@narfation.org Date: Sun Oct 14 18:52:40 2018 +0200

batman-adv-devel: Provide debug messages as trace events

A private debug logging infrastructure is currently provided via $debug_fs/batman_adv/*/log when CONFIG_BATMAN_ADV_DEBUG is enabled. This is not well integrated in the rest of the tracing infrastructure of the kernel.

Other components (like mac80211 or ath10k) allow to gather the debug messages using generic trace events which are better integrated. This makes it possible to interact with them using the existing userspace tools.

The tracepoint batadv:batadv_dbg will now be available when CONFIG_BATMAN_ADV_DEVEL_DEBUG and CONFIG_BATMAN_ADV_DEVEL_TRACING is activated. The log level mask is still used for filtering as usual.

A full system trace for offline parsing can be created (and read) using:

$ batctl ll all $ trace-cmd record -e batadv:batadv_dbg $ trace-cmd report

The same can also be done without recording to a file

$ batctl ll all $ trace-cmd stream -e batadv:batadv_dbg

The trace infrastructure is especially helpful when tracing processes:

$ batctl ll all $ perf trace --event "batadv:*" batctl p 10.204.32.1 0.000 batadv:batadv_dbg:batman_adv bat0 Parsing outgoing ARP REQUEST 0.045 batadv:batadv_dbg:batman_adv bat0 ARP MSG = [src: a2:64:14:53:f8:22-10.204.32.185 dst: 00:00:00:00:00:00-10.204.32.1] 0.067 batadv:batadv_dbg:batman_adv bat0 Entry updated: 10.204.32.185 a2:64:14:53:f8:22 (vid: -1) 0.099 batadv:batadv_dbg:batman_adv bat0 batadv_dat_select_candidates(): IP=10.204.32.1 hash(IP)=48902 0.757 batadv:batadv_dbg:batman_adv bat0 dat_select_candidates() 0: selected fe:2c:91:68:29:2b addr=48977 dist=65460 1.178 batadv:batadv_dbg:batman_adv bat0 dat_select_candidates() 1: selected fe:81:ab:c5:e3:03 addr=49181 dist=65256 1.809 batadv:batadv_dbg:batman_adv bat0 dat_select_candidates() 2: selected 66:25:a7:48:37:fb addr=49328 dist=65109 1.828 batadv:batadv_dbg:batman_adv bat0 DHT_SEND for 10.204.32.1

Signed-off-by: Sven Eckelmann sven@narfation.org

00e9b8873cfb55ff0902920d90ef58325f81a521 batman-adv-devel/Config.in | 12 ++++++++++++ batman-adv-devel/Makefile | 1 + 2 files changed, 13 insertions(+)

diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index c0a6726..9b14feb 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -95,3 +95,15 @@ config BATMAN_ADV_DEVEL_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_DEVEL_TRACING + bool "B.A.T.M.A.N. tracing support" + depends on PACKAGE_kmod-batman-adv-devel + select KERNEL_FTRACE + select KERNEL_ENABLE_DEFAULT_TRACERS + 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_DEVEL_DEBUG must also be selected to get trace events for + batadv_dbg. diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 8be9542..0995507 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -73,6 +73,7 @@ PKG_EXTRA_KCONFIG:= \ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),y,n) \ CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_DEVEL_NC),y,n) \ CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \ + CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_DEVEL_TRACING),y,n) \

PKG_EXTRA_CFLAGS:= \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \