Skip to content

Handle add ctrl errors #2802

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
igaw merged 2 commits into from
May 12, 2025
Merged

Handle add ctrl errors #2802

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
419180e
nvme: check errno not return value
igaw May 8, 2025
1f1027a
fabrics: refactor error propagation in nvmf_connect
igaw May 8, 2025
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
48 changes: 24 additions & 24 deletions fabrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,21 @@ static int nvme_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
int ret;

retry:
/*
* __create_discover_ctrl and callers depend on errno being set
* in the error case.
*/
errno = 0;
ret = nvmf_add_ctrl(h, c, cfg);
if (ret == EAGAIN || (ret == EINTR && !nvme_sigint_received)) {
printf("nvmf_add_ctrl returned '%s'\n", strerror(ret));
if (!ret)
return 0;

if (errno == EAGAIN || (errno == EINTR && !nvme_sigint_received)) {
print_debug("nvmf_add_ctrl returned '%s'\n", strerror(errno));
goto retry;
}

return ret;
return -errno;
}

static nvme_ctrl_t __create_discover_ctrl(nvme_root_t r, nvme_host_t h,
Expand All @@ -205,9 +213,7 @@ static nvme_ctrl_t __create_discover_ctrl(nvme_root_t r, nvme_host_t h,
strcmp(trcfg->subsysnqn, NVME_DISC_SUBSYS_NAME));
tmo = set_discovery_kato(cfg);

errno = 0;
ret = nvme_add_ctrl(h, c, cfg);

cfg->keep_alive_tmo = tmo;
if (ret) {
nvme_free_ctrl(c);
Expand Down Expand Up @@ -1079,10 +1085,8 @@ int nvmf_connect(const char *desc, int argc, char **argv)
return -errno;

h = nvme_lookup_host(r, hnqn, hid);
if (!h) {
errno = ENOMEM;
goto out_free;
}
if (!h)
return -ENOMEM;
if (hostkey)
nvme_host_set_dhchap_key(h, hostkey);
if (!trsvcid)
Expand All @@ -1103,37 +1107,33 @@ int nvmf_connect(const char *desc, int argc, char **argv)
c = lookup_ctrl(h, &trcfg);
if (c && nvme_ctrl_get_name(c) && !cfg.duplicate_connect) {
fprintf(stderr, "already connected\n");
errno = EALREADY;
goto out_free;
return -EALREADY;
}

c = nvme_create_ctrl(r, subsysnqn, transport, traddr,
cfg.host_traddr, cfg.host_iface, trsvcid);
if (!c) {
errno = ENOMEM;
goto out_free;
}
if (!c)
return -ENOMEM;

if (ctrlkey)
nvme_ctrl_set_dhchap_key(c, ctrlkey);

nvme_parse_tls_args(keyring, tls_key, tls_key_identity, &cfg, c);

errno = 0;
ret = nvme_add_ctrl(h, c, &cfg);
if (ret)
if (ret) {
fprintf(stderr, "could not add new controller: %s\n",
nvme_strerror(errno));
else {
errno = 0;
if (flags != -EINVAL)
nvme_show_connect_msg(c, flags);
nvme_strerror(-ret));
return ret;
}

out_free:
/* always print connected device */
nvme_show_connect_msg(c, flags);

if (dump_config)
nvme_dump_config(r);
return -errno;

return 0;
}

static nvme_ctrl_t lookup_nvme_ctrl(nvme_root_t r, const char *name)
Expand Down
10 changes: 6 additions & 4 deletions util/logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,9 @@ int nvme_submit_passthru(int fd, unsigned long ioctl_cmd,
if (!dry_run) {
retry:
err = ioctl(fd, ioctl_cmd, cmd);
if (err == EAGAIN || (err == EINTR && !nvme_sigint_received)) {
nvme_log_retry(err);
if (err && (errno == EAGAIN ||
(errno == EINTR && !nvme_sigint_received))) {
nvme_log_retry(errno);
goto retry;
}
}
Expand Down Expand Up @@ -148,8 +149,9 @@ int nvme_submit_passthru64(int fd, unsigned long ioctl_cmd,
if (!dry_run) {
retry:
err = ioctl(fd, ioctl_cmd, cmd);
if (err == EAGAIN || (err == EINTR && !nvme_sigint_received)) {
nvme_log_retry(err);
if (err && (errno == EAGAIN ||
(errno == EINTR && !nvme_sigint_received))) {
nvme_log_retry(errno);
goto retry;
}
}
Expand Down