summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunguang Xu <brookxu@tencent.com>2021-09-17 15:44:15 +0300
committerTejun Heo <tj@kernel.org>2021-09-20 20:35:38 +0300
commitb03357528fd9516600ff358ab5d4b887b8cb80e8 (patch)
tree037b3e4f1b5a4afa466ee0f2f349b4b9a338a52f
parentf279294b329363eb6ada568e494d609ef78e3e8e (diff)
downloadlinux-b03357528fd9516600ff358ab5d4b887b8cb80e8.tar.xz
misc_cgroup: remove error log to avoid log flood
In scenarios where containers are frequently created and deleted, a large number of error logs maybe generated. The logs only show which node is about to go over the max limit, not the node which resource request failed. As misc.events has provided relevant information, maybe we can remove this log. Signed-off-by: Chunguang Xu <brookxu@tencent.com> Reviewed-by: Michal Koutný <mkoutny@suse.com> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--include/linux/misc_cgroup.h1
-rw-r--r--kernel/cgroup/misc.c7
2 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h
index 091f2d2a1aec..c238207d1615 100644
--- a/include/linux/misc_cgroup.h
+++ b/include/linux/misc_cgroup.h
@@ -37,7 +37,6 @@ struct misc_res {
unsigned long max;
atomic_long_t usage;
atomic_long_t events;
- bool failed;
};
/**
diff --git a/kernel/cgroup/misc.c b/kernel/cgroup/misc.c
index 4b2b49267384..fe3e8a0eb7ed 100644
--- a/kernel/cgroup/misc.c
+++ b/kernel/cgroup/misc.c
@@ -157,13 +157,6 @@ int misc_cg_try_charge(enum misc_res_type type, struct misc_cg *cg,
new_usage = atomic_long_add_return(amount, &res->usage);
if (new_usage > READ_ONCE(res->max) ||
new_usage > READ_ONCE(misc_res_capacity[type])) {
- if (!res->failed) {
- pr_info("cgroup: charge rejected by the misc controller for %s resource in ",
- misc_res_name[type]);
- pr_cont_cgroup_path(i->css.cgroup);
- pr_cont("\n");
- res->failed = true;
- }
ret = -EBUSY;
goto err_charge;
}