Skip to content

Commit 2160d6c

Browse files
Tom Zanussiacmel
authored andcommitted
tools lib traceevent: Add proper KBUFFER_TYPE_TIME_STAMP handling
Kernel commit dc4e280 (ring-buffer: Redefine the unimplemented RINGBUF_TYPE_TIME_STAMP) changed the way the ring buffer timestamps work - after that commit the previously unimplemented RINGBUF_TYPE_TIME_STAMP type causes the time delta to be used as a timestamp rather than a delta to be added to the timestamp. The trace-cmd code didn't get updated to handle this, so misinterprets the event data for this case, which causes a cascade of errors, including trace-report not being able to identify synthetic (or any other) events generated by the histogram code (which uses TIME_STAMP mode). For example, the following triggers along with the trace-cmd shown cause an UNKNOWN_EVENT error and trace-cmd report crash: # echo 'wakeup_latency u64 lat pid_t pid char comm[16]' > /sys/kernel/debug/tracing/synthetic_events # echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > /sys/kernel/debug/tracing/events/sched/sched_wakeup/trigger # echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_wakeup).trace(wakeup_latency,$wakeup_lat,next_pid,next_comm) if next_comm=="ping"' > /sys/kernel/debug/tracing/events/sched/sched_switch/trigger # echo 'hist:keys=comm,pid,lat:wakeup_lat=lat:sort=lat' > /sys/kernel/debug/tracing/events/synthetic/wakeup_latency/trigger # trace-cmd record -e wakeup_latency -e sched_wakeup -f comm==\"ping\" ping localhost -c 5 # trace-cmd report CPU 0 is empty CPU 1 is empty CPU 2 is empty CPU 3 is empty CPU 5 is empty CPU 6 is empty CPU 7 is empty cpus=8 ug! no event found for type 0 [UNKNOWN TYPE 0] ug! no event found for type 11520 Segmentation fault (core dumped) After this patch we get the correct interpretation and the events are shown properly: # trace-cmd report CPU 0 is empty CPU 1 is empty CPU 2 is empty CPU 3 is empty CPU 5 is empty CPU 6 is empty CPU 7 is empty cpus=8 <idle>-0 [004] 23284.341392: sched_wakeup: ping:12031 [120] success=1 CPU:004 <idle>-0 [004] 23284.341464: wakeup_latency: lat=58, pid=12031, comm=ping <idle>-0 [004] 23285.365303: sched_wakeup: ping:12031 [120] success=1 CPU:004 <idle>-0 [004] 23285.365382: wakeup_latency: lat=64, pid=12031, comm=ping <idle>-0 [004] 23286.389290: sched_wakeup: ping:12031 [120] success=1 CPU:004 <idle>-0 [004] 23286.389378: wakeup_latency: lat=72, pid=12031, comm=ping <idle>-0 [004] 23287.413213: sched_wakeup: ping:12031 [120] success=1 CPU:004 <idle>-0 [004] 23287.413291: wakeup_latency: lat=64, pid=12031, comm=ping Link: http://lkml.kernel.org/r/[email protected] Link: http://lore.kernel.org/linux-trace-devel/[email protected] Signed-off-by: Tom Zanussi <[email protected]> [ Ported from trace-cmd.git ] Cc: Andrew Morton <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: [email protected] Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Tzvetomir Stoyanov (VMware) <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 374855c commit 2160d6c

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

tools/lib/traceevent/kbuffer-parse.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ translate_data(struct kbuffer *kbuf, void *data, void **rptr,
361361
break;
362362

363363
case KBUFFER_TYPE_TIME_EXTEND:
364+
case KBUFFER_TYPE_TIME_STAMP:
364365
extend = read_4(kbuf, data);
365366
data += 4;
366367
extend <<= TS_SHIFT;
@@ -369,10 +370,6 @@ translate_data(struct kbuffer *kbuf, void *data, void **rptr,
369370
*length = 0;
370371
break;
371372

372-
case KBUFFER_TYPE_TIME_STAMP:
373-
data += 12;
374-
*length = 0;
375-
break;
376373
case 0:
377374
*length = read_4(kbuf, data) - 4;
378375
*length = (*length + 3) & ~3;
@@ -397,7 +394,11 @@ static unsigned int update_pointers(struct kbuffer *kbuf)
397394

398395
type_len = translate_data(kbuf, ptr, &ptr, &delta, &length);
399396

400-
kbuf->timestamp += delta;
397+
if (type_len == KBUFFER_TYPE_TIME_STAMP)
398+
kbuf->timestamp = delta;
399+
else
400+
kbuf->timestamp += delta;
401+
401402
kbuf->index = calc_index(kbuf, ptr);
402403
kbuf->next = kbuf->index + length;
403404

@@ -454,7 +455,9 @@ static int __next_event(struct kbuffer *kbuf)
454455
if (kbuf->next >= kbuf->size)
455456
return -1;
456457
type = update_pointers(kbuf);
457-
} while (type == KBUFFER_TYPE_TIME_EXTEND || type == KBUFFER_TYPE_PADDING);
458+
} while (type == KBUFFER_TYPE_TIME_EXTEND ||
459+
type == KBUFFER_TYPE_TIME_STAMP ||
460+
type == KBUFFER_TYPE_PADDING);
458461

459462
return 0;
460463
}

0 commit comments

Comments
 (0)