Commit 8d3c682a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.3-2023-03-16' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:
 "A bit bigger than usual, as the NVMe pull request missed last weeks
  submission. In detail:

   - NVMe pull request via Christoph:
        - Avoid potential UAF in nvmet_req_complete (Damien Le Moal)
        - More quirks (Elmer Miroslav Mosher Golovin, Philipp Geulen)
        - Fix a memory leak in the nvme-pci probe teardown path
          (Irvin Cote)
        - Repair the MAINTAINERS entry (Lukas Bulwahn)
        - Fix handling single range discard request (Ming Lei)
        - Show more opcode names in trace events (Minwoo Im)
        - Fix nvme-tcp timeout reporting (Sagi Grimberg)

   - MD pull request via Song:
        - Two fixes for old issues (Neil)
        - Resource leak in device stopping (Xiao)

   - Bio based device stats fix (Yu)

   - Kill unused CONFIG_BLOCK_COMPAT (Lukas)

   - sunvdc missing mdesc_grab() failure check (Liang)

   - Fix for reversal of request ordering upon issue for certain cases
     (Jan)

   - null_blk timeout fixes (Damien)

   - Loop use-after-free fix (Bart)

   - blk-mq SRCU fix for BLK_MQ_F_BLOCKING devices (Chris)"

* tag 'block-6.3-2023-03-16' of git://git.kernel.dk/linux:
  block: remove obsolete config BLOCK_COMPAT
  md: select BLOCK_LEGACY_AUTOLOAD
  block: count 'ios' and 'sectors' when io is done for bio-based device
  block: sunvdc: add check for mdesc_grab() returning NULL
  nvmet: avoid potential UAF in nvmet_req_complete()
  nvme-trace: show more opcode names
  nvme-tcp: add nvme-tcp pdu size build protection
  nvme-tcp: fix opcode reporting in the timeout handler
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM620
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Netac NV3000
  nvme-pci: fixing memory leak in probe teardown path
  nvme: fix handling single range discard request
  MAINTAINERS: repair malformed T: entries in NVM EXPRESS DRIVERS
  block: null_blk: cleanup null_queue_rq()
  block: null_blk: Fix handling of fake timeout request
  blk-mq: fix "bad unlock balance detected" on q->srcu in __blk_mq_run_dispatch_ops
  loop: Fix use-after-free issues
  block: do not reverse request order when flushing plug list
  md: avoid signed overflow in slot_store()
  md: Free resources in __md_stop
parents b7966a5a 8f0d196e

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -14872,12 +14872,12 @@ M: Sagi Grimberg <sagi@grimberg.me> 
L:	linux-nvme@lists.infradead.org

S:	Supported

W:	http://git.infradead.org/nvme.git

T:	git://git.infradead.org/nvme.git

T:	git git://git.infradead.org/nvme.git

F:	Documentation/nvme/

F:	drivers/nvme/host/

F:	drivers/nvme/common/

F:	include/linux/nvme.h

F:	drivers/nvme/host/

F:	include/linux/nvme-*.h

F:	include/linux/nvme.h

F:	include/uapi/linux/nvme_ioctl.h









NVM EXPRESS FABRICS AUTHENTICATION








@@ -14912,7 +14912,7 @@ M:	Chaitanya Kulkarni <kch@nvidia.com>







L:	linux-nvme@lists.infradead.org









S:	Supported









W:	http://git.infradead.org/nvme.git









T:	git://git.infradead.org/nvme.git









T:	git git://git.infradead.org/nvme.git









F:	drivers/nvme/target/

















NVMEM FRAMEWORK
































block/Kconfig



+0
−3






























Original line number
Diff line number
Diff line







@@ -204,9 +204,6 @@ config BLK_INLINE_ENCRYPTION_FALLBACK

















source "block/partitions/Kconfig"



















config BLOCK_COMPAT









	def_bool COMPAT



















config BLK_MQ_PCI









	def_bool PCI










































block/blk-core.c



+6
−10






























Original line number
Diff line number
Diff line







@@ -959,16 +959,11 @@ void update_io_ticks(struct block_device *part, unsigned long now, bool end)







	}









}



















