use normal alloc for fw download

Huge pages are only helpful for large transfers that may exceed the
driver's max segment limit. Unless a fw download wants to exceed that
transfer length, use normal allocation.

Link: https://github.com/linux-nvme/nvme-cli/issues/775
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/nvme.c b/nvme.c
index 6d160ed100e2d8910d6ade5fdeba0cf3e509fe89..e08351c027f2f631ebf183c7e7811542d8aff132 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -99,9 +99,9 @@ static void *__nvme_alloc(size_t len, bool *huge)
        return NULL;
 }
 
-#ifdef LIBHUGETLBFS
 #define HUGE_MIN 0x80000
 
+#ifdef LIBHUGETLBFS
 void nvme_free(void *p, bool huge)
 {
        if (huge)
@@ -2262,7 +2262,14 @@ static int fw_download(int argc, char **argv, struct command *cmd, struct plugin
                goto close_fw_fd;
        }
 
-       fw_buf = nvme_alloc(fw_size, &huge);
+       if (cfg.xfer == 0 || cfg.xfer % 4096)
+               cfg.xfer = 4096;
+
+       if (cfg.xfer < HUGE_MIN)
+               fw_buf = __nvme_alloc(fw_size, &huge);
+       else
+               fw_buf = nvme_alloc(fw_size, &huge);
+
        if (!fw_buf) {
                fprintf(stderr, "No memory for f/w size:%d\n", fw_size);
                err = -ENOMEM;
@@ -2270,8 +2277,6 @@ static int fw_download(int argc, char **argv, struct command *cmd, struct plugin
        }
 
        buf = fw_buf;
-       if (cfg.xfer == 0 || cfg.xfer % 4096)
-               cfg.xfer = 4096;
        if (read(fw_fd, fw_buf, fw_size) != ((ssize_t)(fw_size))) {
                err = -errno;
                fprintf(stderr, "read :%s :%s\n", cfg.fw, strerror(errno));