Skip to content

Commit e9f0a36

Browse files
Sebastian Andrzej Siewiorrostedt
authored andcommitted
tracing: Remove TRACE_FLAG_IRQS_NOSUPPORT
It was possible to enable tracing with no IRQ tracing support. The tracing infrastructure would then record TRACE_FLAG_IRQS_NOSUPPORT as the only tracing flag and show an 'X' in the output. The last user of this feature was PPC32 which managed to implement it during PowerPC merge in 2009. Since then, it was unused and the PPC32 dependency was finally removed in commit 0ea5ee0 ("tracing: Remove PPC32 wart from config TRACING_SUPPORT"). Since the PowerPC merge the code behind !CONFIG_TRACE_IRQFLAGS_SUPPORT with TRACING enabled can no longer be selected used and the 'X' is not displayed or recorded. Remove the CONFIG_TRACE_IRQFLAGS_SUPPORT from the tracing code. Remove TRACE_FLAG_IRQS_NOSUPPORT. Cc: Peter Zijlstra <[email protected]> Cc: Masami Hiramatsu <[email protected]> Cc: Mathieu Desnoyers <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 77a1326 commit e9f0a36

File tree

3 files changed

+0
-17
lines changed

3 files changed

+0
-17
lines changed

Documentation/trace/ftrace.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,9 +1031,6 @@ explains which is which.
10311031
CPU#: The CPU which the process was running on.
10321032

10331033
irqs-off: 'd' interrupts are disabled. '.' otherwise.
1034-
.. caution:: If the architecture does not support a way to
1035-
read the irq flags variable, an 'X' will always
1036-
be printed here.
10371034

10381035
need-resched:
10391036
- 'N' both TIF_NEED_RESCHED and PREEMPT_NEED_RESCHED is set,

include/linux/trace_events.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status);
184184

185185
enum trace_flag_type {
186186
TRACE_FLAG_IRQS_OFF = 0x01,
187-
TRACE_FLAG_IRQS_NOSUPPORT = 0x02,
188187
TRACE_FLAG_NEED_RESCHED = 0x04,
189188
TRACE_FLAG_HARDIRQ = 0x08,
190189
TRACE_FLAG_SOFTIRQ = 0x10,
@@ -193,7 +192,6 @@ enum trace_flag_type {
193192
TRACE_FLAG_BH_OFF = 0x80,
194193
};
195194

196-
#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
197195
static inline unsigned int tracing_gen_ctx_flags(unsigned long irqflags)
198196
{
199197
unsigned int irq_status = irqs_disabled_flags(irqflags) ?
@@ -207,17 +205,6 @@ static inline unsigned int tracing_gen_ctx(void)
207205
local_save_flags(irqflags);
208206
return tracing_gen_ctx_flags(irqflags);
209207
}
210-
#else
211-
212-
static inline unsigned int tracing_gen_ctx_flags(unsigned long irqflags)
213-
{
214-
return tracing_gen_ctx_irq_test(TRACE_FLAG_IRQS_NOSUPPORT);
215-
}
216-
static inline unsigned int tracing_gen_ctx(void)
217-
{
218-
return tracing_gen_ctx_irq_test(TRACE_FLAG_IRQS_NOSUPPORT);
219-
}
220-
#endif
221208

222209
static inline unsigned int tracing_gen_ctx_dec(void)
223210
{

kernel/trace/trace_output.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,6 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
460460
(entry->flags & TRACE_FLAG_IRQS_OFF && bh_off) ? 'D' :
461461
(entry->flags & TRACE_FLAG_IRQS_OFF) ? 'd' :
462462
bh_off ? 'b' :
463-
(entry->flags & TRACE_FLAG_IRQS_NOSUPPORT) ? 'X' :
464463
'.';
465464

466465
switch (entry->flags & (TRACE_FLAG_NEED_RESCHED |

0 commit comments

Comments
 (0)