hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IDA3VP ----------------------------------------- The cgroup file visibility update path has a retry mechanism controlled by XCUCG_SET_FILE_RETRY_COUNT. Emitting an error log on each failed retry can easily flood the kernel log under transient failure conditions. Remove the per-retry error logging to avoid excessive log noise while keeping the retry behavior unchanged. Fixes: aafde051ac61 ("xsched: Add support for CFS quota for cgroups") Signed-off-by: Zicheng Qu <quzicheng@huawei.com> --- include/linux/xsched.h | 2 +- kernel/xsched/cgroup.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/linux/xsched.h b/include/linux/xsched.h index 60cb43b4631f..d4dc321bb216 100644 --- a/include/linux/xsched.h +++ b/include/linux/xsched.h @@ -467,7 +467,7 @@ void xsched_quota_refill(struct work_struct *work); #define XCU_QUOTA_RUNTIME_INF -1 #define XCU_SHARES_MIN 1 -#define XCUCG_SET_FILE_RETRY_COUNT 50 +#define XCUCG_SET_FILE_RETRY_COUNT 100 #define XCUCG_SET_FILE_DELAY_MS 10 #define SCHED_CLASS_MAX_LENGTH 4 diff --git a/kernel/xsched/cgroup.c b/kernel/xsched/cgroup.c index ca04c493faa0..02957b33340a 100644 --- a/kernel/xsched/cgroup.c +++ b/kernel/xsched/cgroup.c @@ -46,13 +46,8 @@ static int xcu_cg_set_file_show(struct xsched_group *xg) /* Update visibility of related files based on sched_class */ for (int type_name = XCU_FILE_PERIOD_MS; type_name < NR_XCU_FILE_TYPES; type_name++) { - if (unlikely(!xg->xcu_file[type_name].kn)) { - XSCHED_ERR("Fail to control the file [%d] to be %s @ %s.\n", - type_name, - xg->sched_class == XSCHED_TYPE_CFS ? "visible" : "invisible", - __func__); + if (unlikely(!xg->xcu_file[type_name].kn)) return -EBUSY; - } cgroup_file_show(&xg->xcu_file[type_name], xg->sched_class == XSCHED_TYPE_CFS); } -- 2.34.1