From bf0f4326b4b7556fe0efa45f51e96372731b475d Mon Sep 17 00:00:00 2001 From: znzjugod Date: Mon, 19 Jun 2023 20:46:17 +0800 Subject: [PATCH] ras-events:quitloopinread_ras_eventwhenkbufdataisbroken --- ...loop-in-read_ras_event-when-kbuf-dat.patch | 41 +++++++++++++++++++ rasdaemon.spec | 9 +++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 fix-ras-events-quit-loop-in-read_ras_event-when-kbuf-dat.patch diff --git a/fix-ras-events-quit-loop-in-read_ras_event-when-kbuf-dat.patch b/fix-ras-events-quit-loop-in-read_ras_event-when-kbuf-dat.patch new file mode 100644 index 0000000..37e88df --- /dev/null +++ b/fix-ras-events-quit-loop-in-read_ras_event-when-kbuf-dat.patch @@ -0,0 +1,41 @@ +From d439975850f947ced01423dc4bb4d6406022b4e1 Mon Sep 17 00:00:00 2001 +From: hubin +Date: Thu, 18 May 2023 16:14:41 +0800 +Subject: [PATCH] ras-events: quit loop in read_ras_event when kbuf data is + broken + +when kbuf data is broken, kbuffer_next_event() may move kbuf->index back to +the current kbuf->index position, causing dead loop. + +In this situation, rasdaemon will repeatedly parse an invalid event, and +print warning like "ug! negative record size -8!", pushing cpu utilization +rate to 100%. + +when kbuf data is broken, discard current page and continue reading next page +kbuf. + +Signed-off-by: hubin +--- + ras-events.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/ras-events.c b/ras-events.c +index 1479732..11ecb4d 100644 +--- a/ras-events.c ++++ b/ras-events.c +@@ -498,6 +498,11 @@ static int read_ras_event_all_cpus(struct pthread_data *pdata, + kbuffer_load_subbuffer(kbuf, page); + + while ((data = kbuffer_read_event(kbuf, &time_stamp))) { ++ if (kbuffer_curr_size(kbuf) < 0) { ++ log(TERM, LOG_ERR, "invalid kbuf data, discard\n"); ++ break; ++ } ++ + parse_ras_data(&pdata[i], + kbuf, data, time_stamp); + +-- +2.33.0 + + diff --git a/rasdaemon.spec b/rasdaemon.spec index cb2edcf..0ef6db0 100644 --- a/rasdaemon.spec +++ b/rasdaemon.spec @@ -1,6 +1,6 @@ Name: rasdaemon Version: 0.6.7 -Release: 10 +Release: 11 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 @@ -46,6 +46,7 @@ Patch6001: backport-rasdaemon-ras-memory-failure-handler-handle-localtim.patch Patch6002: backport-rasdaemon-ras-report-fix-possible-but-unlikely-file-.patch Patch9000: fix-ras-mc-ctl.service-startup-failed-when-selinux-is-no.patch +Patch9001: fix-ras-events-quit-loop-in-read_ras_event-when-kbuf-dat.patch %description The rasdaemon program is a daemon which monitors the platform @@ -91,6 +92,12 @@ rm INSTALL %{buildroot}/usr/include/*.h /usr/bin/systemctl enable rasdaemon.service >/dev/null 2>&1 || : %changelog +* Mon Jun 19 2023 zhangnan - 0.6.7-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:ras-events:quit loop in read_ras_event when kbuf data is broken + * Sat Jun 17 2023 yanglongkang - 0.6.7-10 - Type:bugfix - ID:NA -- Gitee