* [PATCH] IB/iser: Always check sig MR before putting it to the free pool
@ 2020-03-25 15:12 Sergey Gorenko
2020-04-01 6:02 ` Sagi Grimberg
0 siblings, 1 reply; 2+ messages in thread
From: Sergey Gorenko @ 2020-03-25 15:12 UTC (permalink / raw)
To: sagi; +Cc: linux-rdma, Sergey Gorenko, Max Gurtovoy
libiscsi calls the check_protection transport handler only if
SCSI-Respose is received. So, the handler is never called if iSCSI
task is completed for some other reason like a timeout or error
handling. And this behavior looks correct. But the iSER does not
handle this case properly because it puts a non-checked signature
MR to the free pool. Then the error occurs at reusing the MR
because it is not allowed to invalidate a signature MR without
checking.
This commit adds an extra check to iser_unreg_mem_fastreg(), which
is a part of the task cleanup flow. Now the signature MR is
checked there if it is needed.
Signed-off-by: Sergey Gorenko <sergeygo@mellanox.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
---
drivers/infiniband/ulp/iser/iser_memory.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 7a8f24de3631..999ef7cdd05e 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -292,12 +292,27 @@ void iser_unreg_mem_fastreg(struct iscsi_iser_task *iser_task,
{
struct iser_device *device = iser_task->iser_conn->ib_conn.device;
struct iser_mem_reg *reg = &iser_task->rdma_reg[cmd_dir];
+ struct iser_fr_desc *desc;
+ struct ib_mr_status mr_status;
- if (!reg->mem_h)
+ desc = reg->mem_h;
+ if (!desc)
return;
- device->reg_ops->reg_desc_put(&iser_task->iser_conn->ib_conn,
- reg->mem_h);
+ /*
+ * The signature MR cannot be invalidated and reused without checking.
+ * libiscsi calls the check_protection transport handler only if
+ * SCSI-Response is received. And the signature MR is not checked if
+ * the task is completed for some other reason like a timeout or error
+ * handling. That's why we must check the signature MR here before
+ * putting it to the free pool.
+ */
+ if (unlikely(desc->sig_protected)) {
+ desc->sig_protected = false;
+ ib_check_mr_status(desc->rsc.sig_mr, IB_MR_CHECK_SIG_STATUS,
+ &mr_status);
+ }
+ device->reg_ops->reg_desc_put(&iser_task->iser_conn->ib_conn, desc);
reg->mem_h = NULL;
}
--
2.21.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] IB/iser: Always check sig MR before putting it to the free pool
2020-03-25 15:12 [PATCH] IB/iser: Always check sig MR before putting it to the free pool Sergey Gorenko
@ 2020-04-01 6:02 ` Sagi Grimberg
0 siblings, 0 replies; 2+ messages in thread
From: Sagi Grimberg @ 2020-04-01 6:02 UTC (permalink / raw)
To: Sergey Gorenko; +Cc: linux-rdma, Max Gurtovoy
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-01 6:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-25 15:12 [PATCH] IB/iser: Always check sig MR before putting it to the free pool Sergey Gorenko
2020-04-01 6:02 ` Sagi Grimberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).