From 1650bfed43a7b64314087bf4b85ab3b7087e0dc1 Mon Sep 17 00:00:00 2001 From: heppen Date: Fri, 19 Sep 2025 15:19:46 +0800 Subject: [PATCH] fix: numa_sched_tune adapt to kernel 6.6 sched feature path (cherry picked from commit b7db081e9b961b4e46be0cfcb6bcb5cbfba6f87b) --- ...ix-numa_sched_tune-6.6-sched-feature.patch | 45 +++++++++++++++++++ oeAware-manager.spec | 6 ++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-fix-numa_sched_tune-6.6-sched-feature.patch diff --git a/0001-fix-numa_sched_tune-6.6-sched-feature.patch b/0001-fix-numa_sched_tune-6.6-sched-feature.patch new file mode 100644 index 0000000..45336da --- /dev/null +++ b/0001-fix-numa_sched_tune-6.6-sched-feature.patch @@ -0,0 +1,45 @@ +From 53efad0d25676570965ea17372aca6a9ec03fb09 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Thu, 18 Sep 2025 10:19:56 +0800 +Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(numa=5Fsched=5Ftune):=20?= + =?UTF-8?q?=E9=80=82=E9=85=8D6.6=20sched=20feature=E8=B7=AF=E5=BE=84?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + .../tune/system/cpu/numa_sched_tune/numa_sched_tune.cpp | 4 ++-- + src/plugin/tune/system/cpu/numa_sched_tune/numa_sched_tune.h | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/plugin/tune/system/cpu/numa_sched_tune/numa_sched_tune.cpp b/src/plugin/tune/system/cpu/numa_sched_tune/numa_sched_tune.cpp +index 0e784b0..8b4d8b5 100644 +--- a/src/plugin/tune/system/cpu/numa_sched_tune/numa_sched_tune.cpp ++++ b/src/plugin/tune/system/cpu/numa_sched_tune/numa_sched_tune.cpp +@@ -159,9 +159,9 @@ void NumaSchedTune::Run() + + bool NumaSchedTune::WriteFeature(const std::string &feature) + { +- std::ofstream file(schedFeaturesPath); ++ std::ofstream file(schedFeaturePath); + if (!file.is_open()) { +- ERROR(logger, "[NUMA_SCHED] Failed to open sched_features file: " + std::string(schedFeaturesPath)); ++ ERROR(logger, "[NUMA_SCHED] Failed to open sched_features file: " + schedFeaturePath); + return false; + } + +diff --git a/src/plugin/tune/system/cpu/numa_sched_tune/numa_sched_tune.h b/src/plugin/tune/system/cpu/numa_sched_tune/numa_sched_tune.h +index 8c7febe..bd15120 100644 +--- a/src/plugin/tune/system/cpu/numa_sched_tune/numa_sched_tune.h ++++ b/src/plugin/tune/system/cpu/numa_sched_tune/numa_sched_tune.h +@@ -36,7 +36,6 @@ public: + + private: + // Constants +- const std::string schedFeaturesPath = "/sys/kernel/debug/sched_features"; + const std::string enableFeature = "PARAL"; + const std::string disableFeature = "NO_PARAL"; + const std::string schedUtilLowPctPath = "/proc/sys/kernel/sched_util_low_pct"; +-- +2.25.1 + diff --git a/oeAware-manager.spec b/oeAware-manager.spec index a0febbd..cc96428 100644 --- a/oeAware-manager.spec +++ b/oeAware-manager.spec @@ -1,10 +1,11 @@ Name: oeAware-manager Version: v2.1.1 -Release: 1 +Release: 2 Summary: OeAware is a framework for implementing low-load collection, sensing, and tuning on openEuler. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} Source0: %{name}-%{version}.tar.gz +Patch1: 0001-fix-numa_sched_tune-6.6-sched-feature.patch BuildRequires: cmake make gcc-c++ BuildRequires: boost-devel @@ -106,6 +107,9 @@ fi %attr(0644, root, root) %{_includedir}/oeaware/data/*.h %changelog +* Fri Sep 19 2025 heppen -v2.1.1-2 +- fix: numa_sched_tune adapt to kernel 6.6 sched feature path. + * Mon Sep 8 2025 fly_1997 -v2.1.1-1 - add hwprobe_analysis for RISC-V - fix error logger info -- Gitee