Skip to content

nvme: output nvme_alloc_huge() error message #2850

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 1 commit into from
Jun 30, 2025
Merged

nvme: output nvme_alloc_huge() error message #2850

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,8 +1626,10 @@ static int get_persistent_event_log(int argc, char **argv,
cfg.action = NVME_PEVENT_LOG_READ;

pevent_log_info = nvme_alloc_huge(cfg.log_len, &mh);
if (!pevent_log_info)
if (!pevent_log_info) {
nvme_show_error("failed to allocate huge memory");
return -ENOMEM;
}

err = nvme_cli_get_log_persistent_event(dev, cfg.action,
cfg.log_len, pevent_log_info);
Expand Down Expand Up @@ -5127,8 +5129,10 @@ static int fw_download(int argc, char **argv, struct command *cmd, struct plugin
fw_size, cfg.xfer);

fw_buf = nvme_alloc_huge(fw_size, &mh);
if (!fw_buf)
if (!fw_buf) {
nvme_show_error("failed to allocate huge memory");
return -ENOMEM;
}

if (read(fw_fd, fw_buf, fw_size) != ((ssize_t)(fw_size))) {
err = -errno;
Expand Down Expand Up @@ -8260,8 +8264,10 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
}

buffer = nvme_alloc_huge(buffer_size, &mh);
if (!buffer)
if (!buffer) {
nvme_show_error("failed to allocate huge memory");
return -ENOMEM;
}

if (cfg.metadata_size) {
mbuffer_size = ((unsigned long long)cfg.block_count + 1) * ms;
Expand Down Expand Up @@ -9172,8 +9178,10 @@ static int passthru(int argc, char **argv, bool admin,

if (cfg.data_len) {
data = nvme_alloc_huge(cfg.data_len, &mh);
if (!data)
if (!data) {
nvme_show_error("failed to allocate huge memory");
return -ENOMEM;
}

memset(data, cfg.prefill, cfg.data_len);
if (!cfg.read && !cfg.write) {
Expand Down Expand Up @@ -10214,8 +10222,10 @@ static int nvme_mi(int argc, char **argv, __u8 admin_opcode, const char *desc)

if (cfg.data_len) {
data = nvme_alloc_huge(cfg.data_len, &mh);
if (!data)
if (!data) {
nvme_show_error("failed to allocate huge memory");
return -ENOMEM;
}

if (send) {
if (read(fd, data, cfg.data_len) < 0) {
Expand Down