aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nvme
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2017-11-23 17:35:24 +0200
committerChristoph Hellwig <hch@lst.de>2017-11-26 15:33:32 +0100
commit3ef0279bb0031f67537bd8972899a6a23d3064d7 (patch)
tree9df8af1c2c32d83f84b627b74a3ccf445f4d366a /drivers/nvme
parentnvme-rdma: wait for local invalidation before completing a request (diff)
downloadlinux-dev-3ef0279bb0031f67537bd8972899a6a23d3064d7.tar.xz
linux-dev-3ef0279bb0031f67537bd8972899a6a23d3064d7.zip
nvme-rdma: Check remotely invalidated rkey matches our expected rkey
If we got a remote invalidation on a bogus rkey, this is a protocol error. Fail the connection in this case. Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Max Gurtovoy <maxg@mellanox.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
-rw-r--r--drivers/nvme/host/rdma.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index c03460d0ca94..3a952d458e7c 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1334,8 +1334,13 @@ static int nvme_rdma_process_nvme_rsp(struct nvme_rdma_queue *queue,
req->status = cqe->status;
req->result = cqe->result;
- if ((wc->wc_flags & IB_WC_WITH_INVALIDATE) &&
- wc->ex.invalidate_rkey == req->mr->rkey) {
+ if (wc->wc_flags & IB_WC_WITH_INVALIDATE) {
+ if (unlikely(wc->ex.invalidate_rkey != req->mr->rkey)) {
+ dev_err(queue->ctrl->ctrl.device,
+ "Bogus remote invalidation for rkey %#x\n",
+ req->mr->rkey);
+ nvme_rdma_error_recovery(queue->ctrl);
+ }
req->mr->need_inval = false;
} else if (req->mr->need_inval) {
ret = nvme_rdma_inv_rkey(queue, req);