aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt (Google) <rostedt@goodmis.org>2023-01-09 18:40:34 -0500
committerSteven Rostedt (Google) <rostedt@goodmis.org>2023-01-09 18:51:36 -0500
commit89b98f04411788e6bc8018e48743227f9915a627 (patch)
tree52428e5b9e9c3124f23abd4ad911f53abd1e2785
parent0c28cec1e409653095dea0511c24fd9849b2862f (diff)
downloadlibtraceevent-89b98f04411788e6bc8018e48743227f9915a627.tar.gz
libtraceevent: Show migrate-disable field
Since Linux kernel 5.15 (specifically with the addition of 54357f0c9149c ("tracing: Add migrate-disabled counter to tracing output.")), the common_preempt_count field of each event also held the "migrate-disable" field in the most significant byte. This needs to be accounted for as when the migrate disable field is set, it will show: systemd--268 3d..3 15368.334398: rcu_dyntick: --= 4000000000000002 4000000000000000 0x63c systemd--268 3d..13 15368.334399: rcu_dyntick: ++= 4000000000000000 4000000000000002 0x63c systemd--268 3d..12 15368.334400: irq_disable: caller=ct_irq_enter_irqson+0x17 parent=0x0 systemd--268 3d..13 15368.334400: rcu_dyntick: --= 4000000000000002 4000000000000000 0x63c systemd--268 3d..12 15368.334401: rcu_dyntick: ++= 4000000000000000 4000000000000002 0x63c Where the events above have: preempt-count migrate-disable ------------- --------------- 3 0 3 1 2 1 3 1 2 1 That is, in the above print of "3d..13", the '3' of the '13' is the preempt count and the '1' is the migrate disable. But it really should be: systemd--268 3d..3. 15368.334398: rcu_dyntick: --= 4000000000000002 4000000000000000 0x63c systemd--268 3d..31 15368.334399: rcu_dyntick: ++= 4000000000000000 4000000000000002 0x63c systemd--268 3d..21 15368.334400: irq_disable: caller=ct_irq_enter_irqson+0x17 parent=0x0 systemd--268 3d..31 15368.334400: rcu_dyntick: --= 4000000000000002 4000000000000000 0x63c systemd--268 3d..21 15368.334401: rcu_dyntick: ++= 4000000000000000 4000000000000002 0x63c Where the migrate disabled is always displayed with a '.' when zero and its hex count when set. Link: https://lore.kernel.org/linux-trace-devel/20230109184034.359f10ad@gandalf.local.home Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-rw-r--r--src/event-parse.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/event-parse.c b/src/event-parse.c
index 18db7fc..e655087 100644
--- a/src/event-parse.c
+++ b/src/event-parse.c
@@ -6768,8 +6768,13 @@ static void data_latency_format(struct tep_handle *tep, struct trace_seq *s,
(hardirq && softirq) ? 'H' :
hardirq ? 'h' : softirq ? 's' : '.');
- if (pc)
- trace_seq_printf(&sq, "%x", pc);
+ if (pc & 0xf)
+ trace_seq_printf(&sq, "%x", pc & 0xf);
+ else
+ trace_seq_printf(&sq, ".");
+
+ if (pc & 0xf0)
+ trace_seq_printf(&sq, "%x", pc >> 4);
else
trace_seq_printf(&sq, ".");