nvmet-rdma: set max_queue_size for RDMA transport

A new port configuration was added to set max_queue_size. Clamp user
configuration to RDMA transport limits.

Increase the maximal queue size of RDMA controllers from 128 to 256
(the default size stays 128 same as before).

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Israel Rukshin <israelr@nvidia.com>
Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index b3f8416..f2bb9d9 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) {

diff --git a/include/linux/nvme-rdma.h b/include/linux/nvme-rdma.h
index d0b9941..eb2f04d 100644 (file)
--- a/include/linux/nvme-rdma.h
+++ b/include/linux/nvme-rdma.h
@@ -8,8 +8,9 @@
 
 #define NVME_RDMA_IP_PORT              4420
 
-#define NVME_RDMA_MAX_QUEUE_SIZE 128
+#define NVME_RDMA_MAX_QUEUE_SIZE 256
 #define NVME_RDMA_MAX_METADATA_QUEUE_SIZE 128
+#define NVME_RDMA_DEFAULT_QUEUE_SIZE 128
 
 enum nvme_rdma_cm_fmt {
        NVME_RDMA_CM_FMT_1_0 = 0x0,