From 1c249fee5cd09a50a195e1aa4bd8bd8057f6b92c Mon Sep 17 00:00:00 2001 From: Yipeng Zou Date: Fri, 24 May 2024 11:51:33 +0800 Subject: [PATCH 1/2] Revert "sched: QOS_SCHED_DYNAMIC_AFFINITY depend on FAIR_CGROUP_SCHED" hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9R3F8 CVE: NA -------------------------------- It's typo error, should be FAIR_GROUP_SCHED but not FAIR_CGROUP_SCHED. This reverts commit 7fddb812509727addde0bc954a5502e620deae23. Fixes: 7fddb8125097 ("sched: QOS_SCHED_DYNAMIC_AFFINITY depend on FAIR_CGROUP_SCHED") Signed-off-by: Yipeng Zou --- init/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index d6422dc138d8..69bd400daeb3 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1069,7 +1069,6 @@ endif #CGROUP_SCHED config QOS_SCHED_DYNAMIC_AFFINITY bool "qos dynamic affinity" depends on CPUSETS - depends on FAIR_CGROUP_SCHED default n help This feature lets you allocate preferred cpus to taskgroup. If enabled, -- Gitee From d64a496ceb0189986276121a0c0d68781b2384ef Mon Sep 17 00:00:00 2001 From: Yipeng Zou Date: Fri, 24 May 2024 11:51:34 +0800 Subject: [PATCH 2/2] sched: QOS_SCHED_DYNAMIC_AFFINITY depend on FAIR_GROUP_SCHED hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9R3F8 CVE: NA -------------------------------- There are many link error when QOS_SCHED_DYNAMIC_AFFINITY = y && FAIR_GROUP_SCHED=n. The QOS_SCHED_DYNAMIC_AFFINITY feature need FAIR_GROUP_SCHED has been selected first. Fixes: 229f5c1f3868 ("sched: Introduce dynamic affinity for cfs scheduler") Signed-off-by: Yipeng Zou --- init/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/init/Kconfig b/init/Kconfig index 69bd400daeb3..08c8b8f34f8d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1069,6 +1069,7 @@ endif #CGROUP_SCHED config QOS_SCHED_DYNAMIC_AFFINITY bool "qos dynamic affinity" depends on CPUSETS + depends on FAIR_GROUP_SCHED default n help This feature lets you allocate preferred cpus to taskgroup. If enabled, -- Gitee