Skip to content

Nvme blkdev nsid 2 #2667

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

Closed
ikegami-t wants to merge 2 commits into from
Closed

Nvme blkdev nsid 2 #2667

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
192438f
nvme: add io-passthru command chardev handle error message
ikegami-t Jan 20, 2025
6faa333
nvme: add compare, read and compare commands chardev handle error mes…
ikegami-t Jan 20, 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
31 changes: 22 additions & 9 deletions nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8153,10 +8153,9 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
gettimeofday(&end_time, NULL);
if (cfg.latency)
printf(" latency: %s: %llu us\n", command, elapsed_utime(start_time, end_time));
if (err < 0) {
nvme_show_error("submit-io: %s", nvme_strerror(errno));
} else if (err) {
nvme_show_status(err);

if (err) {
io_cmd_show_error(dev, err, "submit-io");
} else {
if (!(opcode & 1) && write(dfd, (void *)buffer, buffer_size) < 0) {
nvme_show_error("write: %s: failed to write buffer to output file",
Expand Down Expand Up @@ -8816,6 +8815,22 @@ static void passthru_print_read_output(struct passthru_config cfg, void *data, i
}
}

static void admin_cmd_show_error(struct nvme_dev *dev, int err, const char *cmd)
{
if (err < 0)
nvme_show_error("%s: %s", cmd, nvme_strerror(errno));
else
nvme_show_status(err);
}

static void passthru_show_error(struct nvme_dev *dev, int err, bool admin, const char *cmd)
{
if (admin)
admin_cmd_show_error(dev, err, cmd);
else
io_cmd_show_error(dev, err, cmd);
}

static int passthru(int argc, char **argv, bool admin,
const char *desc, struct command *cmd)
{
Expand Down Expand Up @@ -9020,11 +9035,9 @@ static int passthru(int argc, char **argv, bool admin,
strcmp(cmd_name, "Unknown") ? cmd_name : "Vendor Specific",
elapsed_utime(start_time, end_time));

if (err < 0) {
nvme_show_error("%s: %s", __func__, nvme_strerror(errno));
} else if (err) {
nvme_show_status(err);
} else {
if (err) {
passthru_show_error(dev, err, admin, __func__);
} else {
fprintf(stderr, "%s Command %s is Success and result: 0x%08x\n", admin ? "Admin" : "IO",
strcmp(cmd_name, "Unknown") ? cmd_name : "Vendor Specific", result);
if (cfg.read)
Expand Down
Loading