Commit c712dccc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme-multipath: enable polled I/O 



Set the poll queue flag to enable polling, given that the multipath
node just dispatches the bios to a lower queue.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarMark Wunderlich <mark.wunderlich@intel.com>
Link: https://lore.kernel.org/r/20211012111226.760968-17-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a614dd22

drivers/nvme/host/multipath.c

+15 −1
Original line number Diff line number Diff line
@@ -85,8 +85,13 @@ void nvme_failover_req(struct request *req) 
	}



	spin_lock_irqsave(&ns->head->requeue_lock, flags);

	for (bio = req->bio; bio; bio = bio->bi_next)

	for (bio = req->bio; bio; bio = bio->bi_next) {

		bio_set_dev(bio, ns->head->disk->part0);

		if (bio->bi_opf & REQ_POLLED) {

			bio->bi_opf &= ~REQ_POLLED;

			bio->bi_cookie = BLK_QC_T_NONE;

		}

	}

	blk_steal_bios(&ns->head->requeue_list, req);

	spin_unlock_irqrestore(&ns->head->requeue_lock, flags);
@@ -477,6 +482,15 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) 


	blk_queue_flag_set(QUEUE_FLAG_NONROT, head->disk->queue);

	blk_queue_flag_set(QUEUE_FLAG_NOWAIT, head->disk->queue);

	/*

	 * This assumes all controllers that refer to a namespace either

	 * support poll queues or not.  That is not a strict guarantee,

	 * but if the assumption is wrong the effect is only suboptimal

	 * performance but not correctness problem.

	 */

	if (ctrl->tagset->nr_maps > HCTX_TYPE_POLL &&

	    ctrl->tagset->map[HCTX_TYPE_POLL].nr_queues)

		blk_queue_flag_set(QUEUE_FLAG_POLL, head->disk->queue);



	/* set to a default value of 512 until the disk is validated */

	blk_queue_logical_block_size(head->disk->queue, 512);