Commit a9aa1908 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-block 

Pull block layer fixes from Jens Axboe:
 "A couple of last minute fixes for regressions in this cycle. More
  specifically:

   - Two patches from Andy, adjusting the NVMe APST quirks to avoid some
     issues specific to one Toshiba drive, and some variant of Samsung
     on two specific Dell laptops.

   - A fix for mtip32xx, turning off mq scheduling on that device. We
     have a real fix for this, but it's too late in the cycle.
     Thankfully we already have a NO_SCHED flag we can apply here. A
     prep patch for this is ensuring that we honor the NO_SCHED flag
     when attempting to online switch schedulers, previsouly we only did
     so for drive load time. From Ming.

   - Fixing an oops in blk-mq polling with scheduling attached. This one
     is easily reproducible, it would be a shame to release 4.11 with
     that issue. From me.

  I'd prefer not having to send in patches at this point in time, but
  the above are all things that have regressed in this cycle and the
  fixes are relatively straight forward"

* 'for-linus' of git://git.kernel.dk/linux-block:
  blk-mq: fix potential oops with polling and blk-mq scheduler
  nvme: Quirk APST off on "THNSF5256GPUK TOSHIBA"
  nvme: Adjust the Samsung APST quirk
  mtip32xx: pass BLK_MQ_F_NO_SCHED
  block: respect BLK_MQ_F_NO_SCHED
parents 4664e322 3a07bb1d

block/blk-mq.c

+10 −1
Original line number Diff line number Diff line
@@ -2928,8 +2928,17 @@ bool blk_mq_poll(struct request_queue *q, blk_qc_t cookie) 
	hctx = q->queue_hw_ctx[blk_qc_t_to_queue_num(cookie)];

	if (!blk_qc_t_is_internal(cookie))

		rq = blk_mq_tag_to_rq(hctx->tags, blk_qc_t_to_tag(cookie));

	else

	else {

		rq = blk_mq_tag_to_rq(hctx->sched_tags, blk_qc_t_to_tag(cookie));

		/*

		 * With scheduling, if the request has completed, we'll

		 * get a NULL return here, as we clear the sched tag when

		 * that happens. The request still remains valid, like always,

		 * so we should be safe with just the NULL check.

		 */

		if (!rq)

			return false;

	}



	return __blk_mq_poll(hctx, rq);

}

block/elevator.c

+10 −2
Original line number Diff line number Diff line
@@ -1098,12 +1098,20 @@ int elevator_change(struct request_queue *q, const char *name) 
}

EXPORT_SYMBOL(elevator_change);



static inline bool elv_support_iosched(struct request_queue *q)

{

	if (q->mq_ops && q->tag_set && (q->tag_set->flags &

				BLK_MQ_F_NO_SCHED))

		return false;

	return true;

}



ssize_t elv_iosched_store(struct request_queue *q, const char *name,

			  size_t count)

{

	int ret;



	if (!(q->mq_ops || q->request_fn))

	if (!(q->mq_ops || q->request_fn) || !elv_support_iosched(q))

		return count;



	ret = __elevator_change(q, name);
@@ -1135,7 +1143,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name) 
			len += sprintf(name+len, "[%s] ", elv->elevator_name);

			continue;

		}

		if (__e->uses_mq && q->mq_ops)

		if (__e->uses_mq && q->mq_ops && elv_support_iosched(q))

			len += sprintf(name+len, "%s ", __e->elevator_name);

		else if (!__e->uses_mq && !q->mq_ops)

			len += sprintf(name+len, "%s ", __e->elevator_name);

drivers/block/mtip32xx/mtip32xx.c

+1 −1
Original line number Diff line number Diff line
@@ -3969,7 +3969,7 @@ static int mtip_block_initialize(struct driver_data *dd) 
	dd->tags.reserved_tags = 1;

	dd->tags.cmd_size = sizeof(struct mtip_cmd);

	dd->tags.numa_node = dd->numa_node;

	dd->tags.flags = BLK_MQ_F_SHOULD_MERGE;

	dd->tags.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_NO_SCHED;

	dd->tags.driver_data = dd;

	dd->tags.timeout = MTIP_NCQ_CMD_TIMEOUT_MS;

drivers/nvme/host/core.c

+15 −8
Original line number Diff line number Diff line
@@ -1315,6 +1315,14 @@ static void nvme_configure_apst(struct nvme_ctrl *ctrl) 
			if (target)

				table->entries[state] = target;



			/*

			 * Don't allow transitions to the deepest state

			 * if it's quirked off.

			 */

			if (state == ctrl->npss &&

			    (ctrl->quirks & NVME_QUIRK_NO_DEEPEST_PS))

				continue;



			/*

			 * Is this state a useful non-operational state for

			 * higher-power states to autonomously transition to?
@@ -1387,16 +1395,15 @@ struct nvme_core_quirk_entry { 
};



static const struct nvme_core_quirk_entry core_quirks[] = {

	{

		/*

	 * Seen on a Samsung "SM951 NVMe SAMSUNG 256GB": using APST causes

	 * the controller to go out to lunch.  It dies when the watchdog

	 * timer reads CSTS and gets 0xffffffff.

		 * This Toshiba device seems to die using any APST states.  See:

		 * https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1678184/comments/11

		 */

	{

		.vid = 0x144d,

		.fr = "BXW75D0Q",

		.vid = 0x1179,

		.mn = "THNSF5256GPUK TOSHIBA",

		.quirks = NVME_QUIRK_NO_APST,

	},

	}

};



/* match is null-terminated but idstr is space-padded. */

drivers/nvme/host/nvme.h

+5 −0
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ enum nvme_quirks { 
	 * APST should not be used.

	 */

	NVME_QUIRK_NO_APST			= (1 << 4),



	/*

	 * The deepest sleep state should not be used.

	 */

	NVME_QUIRK_NO_DEEPEST_PS		= (1 << 5),

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE