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

block: factor out a bvec_alloc_gfp helper 

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

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



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

Clean up bvec_alloc a little by factoring out a helper for the gfp_t
manipulations.

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 3bdec30f

block/bio.c

+11 −9
Original line number Diff line number Diff line
@@ -168,6 +168,16 @@ void bvec_free(mempool_t *pool, struct bio_vec *bv, unsigned int idx) 
	}

}



/*

 * Make the first allocation restricted and don't dump info on allocation

 * failures, since we'll fall back to the mempool in case of failure.

 */

static inline gfp_t bvec_alloc_gfp(gfp_t gfp)

{

	return (gfp & ~(__GFP_DIRECT_RECLAIM | __GFP_IO)) |

		__GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN;

}



struct bio_vec *bvec_alloc(gfp_t gfp_mask, int nr, unsigned long *idx,

			   mempool_t *pool)

{
@@ -208,20 +218,12 @@ struct bio_vec *bvec_alloc(gfp_t gfp_mask, int nr, unsigned long *idx, 
		bvl = mempool_alloc(pool, gfp_mask);

	} else {

		struct biovec_slab *bvs = bvec_slabs + *idx;

		gfp_t __gfp_mask = gfp_mask & ~(__GFP_DIRECT_RECLAIM | __GFP_IO);



		/*

		 * Make this allocation restricted and don't dump info on

		 * allocation failures, since we'll fallback to the mempool

		 * in case of failure.

		 */

		__gfp_mask |= __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN;



		/*

		 * 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, __gfp_mask);

		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;