* [PATCH 0/3] iser updates for 3.9
@ 2013-02-21 14:50 Or Gerlitz
[not found] ` <1361458210-856-1-git-send-email-ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Or Gerlitz @ 2013-02-21 14:50 UTC (permalink / raw)
To: roland-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, oren-VPRAkNaXOzVWk0Htik3J/w,
Or Gerlitz
Hi Roland,
These are the iser updates for the 3.9 merge window, two maintainance
patches and one patch that allows to run over a VF (e.g in a VM).
Or.
Or Gerlitz (3):
IB/iser: Use proper define for the commands per lun value advertized to SCSI ML
IB/iser: Avoid error prints on EAGAIN registration failures
IB/iser: Enable iser to work when FMRs are not supported
drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +-
drivers/infiniband/ulp/iser/iser_memory.c | 9 +++++----
drivers/infiniband/ulp/iser/iser_verbs.c | 8 ++++++--
3 files changed, 12 insertions(+), 7 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH for-3.9 1/3] IB/iser: Use proper define for the commands per lun value advertized to SCSI ML
[not found] ` <1361458210-856-1-git-send-email-ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
@ 2013-02-21 14:50 ` Or Gerlitz
2013-02-21 14:50 ` [PATCH for-3.9 2/3] IB/iser: Avoid error prints on EAGAIN registration failures Or Gerlitz
2013-02-21 14:50 ` [PATCH for-3.9 3/3] IB/iser: Enable iser to work when FMRs are not supported Or Gerlitz
2 siblings, 0 replies; 4+ messages in thread
From: Or Gerlitz @ 2013-02-21 14:50 UTC (permalink / raw)
To: roland-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, oren-VPRAkNaXOzVWk0Htik3J/w,
Or Gerlitz, Roi Dayan
ISER_DEF_CMD_PER_LUN was meant to be ISCSI_DEF_XMIT_CMDS_MAX, not plain 128
Signed-off-by: Roi Dayan <roid-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Signed-off-by: Or Gerlitz <ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index ef7d3be..5babdb3 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -94,7 +94,7 @@
/* support up to 512KB in one RDMA */
#define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K)
-#define ISER_DEF_CMD_PER_LUN 128
+#define ISER_DEF_CMD_PER_LUN ISCSI_DEF_XMIT_CMDS_MAX
/* QP settings */
/* Maximal bounds on received asynchronous PDUs */
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH for-3.9 2/3] IB/iser: Avoid error prints on EAGAIN registration failures
[not found] ` <1361458210-856-1-git-send-email-ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2013-02-21 14:50 ` [PATCH for-3.9 1/3] IB/iser: Use proper define for the commands per lun value advertized to SCSI ML Or Gerlitz
@ 2013-02-21 14:50 ` Or Gerlitz
2013-02-21 14:50 ` [PATCH for-3.9 3/3] IB/iser: Enable iser to work when FMRs are not supported Or Gerlitz
2 siblings, 0 replies; 4+ messages in thread
From: Or Gerlitz @ 2013-02-21 14:50 UTC (permalink / raw)
To: roland-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, oren-VPRAkNaXOzVWk0Htik3J/w,
Or Gerlitz
Under IO/CPU stress its possible that the FMR pool might not have free
FMR mapping element for iser to use as of incompleted background
unmapping processing. On that case we get -EAGAIN, the IO is pushed
back to the SCSI layer which soon retries it. No need to be so
verbose about that.
Signed-off-by: Or Gerlitz <ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
drivers/infiniband/ulp/iser/iser_memory.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 2033a92..79c4f35 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -404,7 +404,7 @@ int iser_reg_rdma_mem(struct iscsi_iser_task *iser_task,
} else { /* use FMR for multiple dma entries */
iser_page_vec_build(mem, ib_conn->page_vec, ibdev);
err = iser_reg_page_vec(ib_conn, ib_conn->page_vec, ®d_buf->reg);
- if (err) {
+ if (err && err != -EAGAIN) {
iser_data_buf_dump(mem, ibdev);
iser_err("mem->dma_nents = %d (dlength = 0x%x)\n",
mem->dma_nents,
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH for-3.9 3/3] IB/iser: Enable iser to work when FMRs are not supported
[not found] ` <1361458210-856-1-git-send-email-ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2013-02-21 14:50 ` [PATCH for-3.9 1/3] IB/iser: Use proper define for the commands per lun value advertized to SCSI ML Or Gerlitz
2013-02-21 14:50 ` [PATCH for-3.9 2/3] IB/iser: Avoid error prints on EAGAIN registration failures Or Gerlitz
@ 2013-02-21 14:50 ` Or Gerlitz
2 siblings, 0 replies; 4+ messages in thread
From: Or Gerlitz @ 2013-02-21 14:50 UTC (permalink / raw)
To: roland-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, oren-VPRAkNaXOzVWk0Htik3J/w,
Or Gerlitz, Alex Tabachnik
Reuse the SG unaligned for FMR driver flow to make the initiator
functional when running over driver instance which doesn't support
FMRs such as mlx4 VF.
Signed-off-by: Or Gerlitz <ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Signed-off-by: Alex Tabachnik <alext-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
drivers/infiniband/ulp/iser/iser_memory.c | 7 ++++---
drivers/infiniband/ulp/iser/iser_verbs.c | 8 ++++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 79c4f35..be1edb0 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -369,10 +369,11 @@ int iser_reg_rdma_mem(struct iscsi_iser_task *iser_task,
regd_buf = &iser_task->rdma_regd[cmd_dir];
aligned_len = iser_data_buf_aligned_len(mem, ibdev);
- if (aligned_len != mem->dma_nents) {
+ if (aligned_len != mem->dma_nents ||
+ (!ib_conn->fmr_pool && mem->dma_nents > 1)) {
iscsi_conn->fmr_unalign_cnt++;
- iser_warn("rdma alignment violation %d/%d aligned\n",
- aligned_len, mem->size);
+ iser_warn("rdma alignment violation (%d/%d aligned) or FMR not supported\n",
+ aligned_len, mem->size);
iser_data_buf_dump(mem, ibdev);
/* unmap the command data before accessing it */
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 95a49af..4debadc 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -242,10 +242,14 @@ static int iser_create_ib_conn_res(struct iser_conn *ib_conn)
IB_ACCESS_REMOTE_READ);
ib_conn->fmr_pool = ib_create_fmr_pool(device->pd, ¶ms);
- if (IS_ERR(ib_conn->fmr_pool)) {
- ret = PTR_ERR(ib_conn->fmr_pool);
+ ret = PTR_ERR(ib_conn->fmr_pool);
+ if (IS_ERR(ib_conn->fmr_pool) && ret != -ENOSYS) {
ib_conn->fmr_pool = NULL;
goto out_err;
+ } else if (ret == -ENOSYS) {
+ ib_conn->fmr_pool = NULL;
+ iser_warn("FMRs are not supported, using unaligned mode\n");
+ ret = 0;
}
memset(&init_attr, 0, sizeof init_attr);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-21 14:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-21 14:50 [PATCH 0/3] iser updates for 3.9 Or Gerlitz
[not found] ` <1361458210-856-1-git-send-email-ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2013-02-21 14:50 ` [PATCH for-3.9 1/3] IB/iser: Use proper define for the commands per lun value advertized to SCSI ML Or Gerlitz
2013-02-21 14:50 ` [PATCH for-3.9 2/3] IB/iser: Avoid error prints on EAGAIN registration failures Or Gerlitz
2013-02-21 14:50 ` [PATCH for-3.9 3/3] IB/iser: Enable iser to work when FMRs are not supported Or Gerlitz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.