Commit dc0b8a57 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: reuse BIO_INLINE_VECS for integrity bvecs 



bvec_alloc always uses biovec_slabs, and thus always needs to use the
same number of inline vecs.  Share a single definition for the data
and integrity bvecs.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8358c28a

block/bio-integrity.c

+2 −4
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include <linux/slab.h>

#include "blk.h"



#define BIP_INLINE_VECS	4



static struct kmem_cache *bip_slab;

static struct workqueue_struct *kintegrityd_wq;
@@ -63,7 +61,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, 
		inline_vecs = nr_vecs;

	} else {

		bip = mempool_alloc(&bs->bio_integrity_pool, gfp_mask);

		inline_vecs = BIP_INLINE_VECS;

		inline_vecs = BIO_INLINE_VECS;

	}



	if (unlikely(!bip))
@@ -470,6 +468,6 @@ void __init bio_integrity_init(void) 


	bip_slab = kmem_cache_create("bio_integrity_payload",

				     sizeof(struct bio_integrity_payload) +

				     sizeof(struct bio_vec) * BIP_INLINE_VECS,

				     sizeof(struct bio_vec) * BIO_INLINE_VECS,

				     0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);

}

block/bio.c

+0 −6
Original line number Diff line number Diff line
@@ -25,12 +25,6 @@ 
#include "blk.h"

#include "blk-rq-qos.h"



/*

 * Test patch to inline a certain number of bi_io_vec's inside the bio

 * itself, to shrink a bio data allocation from two mempool calls to one

 */

#define BIO_INLINE_VECS		4



/*

 * if you change this list, also change bvec_alloc or things will

 * break badly! cannot be bigger than what you can fit into an

block/blk.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ void blk_free_flush_queue(struct blk_flush_queue *q); 


void blk_freeze_queue(struct request_queue *q);



#define BIO_INLINE_VECS 4

struct bio_vec *bvec_alloc(gfp_t, int, unsigned long *, mempool_t *);

void bvec_free(mempool_t *, struct bio_vec *, unsigned int);

unsigned int bvec_nr_vecs(unsigned short idx);