From: Jeff Mahoney <jeffm@suse.com>
To: BtrFS List <linux-btrfs@vger.kernel.org>
Cc: Chris Mason <chris.mason@oracle.com>
Subject: [patch 54/65] btrfs: Use mempools for delayed refs
Date: Mon, 03 Oct 2011 23:23:24 -0400 [thread overview]
Message-ID: <20111004032306.104580941@suse.com> (raw)
In-Reply-To: 20111004032230.458853274@suse.com
This patch converts the delayed ref code to use slab cache-backed mempools
for allocating its nodes.
The allocations happen deep in the call path where error recovery is
impossible.
By using mempools, we ensure that the allocations can't fail. Each
mempool keeps a page of structures available for each type.
This also has an advantage of eliminating the error path from a big
chunk of code, simplifying the error handling.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
fs/btrfs/delayed-ref.c | 119 ++++++++++++++++++++++++++++++++++++++-----------
fs/btrfs/delayed-ref.h | 6 ++
fs/btrfs/super.c | 9 +++
3 files changed, 107 insertions(+), 27 deletions(-)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -18,11 +18,20 @@
#include <linux/sched.h>
#include <linux/slab.h>
+#include <linux/mempool.h>
#include <linux/sort.h>
#include "ctree.h"
#include "delayed-ref.h"
#include "transaction.h"
+static struct kmem_cache *ref_head_cache;
+static struct kmem_cache *tree_ref_cache;
+static struct kmem_cache *data_ref_cache;
+
+static mempool_t *ref_head_pool;
+static mempool_t *tree_ref_pool;
+static mempool_t *data_ref_pool;
+
/*
* delayed back reference update tracking. For subvolume trees
* we queue up extent allocations and backref maintenance for
@@ -455,7 +464,7 @@ static noinline void add_delayed_ref_hea
* we've updated the existing ref, free the newly
* allocated ref
*/
- kfree(head_ref);
+ mempool_free(head_ref, ref_head_pool);
} else {
delayed_refs->num_heads++;
delayed_refs->num_heads_ready++;
@@ -510,7 +519,7 @@ static noinline void add_delayed_tree_re
* we've updated the existing ref, free the newly
* allocated ref
*/
- kfree(full_ref);
+ mempool_free(full_ref, tree_ref_pool);
} else {
delayed_refs->num_entries++;
trans->delayed_ref_updates++;
@@ -565,7 +574,7 @@ static noinline void add_delayed_data_re
* we've updated the existing ref, free the newly
* allocated ref
*/
- kfree(full_ref);
+ mempool_free(full_ref, data_ref_pool);
} else {
delayed_refs->num_entries++;
trans->delayed_ref_updates++;
@@ -587,15 +596,8 @@ int btrfs_add_delayed_tree_ref(struct bt
struct btrfs_delayed_ref_root *delayed_refs;
BUG_ON(extent_op && extent_op->is_data);
- ref = kmalloc(sizeof(*ref), GFP_NOFS);
- if (!ref)
- return -ENOMEM;
-
- head_ref = kmalloc(sizeof(*head_ref), GFP_NOFS);
- if (!head_ref) {
- kfree(ref);
- return -ENOMEM;
- }
+ ref = mempool_alloc(tree_ref_pool, GFP_NOFS);
+ head_ref = mempool_alloc(ref_head_pool, GFP_NOFS);
head_ref->extent_op = extent_op;
@@ -628,15 +630,8 @@ int btrfs_add_delayed_data_ref(struct bt
struct btrfs_delayed_ref_root *delayed_refs;
BUG_ON(extent_op && !extent_op->is_data);
- ref = kmalloc(sizeof(*ref), GFP_NOFS);
- if (!ref)
- return -ENOMEM;
-
- head_ref = kmalloc(sizeof(*head_ref), GFP_NOFS);
- if (!head_ref) {
- kfree(ref);
- return -ENOMEM;
- }
+ ref = mempool_alloc(data_ref_pool, GFP_NOFS);
+ head_ref = mempool_alloc(ref_head_pool, GFP_NOFS);
head_ref->extent_op = extent_op;
@@ -662,10 +657,7 @@ int btrfs_add_delayed_extent_op(struct b
struct btrfs_delayed_ref_head *head_ref;
struct btrfs_delayed_ref_root *delayed_refs;
- head_ref = kmalloc(sizeof(*head_ref), GFP_NOFS);
- if (!head_ref)
- return -ENOMEM;
-
+ head_ref = mempool_alloc(ref_head_pool, GFP_NOFS);
head_ref->extent_op = extent_op;
delayed_refs = &trans->transaction->delayed_refs;
@@ -694,3 +686,80 @@ btrfs_find_delayed_ref_head(struct btrfs
return btrfs_delayed_node_to_head(ref);
return NULL;
}
+
+void btrfs_free_delayed_ref(struct btrfs_delayed_ref_node *ref)
+{
+ if (!ref->type)
+ mempool_free(ref, ref_head_pool);
+ else if (ref->type == BTRFS_SHARED_BLOCK_REF_KEY ||
+ ref->type == BTRFS_TREE_BLOCK_REF_KEY)
+ mempool_free(ref, tree_ref_pool);
+ else if (ref->type == BTRFS_SHARED_DATA_REF_KEY ||
+ ref->type == BTRFS_EXTENT_DATA_REF_KEY)
+ mempool_free(ref, data_ref_pool);
+ else
+ BUG();
+}
+
+void
+btrfs_destroy_delayed_ref_caches(void)
+{
+ if (data_ref_pool)
+ mempool_destroy(data_ref_pool);
+ if (data_ref_cache)
+ kmem_cache_destroy(data_ref_cache);
+
+ if (tree_ref_pool)
+ mempool_destroy(tree_ref_pool);
+ if (tree_ref_cache)
+ kmem_cache_destroy(tree_ref_cache);
+
+ if (ref_head_pool)
+ mempool_destroy(ref_head_pool);
+ if (ref_head_cache)
+ kmem_cache_destroy(ref_head_cache);
+}
+
+int __init
+btrfs_create_delayed_ref_caches(void)
+{
+ int objsize = sizeof(struct btrfs_delayed_ref_head);
+ ref_head_cache = kmem_cache_create("btrfs_delayed_ref_head", objsize,
+ 0, 0, NULL);
+ if (!ref_head_cache)
+ goto error;
+
+ ref_head_pool = mempool_create_slab_pool(PAGE_SIZE/objsize,
+ ref_head_cache);
+ if (!ref_head_pool)
+ goto error;
+
+
+ objsize = sizeof(struct btrfs_delayed_tree_ref);
+ tree_ref_cache = kmem_cache_create("btrfs_delayed_tree_ref", objsize,
+ 0, 0, NULL);
+ if (!tree_ref_cache)
+ goto error;
+
+ tree_ref_pool = mempool_create_slab_pool(PAGE_SIZE/objsize,
+ tree_ref_cache);
+ if (!tree_ref_pool)
+ goto error;
+
+
+ objsize = sizeof(struct btrfs_delayed_data_ref);
+ data_ref_cache = kmem_cache_create("btrfs_delayed_data_ref", objsize,
+ 0, 0, NULL);
+ if (!data_ref_cache)
+ goto error;
+
+ data_ref_pool = mempool_create_slab_pool(PAGE_SIZE/objsize,
+ data_ref_cache);
+ if (!data_ref_pool)
+ goto error;
+
+ return 0;
+error:
+ btrfs_destroy_delayed_ref_caches();
+ return -ENOMEM;
+}
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -142,12 +142,13 @@ struct btrfs_delayed_ref_root {
u64 run_delayed_start;
};
+void btrfs_free_delayed_ref(struct btrfs_delayed_ref_node *ref);
static inline void btrfs_put_delayed_ref(struct btrfs_delayed_ref_node *ref)
{
WARN_ON(atomic_read(&ref->refs) == 0);
if (atomic_dec_and_test(&ref->refs)) {
WARN_ON(ref->in_tree);
- kfree(ref);
+ btrfs_free_delayed_ref(ref);
}
}
@@ -202,4 +203,7 @@ btrfs_delayed_node_to_head(struct btrfs_
WARN_ON(!btrfs_delayed_ref_is_head(node));
return container_of(node, struct btrfs_delayed_ref_head, node);
}
+
+int btrfs_create_delayed_ref_caches(void);
+void btrfs_destroy_delayed_ref_caches(void);
#endif
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1308,13 +1308,19 @@ static int __init init_btrfs_fs(void)
if (err)
goto free_delayed_inode;
- err = register_filesystem(&btrfs_fs_type);
+ err = btrfs_create_delayed_ref_caches();
if (err)
goto unregister_ioctl;
+ err = register_filesystem(&btrfs_fs_type);
+ if (err)
+ goto free_delayed_ref_caches;
+
printk(KERN_INFO "%s loaded\n", BTRFS_BUILD_VERSION);
return 0;
+free_delayed_ref_caches:
+ btrfs_destroy_delayed_ref_caches();
unregister_ioctl:
btrfs_interface_exit();
free_delayed_inode:
@@ -1333,6 +1339,7 @@ free_compress:
static void __exit exit_btrfs_fs(void)
{
+ btrfs_destroy_delayed_ref_caches();
btrfs_destroy_cachep();
btrfs_delayed_inode_exit();
extent_map_exit();
next prev parent reply other threads:[~2011-10-04 3:23 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-04 3:22 [patch 00/65] Error handling patchset v3 Jeff Mahoney
2011-10-04 3:22 ` [patch 01/65] btrfs: Add btrfs_panic() Jeff Mahoney
2011-10-10 16:35 ` David Sterba
2011-10-10 16:42 ` David Sterba
2011-10-10 16:54 ` Jeff Mahoney
2011-10-04 3:22 ` [patch 02/65] btrfs: Catch locking failures in {set,clear}_extent_bit Jeff Mahoney
2011-10-04 3:22 ` [patch 03/65] btrfs: Panic on bad rbtree operations Jeff Mahoney
2011-10-04 3:22 ` [patch 04/65] btrfs: Simplify btrfs_insert_root Jeff Mahoney
2011-10-04 3:22 ` [patch 05/65] btrfs: set_extent_bit error push-up Jeff Mahoney
2011-10-04 3:22 ` [patch 06/65] btrfs: lock_extent " Jeff Mahoney
2011-10-04 3:22 ` [patch 07/65] btrfs: clear_extent_bit " Jeff Mahoney
2011-10-04 3:22 ` [patch 08/65] btrfs: unlock_extent " Jeff Mahoney
2011-10-04 3:22 ` [patch 09/65] btrfs: pin_down_extent should return void Jeff Mahoney
2011-10-04 3:22 ` [patch 10/65] btrfs: btrfs_pin_extent error push-up Jeff Mahoney
2011-10-04 3:22 ` [patch 11/65] btrfs: btrfs_drop_snapshot should return int Jeff Mahoney
2011-10-04 3:22 ` [patch 12/65] btrfs: btrfs_start_transaction non-looped error push-up Jeff Mahoney
2011-10-04 3:22 ` [patch 13/65] btrfs: find_and_setup_root " Jeff Mahoney
2011-10-04 3:22 ` [patch 14/65] btrfs: btrfs_update_root " Jeff Mahoney
2011-10-04 3:22 ` [patch 15/65] btrfs: set_range_writeback should return void Jeff Mahoney
2011-10-04 3:22 ` [patch 16/65] btrfs: wait_on_state " Jeff Mahoney
2011-10-04 3:22 ` [patch 17/65] btrfs: wait_extent_bit " Jeff Mahoney
2011-10-04 3:22 ` [patch 18/65] btrfs: __unlock_for_delalloc " Jeff Mahoney
2011-10-04 3:22 ` [patch 19/65] btrfs: check_page_uptodate " Jeff Mahoney
2011-10-04 3:22 ` [patch 20/65] btrfs: check_page_locked " Jeff Mahoney
2011-10-04 3:22 ` [patch 21/65] btrfs: check_page_writeback " Jeff Mahoney
2011-10-04 3:22 ` [patch 22/65] btrfs: clear_extent_buffer_dirty " Jeff Mahoney
2011-10-04 3:22 ` [patch 23/65] btrfs: btrfs_cleanup_fs_uuids " Jeff Mahoney
2011-10-04 3:22 ` [patch 24/65] btrfs: run_scheduled_bios " Jeff Mahoney
2011-10-04 3:22 ` [patch 25/65] btrfs: btrfs_close_extra_devices " Jeff Mahoney
2011-10-04 3:22 ` [patch 26/65] btrfs: schedule_bio " Jeff Mahoney
2011-10-04 3:22 ` [patch 27/65] btrfs: fill_device_from_item " Jeff Mahoney
2011-10-04 3:22 ` [patch 28/65] btrfs: btrfs_queue_worker " Jeff Mahoney
2011-10-04 3:22 ` [patch 29/65] btrfs: run_ordered_completions " Jeff Mahoney
2011-10-04 3:23 ` [patch 30/65] btrfs: btrfs_stop_workers " Jeff Mahoney
2011-10-04 3:23 ` [patch 31/65] btrfs: btrfs_requeue_work " Jeff Mahoney
2011-10-04 3:23 ` [patch 32/65] btrfs: tree-log: btrfs_end_log_trans " Jeff Mahoney
2011-10-04 3:23 ` [patch 33/65] btrfs: tree-log: wait_for_writer " Jeff Mahoney
2011-10-04 3:23 ` [patch 34/65] btrfs: btrfs_init_compress " Jeff Mahoney
2011-10-04 3:23 ` [patch 35/65] btrfs: btrfs_invalidate_inodes " Jeff Mahoney
2011-10-04 3:23 ` [patch 36/65] btrfs: __setup_root " Jeff Mahoney
2011-10-04 3:23 ` [patch 37/65] btrfs: btrfs_destroy_delalloc_inodes " Jeff Mahoney
2011-10-04 3:23 ` [patch 38/65] btrfs: btrfs_prepare_extent_commit " Jeff Mahoney
2011-10-04 3:23 ` [patch 39/65] btrfs: btrfs_set_block_group_rw " Jeff Mahoney
2011-10-04 3:23 ` [patch 40/65] btrfs: setup_inline_extent_backref " Jeff Mahoney
2011-10-04 3:23 ` [patch 41/65] btrfs: btrfs_run_defrag_inodes " Jeff Mahoney
2011-10-04 3:23 ` [patch 42/65] btrfs: Simplify btrfs_submit_bio_hook Jeff Mahoney
2011-10-04 3:23 ` [patch 43/65] btrfs: Factor out tree->ops->merge_bio_hook call Jeff Mahoney
2011-10-04 3:23 ` [patch 44/65] btrfs: ->submit_bio_hook error push-up Jeff Mahoney
2011-10-04 3:23 ` [patch 45/65] btrfs: __add_reloc_root " Jeff Mahoney
2011-10-04 3:23 ` [patch 46/65] btrfs: fixup_low_keys should return void Jeff Mahoney
2011-10-04 3:23 ` [patch 47/65] btrfs: setup_items_for_insert " Jeff Mahoney
2011-10-04 3:23 ` [patch 48/65] btrfs: del_ptr " Jeff Mahoney
2011-10-04 3:23 ` [patch 49/65] btrfs: insert_ptr " Jeff Mahoney
2011-10-04 3:23 ` [patch 50/65] btrfs: add_delayed_ref_head " Jeff Mahoney
2011-10-04 3:23 ` [patch 51/65] btrfs: add_delayed_tree_ref " Jeff Mahoney
2011-10-04 3:23 ` [patch 52/65] btrfs: add_delayed_data_ref " Jeff Mahoney
2011-10-04 3:23 ` [patch 53/65] btrfs: Fix kfree of member instead of structure Jeff Mahoney
2011-10-04 3:23 ` Jeff Mahoney [this message]
2011-10-04 3:23 ` [patch 55/65] btrfs: Delayed ref mempool functions should return void Jeff Mahoney
2011-10-04 3:23 ` [patch 56/65] btrfs: btrfs_inc_extent_ref void return prep Jeff Mahoney
2011-10-04 3:23 ` [patch 57/65] btrfs: btrfs_free_extent " Jeff Mahoney
2011-10-04 3:23 ` [patch 58/65] btrfs: __btrfs_mod_refs process_func should return void Jeff Mahoney
2011-10-04 3:23 ` [patch 59/65] btrfs: __btrfs_mod_ref " Jeff Mahoney
2011-10-04 3:23 ` [patch 60/65] btrfs: clean_tree_block " Jeff Mahoney
2011-10-04 3:23 ` [patch 61/65] btrfs: btrfs_truncate_item " Jeff Mahoney
2011-10-04 3:23 ` [patch 62/65] btrfs: btrfs_extend_item " Jeff Mahoney
2011-10-04 3:23 ` [patch 63/65] btrfs: end_compressed_writeback " Jeff Mahoney
2011-10-04 3:23 ` [patch 64/65] btrfs: copy_for_split " Jeff Mahoney
2011-10-04 3:23 ` [patch 65/65] btrfs: update_inline_extent_backref " Jeff Mahoney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111004032306.104580941@suse.com \
--to=jeffm@suse.com \
--cc=chris.mason@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).