From: Sagi Grimberg <sagi@grimberg.me>
Date: Thu, 23 Nov 2017 15:35:24 +0000 (+0200)
Subject: nvme-rdma: Check remotely invalidated rkey matches our expected rkey
X-Git-Tag: android-x86-8.1-r1~2126^2^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ef0279bb0031f67537bd8972899a6a23d3064d7;p=android-x86%2Fkernel.git

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>
---

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);