From 7413e1e497b112df91bd01380403e675e88dd5a2 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 6 Mar 2023 10:11:10 +0900 Subject: [PATCH] nvme: Initialize cpl->sqid when aborting requests for RDMA and TCP nvme_rdma_qpair_abort_reqs() and nvme_tcp_qpair_abort_reqs() did not initialize cpl->sqid. Hence, unexpected message was printed by spdk_nvme_print_completion(). Fix the bugs in this patch. Fixes #2930 Signed-off-by: Shuhei Matsumoto Change-Id: I8b41166e58b26ce22c453ab85794b46dbe3dd3a2 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17067 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Michael Haeuptle Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/nvme/nvme_rdma.c | 1 + lib/nvme/nvme_tcp.c | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index fc0119d4a..2da8b8642 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -2355,6 +2355,7 @@ nvme_rdma_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr) struct spdk_nvme_cpl cpl; struct nvme_rdma_qpair *rqpair = nvme_rdma_qpair(qpair); + cpl.sqid = qpair->id; cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION; cpl.status.sct = SPDK_NVME_SCT_GENERIC; cpl.status.dnr = dnr; diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c index 85944c7b7..bff237502 100644 --- a/lib/nvme/nvme_tcp.c +++ b/lib/nvme/nvme_tcp.c @@ -789,6 +789,7 @@ nvme_tcp_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr) struct spdk_nvme_cpl cpl = {}; struct nvme_tcp_qpair *tqpair = nvme_tcp_qpair(qpair); + cpl.sqid = qpair->id; cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION; cpl.status.sct = SPDK_NVME_SCT_GENERIC; cpl.status.dnr = dnr;