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>

diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h
index 091f2d2a1aece2da85f1676783951aa85d8707d9..c238207d1615698a14d477246d6bbb135af79a50 100644 (file)
--- 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 4b2b49267384d8b47f0d8e7e6f7356979abef825..fe3e8a0eb7ed129de90d6d7e2172ff71ab9b0e61 100644 (file)
--- 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;
                }