ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "nvme_rdma: Continue even if we receive a normal WC when qpair is disconnected"

Browse Source 
This reverts commit b9518a5540.

Reason for revert: Fix a degradation for adminq

Change-Id: I0e2c5e48a5ca34171fa98fa68216da4354b5d262
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10879
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Shuhei Matsumoto 2022-01-24 03:53:48 +00:00 committed by Tomasz Zawadzki
parent 646fb03fb8
commit 194dc9e2f9
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/nvme/nvme_rdma.c
View File

@ -2191,6 +2191,13 @@ nvme_rdma_log_wc_status(struct nvme_rdma_qpair *rqpair, struct ibv_wc *wc)
} }
} }
static inline bool
nvme_rdma_is_rxe_device(struct ibv_device_attr *dev_attr)
{
return dev_attr->vendor_id == SPDK_RDMA_RXE_VENDOR_ID_OLD ||
dev_attr->vendor_id == SPDK_RDMA_RXE_VENDOR_ID_NEW;
}
static int static int
nvme_rdma_cq_process_completions(struct ibv_cq *cq, uint32_t batch_size, nvme_rdma_cq_process_completions(struct ibv_cq *cq, uint32_t batch_size,
struct nvme_rdma_poll_group *group, struct nvme_rdma_poll_group *group,
@ -2281,11 +2288,15 @@ nvme_rdma_cq_process_completions(struct ibv_cq *cq, uint32_t batch_size,
struct ibv_device_attr dev_attr; struct ibv_device_attr dev_attr;
int query_status; int query_status;
/* We may receive a completion without error status when qpair is disconnected/destroyed. */ /* Bug in Soft Roce - we may receive a completion without error status when qpair is disconnected/destroyed.
* As sanity check - log an error if we use a real HW (it should never happen) */
query_status = ibv_query_device(cq->context, &dev_attr); query_status = ibv_query_device(cq->context, &dev_attr);
if (query_status == 0) { if (query_status == 0) {
SPDK_INFOLOG(nvme, "Received malformed completion: request 0x%"PRIx64" type %d\n", if (!nvme_rdma_is_rxe_device(&dev_attr)) {
wc->wr_id, rdma_wr->type); SPDK_ERRLOG("Received malformed completion: request 0x%"PRIx64" type %d\n", wc->wr_id,
rdma_wr->type);
assert(0);
}
} else { } else {
SPDK_ERRLOG("Failed to query ib device\n"); SPDK_ERRLOG("Failed to query ib device\n");
assert(0); assert(0);