From 1c63773c7c52c75310a26d7286f03d8a8a2d7d53 Mon Sep 17 00:00:00 2001 From: Shengwei Luo Date: Tue, 23 Apr 2024 17:24:08 +0800 Subject: [PATCH] Fix cpu isolate errors when some cpus are offline before the service started Signed-off-by: slim6882 --- ...u-isolate-errors-when-some-cpus-are-.patch | 32 +++++++++++++++++++ rasdaemon.spec | 10 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 bugfix-fix-cpu-isolate-errors-when-some-cpus-are-.patch diff --git a/bugfix-fix-cpu-isolate-errors-when-some-cpus-are-.patch b/bugfix-fix-cpu-isolate-errors-when-some-cpus-are-.patch new file mode 100644 index 0000000..304dbd5 --- /dev/null +++ b/bugfix-fix-cpu-isolate-errors-when-some-cpus-are-.patch @@ -0,0 +1,32 @@ +From 77600e0cd71cd5c34126635b199e7b66f4d74874 Mon Sep 17 00:00:00 2001 +From: Shengwei Luo +Date: Tue, 23 Apr 2024 17:09:10 +0800 +Subject: [PATCH] rasdaemon: Fix cpu isolate errors when some cpus are offline + before the service started. + +The upstream patch use (sysconf(_SC_NPROCESSORS_ONLN)) instead of +(sysconf(_SC_NPROCESSORS_CONF)). However ras_cpu_isolation_init() +need the all cpu info, so fix it. + +Fixes: f1ea76375281 ("rasdaemon: Check CPUs online, not configured") +Signed-off-by: Shengwei Luo +--- + ras-events.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ras-events.c b/ras-events.c +index ffac02b..1aa6db6 100644 +--- a/ras-events.c ++++ b/ras-events.c +@@ -950,7 +950,7 @@ int handle_ras_events(int record_events) + cpus = get_num_cpus(ras); + + #ifdef HAVE_CPU_FAULT_ISOLATION +- ras_cpu_isolation_init(cpus); ++ ras_cpu_isolation_init(sysconf(_SC_NPROCESSORS_CONF)); + #endif + + #ifdef HAVE_MCE +-- +2.33.0 + diff --git a/rasdaemon.spec b/rasdaemon.spec index b27a08d..636050f 100644 --- a/rasdaemon.spec +++ b/rasdaemon.spec @@ -1,6 +1,6 @@ Name: rasdaemon Version: 0.8.0 -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 @@ -33,6 +33,7 @@ Patch9006: 0003-rasdaemon-Add-support-for-creating-the-vendor-error-.patch Patch9007: backport-Check-CPUs-online-not-configured.patch Patch9008: backport-rasdaemon-diskerror-fix-incomplete-diskerror-log.patch Patch9009: 0001-rasdaemon-Fix-for-vendor-errors-are-not-recorded-in-.patch +Patch9010: bugfix-fix-cpu-isolate-errors-when-some-cpus-are-.patch %description The rasdaemon program is a daemon which monitors the platform @@ -84,6 +85,13 @@ fi /usr/bin/systemctl disable rasdaemon.service >/dev/null 2>&1 || : %changelog +* Thu Apr 25 2024 yangjunshuo - 0.8.0-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix cpu isolate errors when some cpus are offline + before the service started + * Fri Mar 29 2024 Bing Xia - 0.8.0-4 - Type:bugfix - ID:NA -- Gitee