Merge tag 'zonefs-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[sfrench/cifs-2.6.git] / drivers / nvme / target / rdma.c

diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index 3a0f2c170f4c16f6c1fa6f09c2cac948403550fb..f2bb9d95ecf4bc6cde907d1f9af3e2d89998f376 100644 (file)
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -1956,6 +1956,14 @@ static int nvmet_rdma_add_port(struct nvmet_port *nport)
                nport->inline_data_size = NVMET_RDMA_MAX_INLINE_DATA_SIZE;
        }
 
+       if (nport->max_queue_size < 0) {
+               nport->max_queue_size = NVME_RDMA_DEFAULT_QUEUE_SIZE;
+       } else if (nport->max_queue_size > NVME_RDMA_MAX_QUEUE_SIZE) {
+               pr_warn("max_queue_size %u is too large, reducing to %u\n",
+                       nport->max_queue_size, NVME_RDMA_MAX_QUEUE_SIZE);
+               nport->max_queue_size = NVME_RDMA_MAX_QUEUE_SIZE;
+       }
+
        ret = inet_pton_with_scope(&init_net, af, nport->disc_addr.traddr,
                        nport->disc_addr.trsvcid, &port->addr);
        if (ret) {
@@ -2015,6 +2023,8 @@ static u8 nvmet_rdma_get_mdts(const struct nvmet_ctrl *ctrl)
 
 static u16 nvmet_rdma_get_max_queue_size(const struct nvmet_ctrl *ctrl)
 {
+       if (ctrl->pi_support)
+               return NVME_RDMA_MAX_METADATA_QUEUE_SIZE;
        return NVME_RDMA_MAX_QUEUE_SIZE;
 }