nvme-fabrics: allow user to pass in nr_poll_queues

[linux.git] / drivers / nvme / host / fabrics.c

diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index bd0969db6225c5747b3105b7c5e88cffd6b6f2b1..b2ab213f43dead83370a883ad64e8875de964c41 100644 (file)
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -159,7 +159,7 @@ int nvmf_reg_read32(struct nvme_ctrl *ctrl, u32 off, u32 *val)
        cmd.prop_get.offset = cpu_to_le32(off);
 
        ret = __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, &res, NULL, 0, 0,
-                       NVME_QID_ANY, 0, 0);
+                       NVME_QID_ANY, 0, 0, false);
 
        if (ret >= 0)
                *val = le64_to_cpu(res.u64);
@@ -206,7 +206,7 @@ int nvmf_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val)
        cmd.prop_get.offset = cpu_to_le32(off);
 
        ret = __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, &res, NULL, 0, 0,
-                       NVME_QID_ANY, 0, 0);
+                       NVME_QID_ANY, 0, 0, false);
 
        if (ret >= 0)
                *val = le64_to_cpu(res.u64);
@@ -252,7 +252,7 @@ int nvmf_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val)
        cmd.prop_set.value = cpu_to_le64(val);
 
        ret = __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, NULL, 0, 0,
-                       NVME_QID_ANY, 0, 0);
+                       NVME_QID_ANY, 0, 0, false);
        if (unlikely(ret))
                dev_err(ctrl->device,
                        "Property Set error: %d, offset %#x\n",
@@ -392,6 +392,9 @@ int nvmf_connect_admin_queue(struct nvme_ctrl *ctrl)
        cmd.connect.kato = ctrl->opts->discovery_nqn ? 0 :
                cpu_to_le32((ctrl->kato + NVME_KATO_GRACE) * 1000);
 
+       if (ctrl->opts->disable_sqflow)
+               cmd.connect.cattr |= NVME_CONNECT_DISABLE_SQFLOW;
+
        data = kzalloc(sizeof(*data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
@@ -403,7 +406,7 @@ int nvmf_connect_admin_queue(struct nvme_ctrl *ctrl)
 
        ret = __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, &res,
                        data, sizeof(*data), 0, NVME_QID_ANY, 1,
-                       BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);
+                       BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT, false);
        if (ret) {
                nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32),
                                       &cmd, data);
@@ -438,7 +441,7 @@ EXPORT_SYMBOL_GPL(nvmf_connect_admin_queue);
  *     > 0: NVMe error status code
  *     < 0: Linux errno error code
  */
-int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid)
+int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid, bool poll)
 {
        struct nvme_command cmd;
        struct nvmf_connect_data *data;
@@ -451,6 +454,9 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid)
        cmd.connect.qid = cpu_to_le16(qid);
        cmd.connect.sqsize = cpu_to_le16(ctrl->sqsize);
 
+       if (ctrl->opts->disable_sqflow)
+               cmd.connect.cattr |= NVME_CONNECT_DISABLE_SQFLOW;
+
        data = kzalloc(sizeof(*data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
@@ -462,7 +468,7 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid)
 
        ret = __nvme_submit_sync_cmd(ctrl->connect_q, &cmd, &res,
                        data, sizeof(*data), 0, qid, 1,
-                       BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);
+                       BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT, poll);
        if (ret) {
                nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32),
                                       &cmd, data);
@@ -607,6 +613,11 @@ static const match_table_t opt_tokens = {
        { NVMF_OPT_HOST_TRADDR,         "host_traddr=%s"        },
        { NVMF_OPT_HOST_ID,             "hostid=%s"             },
        { NVMF_OPT_DUP_CONNECT,         "duplicate_connect"     },
+       { NVMF_OPT_DISABLE_SQFLOW,      "disable_sqflow"        },
+       { NVMF_OPT_HDR_DIGEST,          "hdr_digest"            },
+       { NVMF_OPT_DATA_DIGEST,         "data_digest"           },
+       { NVMF_OPT_NR_WRITE_QUEUES,     "nr_write_queues=%d"    },
+       { NVMF_OPT_NR_POLL_QUEUES,      "nr_poll_queues=%d"     },
        { NVMF_OPT_ERR,                 NULL                    }
 };
 
@@ -626,6 +637,8 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
        opts->reconnect_delay = NVMF_DEF_RECONNECT_DELAY;
        opts->kato = NVME_DEFAULT_KATO;
        opts->duplicate_connect = false;
+       opts->hdr_digest = false;
+       opts->data_digest = false;
 
        options = o = kstrdup(buf, GFP_KERNEL);
        if (!options)
@@ -817,6 +830,39 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
                case NVMF_OPT_DUP_CONNECT:
                        opts->duplicate_connect = true;
                        break;
+               case NVMF_OPT_DISABLE_SQFLOW:
+                       opts->disable_sqflow = true;
+                       break;
+               case NVMF_OPT_HDR_DIGEST:
+                       opts->hdr_digest = true;
+                       break;
+               case NVMF_OPT_DATA_DIGEST:
+                       opts->data_digest = true;
+                       break;
+               case NVMF_OPT_NR_WRITE_QUEUES:
+                       if (match_int(args, &token)) {
+                               ret = -EINVAL;
+                               goto out;
+                       }
+                       if (token <= 0) {
+                               pr_err("Invalid nr_write_queues %d\n", token);
+                               ret = -EINVAL;
+                               goto out;
+                       }
+                       opts->nr_write_queues = token;
+                       break;
+               case NVMF_OPT_NR_POLL_QUEUES:
+                       if (match_int(args, &token)) {
+                               ret = -EINVAL;
+                               goto out;
+                       }
+                       if (token <= 0) {
+                               pr_err("Invalid nr_poll_queues %d\n", token);
+                               ret = -EINVAL;
+                               goto out;
+                       }
+                       opts->nr_poll_queues = token;
+                       break;
                default:
                        pr_warn("unknown parameter or missing value '%s' in ctrl creation request\n",
                                p);
@@ -933,7 +979,8 @@ EXPORT_SYMBOL_GPL(nvmf_free_options);
 #define NVMF_REQUIRED_OPTS     (NVMF_OPT_TRANSPORT | NVMF_OPT_NQN)
 #define NVMF_ALLOWED_OPTS      (NVMF_OPT_QUEUE_SIZE | NVMF_OPT_NR_IO_QUEUES | \
                                 NVMF_OPT_KATO | NVMF_OPT_HOSTNQN | \
-                                NVMF_OPT_HOST_ID | NVMF_OPT_DUP_CONNECT)
+                                NVMF_OPT_HOST_ID | NVMF_OPT_DUP_CONNECT |\
+                                NVMF_OPT_DISABLE_SQFLOW)
 
 static struct nvme_ctrl *
 nvmf_create_ctrl(struct device *dev, const char *buf, size_t count)