Commit 462abc9d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.19-2022-06-16' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - NVMe pull request from Christoph
      - Quirks, quirks, quirks to work around buggy consumer grade
        devices (Keith Bush, Ning Wang, Stefan Reiter, Rasheed Hsueh)
      - Better kernel messages for devices that need quirking (Keith
        Bush)
      - Make a kernel message more useful (Thomas Weißschuh)

 - MD pull request from Song, with a few fixes

 - blk-mq sysfs locking fixes (Ming)

 - BFQ stats fix (Bart)

 - blk-mq offline queue fix (Bart)

 - blk-mq flush request tag fix (Ming)

* tag 'block-5.19-2022-06-16' of git://git.kernel.dk/linux-block:
  block/bfq: Enable I/O statistics
  blk-mq: don't clear flush_rq from tags->rqs[]
  blk-mq: avoid to touch q->elevator without any protection
  blk-mq: protect q->elevator by ->sysfs_lock in blk_mq_elv_switch_none
  block: Fix handling of offline queues in blk_mq_alloc_request_hctx()
  md/raid5-ppl: Fix argument order in bio_alloc_bioset()
  Revert "md: don't unregister sync_thread with reconfig_mutex held"
  nvme-pci: disable write zeros support on UMIC and Samsung SSDs
  nvme-pci: avoid the deepest sleep state on ZHITAI TiPro7000 SSDs
  nvme-pci: sk hynix p31 has bogus namespace ids
  nvme-pci: smi has bogus namespace ids
  nvme-pci: phison e12 has bogus namespace ids
  nvme-pci: add NVME_QUIRK_BOGUS_NID for ADATA XPG GAMMIX S50
  nvme-pci: add trouble shooting steps for timeouts
  nvme: add bug report info for global duplicate id
  nvme: add device name to warning in uuid_show()
parents f8e174c3 b96f3cab

block/bfq-iosched.c

+6 −0
Original line number Diff line number Diff line
@@ -7046,6 +7046,7 @@ static void bfq_exit_queue(struct elevator_queue *e) 
	spin_unlock_irq(&bfqd->lock);

#endif



	blk_stat_disable_accounting(bfqd->queue);

	wbt_enable_default(bfqd->queue);



	kfree(bfqd);
@@ -7188,7 +7189,12 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) 
	bfq_init_root_group(bfqd->root_group, bfqd);

	bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group);



	/* We dispatch from request queue wide instead of hw queue */

	blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q);



	wbt_disable_default(q);

	blk_stat_enable_accounting(q);



	return 0;



out_free:

block/blk-mq-sched.c

+1 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
	int ret;



	if (!e) {

		blk_queue_flag_clear(QUEUE_FLAG_SQ_SCHED, q);

		q->elevator = NULL;

		q->nr_requests = q->tag_set->queue_depth;

		return 0;

block/blk-mq.c

+10 −19
Original line number Diff line number Diff line
@@ -579,6 +579,8 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, 
	if (!blk_mq_hw_queue_mapped(data.hctx))

		goto out_queue_exit;

	cpu = cpumask_first_and(data.hctx->cpumask, cpu_online_mask);

	if (cpu >= nr_cpu_ids)

		goto out_queue_exit;

	data.ctx = __blk_mq_get_ctx(q, cpu);



	if (!q->elevator)
@@ -2140,20 +2142,6 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) 
}

EXPORT_SYMBOL(blk_mq_run_hw_queue);



/*

 * Is the request queue handled by an IO scheduler that does not respect

 * hardware queues when dispatching?

 */

static bool blk_mq_has_sqsched(struct request_queue *q)

{

	struct elevator_queue *e = q->elevator;



	if (e && e->type->ops.dispatch_request &&

	    !(e->type->elevator_features & ELEVATOR_F_MQ_AWARE))

		return true;

	return false;

}



/*

 * Return prefered queue to dispatch from (if any) for non-mq aware IO

 * scheduler.
@@ -2186,7 +2174,7 @@ void blk_mq_run_hw_queues(struct request_queue *q, bool async) 
	unsigned long i;



	sq_hctx = NULL;

	if (blk_mq_has_sqsched(q))

	if (blk_queue_sq_sched(q))

		sq_hctx = blk_mq_get_sq_hctx(q);

	queue_for_each_hw_ctx(q, hctx, i) {

		if (blk_mq_hctx_stopped(hctx))
@@ -2214,7 +2202,7 @@ void blk_mq_delay_run_hw_queues(struct request_queue *q, unsigned long msecs) 
	unsigned long i;



	sq_hctx = NULL;

	if (blk_mq_has_sqsched(q))

	if (blk_queue_sq_sched(q))

		sq_hctx = blk_mq_get_sq_hctx(q);

	queue_for_each_hw_ctx(q, hctx, i) {

		if (blk_mq_hctx_stopped(hctx))
@@ -3443,6 +3431,7 @@ static void blk_mq_exit_hctx(struct request_queue *q, 
	if (blk_mq_hw_queue_mapped(hctx))

		blk_mq_tag_idle(hctx);



	if (blk_queue_init_done(q))

		blk_mq_clear_flush_rq_mapping(set->tags[hctx_idx],

				set->queue_depth, flush_rq);

	if (set->ops->exit_request)
@@ -4438,12 +4427,14 @@ static bool blk_mq_elv_switch_none(struct list_head *head, 
	if (!qe)

		return false;



	/* q->elevator needs protection from ->sysfs_lock */

	mutex_lock(&q->sysfs_lock);



	INIT_LIST_HEAD(&qe->node);

	qe->q = q;

	qe->type = q->elevator->type;

	list_add(&qe->node, head);



	mutex_lock(&q->sysfs_lock);

	/*

	 * After elevator_switch_mq, the previous elevator_queue will be

	 * released by elevator_release. The reference of the io scheduler

block/kyber-iosched.c

+2 −1
Original line number Diff line number Diff line
@@ -421,6 +421,8 @@ static int kyber_init_sched(struct request_queue *q, struct elevator_type *e) 


	blk_stat_enable_accounting(q);



	blk_queue_flag_clear(QUEUE_FLAG_SQ_SCHED, q);



	eq->elevator_data = kqd;

	q->elevator = eq;
@@ -1033,7 +1035,6 @@ static struct elevator_type kyber_sched = { 
#endif

	.elevator_attrs = kyber_sched_attrs,

	.elevator_name = "kyber",

	.elevator_features = ELEVATOR_F_MQ_AWARE,

	.elevator_owner = THIS_MODULE,

};

block/mq-deadline.c

+3 −0
Original line number Diff line number Diff line
@@ -642,6 +642,9 @@ static int dd_init_sched(struct request_queue *q, struct elevator_type *e) 
	spin_lock_init(&dd->lock);

	spin_lock_init(&dd->zone_lock);



	/* We dispatch from request queue wide instead of hw queue */

	blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q);



	q->elevator = eq;

	return 0;