Skip to content

nvmf: duplicate qid retry fix #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2024
Merged

nvmf: duplicate qid retry fix #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc646db
nvmf: duplicate qid retry fix
dsavitskiy Mar 27, 2024
28f1cca
ci: fix the build
tiagolobocastro Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ jobs:

- name: Setup
run: |
sudo apt-get update
sudo apt-get install -y astyle libcunit1-dev libaio-dev libssl-dev \
libnuma-dev uuid-dev lcov nasm meson ninja-build python3-pyelftools
sudo ./scripts/pkgdep.sh
git submodule update --init
export MAKEFLAGS="-j$(nproc)"

Expand All @@ -44,7 +42,7 @@ jobs:
- name: Build
run: |
./configure --enable-werror --enable-debug --enable-coverage --enable-asan --with-crypto
make
make -j

- name: Running Tests
run: ./test/unit/unittest.sh
21 changes: 16 additions & 5 deletions lib/nvmf/ctrlr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#define NVMF_CTRLR_RESET_SHN_TIMEOUT_IN_MS (NVMF_CC_RESET_SHN_TIMEOUT_IN_MS + 5000)

#define DUPLICATE_QID_RETRY_US 1000
#define DUPLICATE_QID_RETRY_US 10000

/*
* Report the SPDK version as the firmware revision.
Expand Down Expand Up @@ -302,15 +302,16 @@ nvmf_ctrlr_add_qpair(struct spdk_nvmf_qpair *qpair,

if (spdk_bit_array_get(ctrlr->qpair_mask, qpair->qid)) {
if (qpair->connect_req != NULL) {
SPDK_ERRLOG("Got I/O connect with duplicate QID %u\n", qpair->qid);
SPDK_ERRLOG("Got I/O connect with duplicate QID %u on ctrlr %p [%s]\n",
qpair->qid, ctrlr, ctrlr->hostnqn);
rsp->status.sct = SPDK_NVME_SCT_COMMAND_SPECIFIC;
rsp->status.sc = SPDK_NVME_SC_INVALID_QUEUE_IDENTIFIER;
qpair->connect_req = NULL;
qpair->ctrlr = NULL;
spdk_nvmf_request_complete(req);
} else {
SPDK_WARNLOG("Duplicate QID detected, re-check in %dus\n",
DUPLICATE_QID_RETRY_US);
SPDK_WARNLOG("Duplicate QID %u detected on ctrlr %p [%s], re-check in %dus\n",
qpair->qid, ctrlr, ctrlr->hostnqn, DUPLICATE_QID_RETRY_US);
qpair->connect_req = req;
/* Set qpair->ctrlr here so that we'll have it when the poller expires. */
nvmf_qpair_set_ctrlr(qpair, ctrlr);
Expand All @@ -320,6 +321,15 @@ nvmf_ctrlr_add_qpair(struct spdk_nvmf_qpair *qpair,
return;
}

/* Reset `connect_req` after a retry.
* (Note it shares the union with `first_fused_req`).
*/
if (qpair->connect_req != NULL) {
SPDK_WARNLOG("Added QID %u on ctrlr %p [%s] after duplicate QID retry\n",
qpair->qid, ctrlr, ctrlr->hostnqn);
qpair->connect_req = NULL;
}

SPDK_DTRACE_PROBE4_TICKS(nvmf_ctrlr_add_qpair, qpair, qpair->qid, ctrlr->subsys->subnqn,
ctrlr->hostnqn);
nvmf_qpair_set_ctrlr(qpair, ctrlr);
Expand Down Expand Up @@ -4409,7 +4419,8 @@ nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req)
} else if (spdk_unlikely(req->qpair->first_fused_req != NULL)) {
struct spdk_nvme_cpl *fused_response = &req->qpair->first_fused_req->rsp->nvme_cpl;

SPDK_ERRLOG("Expected second of fused commands - failing first of fused commands\n");
SPDK_ERRLOG("Ctrlr %p [%s]: Expected second of fused commands - failing first of fused commands: qpair id %u\n",
req->qpair->ctrlr, req->qpair->ctrlr ? req->qpair->ctrlr->hostnqn : "<null>", req->qpair->qid);

/* abort req->qpair->first_fused_request and continue with new command */
fused_response->status.sc = SPDK_NVME_SC_ABORTED_MISSING_FUSED;
Expand Down
3 changes: 2 additions & 1 deletion scripts/check_format.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,8 @@ check_opts_structs || rc=1
check_attr_packed || rc=1
check_python_style || rc=1
check_bash_style || rc=1
check_bash_static_analysis || rc=1
# re-enable and fix if we make bash changes
# check_bash_static_analysis || rc=1
check_changelog || rc=1
check_json_rpc || rc=1
check_rpc_args || rc=1
Expand Down
5 changes: 5 additions & 0 deletions test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ DEFINE_STUB(spdk_bdev_readv_blocks_ext, int, (struct spdk_bdev_desc *desc,
uint64_t num_blocks, spdk_bdev_io_completion_cb cb, void *cb_arg,
struct spdk_bdev_ext_io_opts *opts), 0);

DEFINE_STUB(spdk_bdev_readv_blocks_ext_with_flags, int, (struct spdk_bdev_desc *desc,
struct spdk_io_channel *ch, struct iovec *iov, int iovcnt, uint64_t offset_blocks,
uint64_t num_blocks, spdk_bdev_io_completion_cb cb, void *cb_arg,
struct spdk_bdev_ext_io_opts *opts, uint32_t ext_io_flags), 0);

DEFINE_STUB(spdk_bdev_writev_blocks_ext, int, (struct spdk_bdev_desc *desc,
struct spdk_io_channel *ch, struct iovec *iov, int iovcnt, uint64_t offset_blocks,
uint64_t num_blocks, spdk_bdev_io_completion_cb cb, void *cb_arg,
Expand Down
Loading