Commit d241a95f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: optionally mark pages dirty in bio_release_pages 



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: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b2d0d991

block/bio.c

+7 −5
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static void bio_get_pages(struct bio *bio) 
		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 bio_vec *bvec;
@@ -853,9 +853,12 @@ void bio_release_pages(struct bio *bio) 
	if (bio_flagged(bio, BIO_NO_PAGE_REF))

		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);

	}

}



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) {

		next = bio->bi_private;



		bio_set_pages_dirty(bio);

		bio_release_pages(bio);

		bio_release_pages(bio, true);

		bio_put(bio);

	}

}
@@ -1700,7 +1702,7 @@ void bio_check_pages_dirty(struct bio *bio) 
			goto defer;

	}



	bio_release_pages(bio);

	bio_release_pages(bio, false);

	bio_put(bio);

	return;

defer:

include/linux/bio.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

		unsigned int len, unsigned int off);

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;

extern struct bio *bio_map_user_iov(struct request_queue *,

				    struct iov_iter *, gfp_t);

CRA Git | Maintained and supported by SUSTech CRA and CCSE