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 <vvs@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/scm.c b/net/core/scm.c
index ae3085d9aae8adb81d3bb42c8a915a205476a0ee..5c356f0dee30c3edaa57b49176cce021d5248cd7 100644 (file)
--- 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]);