Commit f436e783 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Li Nan
Browse files

block: streamline bvec_alloc 

mainline inclusion
from mainline-v5.12-rc1
commit f007a3d6
bugzilla: https://gitee.com/openeuler/kernel/issues/IB7FJU

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f007a3d66c5480c8dae3fa20a89a06861ef1f5db



--------------------------------

Avoid the pointless goto by trying the slab allocation first and falling
through to the mempool.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parent 7a443d6c

block/bio.c

+10 −16
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ static inline gfp_t bvec_alloc_gfp(gfp_t gfp) 
struct bio_vec *bvec_alloc(gfp_t gfp_mask, int nr, unsigned long *idx,

			   mempool_t *pool)

{

	struct bio_vec *bvl;



	/*

	 * see comment near bvec_array define!

	 */
@@ -210,28 +208,24 @@ struct bio_vec *bvec_alloc(gfp_t gfp_mask, int nr, unsigned long *idx, 
	}



	/*

	 * idx now points to the pool we want to allocate from. only the

	 * 1-vec entry pool is mempool backed.

	 * Try a slab allocation first for all smaller allocations.  If that

	 * fails and __GFP_DIRECT_RECLAIM is set retry with the mempool.

	 * The mempool is sized to handle up to BIO_MAX_PAGES entries.

	 */

	if (*idx == BVEC_POOL_MAX) {

fallback:

		bvl = mempool_alloc(pool, gfp_mask);

	} else {

	if (*idx < BVEC_POOL_MAX) {

		struct biovec_slab *bvs = bvec_slabs + *idx;

		struct bio_vec *bvl;



		/*

		 * Try a slab allocation. If this fails and __GFP_DIRECT_RECLAIM

		 * is set, retry with the 1-entry mempool

		 */

		bvl = kmem_cache_alloc(bvs->slab, bvec_alloc_gfp(gfp_mask));

		if (unlikely(!bvl && (gfp_mask & __GFP_DIRECT_RECLAIM))) {

			*idx = BVEC_POOL_MAX;

			goto fallback;

		if (likely(bvl) || !(gfp_mask & __GFP_DIRECT_RECLAIM)) {

			(*idx)++;

			return bvl;

		}

		*idx = BVEC_POOL_MAX;

	}



	(*idx)++;

	return bvl;

	return mempool_alloc(pool, gfp_mask);

}



void bio_uninit(struct bio *bio)