bio: Remove the incorrect test for idx in __bio_clone_fast
PATCH 1/2 bio: Remove the incorrect test for idx in __bio_clone_fast
It is more lucky that kernel crash does not happen, since we test the bi_pool in function __bio_clone_fast. Now bi_flags is used to flag the idx, so it is incorrect to test the bi_pool.
For now, the bio in function __bio_clone_fast may have its own bvec, if the caller is bio_clone_fast.
Removing the test to fix this issue.
--- block/bio.c | 2 -- 1 file changed, 2 deletions(-)
block/bio.c +0 -2
@@ -573,8 +573,6 @@ EXPORT_SYMBOL(bio_phys_segments);*/ void __bio_clone_fast (struct bio *bio,struct bio *bio_src) { -BUG_ON (bio->bi_pool &&BIO_POOL_IDX (bio) !=BIO_POOL_NONE ); -/* * most users will be overriding ->bi_bdev with a new target, * so we don't set nor calculate new physical/hw segment counts here
Signature · 1 line
2.6.3
PATCH 2/2 bio: Free own bvec before assigning the source bio's bvec
This is a memory leaking during splitting the bio by the caller bio_clone_fast.
Clone bio may allocate its own bvec, if demanding bvec is more than inline bvec in function bio_alloc_bioset.
bi_io_vec is assigned to the source bio's bvec directly without freeing it firstly in function __bio_clone_fast.
To fix it, freeing the own bvec firstly before assigning the source bio's bvec.
--- block/bio.c | 4 ++++ 1 file changed, 4 insertions(+)
block/bio.c +4 -0
@@ -581,6 +581,10 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src)bio_set_flag (bio,BIO_CLONED ); bio->bi_rw = bio_src->bi_rw; bio->bi_iter = bio_src->bi_iter; + +if (bio_flagged (bio,BIO_OWNS_VEC )) +bvec_free (bio->bi_pool->bvec_pool, + bio->bi_io_vec,BIO_POOL_IDX (bio)); bio->bi_io_vec = bio_src->bi_io_vec; }EXPORT_SYMBOL (__bio_clone_fast);
Signature · 1 line
2.6.3
Re: [PATCH 2/2] bio: Free own bvec before assigning the source bio's bvec
Sorry to bother you, since I have missed the nr_iovecs in bio_clone_fast.
Nacked this patch.
Thanks
Minfei
Quoted 35 lines · Minfei Huang
This is a memory leaking during splitting the bio by the caller
bio_clone_fast.Clone bio may allocate its own bvec, if demanding bvec is more than inline bvec in function
bio_alloc_bioset.
bi_io_vecis assigned to the source bio's bvec directly without freeing it firstly in function__bio_clone_fast.To fix it, freeing the own bvec firstly before assigning the source bio's bvec.
Signed-off-by Minfei Huang <[email protected]>--- block/bio.c | 4 ++++ 1 file changed, 4 insertions(+)block/bio.c +4
-0@@ -581,6 +581,10 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src)bio_set_flag (bio,BIO_CLONED ); bio->bi_rw = bio_src->bi_rw; bio->bi_iter = bio_src->bi_iter; + +if (bio_flagged (bio,BIO_OWNS_VEC )) +bvec_free (bio->bi_pool->bvec_pool, + bio->bi_io_vec,BIO_POOL_IDX (bio)); bio->bi_io_vec = bio_src->bi_io_vec; }EXPORT_SYMBOL (__bio_clone_fast);Signature · 1 line
2.6.3
Quoted 19 lines · Minfei Huang
It is more lucky that kernel crash does not happen, since we test the
bi_poolin function__bio_clone_fast. Nowbi_flagsis used to flag the idx, so it is incorrect to test thebi_pool.For now, the bio in function
__bio_clone_fastmay have its own bvec, if the caller isbio_clone_fast.Removing the test to fix this issue.
Signed-off-by Minfei Huang <[email protected]>--- block/bio.c | 2 -- 1 file changed, 2 deletions(-)block/bio.c +0
-0
block/bio.c EXPORT_SYMBOL(bio_phys_segments); · line 577
Quoted 5 lines
block/bio.c +0
-2@@ -573,8 +573,6 @@ EXPORT_SYMBOL(bio_phys_segments);*/ void __bio_clone_fast (struct bio *bio,struct bio *bio_src) { -BUG_ON (bio->bi_pool &&BIO_POOL_IDX (bio) !=BIO_POOL_NONE ); -
Sorry to bother you, since I have missed the nr_iovecs in function bio_clone_fast.
Will update this patch to make test correct, instead of removing it.
Thanks
Minfei
Quoted 6 lines
block/bio.c +0
-0/* * most users will be overriding ->bi_bdev with a new target, * so we don't set nor calculate new physical/hw segment counts here Signature · 1 line
2.6.3