NVMF/RDMA 8K Inline Support
Subsystems (2)
v2 cover NVMF/RDMA 8K Inline Support
For small nvmf write IO over the rdma transport, it is advantagous to make use of inline mode to avoid the latency of the target issuing an rdma read to fetch the data. Currently inline is used for <= 4K writes. 8K, though, requires the rdma read. For iWARP transports additional latency is incurred because the target mr of the read must be registered with remote write access. By allowing 2 pages worth of inline payload, I see a reduction in 8K nvmf write latency of anywhere from 2-7 usecs depending on the RDMA transport..
This series is a respin of a series floated last year by Parav and Max [1]. I'm continuing it now and trying to address the comments from their submission.
A few of the comments have been addressed:
- nvme-rdma: Support up to 4 segments of inline data.
- nvme-rdma: Cap the number of inline segments to not exceed device limitations.
- nvmet-rdma: Make the inline data size configurable in nvmet-rdma via configfs.
Other issues I haven't addressed:
- nvme-rdma: make the sge array for inline segments dynamic based on the target's advertised inline_data_size. Since we're limiting the max count to 4, I'm not sure this is worth the complexity of allocating the sge array vs just embedding the max.
- nvmet-rdma: concern about high order page allocations. Is 4 pages too high? One possibility is that, if the device max_sge allows, use a few more sges. IE 16K could be 2 8K sges, or 4 4K. This probably makes passing the inline data to bio more complex. I haven't looked into this yet.
- nvmet-rdma: reduce the qp depth if the inline size greatly increases the memory footprint. I'm not sure how to do this in a reasonable mannor. Since the inline data size is now configurable, do we still need this?
- nvmet-rdma: make the qp depth configurable so the admin can reduce it manually to lower the memory footprint.
Please comment!
Thanks,
Steve.
[1] Original submissions:
http://lists.infradead.org/pipermail/linux-nvme/2017-February/008057.html
http://lists.infradead.org/pipermail/linux-nvme/2017-February/008059.html
Steve Wise (2):
nvme-rdma: support up to 4 segments of inline data
nvmet-rdma: support 16K inline data
drivers/nvme/host/rdma.c | 34 +++++++++++++++++++++++----------- drivers/nvme/target/admin-cmd.c | 4 ++-- drivers/nvme/target/configfs.c | 34 ++++++++++++++++++++++++++++++++++ drivers/nvme/target/discovery.c | 2 +- drivers/nvme/target/nvmet.h | 4 +++- drivers/nvme/target/rdma.c | 41 +++++++++++++++++++++++++++++------------ 6 files changed, 92 insertions(+), 27 deletions(-)
Signature · 1 line
1.8.3.1
RFC PATCH v2 1/2 nvme-rdma: support up to 4 segments of inline data
Allow up to 4 segments of inline data for NVMF WRITE operations. This reduces latency for small WRITEs by removing the need for the target to issue a READ WR for IB, or a REG_MR + READ WR chain for iWarp.
Also cap the inline segments used based on the limitations of the device.
--- drivers/nvme/host/rdma.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-)
drivers/nvme/host/rdma.c +23 -11
@@ -40,13 +40,14 @@#define NVME_RDMA_MAX_SEGMENTS 256 -#define NVME_RDMA_MAX_INLINE_SEGMENTS 1 +#define NVME_RDMA_MAX_INLINE_SEGMENTS 4struct nvme_rdma_device {struct ib_device *dev;struct ib_pd *pd;struct kref ref;struct list_head entry; +unsigned int num_inline_segments; };struct nvme_rdma_qe {
@@ -249,7 +250,7 @@ static int nvme_rdma_create_qp(struct nvme_rdma_queue *queue, const int factor)/* +1 for drain */ init_attr.cap.max_recv_wr = queue->queue_size +1 ; init_attr.cap.max_recv_sge =1 ; - init_attr.cap.max_send_sge =1 +NVME_RDMA_MAX_INLINE_SEGMENTS ; + init_attr.cap.max_send_sge =1 + dev->num_inline_segments; init_attr.sq_sig_type =IB_SIGNAL_REQ_WR ; init_attr.qp_type =IB_QPT_RC ; init_attr.send_cq = queue->ib_cq;
@@ -374,6 +375,9 @@ static int nvme_rdma_dev_get(struct nvme_rdma_device *dev) goto out_free_pd; } + ndev->num_inline_segments =min (NVME_RDMA_MAX_INLINE_SEGMENTS , + ndev->dev->attrs.max_sge -1 ); +pr_debug ("num_inline_segments = %u\n" , ndev->num_inline_segments);list_add (&ndev->entry, &device_list); out_unlock:mutex_unlock (&device_list_mutex);
@@ -1086,19 +1090,27 @@ static int nvme_rdma_set_sg_null(struct nvme_command *c) }static int nvme_rdma_map_sg_inline (struct nvme_rdma_queue *queue, -struct nvme_rdma_request *req,struct nvme_command *c) +struct nvme_rdma_request *req,struct nvme_command *c, +int count) {struct nvme_sgl_desc *sg = &c->common.dptr.sgl; +struct scatterlist *sgl = req->sg_table.sgl; +struct ib_sge *sge = &req->sge[1 ]; +u32 len =0 ; +int i; - req->sge[1 ].addr =sg_dma_address (req->sg_table.sgl); - req->sge[1 ].length =sg_dma_len (req->sg_table.sgl); - req->sge[1 ].lkey = queue->device->pd->local_dma_lkey; +for (i =0 ; i < count; i++, sgl++, sge++) { + sge->addr =sg_dma_address (sgl); + sge->length =sg_dma_len (sgl); + sge->lkey = queue->device->pd->local_dma_lkey; + len += sge->length; + } sg->addr =cpu_to_le64 (queue->ctrl->ctrl.icdoff); - sg->length =cpu_to_le32 (sg_dma_len (req->sg_table.sgl)); + sg->length =cpu_to_le32 (len); sg->type = (NVME_SGL_FMT_DATA_DESC <<4 ) |NVME_SGL_FMT_OFFSET ; - req->num_sge++; + req->num_sge += count;return 0 ; }
@@ -1191,13 +1203,13 @@ static int nvme_rdma_map_data(struct nvme_rdma_queue *queue,return -EIO ; } -if (count ==1 ) { +if (count <= dev->num_inline_segments) {if (rq_data_dir (rq) ==WRITE &&nvme_rdma_queue_idx (queue) &&blk_rq_payload_bytes (rq) <=nvme_rdma_inline_data_size (queue)) -return nvme_rdma_map_sg_inline (queue, req, c); +return nvme_rdma_map_sg_inline (queue, req, c, count); -if (dev->pd->flags &IB_PD_UNSAFE_GLOBAL_RKEY ) +if (count ==1 && dev->pd->flags &IB_PD_UNSAFE_GLOBAL_RKEY )return nvme_rdma_map_sg_single (queue, req, c); }
Signature · 1 line
1.8.3.1
Christoph Hellwig
maintainerRFC PATCH v2 1/2 nvme-rdma: support up to 4 segments of inline data
Looks good,
RFC PATCH v2 2/2 nvmet-rdma: support 16K inline data
In reply to Steve WiseAdd a new configfs port attribute, called inline_data_size, to allow configuring the size of inline data for a given port. The maximum size allowed is still enforced by nvmet-rdma with NVMET_RDMA_MAX_INLINE_DATA_SIZE, which is increased to max(16KB, PAGE_SIZE). And the default size, if not specified via configfs, is still PAGE_SIZE. This preserves the existing behavior, but allows larger inline sizes.
--- drivers/nvme/target/admin-cmd.c | 4 ++-- drivers/nvme/target/configfs.c | 34 ++++++++++++++++++++++++++++++++++ drivers/nvme/target/discovery.c | 2 +- drivers/nvme/target/nvmet.h | 4 +++- drivers/nvme/target/rdma.c | 41 +++++++++++++++++++++++++++++------------ 5 files changed, 69 insertions(+), 16 deletions(-)
drivers/nvme/target/admin-cmd.c +2 -2
@@ -247,14 +247,14 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) id->sgls =cpu_to_le32 (1 <<0 );/* we always support SGLs */ if (ctrl->ops->has_keyed_sgls) id->sgls |=cpu_to_le32 (1 <<2 ); -if (ctrl->ops->sqe_inline_size) +if (req->port->inline_data_size) id->sgls |=cpu_to_le32 (1 <<20 );strcpy (id->subnqn, ctrl->subsys->subsysnqn);/* Max command capsule size is sqe + single page of in-capsule data */ id->ioccsz =cpu_to_le32 ((sizeof (struct nvme_command ) + - ctrl->ops->sqe_inline_size) /16 ); + req->port->inline_data_size) /16 );/* Max response capsule size is cqe */ id->iorcsz =cpu_to_le32 (sizeof (struct nvme_completion ) /16 );
drivers/nvme/target/configfs.c +34 -0
@@ -214,6 +214,38 @@ static ssize_t nvmet_addr_trsvcid_store(struct config_item *item,CONFIGFS_ATTR (nvmet_, addr_trsvcid); +static ssize_t nvmet_inline_data_size_show (struct config_item *item, +char *page) +{ +struct nvmet_port *port =to_nvmet_port (item); + +return snprintf (page,PAGE_SIZE ,"%u\n" , + port->inline_data_size); +} + +static ssize_t nvmet_inline_data_size_store (struct config_item *item, +const char *page,size_t count) +{ +struct nvmet_port *port =to_nvmet_port (item); +unsigned int size; +int ret; + +if (port->enabled) { +pr_err ("Cannot modify inline_data_size enabled\n" ); +pr_err ("Disable the port before modifying\n" ); +return -EACCES ; + } + ret =kstrtouint ((const char *)page,0 , &size); +if (ret) { +pr_err ("Invalid value '%s' for inline_data_size\n" , page); +return -EINVAL ; + } + port->inline_data_size = size; +return count; +} + +CONFIGFS_ATTR (nvmet_, inline_data_size); +static ssize_t nvmet_addr_trtype_show (struct config_item *item,char *page) {
@@ -870,6 +902,7 @@ static void nvmet_port_release(struct config_item *item) &nvmet_attr_addr_traddr, &nvmet_attr_addr_trsvcid, &nvmet_attr_addr_trtype, + &nvmet_attr_inline_data_size, NULL, };
@@ -899,6 +932,7 @@ static struct config_group *nvmet_ports_make(struct config_group *group,INIT_LIST_HEAD (&port->entry);INIT_LIST_HEAD (&port->subsystems);INIT_LIST_HEAD (&port->referrals); + port->inline_data_size =NVMET_DEFAULT_INLINE_DATA_SIZE ; port->disc_addr.portid =cpu_to_le16 (portid);config_group_init_type_name (&port->group, name, &nvmet_port_type);
drivers/nvme/target/discovery.c +1 -1
@@ -171,7 +171,7 @@ static void nvmet_execute_identify_disc_ctrl(struct nvmet_req *req) id->sgls =cpu_to_le32 (1 <<0 );/* we always support SGLs */ if (ctrl->ops->has_keyed_sgls) id->sgls |=cpu_to_le32 (1 <<2 ); -if (ctrl->ops->sqe_inline_size) +if (req->port->inline_data_size) id->sgls |=cpu_to_le32 (1 <<20 );strcpy (id->subnqn, ctrl->subsys->subsysnqn);
drivers/nvme/target/nvmet.h +3 -1
@@ -79,6 +79,8 @@ struct nvmet_sq {struct completion confirm_done; }; +#define NVMET_DEFAULT_INLINE_DATA_SIZE -1 +/** * struct nvmet_port - Common structure to keep port * information for the target.
@@ -98,6 +100,7 @@ struct nvmet_port {struct list_head referrals;void *priv;bool enabled; +int inline_data_size; };static inline struct nvmet_port *to_nvmet_port (struct config_item *item)
@@ -202,7 +205,6 @@ struct nvmet_subsys_link {struct nvmet_fabrics_ops {struct module *owner;unsigned int type; -unsigned int sqe_inline_size;unsigned int msdbd;bool has_keyed_sgls :1 ;void (*queue_response)(struct nvmet_req *req);
drivers/nvme/target/rdma.c +29 -12
123 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Christoph Hellwig
maintainerRFC PATCH v2 2/2 nvmet-rdma: support 16K inline data
drivers/nvme/target/configfs.c static ssize_t nvmet_addr_trsvcid_store(struct config_item *item, · line 223
Quoted 7 lines
drivers/nvme/target/configfs.c +7
-0+static ssize_t nvmet_inline_data_size_show (struct config_item *item, +char *page) +{ +struct nvmet_port *port =to_nvmet_port (item); + +return snprintf (page,PAGE_SIZE ,"%u\n" , + port->inline_data_size);
Please fir the whole sprintf statement onto a single line.
Quoted 5 lines
drivers/nvme/target/configfs.c +5
-0+} + +static ssize_t nvmet_inline_data_size_store (struct config_item *item, +const char *page,size_t count) +{
drivers/nvme/target/configfs.c static ssize_t nvmet_addr_trsvcid_store(struct config_item *item, · line 238
Quoted 10 lines
drivers/nvme/target/configfs.c +10
-0+struct nvmet_port *port =to_nvmet_port (item); +unsigned int size; +int ret; + +if (port->enabled) { +pr_err ("Cannot modify inline_data_size enabled\n" ); +pr_err ("Disable the port before modifying\n" ); +return -EACCES ; + } + ret =kstrtouint ((const char *)page,0 , &size);
This cast looks bogus.
Also inline_data_size shoul be and u32 as that is closest to what is on the wire, and you thus should use kstrtou32 and pass the inline_data_size straight to kstrtou32 instead of bouncing it through a local variable.
Quoted 1 line
+CONFIGFS_ATTR(nvmet_,
inline_data_size);
The characters before the first _ in the name are used as a group by nvmetcli. So I think this should get a param_ or so prefix before the inline_data_size. Also currently this attribute only makes sense for rdma, so I think we still need a flag in nvmet_fabrics_ops that enables/disables this attribute.
Last but not least please also send a nvmetcli patch to support this new attribute.
Quoted 1 line
+#define
NVMET_DEFAULT_INLINE_DATA_SIZE-1
0 makes much more sense as the default, and then we don't even need a name for it.
drivers/nvme/target/rdma.c line 39
Quoted 2 lines
drivers/nvme/target/rdma.c +2
-0+#define NVMET_RDMA_DEFAULT_INLINE_DATA_SIZE PAGE_SIZE +#define NVMET_RDMA_MAX_INLINE_DATA_SIZE max_t(int, SZ_16K, PAGE_SIZE)
So for 64k pages the minimum is bigger than the maximum? :)
Review
Quoted 1 line
(quoted diff) +1
-0+ int inline_data_size;
u32
RFC PATCH v2 2/2 nvmet-rdma: support 16K inline data
Quoted 8 lines · Christoph Hellwig
drivers/nvme/target/configfs.c static ssize_t nvmet_addr_trsvcid_store(struct config_item *item, · line 223
Quoted 7 lines
drivers/nvme/target/configfs.c +7
-0+static ssize_t nvmet_inline_data_size_show (struct config_item *item, +char *page) +{ +struct nvmet_port *port =to_nvmet_port (item); + +return snprintf (page,PAGE_SIZE ,"%u\n" , + port->inline_data_size);Please fir the whole sprintf statement onto a single line.
sure
Quoted 17 lines
Quoted 5 lines
drivers/nvme/target/configfs.c +5
-0+} + +static ssize_t nvmet_inline_data_size_store (struct config_item *item, +const char *page,size_t count) +{drivers/nvme/target/configfs.c static ssize_t nvmet_addr_trsvcid_store(struct config_item *item, · line 238
Quoted 10 lines
drivers/nvme/target/configfs.c +10
-0+struct nvmet_port *port =to_nvmet_port (item); +unsigned int size; +int ret; + +if (port->enabled) { +pr_err ("Cannot modify inline_data_size enabled\n" ); +pr_err ("Disable the port before modifying\n" ); +return -EACCES ; + } + ret =kstrtouint ((const char *)page,0 , &size);This cast looks bogus.
Quoted 4 lines
Also
inline_data_sizeshoul be and u32 as that is closest to what is on the wire, and you thus should use kstrtou32 and pass theinline_data_sizestraight to kstrtou32 instead of bouncing it through a local variable.
I made it an int so it could be initialized to -1 indicating it is not set by the config.? This allows the rdma transport to use its default value if the config does not specify any value.? I did this so the admin could totally disable inline by specifying 0.?? So I needed a value that indicates "unspecified".
Quoted 6 lines
Quoted 1 line
+CONFIGFS_ATTR(nvmet_,
inline_data_size);The characters before the first _ in the name are used as a group by nvmetcli. So I think this should get a
param_or so prefix before theinline_data_size. Also currently this attribute only makes sense for rdma, so I think we still need a flag innvmet_fabrics_opsthat enables/disables this attribute.
Ah, so setting it in a port that isn't the rdma transport will cause a failure.? That makes sense.
Quoted 2 lines
Last but not least please also send a nvmetcli patch to support this new attribute.
Will do.
Quoted 3 lines
Quoted 1 line
+#define
NVMET_DEFAULT_INLINE_DATA_SIZE-10 makes much more sense as the default, and then we don't even need a name for it.
I wanted the user to be able to disable inline by setting it to 0.? Is that not needed?? Maybe by adding back the nvmet_fabrics_ops field will alleviate this issue.? Perhaps a default_inline_size field that rdma sets to PAGE_SIZE.? Then configfs can default it to that.?
Quoted 3 lines
drivers/nvme/target/rdma.c line 39
Quoted 2 lines
drivers/nvme/target/rdma.c +2
-0+#define NVMET_RDMA_DEFAULT_INLINE_DATA_SIZE PAGE_SIZE +#define NVMET_RDMA_MAX_INLINE_DATA_SIZE max_t(int, SZ_16K, PAGE_SIZE)So for 64k pages the minimum is bigger than the maximum? :)
For 64k pages, the default is 64K and the max is 64K.
Steve.
Christoph Hellwig
maintainerRFC PATCH v2 2/2 nvmet-rdma: support 16K inline data
Quoted 8 lines · Steve Wise
Quoted 7 lines
drivers/nvme/target/configfs.c static ssize_t nvmet_addr_trsvcid_store(struct config_item *item, · line 238
Quoted 1 line
drivers/nvme/target/configfs.c +1
-0+ ret =kstrtouint ((const char *)page,0 , &size);This cast looks bogus.
Also
inline_data_sizeshoul be and u32 as that is closest to what is on the wire, and you thus should use kstrtou32 and pass theinline_data_sizestraight to kstrtou32 instead of bouncing it through a local variable.
Quoted 5 lines
I made it an int so it could be initialized to -1 indicating it is not set by the config.? This allows the rdma transport to use its default value if the config does not specify any value.? I did this so the admin could totally disable inline by specifying 0.?? So I needed a value that indicates "unspecified".
Ok, make sense. So lets keep that behavior, and let every negative value mean default so that we don't need another error check here. Rest of the comments above still stands.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
+#define
NVMET_DEFAULT_INLINE_DATA_SIZE-10 makes much more sense as the default, and then we don't even need a name for it.
I wanted the user to be able to disable inline by setting it to 0.? Is that not needed?? Maybe by adding back the
nvmet_fabrics_opsfield will alleviate this issue.? Perhaps adefault_inline_sizefield that rdma sets toPAGE_SIZE.? Then configfs can default it to that.?
As said above I think we can keep the negative means default, I'd still use the plain -1 instead of a define there.
Quoted 6 lines
Quoted 4 lines
drivers/nvme/target/rdma.c line 39
Quoted 3 lines
drivers/nvme/target/rdma.c +2
-0+#define NVMET_RDMA_DEFAULT_INLINE_DATA_SIZE PAGE_SIZE +#define NVMET_RDMA_MAX_INLINE_DATA_SIZE max_t(int, SZ_16K, PAGE_SIZE)So for 64k pages the minimum is bigger than the maximum? :)
For 64k pages, the default is 64K and the max is 64K.
Indeed, sorry.
RFC PATCH v2 2/2 nvmet-rdma: support 16K inline data
Quoted 16 lines · Steve Wise
Quoted 8 lines
Quoted 7 lines
drivers/nvme/target/configfs.c static ssize_t nvmet_addr_trsvcid_store(struct config_item *item, · line 238
Quoted 1 line
drivers/nvme/target/configfs.c +1
-0+ ret =kstrtouint ((const char *)page,0 , &size);This cast looks bogus.
Also
inline_data_sizeshoul be and u32 as that is closest to what is on the wire, and you thus should use kstrtou32 and pass theinline_data_sizestraight to kstrtou32 instead of bouncing it through a local variable.Quoted 5 lines
I made it an int so it could be initialized to -1 indicating it is not set by the config.? This allows the rdma transport to use its default value if the config does not specify any value.? I did this so the admin could totally disable inline by specifying 0.?? So I needed a value that indicates "unspecified".
Quoted 3 lines
Ok, make sense. So lets keep that behavior, and let every negative value mean default so that we don't need another error check here. Rest of the comments above still stands.
Agreed.
Looking at nvmet_rdma_alloc_cmd(), I think I'll also need to fix rdma.c to support no inline data usage.
Thanks!
Steve.
v2 cover NVMF/RDMA 8K Inline Support
In reply to Steve WiseOops!? The subject should be "16K Inline Support"
Steve.
Quoted 64 lines · Steve Wise
For small nvmf write IO over the rdma transport, it is advantagous to make use of inline mode to avoid the latency of the target issuing an rdma read to fetch the data. Currently inline is used for <= 4K writes. 8K, though, requires the rdma read. For iWARP transports additional latency is incurred because the target mr of the read must be registered with remote write access. By allowing 2 pages worth of inline payload, I see a reduction in 8K nvmf write latency of anywhere from 2-7 usecs depending on the RDMA transport..
This series is a respin of a series floated last year by Parav and Max [1]. I'm continuing it now and trying to address the comments from their submission.
A few of the comments have been addressed:
- nvme-rdma: Support up to 4 segments of inline data.
- nvme-rdma: Cap the number of inline segments to not exceed device limitations.
- nvmet-rdma: Make the inline data size configurable in nvmet-rdma via configfs.
Other issues I haven't addressed:
- nvme-rdma: make the sge array for inline segments dynamic based on the target's advertised
inline_data_size. Since we're limiting the max count to 4, I'm not sure this is worth the complexity of allocating the sge array vs just embedding the max.- nvmet-rdma: concern about high order page allocations. Is 4 pages too high? One possibility is that, if the device
max_sgeallows, use a few more sges. IE 16K could be 2 8K sges, or 4 4K. This probably makes passing the inline data to bio more complex. I haven't looked into this yet.- nvmet-rdma: reduce the qp depth if the inline size greatly increases the memory footprint. I'm not sure how to do this in a reasonable mannor. Since the inline data size is now configurable, do we still need this?
- nvmet-rdma: make the qp depth configurable so the admin can reduce it manually to lower the memory footprint.
Please comment!
Thanks,
Steve.
[1] Original submissions:
http://lists.infradead.org/pipermail/linux-nvme/2017-February/008057.html
http://lists.infradead.org/pipermail/linux-nvme/2017-February/008059.htmlSteve Wise (2):
nvme-rdma: support up to 4 segments of inline data
nvmet-rdma: support 16K inline datadrivers/nvme/host/rdma.c | 34 +++++++++++++++++++++++----------- drivers/nvme/target/admin-cmd.c | 4 ++-- drivers/nvme/target/configfs.c | 34 ++++++++++++++++++++++++++++++++++ drivers/nvme/target/discovery.c | 2 +- drivers/nvme/target/nvmet.h | 4 +++- drivers/nvme/target/rdma.c | 41 +++++++++++++++++++++++++++++------------ 6 files changed, 92 insertions(+), 27 deletions(-)