aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorMing Lei <ming.lei@redhat.com>2021-01-11 11:05:54 +0800
committerJens Axboe <axboe@kernel.dk>2021-01-24 21:22:45 -0700
commit9f180e315a93cde559ac1c9c4c5ce980aa681c1c (patch)
treea1469d03fead5c762d84d3b64f416fd34cd0aa33 /block
parentblock: don't pass BIOSET_NEED_BVECS for q->bio_split (diff)
downloadlinux-dev-9f180e315a93cde559ac1c9c4c5ce980aa681c1c.tar.xz
linux-dev-9f180e315a93cde559ac1c9c4c5ce980aa681c1c.zip
block: don't allocate inline bvecs if this bioset needn't bvecs
The inline bvecs won't be used if user needn't bvecs by not passing BIOSET_NEED_BVECS, so don't allocate bvecs in this situation. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Pavel Begunkov <asml.silence@gmail.com> Tested-by: Pavel Begunkov <asml.silence@gmail.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/bio.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/block/bio.c b/block/bio.c
index 87bf16460e0e..8ccda51dd831 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -89,8 +89,7 @@ fail_alloc_slab:
static inline unsigned int bs_bio_slab_size(struct bio_set *bs)
{
- return bs->front_pad + sizeof(struct bio) +
- BIO_INLINE_VECS * sizeof(struct bio_vec);
+ return bs->front_pad + sizeof(struct bio) + bs->back_pad;
}
static struct kmem_cache *bio_find_or_create_slab(struct bio_set *bs)
@@ -1563,6 +1562,10 @@ int bioset_init(struct bio_set *bs,
int flags)
{
bs->front_pad = front_pad;
+ if (flags & BIOSET_NEED_BVECS)
+ bs->back_pad = BIO_INLINE_VECS * sizeof(struct bio_vec);
+ else
+ bs->back_pad = 0;
spin_lock_init(&bs->rescue_lock);
bio_list_init(&bs->rescue_list);