Unverified Commit 44981351 authored by Bart Van Assche's avatar Bart Van Assche Committed by Christian Brauner
Browse files

block, fs: Restore the per-bio/request data lifetime fields 



Restore support for passing data lifetime information from filesystems to
block drivers. This patch reverts commit b179c98f ("block: Remove
request.write_hint") and commit c75e707f ("block: remove the
per-bio/request write hint").

This patch does not modify the size of struct bio because the new
bi_write_hint member fills a hole in struct bio. pahole reports the
following for struct bio on an x86_64 system with this patch applied:

        /* size: 112, cachelines: 2, members: 20 */
        /* sum members: 110, holes: 1, sum holes: 2 */
        /* last cacheline: 48 bytes */

Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240202203926.2478590-7-bvanassche@acm.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent ea7d8986

block/bio.c

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ void bio_init(struct bio *bio, struct block_device *bdev, struct bio_vec *table, 
	bio->bi_opf = opf;

	bio->bi_flags = 0;

	bio->bi_ioprio = 0;

	bio->bi_write_hint = 0;

	bio->bi_status = 0;

	bio->bi_iter.bi_sector = 0;

	bio->bi_iter.bi_size = 0;
@@ -813,6 +814,7 @@ static int __bio_clone(struct bio *bio, struct bio *bio_src, gfp_t gfp) 
{

	bio_set_flag(bio, BIO_CLONED);

	bio->bi_ioprio = bio_src->bi_ioprio;

	bio->bi_write_hint = bio_src->bi_write_hint;

	bio->bi_iter = bio_src->bi_iter;



	if (bio->bi_bdev) {

block/blk-crypto-fallback.c

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ static struct bio *blk_crypto_fallback_clone_bio(struct bio *bio_src) 
	if (bio_flagged(bio_src, BIO_REMAPPED))

		bio_set_flag(bio, BIO_REMAPPED);

	bio->bi_ioprio		= bio_src->bi_ioprio;

	bio->bi_write_hint	= bio_src->bi_write_hint;

	bio->bi_iter.bi_sector	= bio_src->bi_iter.bi_sector;

	bio->bi_iter.bi_size	= bio_src->bi_iter.bi_size;

block/blk-merge.c

+8 −0
Original line number Diff line number Diff line
@@ -810,6 +810,10 @@ static struct request *attempt_merge(struct request_queue *q, 
	if (rq_data_dir(req) != rq_data_dir(next))

		return NULL;



	/* Don't merge requests with different write hints. */

	if (req->write_hint != next->write_hint)

		return NULL;



	if (req->ioprio != next->ioprio)

		return NULL;
@@ -937,6 +941,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) 
	if (!bio_crypt_rq_ctx_compatible(rq, bio))

		return false;



	/* Don't merge requests with different write hints. */

	if (rq->write_hint != bio->bi_write_hint)

		return false;



	if (rq->ioprio != bio_prio(bio))

		return false;

block/blk-mq.c

+2 −0
Original line number Diff line number Diff line
@@ -2585,6 +2585,7 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio, 
		rq->cmd_flags |= REQ_FAILFAST_MASK;



	rq->__sector = bio->bi_iter.bi_sector;

	rq->write_hint = bio->bi_write_hint;

	blk_rq_bio_prep(rq, bio, nr_segs);



	/* This can't fail, since GFP_NOIO includes __GFP_DIRECT_RECLAIM. */
@@ -3185,6 +3186,7 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, 
	}

	rq->nr_phys_segments = rq_src->nr_phys_segments;

	rq->ioprio = rq_src->ioprio;

	rq->write_hint = rq_src->write_hint;



	if (rq->bio && blk_crypto_rq_bio_prep(rq, rq->bio, gfp_mask) < 0)

		goto free_and_out;

block/bounce.c

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ static struct bio *bounce_clone_bio(struct bio *bio_src) 
	if (bio_flagged(bio_src, BIO_REMAPPED))

		bio_set_flag(bio, BIO_REMAPPED);

	bio->bi_ioprio		= bio_src->bi_ioprio;

	bio->bi_write_hint	= bio_src->bi_write_hint;

	bio->bi_iter.bi_sector	= bio_src->bi_iter.bi_sector;

	bio->bi_iter.bi_size	= bio_src->bi_iter.bi_size;