bcache: allocate meta data pages as compound pages

commit 5fe48867856367142d91a82f2cbf7a57a24cbb70 upstream.

There are some meta data of bcache are allocated by multiple pages,
and they are used as bio bv_page for I/Os to the cache device. for
example cache_set->uuids, cache->disk_buckets, journal_write->data,
bset_tree->data.

For such meta data memory, all the allocated pages should be treated
as a single memory block. Then the memory management and underlying I/O
code can treat them more clearly.

This patch adds __GFP_COMP flag to all the location allocating >0 order
pages for the above mentioned meta data. Then their pages are treated
as compound pages now.

Signed-off-by: Coly Li <colyli@suse.de>
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index 4385303836d8e7cfe873bd497e90ed978ec7c50d..ae4cd74c8001e106f3d16fb3aa36c057a5671242 100644 (file)
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
@@ -322,7 +322,7 @@ int bch_btree_keys_alloc(struct btree_keys *b,
 
        b->page_order = page_order;
 
-       t->data = (void *) __get_free_pages(gfp, b->page_order);
+       t->data = (void *) __get_free_pages(__GFP_COMP|gfp, b->page_order);
        if (!t->data)
                goto err;
 

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index fd1f288fd8015907a1fd174b79261f6fd1884bbc..2f68cc51bbc7078682a043c475192688aa0a46f0 100644 (file)
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -785,7 +785,7 @@ int bch_btree_cache_alloc(struct cache_set *c)
        mutex_init(&c->verify_lock);
 
        c->verify_ondisk = (void *)
-               __get_free_pages(GFP_KERNEL, ilog2(bucket_pages(c)));
+               __get_free_pages(GFP_KERNEL|__GFP_COMP, ilog2(bucket_pages(c)));
 
        c->verify_data = mca_bucket_alloc(c, &ZERO_KEY, GFP_KERNEL);
 

diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index 0e3ff9745ac742d5fb72bdcda46ae227dd37ee62..9179638b33874701eff201e4d8bb1c550f7f9573 100644 (file)
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -999,8 +999,8 @@ int bch_journal_alloc(struct cache_set *c)
        j->w[1].c = c;
 
        if (!(init_fifo(&j->pin, JOURNAL_PIN, GFP_KERNEL)) ||
-           !(j->w[0].data = (void *) __get_free_pages(GFP_KERNEL, JSET_BITS)) ||
-           !(j->w[1].data = (void *) __get_free_pages(GFP_KERNEL, JSET_BITS)))
+           !(j->w[0].data = (void *) __get_free_pages(GFP_KERNEL|__GFP_COMP, JSET_BITS)) ||
+           !(j->w[1].data = (void *) __get_free_pages(GFP_KERNEL|__GFP_COMP, JSET_BITS)))
                return -ENOMEM;
 
        return 0;

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 7048370331c38b2132bce46b24be272c27b50b2d..b4d23d9f30f9be0821ce803846856a9814404828 100644 (file)
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1775,7 +1775,7 @@ void bch_cache_set_unregister(struct cache_set *c)
 }
 
 #define alloc_bucket_pages(gfp, c)                     \
-       ((void *) __get_free_pages(__GFP_ZERO|gfp, ilog2(bucket_pages(c))))
+       ((void *) __get_free_pages(__GFP_ZERO|__GFP_COMP|gfp, ilog2(bucket_pages(c))))
 
 struct cache_set *bch_cache_set_alloc(struct cache_sb *sb)
 {