!88 backport libtraceevent patch to adapt to kernel ftrace ring buffer change
From: @markeryang Reviewed-by: @znzjugod, @gaoruoshu Signed-off-by: @gaoruoshu
This commit is contained in:
openeuler-ci-bot
Gitee
commit
30ebea869d
@ -0,0 +1,128 @@
|
||||
From 2cf6aa4bfa3b2e7efbc15741d2c0327651082223 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <zanussi@kernel.org>
|
||||
Date: Thu, 2 Jul 2020 14:53:46 -0400
|
||||
Subject: tools lib traceevent: Add proper KBUFFER_TYPE_TIME_STAMP handling
|
||||
|
||||
Kernel commit dc4e2801d400 (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/1567628224.13841.4.camel@kernel.org
|
||||
Link: http://lore.kernel.org/linux-trace-devel/20200625100516.365338-3-tz.stoyanov@gmail.com
|
||||
|
||||
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
|
||||
[ Ported from trace-cmd.git ]
|
||||
Cc: Andrew Morton <akpm@linux-foundation.org>
|
||||
Cc: Jiri Olsa <jolsa@redhat.com>
|
||||
Cc: Namhyung Kim <namhyung@kernel.org>
|
||||
Cc: linux-trace-devel@vger.kernel.org
|
||||
Link: http://lore.kernel.org/lkml/20200702185703.785094515@goodmis.org
|
||||
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
|
||||
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
||||
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||
---
|
||||
libtrace/kbuffer-parse.c | 15 +++++++++------
|
||||
1 file changed, 9 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libtrace/kbuffer-parse.c b/libtrace/kbuffer-parse.c
|
||||
index 583db99..f1640d6 100644
|
||||
--- a/libtrace/kbuffer-parse.c
|
||||
+++ b/libtrace/kbuffer-parse.c
|
||||
@@ -361,6 +361,7 @@ translate_data(struct kbuffer *kbuf, void *data, void **rptr,
|
||||
break;
|
||||
|
||||
case KBUFFER_TYPE_TIME_EXTEND:
|
||||
+ case KBUFFER_TYPE_TIME_STAMP:
|
||||
extend = read_4(kbuf, data);
|
||||
data += 4;
|
||||
extend <<= TS_SHIFT;
|
||||
@@ -369,10 +370,6 @@ translate_data(struct kbuffer *kbuf, void *data, void **rptr,
|
||||
*length = 0;
|
||||
break;
|
||||
|
||||
- case KBUFFER_TYPE_TIME_STAMP:
|
||||
- data += 12;
|
||||
- *length = 0;
|
||||
- break;
|
||||
case 0:
|
||||
*length = read_4(kbuf, data) - 4;
|
||||
*length = (*length + 3) & ~3;
|
||||
@@ -397,7 +394,11 @@ static unsigned int update_pointers(struct kbuffer *kbuf)
|
||||
|
||||
type_len = translate_data(kbuf, ptr, &ptr, &delta, &length);
|
||||
|
||||
- kbuf->timestamp += delta;
|
||||
+ if (type_len == KBUFFER_TYPE_TIME_STAMP)
|
||||
+ kbuf->timestamp = delta;
|
||||
+ else
|
||||
+ kbuf->timestamp += delta;
|
||||
+
|
||||
kbuf->index = calc_index(kbuf, ptr);
|
||||
kbuf->next = kbuf->index + length;
|
||||
|
||||
@@ -454,7 +455,9 @@ static int __next_event(struct kbuffer *kbuf)
|
||||
if (kbuf->next >= kbuf->size)
|
||||
return -1;
|
||||
type = update_pointers(kbuf);
|
||||
- } while (type == KBUFFER_TYPE_TIME_EXTEND || type == KBUFFER_TYPE_PADDING);
|
||||
+ } while (type == KBUFFER_TYPE_TIME_EXTEND ||
|
||||
+ type == KBUFFER_TYPE_TIME_STAMP ||
|
||||
+ type == KBUFFER_TYPE_PADDING);
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
cgit
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: rasdaemon
|
||||
Version: 0.6.8
|
||||
Release: 4
|
||||
Release: 5
|
||||
License: GPLv2
|
||||
Summary: Utility to get Platform Reliability, Availability and Serviceability (RAS) reports via the Kernel tracing events
|
||||
URL: https://github.com/mchehab/rasdaemon.git
|
||||
@ -21,6 +21,7 @@ Requires(postun): systemd
|
||||
|
||||
Patch6000: backport-rasdaemon-ras-memory-failure-handler-handle-localtim.patch
|
||||
Patch6001: backport-rasdaemon-ras-report-fix-possible-but-unlikely-file-.patch
|
||||
Patch6002: backport-traceevent-Add-proper-KBUFFER_TYPE_TIME_STAMP-handling.patch
|
||||
|
||||
Patch9000: bugfix-rasdaemon-wait-for-file-access.patch
|
||||
Patch9001: bugfix-fix-fd-check.patch
|
||||
@ -87,6 +88,12 @@ rm INSTALL %{buildroot}/usr/include/*.h
|
||||
/usr/bin/systemctl enable rasdaemon.service >/dev/null 2>&1 || :
|
||||
|
||||
%changelog
|
||||
* Sat Jun 17 2023 yanglongkang <yanglongkang@h-partners.com> - 0.6.8-5
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:backport libtraceevent patch to adapt to kernel ftrace ring buffer change
|
||||
|
||||
* Fri Jun 2 2023 Shiju Jose<shiju.jose@huawei.com> - 0.6.8-4
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user