Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fba4b697 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Fix slab accounting flags 



BTRFS is using a variety of slab caches to satisfy internal needs.
Those slab caches are always allocated with the SLAB_RECLAIM_ACCOUNT,
meaning allocations from the caches are going to be accounted as
SReclaimable. At the same time btrfs is not registering any shrinkers
whatsoever, thus preventing memory from the slabs to be shrunk. This
means those caches are not in fact reclaimable.

To fix this remove the SLAB_RECLAIM_ACCOUNT on all caches apart from the
inode cache, since this one is being freed by the generic VFS super_block
shrinker. Also set the transaction related caches as SLAB_TEMPORARY,
to better document the lifetime of the objects (it just translates
to SLAB_RECLAIM_ACCOUNT).

Signed-off-by: default avatarNikolay Borisov <n.borisov.lkml@gmail.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7af7c616

fs/btrfs/backref.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ int __init btrfs_prelim_ref_init(void) 
	btrfs_prelim_ref_cache = kmem_cache_create("btrfs_prelim_ref",

					sizeof(struct __prelim_ref),

					0,

					SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD,

					SLAB_MEM_SPREAD,

					NULL);

	if (!btrfs_prelim_ref_cache)

		return -ENOMEM;

fs/btrfs/delayed-inode.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int __init btrfs_delayed_inode_init(void) 
	delayed_node_cache = kmem_cache_create("btrfs_delayed_node",

					sizeof(struct btrfs_delayed_node),

					0,

					SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD,

					SLAB_MEM_SPREAD,

					NULL);

	if (!delayed_node_cache)

		return -ENOMEM;

fs/btrfs/delayed-ref.c

+4 −4
Original line number Diff line number Diff line
@@ -940,28 +940,28 @@ int btrfs_delayed_ref_init(void) 
	btrfs_delayed_ref_head_cachep = kmem_cache_create(

				"btrfs_delayed_ref_head",

				sizeof(struct btrfs_delayed_ref_head), 0,

				SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);

				SLAB_MEM_SPREAD, NULL);

	if (!btrfs_delayed_ref_head_cachep)

		goto fail;



	btrfs_delayed_tree_ref_cachep = kmem_cache_create(

				"btrfs_delayed_tree_ref",

				sizeof(struct btrfs_delayed_tree_ref), 0,

				SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);

				SLAB_MEM_SPREAD, NULL);

	if (!btrfs_delayed_tree_ref_cachep)

		goto fail;



	btrfs_delayed_data_ref_cachep = kmem_cache_create(

				"btrfs_delayed_data_ref",

				sizeof(struct btrfs_delayed_data_ref), 0,

				SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);

				SLAB_MEM_SPREAD, NULL);

	if (!btrfs_delayed_data_ref_cachep)

		goto fail;



	btrfs_delayed_extent_op_cachep = kmem_cache_create(

				"btrfs_delayed_extent_op",

				sizeof(struct btrfs_delayed_extent_op), 0,

				SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);

				SLAB_MEM_SPREAD, NULL);

	if (!btrfs_delayed_extent_op_cachep)

		goto fail;

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int __init btrfs_end_io_wq_init(void) 
	btrfs_end_io_wq_cache = kmem_cache_create("btrfs_end_io_wq",

					sizeof(struct btrfs_end_io_wq),

					0,

					SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD,

					SLAB_MEM_SPREAD,

					NULL);

	if (!btrfs_end_io_wq_cache)

		return -ENOMEM;

fs/btrfs/extent_io.c

+2 −2
Original line number Diff line number Diff line
@@ -163,13 +163,13 @@ int __init extent_io_init(void) 
{

	extent_state_cache = kmem_cache_create("btrfs_extent_state",

			sizeof(struct extent_state), 0,

			SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);

			SLAB_MEM_SPREAD, NULL);

	if (!extent_state_cache)

		return -ENOMEM;



	extent_buffer_cache = kmem_cache_create("btrfs_extent_buffer",

			sizeof(struct extent_buffer), 0,

			SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);

			SLAB_MEM_SPREAD, NULL);

	if (!extent_buffer_cache)

		goto free_state_cache;