nvme-multipath: pass queue_limits to blk_alloc_disk

The multipath disk starts out with the stacking default limits.
The one interesting part here is that blk_set_stacking_limits
sets the max_zone_append_sectorts to UINT_MAX, which fails the
validation for non-zoned devices.  With the old one call per
limit scheme this was fine because no one verified this weird
mismatch and it was fixed by blk_stack_limits a little later
before I/O could be issued.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index dc5d0d0a82d0e26b545dd51778877991d95acbef..5397fb428b242cea36f8c36997e134f6463e9f39 100644 (file)
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -516,6 +516,7 @@ static void nvme_requeue_work(struct work_struct *work)
 
 int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head)
 {
+       struct queue_limits lim;
        bool vwc = false;
 
        mutex_init(&head->lock);
@@ -532,7 +533,12 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head)
            !nvme_is_unique_nsid(ctrl, head) || !multipath)
                return 0;
 
-       head->disk = blk_alloc_disk(NULL, ctrl->numa_node);
+       blk_set_stacking_limits(&lim);
+       lim.dma_alignment = 3;
+       if (head->ids.csi != NVME_CSI_ZNS)
+               lim.max_zone_append_sectors = 0;
+
+       head->disk = blk_alloc_disk(&lim, ctrl->numa_node);
        if (IS_ERR(head->disk))
                return PTR_ERR(head->disk);
        head->disk->fops = &nvme_ns_head_ops;
@@ -553,11 +559,6 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head)
            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);
-       blk_set_stacking_limits(&head->disk->queue->limits);
-       blk_queue_dma_alignment(head->disk->queue, 3);
-
        /* we need to propagate up the VMC settings */
        if (ctrl->vwc & NVME_CTRL_VWC_PRESENT)
                vwc = true;