mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-23 12:14:10 +08:00
ring-buffer: Add interrupt information to dump of data sub-buffer
When the ring buffer timestamp verifier triggers, it dumps the content of the sub-buffer. But currently it only dumps the timestamps and the offset of the data as well as the deltas. It would be even more informative if the event data also showed the interrupt context level it was in. That is, if each event showed that the event was written in normal, softirq, irq or NMI context. Then a better idea about how the events may have been interrupted from each other. As the payload of the ring buffer is really a black box of the ring buffer, just assume that if the payload is larger than a trace entry, that it is a trace entry. As trace entries have the interrupt context information saved in a flags field, look at that location and report the output of the flags. If the payload is not a trace entry, there's no way to really know, and the information will be garbage. But that's OK, because this is for debugging only (this output is not used in production as the buffer check that calls it causes a huge overhead to the tracing). This information, when available, is crucial for debugging timestamp issues. If it's garbage, it will also be pretty obvious that its garbage too. As this output usually happens in kselftests of the tracing code, the user will know what the payload is at the time. Link: https://lore.kernel.org/linux-trace-kernel/20231219074542.6f304601@gandalf.local.home Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Suggested-by: Joel Fernandes (Google) <joel@joelfernandes.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
This commit is contained in:
parent
c84897c0ff
commit
d40dbb617a
@ -3185,6 +3185,76 @@ EXPORT_SYMBOL_GPL(ring_buffer_unlock_commit);
|
||||
#define CHECK_FULL_PAGE 1L
|
||||
|
||||
#ifdef CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS
|
||||
|
||||
static const char *show_irq_str(int bits)
|
||||
{
|
||||
const char *type[] = {
|
||||
".", // 0
|
||||
"s", // 1
|
||||
"h", // 2
|
||||
"Hs", // 3
|
||||
"n", // 4
|
||||
"Ns", // 5
|
||||
"Nh", // 6
|
||||
"NHs", // 7
|
||||
};
|
||||
|
||||
return type[bits];
|
||||
}
|
||||
|
||||
/* Assume this is an trace event */
|
||||
static const char *show_flags(struct ring_buffer_event *event)
|
||||
{
|
||||
struct trace_entry *entry;
|
||||
int bits = 0;
|
||||
|
||||
if (rb_event_data_length(event) - RB_EVNT_HDR_SIZE < sizeof(*entry))
|
||||
return "X";
|
||||
|
||||
entry = ring_buffer_event_data(event);
|
||||
|
||||
if (entry->flags & TRACE_FLAG_SOFTIRQ)
|
||||
bits |= 1;
|
||||
|
||||
if (entry->flags & TRACE_FLAG_HARDIRQ)
|
||||
bits |= 2;
|
||||
|
||||
if (entry->flags & TRACE_FLAG_NMI)
|
||||
bits |= 4;
|
||||
|
||||
return show_irq_str(bits);
|
||||
}
|
||||
|
||||
static const char *show_irq(struct ring_buffer_event *event)
|
||||
{
|
||||
struct trace_entry *entry;
|
||||
|
||||
if (rb_event_data_length(event) - RB_EVNT_HDR_SIZE < sizeof(*entry))
|
||||
return "";
|
||||
|
||||
entry = ring_buffer_event_data(event);
|
||||
if (entry->flags & TRACE_FLAG_IRQS_OFF)
|
||||
return "d";
|
||||
return "";
|
||||
}
|
||||
|
||||
static const char *show_interrupt_level(void)
|
||||
{
|
||||
unsigned long pc = preempt_count();
|
||||
unsigned char level = 0;
|
||||
|
||||
if (pc & SOFTIRQ_OFFSET)
|
||||
level |= 1;
|
||||
|
||||
if (pc & HARDIRQ_MASK)
|
||||
level |= 2;
|
||||
|
||||
if (pc & NMI_MASK)
|
||||
level |= 4;
|
||||
|
||||
return show_irq_str(level);
|
||||
}
|
||||
|
||||
static void dump_buffer_page(struct buffer_data_page *bpage,
|
||||
struct rb_event_info *info,
|
||||
unsigned long tail)
|
||||
@ -3224,8 +3294,9 @@ static void dump_buffer_page(struct buffer_data_page *bpage,
|
||||
|
||||
case RINGBUF_TYPE_DATA:
|
||||
ts += event->time_delta;
|
||||
pr_warn(" 0x%x: [%lld] delta:%d\n",
|
||||
e, ts, event->time_delta);
|
||||
pr_warn(" 0x%x: [%lld] delta:%d %s%s\n",
|
||||
e, ts, event->time_delta,
|
||||
show_flags(event), show_irq(event));
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -3316,11 +3387,11 @@ static void check_buffer(struct ring_buffer_per_cpu *cpu_buffer,
|
||||
atomic_inc(&cpu_buffer->record_disabled);
|
||||
/* There's some cases in boot up that this can happen */
|
||||
WARN_ON_ONCE(system_state != SYSTEM_BOOTING);
|
||||
pr_warn("[CPU: %d]TIME DOES NOT MATCH expected:%lld actual:%lld delta:%lld before:%lld after:%lld%s\n",
|
||||
pr_warn("[CPU: %d]TIME DOES NOT MATCH expected:%lld actual:%lld delta:%lld before:%lld after:%lld%s context:%s\n",
|
||||
cpu_buffer->cpu,
|
||||
ts + info->delta, info->ts, info->delta,
|
||||
info->before, info->after,
|
||||
full ? " (full)" : "");
|
||||
full ? " (full)" : "", show_interrupt_level());
|
||||
dump_buffer_page(bpage, info, tail);
|
||||
atomic_dec(&ts_dump);
|
||||
/* Do not re-enable checking */
|
||||
|
Loading…
Reference in New Issue
Block a user