Commit 561593a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.18/write-streams-2022-03-18' of git://git.kernel.dk/linux-block 

Pull NVMe write streams removal from Jens Axboe:
 "This removes the write streams support in NVMe. No vendor ever really
  shipped working support for this, and they are not interested in
  supporting it.

  With the NVMe support gone, we have nothing in the tree that supports
  this. Remove passing around of the hints.

  The only discussion point in this patchset imho is the fact that the
  file specific write hint setting/getting fcntl helpers will now return
  -1/EINVAL like they did before we supported write hints. No known
  applications use these functions, I only know of one prototype that I
  help do for RocksDB, and that's not used. That said, with a change
  like this, it's always a bit controversial. Alternatively, we could
  just make them return 0 and pretend it worked. It's placement based
  hints after all"

* tag 'for-5.18/write-streams-2022-03-18' of git://git.kernel.dk/linux-block:
  fs: remove fs.f_write_hint
  fs: remove kiocb.ki_hint
  block: remove the per-bio/request write hint
  nvme: remove support or stream based temperature hint
parents 9bf3fc50 7b12e496

block/bio.c

+0 −2
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ 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;
@@ -737,7 +736,6 @@ static int __bio_clone(struct bio *bio, struct bio *bio_src, gfp_t gfp) 
	    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 = bio_src->bi_iter;



	bio_clone_blkg_association(bio, bio_src);

block/blk-crypto-fallback.c

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static struct bio *blk_crypto_fallback_clone_bio(struct bio *bio_src) 
		bio_set_flag(bio, BIO_REMAPPED);

	bio->bi_opf		= bio_src->bi_opf;

	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

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

		return NULL;



	/*

	 * Don't allow merge of different write hints, or for a hint with

	 * non-hint IO.

	 */

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

		return NULL;



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

		return NULL;
@@ -886,13 +879,6 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) 
	if (!bio_crypt_rq_ctx_compatible(rq, bio))

		return false;



	/*

	 * Don't allow merge of different write hints, or for a hint with

	 * non-hint IO.

	 */

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

		return false;



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

		return false;

block/blk-mq-debugfs.c

+0 −24
Original line number Diff line number Diff line
@@ -183,35 +183,11 @@ static ssize_t queue_state_write(void *data, const char __user *buf, 
	return count;

}



static int queue_write_hint_show(void *data, struct seq_file *m)

{

	struct request_queue *q = data;

	int i;



	for (i = 0; i < BLK_MAX_WRITE_HINTS; i++)

		seq_printf(m, "hint%d: %llu\n", i, q->write_hints[i]);



	return 0;

}



static ssize_t queue_write_hint_store(void *data, const char __user *buf,

				      size_t count, loff_t *ppos)

{

	struct request_queue *q = data;

	int i;



	for (i = 0; i < BLK_MAX_WRITE_HINTS; i++)

		q->write_hints[i] = 0;



	return count;

}



static const struct blk_mq_debugfs_attr blk_mq_debugfs_queue_attrs[] = {

	{ "poll_stat", 0400, queue_poll_stat_show },

	{ "requeue_list", 0400, .seq_ops = &queue_requeue_list_seq_ops },

	{ "pm_only", 0600, queue_pm_only_show, NULL },

	{ "state", 0600, queue_state_show, queue_state_write },

	{ "write_hints", 0600, queue_write_hint_show, queue_write_hint_store },

	{ "zone_wlock", 0400, queue_zone_wlock_show, NULL },

	{ },

};

block/blk-mq.c

+0 −1
Original line number Diff line number Diff line
@@ -2412,7 +2412,6 @@ 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. */