diff --git a/backport-traceevent-Add-proper-KBUFFER_TYPE_TIME_STAMP-handling.patch b/backport-traceevent-Add-proper-KBUFFER_TYPE_TIME_STAMP-handling.patch new file mode 100644 index 0000000000000000000000000000000000000000..bbb5e00bd613f7483e5c9d7706f3f647f0dce784 --- /dev/null +++ b/backport-traceevent-Add-proper-KBUFFER_TYPE_TIME_STAMP-handling.patch @@ -0,0 +1,128 @@ +From 2cf6aa4bfa3b2e7efbc15741d2c0327651082223 Mon Sep 17 00:00:00 2001 +From: Tom Zanussi +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 + -0 [004] 23284.341392: sched_wakeup: ping:12031 [120] success=1 CPU:004 + -0 [004] 23284.341464: wakeup_latency: lat=58, pid=12031, comm=ping + -0 [004] 23285.365303: sched_wakeup: ping:12031 [120] success=1 CPU:004 + -0 [004] 23285.365382: wakeup_latency: lat=64, pid=12031, comm=ping + -0 [004] 23286.389290: sched_wakeup: ping:12031 [120] success=1 CPU:004 + -0 [004] 23286.389378: wakeup_latency: lat=72, pid=12031, comm=ping + -0 [004] 23287.413213: sched_wakeup: ping:12031 [120] success=1 CPU:004 + -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 +[ Ported from trace-cmd.git ] +Cc: Andrew Morton +Cc: Jiri Olsa +Cc: Namhyung Kim +Cc: linux-trace-devel@vger.kernel.org +Link: http://lore.kernel.org/lkml/20200702185703.785094515@goodmis.org +Signed-off-by: Tzvetomir Stoyanov (VMware) +Signed-off-by: Steven Rostedt (VMware) +Signed-off-by: Arnaldo Carvalho de Melo +--- + 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 + diff --git a/rasdaemon.spec b/rasdaemon.spec index 1460941c6a7f0355f3e9b49766e053e987e33740..d45212f0665bb3dd5c0bf535795a48aaeed7251a 100644 --- a/rasdaemon.spec +++ b/rasdaemon.spec @@ -1,6 +1,6 @@ Name: rasdaemon Version: 0.6.7 -Release: 11 +Release: 12 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 @@ -39,6 +39,7 @@ Patch17: 0009-rasdaemon-ras-mc-ctl-Updated-HiSilicon-platform-name.patch Patch18: 0010-rasdaemon-Fix-for-a-memory-out-of-bounds-issue-and-o.patch Patch19: 0001-rasdaemon-use-standard-length-PATH_MAX-for-path-name.patch Patch20: rasdaemon-diskerror-fix-incomplete-diskerror-log.patch +Patch21: backport-traceevent-Add-proper-KBUFFER_TYPE_TIME_STAMP-handling.patch Patch6000: backport-rasdaemon-ras-mc-ctl-Fix-script-to-parse-dimm-sizes.patch Patch6001: backport-rasdaemon-ras-memory-failure-handler-handle-localtim.patch @@ -97,6 +98,12 @@ rm INSTALL %{buildroot}/usr/include/*.h /usr/bin/systemctl enable rasdaemon.service >/dev/null 2>&1 || : %changelog +* Sat Jun 17 2023 yanglongkang - 0.6.7-12 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:backport libtraceevent patch to adapt to kernel ftrace ring buffer change + * Fri Jun 2 2023 Shiju Jose - 0.6.7-11 - Type:bugfix - ID:NA