Skip to content

Commit 890ed95

Browse files
ikegami-tigaw
authored andcommitted
nvme: output nvme_alloc_huge() error message
Currently only the value -ENOMEM returned for the error. Signed-off-by: Tokunori Ikegami <[email protected]>
1 parent cb70bd3 commit 890ed95

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

nvme.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,8 +1626,10 @@ static int get_persistent_event_log(int argc, char **argv,
16261626
cfg.action = NVME_PEVENT_LOG_READ;
16271627

16281628
pevent_log_info = nvme_alloc_huge(cfg.log_len, &mh);
1629-
if (!pevent_log_info)
1629+
if (!pevent_log_info) {
1630+
nvme_show_error("failed to allocate huge memory");
16301631
return -ENOMEM;
1632+
}
16311633

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

51295131
fw_buf = nvme_alloc_huge(fw_size, &mh);
5130-
if (!fw_buf)
5132+
if (!fw_buf) {
5133+
nvme_show_error("failed to allocate huge memory");
51315134
return -ENOMEM;
5135+
}
51325136

51335137
if (read(fw_fd, fw_buf, fw_size) != ((ssize_t)(fw_size))) {
51345138
err = -errno;
@@ -8287,8 +8291,10 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
82878291
}
82888292

82898293
buffer = nvme_alloc_huge(buffer_size, &mh);
8290-
if (!buffer)
8294+
if (!buffer) {
8295+
nvme_show_error("failed to allocate huge memory");
82918296
return -ENOMEM;
8297+
}
82928298

82938299
if (cfg.metadata_size) {
82948300
mbuffer_size = ((unsigned long long)cfg.block_count + 1) * ms;
@@ -9199,8 +9205,10 @@ static int passthru(int argc, char **argv, bool admin,
91999205

92009206
if (cfg.data_len) {
92019207
data = nvme_alloc_huge(cfg.data_len, &mh);
9202-
if (!data)
9208+
if (!data) {
9209+
nvme_show_error("failed to allocate huge memory");
92039210
return -ENOMEM;
9211+
}
92049212

92059213
memset(data, cfg.prefill, cfg.data_len);
92069214
if (!cfg.read && !cfg.write) {
@@ -10241,8 +10249,10 @@ static int nvme_mi(int argc, char **argv, __u8 admin_opcode, const char *desc)
1024110249

1024210250
if (cfg.data_len) {
1024310251
data = nvme_alloc_huge(cfg.data_len, &mh);
10244-
if (!data)
10252+
if (!data) {
10253+
nvme_show_error("failed to allocate huge memory");
1024510254
return -ENOMEM;
10255+
}
1024610256

1024710257
if (send) {
1024810258
if (read(fd, data, cfg.data_len) < 0) {

0 commit comments

Comments
 (0)