From b629c0843dd366d5f234f7b247e19da1a374e0b8 Mon Sep 17 00:00:00 2001 From: Yipeng Zou Date: Fri, 24 May 2024 11:28:25 +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 0232640040dc906424ef969ba1a0aaee97cf2846. Fixes: 0232640040dc ("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 dc49f231294a..4b16ac2efda8 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1128,7 +1128,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 0045db953223a0ae241555b2bfda3985718beaa1 Mon Sep 17 00:00:00 2001 From: Yipeng Zou Date: Fri, 24 May 2024 11:28:26 +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: 890af1b1e1d5 ("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 4b16ac2efda8..c1f125e99163 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1128,6 +1128,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