unsigned long bdev_start_io_acct(struct block_device *bdev,









				 unsigned int sectors, enum req_op op,









unsigned long bdev_start_io_acct(struct block_device *bdev, enum req_op op,









				 unsigned long start_time)









{









	const int sgrp = op_stat_group(op);



















	part_stat_lock();









	update_io_ticks(bdev, start_time, false);









	part_stat_inc(bdev, ios[sgrp]);









	part_stat_add(bdev, sectors[sgrp], sectors);









	part_stat_local_inc(bdev, in_flight[op_is_write(op)]);









	part_stat_unlock();


















@@ -984,13 +979,12 @@ EXPORT_SYMBOL(bdev_start_io_acct);







 */









unsigned long bio_start_io_acct(struct bio *bio)









{









	return bdev_start_io_acct(bio->bi_bdev, bio_sectors(bio),









				  bio_op(bio), jiffies);









	return bdev_start_io_acct(bio->bi_bdev, bio_op(bio), jiffies);









}









EXPORT_SYMBOL_GPL(bio_start_io_acct);



















void bdev_end_io_acct(struct block_device *bdev, enum req_op op,









		      unsigned long start_time)









		      unsigned int sectors, unsigned long start_time)









{









	const int sgrp = op_stat_group(op);









	unsigned long now = READ_ONCE(jiffies);








@@ -998,6 +992,8 @@ void bdev_end_io_acct(struct block_device *bdev, enum req_op op,

















	part_stat_lock();









	update_io_ticks(bdev, now, true);









	part_stat_inc(bdev, ios[sgrp]);









	part_stat_add(bdev, sectors[sgrp], sectors);









	part_stat_add(bdev, nsecs[sgrp], jiffies_to_nsecs(duration));









	part_stat_local_dec(bdev, in_flight[op_is_write(op)]);









	part_stat_unlock();








@@ -1007,7 +1003,7 @@ EXPORT_SYMBOL(bdev_end_io_acct);







void bio_end_io_acct_remapped(struct bio *bio, unsigned long start_time,









			      struct block_device *orig_bdev)









{









	bdev_end_io_acct(orig_bdev, bio_op(bio), start_time);









	bdev_end_io_acct(orig_bdev, bio_op(bio), bio_sectors(bio), start_time);









}









EXPORT_SYMBOL_GPL(bio_end_io_acct_remapped);










































block/blk-mq.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -2725,6 +2725,7 @@ static void blk_mq_dispatch_plug_list(struct blk_plug *plug, bool from_sched)







	struct blk_mq_hw_ctx *this_hctx = NULL;









	struct blk_mq_ctx *this_ctx = NULL;









	struct request *requeue_list = NULL;









	struct request **requeue_lastp = &requeue_list;









	unsigned int depth = 0;









	LIST_HEAD(list);


















@@ -2735,10 +2736,10 @@ static void blk_mq_dispatch_plug_list(struct blk_plug *plug, bool from_sched)







			this_hctx = rq->mq_hctx;









			this_ctx = rq->mq_ctx;









		} else if (this_hctx != rq->mq_hctx || this_ctx != rq->mq_ctx) {









			rq_list_add(&requeue_list, rq);









			rq_list_add_tail(&requeue_lastp, rq);









			continue;









		}









		list_add_tail(&rq->queuelist, &list);









		list_add(&rq->queuelist, &list);









		depth++;









	} while (!rq_list_empty(plug->mq_list));










































block/blk-mq.h



+3
−2






























Original line number
Diff line number
Diff line







@@ -378,12 +378,13 @@ static inline bool hctx_may_queue(struct blk_mq_hw_ctx *hctx,







#define __blk_mq_run_dispatch_ops(q, check_sleep, dispatch_ops)	\









do {								\









	if ((q)->tag_set->flags & BLK_MQ_F_BLOCKING) {		\









		struct blk_mq_tag_set *__tag_set = (q)->tag_set; \









		int srcu_idx;					\









								\









		might_sleep_if(check_sleep);			\









		srcu_idx = srcu_read_lock((q)->tag_set->srcu);	\









		srcu_idx = srcu_read_lock(__tag_set->srcu);	\









		(dispatch_ops);					\









		srcu_read_unlock((q)->tag_set->srcu, srcu_idx);	\









		srcu_read_unlock(__tag_set->srcu, srcu_idx);	\









	} else {						\









		rcu_read_lock();				\









		(dispatch_ops);					\