Skip to content

mmap_registers: Made mmap functionality conditional on mmap support #3294

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
bgoing-micron-oss wants to merge 1 commit into from
+23 −6
Closed

mmap_registers: Made mmap functionality conditional on mmap support #3294

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@ conf.set(

conf.set('NVME_HAVE_SENDFILE', cc.has_function('sendfile'))

conf.set('NVME_HAVE_MMAP', cc.has_function('mmap'))

project_config_file = 'nvme-config.h'
nvme_config_h = configure_file(output: project_config_file, configuration: conf)
config_dep = declare_dependency(
Expand Down
27 changes: 21 additions & 6 deletions nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@

#include <linux/fs.h>

#include <sys/ioctl.h>
#ifdef NVME_HAVE_MMAP
#include <sys/mman.h>
#endif

#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>

Expand Down Expand Up @@ -257,6 +260,7 @@ struct nvme_args nvme_args = {
};

static void *mmap_registers(struct libnvme_transport_handle *hdl, bool writable);
static int munmap_registers(void *addr);

static OPT_VALS(feature_name) = {
VAL_BYTE("arbitration", NVME_FEAT_FID_ARBITRATION),
Expand Down Expand Up @@ -1107,7 +1111,7 @@ static int get_effects_log(int argc, char **argv, struct command *acmd, struct p

if (bar) {
cap = mmio_read64(bar + NVME_REG_CAP);
munmap(bar, getpagesize());
munmap_registers(bar);
} else {
nvme_init_get_property(&cmd, NVME_REG_CAP);
err = libnvme_submit_admin_passthru(hdl, &cmd);
Expand Down Expand Up @@ -5802,8 +5806,9 @@ static int nvme_get_properties(struct libnvme_transport_handle *hdl, void **pbar

static void *mmap_registers(struct libnvme_transport_handle *hdl, bool writable)
{
void *membase = NULL;
#ifdef NVME_HAVE_MMAP
char path[512];
void *membase;
int fd;
int prot = PROT_READ;

Expand Down Expand Up @@ -5832,9 +5837,19 @@ static void *mmap_registers(struct libnvme_transport_handle *hdl, bool writable)
}

close(fd);
#endif
return membase;
}

static int munmap_registers(void *addr)
{
#ifdef NVME_HAVE_MMAP
return munmap(addr, getpagesize());
#else
return 0;
#endif
}

static int show_registers(int argc, char **argv, struct command *acmd, struct plugin *plugin)
{
const char *desc = "Reads and shows the defined NVMe controller registers\n"
Expand Down Expand Up @@ -5886,7 +5901,7 @@ static int show_registers(int argc, char **argv, struct command *acmd, struct pl
if (cfg.fabrics)
free(bar);
else
munmap(bar, getpagesize());
munmap_registers(bar);

return 0;
}
Expand Down Expand Up @@ -6171,7 +6186,7 @@ static int get_register(int argc, char **argv, struct command *acmd, struct plug
if (fabrics)
free(bar);
else
munmap(bar, getpagesize());
munmap_registers(bar);

return err;
}
Expand Down Expand Up @@ -6455,7 +6470,7 @@ static int set_register(int argc, char **argv, struct command *acmd, struct plug
err = set_register_names(hdl, bar, opts, &cfg);

if (bar)
munmap(bar, getpagesize());
munmap_registers(bar);

return err;
}
Expand Down
Loading