android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: optionally mark pages dirty in bio_release_pages

Browse Source 
A lot of callers of bio_release_pages also want to mark the released
pages as dirty.  Add a mark_dirty parameter to avoid a second
relatively expensive bio_for_each_segment_all loop.

Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2019-06-26 15:49:21 +02:00 committed by Jens Axboe
parent b2d0d99135
commit d241a95f35
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/bio.c
View File

@ -845,7 +845,7 @@ static void bio_get_pages(struct bio *bio)
get_page(bvec->bv_page); get_page(bvec->bv_page);
} }
void bio_release_pages(struct bio *bio) void bio_release_pages(struct bio *bio, bool mark_dirty)
{ {
struct bvec_iter_all iter_all; struct bvec_iter_all iter_all;
struct bio_vec *bvec; struct bio_vec *bvec;
@ -853,8 +853,11 @@ void bio_release_pages(struct bio *bio)
if (bio_flagged(bio, BIO_NO_PAGE_REF)) if (bio_flagged(bio, BIO_NO_PAGE_REF))
return; return;
bio_for_each_segment_all(bvec, bio, iter_all) bio_for_each_segment_all(bvec, bio, iter_all) {
if (mark_dirty && !PageCompound(bvec->bv_page))
set_page_dirty_lock(bvec->bv_page);
put_page(bvec->bv_page); put_page(bvec->bv_page);
}
} }
static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter) static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
@ -1683,8 +1686,7 @@ static void bio_dirty_fn(struct work_struct *work)
while ((bio = next) != NULL) { while ((bio = next) != NULL) {
next = bio->bi_private; next = bio->bi_private;
bio_set_pages_dirty(bio); bio_release_pages(bio, true);
bio_release_pages(bio);
bio_put(bio); bio_put(bio);
} }
} }
@ -1700,7 +1702,7 @@ void bio_check_pages_dirty(struct bio *bio)
goto defer; goto defer;
} }
bio_release_pages(bio); bio_release_pages(bio, false);
bio_put(bio); bio_put(bio);
return; return;
defer: defer:

2
include/linux/bio.h
View File

@ -426,7 +426,7 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,
void __bio_add_page(struct bio *bio, struct page *page, void __bio_add_page(struct bio *bio, struct page *page,
unsigned int len, unsigned int off); unsigned int len, unsigned int off);
int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter); int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter);
void bio_release_pages(struct bio *bio); void bio_release_pages(struct bio *bio, bool mark_dirty);
struct rq_map_data; struct rq_map_data;
extern struct bio *bio_map_user_iov(struct request_queue *, extern struct bio *bio_map_user_iov(struct request_queue *,
struct iov_iter *, gfp_t); struct iov_iter *, gfp_t);