Skip to contentSkip to conversation

block: don't run get_page() on pages from non-bvec iov iter

PATCH In review Ming Lei 4 participants 4 messages Apr 24, 2019 Block layer

lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH 1/1 block: don't run get_page() on pages from non-bvec iov iter

The refcount has been increased for pages retrieved from non-bvec iov iter via __bio_iov_iter_get_pages(), so don't need to do that again.

Otherwise, IO pages are leaked easily.

Cc Christoph Hellwig <[email protected]>
Fixes 7321ecbfc7cf ("block: change how we get page references in bio_iov_iter_get_pages")
---
 block/bio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/bio.c +1 -1
index c81ed2dfee53..662d45752ec5 100644
@@ -992,7 +992,7 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 
 	if (iov_iter_bvec_no_ref(iter))
 		bio_set_flag(bio, BIO_NO_PAGE_REF);
-	else
+	else if (is_bvec)
 		bio_get_pages(bio);
 
 	return bio->bi_vcnt ? 0 : ret;
Signature · 1 line
2.9.5
Reviewed-by on v1 1/1
#1 lore raw

Looks good.

Quoted 26 lines · Ming Lei

The refcount has been increased for pages retrieved from non-bvec iov iter via __bio_iov_iter_get_pages(), so don't need to do that again.

Otherwise, IO pages are leaked easily.

Cc Christoph Hellwig <[email protected]>
Fixes 7321ecbfc7cf ("block: change how we get page references in bio_iov_iter_get_pages")
---
  block/bio.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
block/bio.c +1 -1
index c81ed2dfee53..662d45752ec5 100644
@@ -992,7 +992,7 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 
  	if (iov_iter_bvec_no_ref(iter))
  		bio_set_flag(bio, BIO_NO_PAGE_REF);
-	else
+	else if (is_bvec)
  		bio_get_pages(bio);
 
  	return bio->bi_vcnt ? 0 : ret;
maintainer
#2 lore raw
In reply to Ming Lei
Quoted 4 lines · Ming Lei

The refcount has been increased for pages retrieved from non-bvec iov iter via __bio_iov_iter_get_pages(), so don't need to do that again.

Otherwise, IO pages are leaked easily.

Thanks Ming, applied.

Signature · 1 line
Jens Axboe