Unverified Commit 86835c39 authored by Christian Brauner's avatar Christian Brauner
Browse files

Merge tag 'vfs-6.9.rw_hint' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs 



Pull write hint fix from Christian Brauner:

UFS devices are widely used in mobile applications, e.g. in smartphones.
UFS vendors need data lifetime information to achieve good performance.
Providing data lifetime information to UFS devices can result in up to
40% lower write amplification. Hence this patch series that restores the
bi_write_hint member in struct bio. After this patch series has been
merged, patches that implement data lifetime support in the SCSI disk
(sd) driver will be sent to the Linux kernel SCSI maintainer.

The following changes are included in this patch series:

- Improvements for the F_GET_RW_HINT and F_SET_RW_HINT fcntls.
- Move enum rw_hint into a new header file.
- Support F_SET_RW_HINT for block devices to make it easy to test data
  lifetime support.
- Restore the bio.bi_write_hint member and restore support in the VFS
  layer and also in the block layer for data lifetime information.

The shell script that has been used to test the patch series combined
with the SCSI patches is available at the end of this cover letter.

* tag 'vfs-6.9.rw_hint' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs:
  block, fs: Restore the per-bio/request data lifetime fields
  fs: Propagate write hints to the struct block_device inode
  fs: Move enum rw_hint into a new header file
  fs: Split fcntl_rw_hint()
  fs: Verify write lifetime constants at compile time
  fs: Fix rw_hint validation

Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parents dcd04ea5 44981351

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;