From 999d312b9d745ccbeabfadad92f33d7eb8dffa2e Mon Sep 17 00:00:00 2001 From: Yipeng Zou Date: Fri, 24 May 2024 18:13:31 +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 758b9988d742..b722b7a887c1 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1072,7 +1072,6 @@ config TASK_PLACEMENT_BY_CPU_RANGE config QOS_SCHED_DYNAMIC_AFFINITY bool "qos dynamic affinity" depends on CPUSETS - depends on FAIR_CGROUP_SCHED select TASK_PLACEMENT_BY_CPU_RANGE default n help -- Gitee From 47f1a8c05d576faf5da0406ec018ae873b206922 Mon Sep 17 00:00:00 2001 From: Yipeng Zou Date: Fri, 24 May 2024 18:13:32 +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 b722b7a887c1..b5a882ded286 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1072,6 +1072,7 @@ config TASK_PLACEMENT_BY_CPU_RANGE config QOS_SCHED_DYNAMIC_AFFINITY bool "qos dynamic affinity" depends on CPUSETS + depends on FAIR_GROUP_SCHED select TASK_PLACEMENT_BY_CPU_RANGE default n help -- Gitee