lkml.org 
[lkml]   [2021]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC PATCH v2 1/3] misc_cgroup: add support for nofile limit
Date
From: Chunguang Xu <brookxu@tencent.com>

Since the global open files are limited, in order to avoid the
abnormal behavior of some containers from generating too many
files, causing other containers to be unavailable, we need to
limit the open files of some containers.

v2: fix compile error while CONFIG_CGROUP_MISC not set.

Signed-off-by: Chunguang Xu <brookxu@tencent.com>
Reported-by: kernel test robot <lkp@intel.com>
---
fs/file_table.c | 28 ++++++++++++++++++++++++++--
include/linux/fs.h | 4 +++-
include/linux/misc_cgroup.h | 1 +
kernel/cgroup/misc.c | 1 +
4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/fs/file_table.c b/fs/file_table.c
index 45437f8e1003..5957b2de9701 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -29,6 +29,7 @@
#include <linux/swap.h>

#include <linux/atomic.h>
+#include <linux/misc_cgroup.h>

#include "internal.h"

@@ -53,8 +54,16 @@ static void file_free_rcu(struct rcu_head *head)
static inline void file_free(struct file *f)
{
security_file_free(f);
- if (!(f->f_mode & FMODE_NOACCOUNT))
+ if (!(f->f_mode & FMODE_NOACCOUNT)) {
+#ifdef CONFIG_CGROUP_MISC
+ struct misc_cg *misc_cg = css_misc(f->f_css);
+
+ misc_cg_uncharge(MISC_CG_RES_NOFILE, misc_cg, 1);
+ put_misc_cg(misc_cg);
+#endif
+
percpu_counter_dec(&nr_files);
+ }
call_rcu(&f->f_u.fu_rcuhead, file_free_rcu);
}

@@ -148,8 +157,22 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
}

f = __alloc_file(flags, cred);
- if (!IS_ERR(f))
+ if (!IS_ERR(f)) {
+#ifdef CONFIG_CGROUP_MISC
+ struct misc_cg *misc_cg = get_current_misc_cg();
+ int ret;
+
+ ret = misc_cg_try_charge(MISC_CG_RES_NOFILE, misc_cg, 1);
+ if (ret < 0) {
+ file_free(f);
+ put_misc_cg(misc_cg);
+ return ERR_PTR(-ENFILE);
+ }
+ f->f_css = &misc_cg->css;
+#endif
+
percpu_counter_inc(&nr_files);
+ }

return f;

@@ -397,4 +420,5 @@ void __init files_maxfiles_init(void)
n = ((nr_pages - memreserve) * (PAGE_SIZE / 1024)) / 10;

files_stat.max_files = max_t(unsigned long, n, NR_FILE);
+ misc_cg_set_capacity(MISC_CG_RES_NOFILE, files_stat.max_files);
}
diff --git a/include/linux/fs.h b/include/linux/fs.h
index fad6663cd1b0..9ef3dd579ed6 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -947,7 +947,9 @@ struct file {
#endif
/* needed for tty driver, and maybe others */
void *private_data;
-
+#ifdef CONFIG_CGROUP_MISC
+ struct cgroup_subsys_state *f_css;
+#endif
#ifdef CONFIG_EPOLL
/* Used by fs/eventpoll.c to link all the hooks to this file */
struct hlist_head *f_ep;
diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h
index da2367e2ac1e..8450a5e66de0 100644
--- a/include/linux/misc_cgroup.h
+++ b/include/linux/misc_cgroup.h
@@ -18,6 +18,7 @@ enum misc_res_type {
/* AMD SEV-ES ASIDs resource */
MISC_CG_RES_SEV_ES,
#endif
+ MISC_CG_RES_NOFILE,
MISC_CG_RES_TYPES
};

diff --git a/kernel/cgroup/misc.c b/kernel/cgroup/misc.c
index ec02d963cad1..5d51b8eeece6 100644
--- a/kernel/cgroup/misc.c
+++ b/kernel/cgroup/misc.c
@@ -24,6 +24,7 @@ static const char *const misc_res_name[] = {
/* AMD SEV-ES ASIDs resource */
"sev_es",
#endif
+ "nofile"
};

/* Root misc cgroup */
--
2.30.0
\
 
 \ /
  Last update: 2021-07-22 19:36    [W:0.068 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site