diff options
| author | Vasily Averin <[email protected]> | 2021-07-19 10:44:56 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2021-07-20 13:00:38 +0000 |
| commit | 2c6ad20b581e37d6331010ee1d28b3307c90ba0a (patch) | |
| tree | 0fb3b7875cbcb3fdf333b7ac6470d97d8387e2c9 /net/core/scm.c | |
| parent | memcg: ipv6/sit: account and don't WARN on ip_tunnel_prl structs allocation (diff) | |
| download | kernel-2c6ad20b581e37d6331010ee1d28b3307c90ba0a.tar.gz kernel-2c6ad20b581e37d6331010ee1d28b3307c90ba0a.zip | |
memcg: enable accounting for scm_fp_list objects
unix sockets allows to send file descriptors via SCM_RIGHTS type messages.
Each such send call forces kernel to allocate up to 2Kb memory for
struct scm_fp_list.
It makes sense to account for them to restrict the host's memory
consumption from inside the memcg-limited container.
Signed-off-by: Vasily Averin <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/core/scm.c')
| -rw-r--r-- | net/core/scm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/scm.c b/net/core/scm.c index ae3085d9aae8..5c356f0dee30 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -79,7 +79,7 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp) if (!fpl) { - fpl = kmalloc(sizeof(struct scm_fp_list), GFP_KERNEL); + fpl = kmalloc(sizeof(struct scm_fp_list), GFP_KERNEL_ACCOUNT); if (!fpl) return -ENOMEM; *fplp = fpl; @@ -355,7 +355,7 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl) return NULL; new_fpl = kmemdup(fpl, offsetof(struct scm_fp_list, fp[fpl->count]), - GFP_KERNEL); + GFP_KERNEL_ACCOUNT); if (new_fpl) { for (i = 0; i < fpl->count; i++) get_file(fpl->fp[i]); |