From 3833b8f02e62f02525223f3bfc77bfd67051d455 Mon Sep 17 00:00:00 2001 From: Pu Lehui Date: Thu, 29 May 2025 09:14:00 +0000 Subject: [PATCH 1/2] interference: Fix compilation issue hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICAOAT -------------------------------- kernel test robot reported the following compilation error: drivers/base/arch_topology.c:811:2: error: implicit declaration of function 'cgroup_ifs_set_smt' [-Werror=implicit-function-declaration] Let's fix it by adding cgroup_ifs_set_smt related header file. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202505282112.qVJOB1Zd-lkp@intel.com/ Fixes: edff31302c6d ("interference: Add smt interference track support") Signed-off-by: Pu Lehui --- drivers/base/arch_topology.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index a26169094712..b776ba4127db 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include -- Gitee From fd27647cf6d981b2aaeb90ee202a3ca6ef98e48e Mon Sep 17 00:00:00 2001 From: Xu Kuohai Date: Thu, 29 May 2025 09:14:01 +0000 Subject: [PATCH 2/2] interference: Fix IFS cannot show in cgroup v1 sub-cgroup hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICAOAT -------------------------------- Fix IFS cannot show in cgroup v1 sub-cgroup Fixes: 28d4e4995d76 ("interference: Add cgroup v1 support for CGROUP_IFS") Signed-off-by: Xu Kuohai Signed-off-by: Pu Lehui --- include/linux/cgroup.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index d6f43bca5ecb..29fb4556d123 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -905,6 +905,10 @@ static inline struct cgroup_ifs *cgroup_ifs(struct cgroup *cgrp) static inline struct cgroup_ifs *task_ifs(struct task_struct *task) { +#ifdef CONFIG_CGROUP_CPUACCT + if (!cgroup_subsys_on_dfl(cpuacct_cgrp_subsys)) + return cgroup_ifs(task_cgroup(task, cpuacct_cgrp_id)); +#endif return cgroup_ifs(task_dfl_cgroup(task)); } -- Gitee