Commit 5d097056 authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Linus Torvalds
Browse files

kmemcg: account certain kmem allocations to memcg 



Mark those kmem allocations that are known to be easily triggered from
userspace as __GFP_ACCOUNT/SLAB_ACCOUNT, which makes them accounted to
memcg.  For the list, see below:

 - threadinfo
 - task_struct
 - task_delay_info
 - pid
 - cred
 - mm_struct
 - vm_area_struct and vm_region (nommu)
 - anon_vma and anon_vma_chain
 - signal_struct
 - sighand_struct
 - fs_struct
 - files_struct
 - fdtable and fdtable->full_fds_bits
 - dentry and external_name
 - inode for all filesystems. This is the most tedious part, because
   most filesystems overwrite the alloc_inode method.

The list is far from complete, so feel free to add more objects.
Nevertheless, it should be close to "account everything" approach and
keep most workloads within bounds.  Malevolent users will be able to
breach the limit, but this was possible even with the former "account
everything" approach (simply because it did not account everything in
fact).

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarVladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Greg Thelen <gthelen@google.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 37f08dda

arch/powerpc/platforms/cell/spufs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -767,7 +767,7 @@ static int __init spufs_init(void) 
	ret = -ENOMEM;

	ret = -ENOMEM;

	spufs_inode_cache = kmem_cache_create("spufs_inode_cache",

	spufs_inode_cache = kmem_cache_create("spufs_inode_cache",

			sizeof(struct spufs_inode_info), 0,

			sizeof(struct spufs_inode_info), 0,

			SLAB_HWCACHE_ALIGN, spufs_init_once);

			SLAB_HWCACHE_ALIGN|SLAB_ACCOUNT, spufs_init_once);





	if (!spufs_inode_cache)

	if (!spufs_inode_cache)

		goto out;

		goto out;

drivers/staging/lustre/lustre/llite/super25.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -106,7 +106,8 @@ static int __init init_lustre_lite(void) 
	rc = -ENOMEM;

	rc = -ENOMEM;

	ll_inode_cachep = kmem_cache_create("lustre_inode_cache",

	ll_inode_cachep = kmem_cache_create("lustre_inode_cache",

					    sizeof(struct ll_inode_info),

					    sizeof(struct ll_inode_info),

					    0, SLAB_HWCACHE_ALIGN, NULL);

					    0, SLAB_HWCACHE_ALIGN|SLAB_ACCOUNT,

					    NULL);

	if (ll_inode_cachep == NULL)

	if (ll_inode_cachep == NULL)

		goto out_cache;

		goto out_cache;

fs/9p/v9fs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -575,7 +575,7 @@ static int v9fs_init_inode_cache(void) 
	v9fs_inode_cache = kmem_cache_create("v9fs_inode_cache",

	v9fs_inode_cache = kmem_cache_create("v9fs_inode_cache",

					  sizeof(struct v9fs_inode),

					  sizeof(struct v9fs_inode),

					  0, (SLAB_RECLAIM_ACCOUNT|

					  0, (SLAB_RECLAIM_ACCOUNT|

					      SLAB_MEM_SPREAD),

					      SLAB_MEM_SPREAD|SLAB_ACCOUNT),

					  v9fs_inode_init_once);

					  v9fs_inode_init_once);

	if (!v9fs_inode_cache)

	if (!v9fs_inode_cache)

		return -ENOMEM;

		return -ENOMEM;

fs/adfs/super.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -271,7 +271,7 @@ static int __init init_inodecache(void) 
	adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",

	adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",

					     sizeof(struct adfs_inode_info),

					     sizeof(struct adfs_inode_info),

					     0, (SLAB_RECLAIM_ACCOUNT|

					     0, (SLAB_RECLAIM_ACCOUNT|

						SLAB_MEM_SPREAD),

						SLAB_MEM_SPREAD|SLAB_ACCOUNT),

					     init_once);

					     init_once);

	if (adfs_inode_cachep == NULL)

	if (adfs_inode_cachep == NULL)

		return -ENOMEM;

		return -ENOMEM;

fs/affs/super.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ static int __init init_inodecache(void) 
	affs_inode_cachep = kmem_cache_create("affs_inode_cache",

	affs_inode_cachep = kmem_cache_create("affs_inode_cache",

					     sizeof(struct affs_inode_info),

					     sizeof(struct affs_inode_info),

					     0, (SLAB_RECLAIM_ACCOUNT|

					     0, (SLAB_RECLAIM_ACCOUNT|

						SLAB_MEM_SPREAD),

						SLAB_MEM_SPREAD|SLAB_ACCOUNT),

					     init_once);

					     init_once);

	if (affs_inode_cachep == NULL)

	if (affs_inode_cachep == NULL)

		return -ENOMEM;

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE