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 0000000000000000000000000000000000000000..304dbd5b9ecded4e7db933acd36c4c019d39f9c8 --- /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 04e137659e11ca4b3bb5c8b7f26c289cec328abd..4d4cf2847c0a93306f974cd1ea9412a23d7828b2 100644 --- a/rasdaemon.spec +++ b/rasdaemon.spec @@ -1,6 +1,6 @@ Name: rasdaemon Version: 0.6.7 -Release: 20 +Release: 21 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 @@ -41,6 +41,7 @@ Patch19: 0001-rasdaemon-use-standard-length-PATH_MAX-for-path-name.patch Patch20: rasdaemon-diskerror-fix-incomplete-diskerror-log.patch Patch21: 0001-Check-CPUs-online-not-configured.patch Patch22: backport-Fix-potential-overflow-with-some-arrays-at-page-isol.patch +Patch23: bugfix-fix-cpu-isolate-errors-when-some-cpus-are-.patch Patch6000: backport-rasdaemon-ras-mc-ctl-Fix-script-to-parse-dimm-sizes.patch Patch6001: backport-rasdaemon-ras-memory-failure-handler-handle-localtim.patch @@ -112,6 +113,13 @@ if [ $1 -eq 0 ] ; then fi %changelog +* Thu Apr 25 2024 yangjunshuo - 0.6.7-21 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix cpu isolate errors when some cpus are offline + before the service started + * Tue Apr 23 2024 Bing Xia - 0.6.7-20 - Type:bugfix - ID:NA