openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: memory allocations in bounce_clone_bio must not fail 

The caller can't cope with a failure from bounce_clone_bio, so
use __GFP_NOFAIL for the passthrough case.  bio_alloc_bioset already
won't fail due to the use of mempools.

And yes, we need to get rid of this bock layer bouncing code entirely
sooner or later..

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-02-24 08:24:07 +01:00 committed by Jens Axboe
parent ebfe4183c7
commit 47dc096ac1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/bounce.c
View File

@ -242,12 +242,11 @@ static struct bio *bounce_clone_bio(struct bio *bio_src)
* __bio_clone_fast() anyways. * __bio_clone_fast() anyways.
*/ */
if (bio_is_passthrough(bio_src)) if (bio_is_passthrough(bio_src))
bio = bio_kmalloc(GFP_NOIO, bio_segments(bio_src)); bio = bio_kmalloc(GFP_NOIO | __GFP_NOFAIL,
bio_segments(bio_src));
else else
bio = bio_alloc_bioset(GFP_NOIO, bio_segments(bio_src), bio = bio_alloc_bioset(GFP_NOIO, bio_segments(bio_src),
&bounce_bio_set); &bounce_bio_set);
if (!bio)
return NULL;
bio->bi_bdev = bio_src->bi_bdev; bio->bi_bdev = bio_src->bi_bdev;
if (bio_flagged(bio_src, BIO_REMAPPED)) if (bio_flagged(bio_src, BIO_REMAPPED))
bio_set_flag(bio, BIO_REMAPPED); bio_set_flag(bio, BIO_REMAPPED);