net: iwlwifi: Remove in_interrupt() from tracing macro. (bd63bca5) · Commits · 戴 / test

The usage of in_interrupt) in driver code is phased out. The iwlwifi_dbg tracepoint records in_interrupt() seperately, but that's superfluous because the trace header already records all kind of state and context information like hardirq status, softirq status, preemption count etc. Aside of that the recording of in_interrupt() as boolean does not allow to distinguish between the possible contexts (hard interrupt, soft interrupt, bottom half disabled) while the trace header gives precise information. Remove the duplicate information from the tracepoint and fixup the caller. Signed-off-by:

Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Acked-by:

Luca Coelho <luca@coelho.fi> Acked-by:

Kalle Valo <kvalo@codeaurora.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/wireless/intel/iwlwifi/iwl-debug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ void __iwl_dbg(struct device *dev,
		(!limit \|\| net_ratelimit()))
		dev_printk(KERN_DEBUG, dev, "%s %pV", function, &vaf);
		#endif
		trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf);
		trace_iwlwifi_dbg(level, function, &vaf);
		va_end(args);
		}
		IWL_EXPORT_SYMBOL(__iwl_dbg);

drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -54,18 +54,16 @@ DEFINE_EVENT(iwlwifi_msg_event, iwlwifi_crit,
		);

		TRACE_EVENT(iwlwifi_dbg,
		TP_PROTO(u32 level, bool in_interrupt, const char *function,
		TP_PROTO(u32 level, const char *function,
		struct va_format *vaf),
		TP_ARGS(level, in_interrupt, function, vaf),
		TP_ARGS(level, function, vaf),
		TP_STRUCT__entry(
		__field(u32, level)
		__field(u8, in_interrupt)
		__string(function, function)
		__dynamic_array(char, msg, MAX_MSG_LEN)
		),
		TP_fast_assign(
		__entry->level = level;
		__entry->in_interrupt = in_interrupt;
		__assign_str(function, function);
		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
		MAX_MSG_LEN, vaf->fmt,

Admin message