X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=memory.c;h=b5a71d5397fd852d42e2fb73f4d45b2a90d38e3b;hp=5f3c4fa56c3d54b7bfe5a797a67776e1027d7cd3;hb=e48676baa53074b429460c71fb2c9e0ac7ac7d8c;hpb=d0bdaf49eb3f4faa941d02274f2bd875a187e7d7;ds=sidebyside diff --git a/memory.c b/memory.c index 5f3c4fa5..b5a71d53 100644 --- a/memory.c +++ b/memory.c @@ -6,7 +6,6 @@ #include #include "fio.h" -#include "os.h" static void *pinned_mem; @@ -34,7 +33,7 @@ int fio_pin_memory(void) if (phys_mem) { if ((mlock_size + 128 * 1024 * 1024) > phys_mem) { mlock_size = phys_mem - 128 * 1024 * 1024; - fprintf(f_out, "fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20); + log_info("fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20); } } @@ -59,55 +58,61 @@ int fio_pin_memory(void) */ int allocate_io_mem(struct thread_data *td) { - if (td->mem_type == MEM_MALLOC) + if (td->o.mem_type == MEM_MALLOC) td->orig_buffer = malloc(td->orig_buffer_size); - else if (td->mem_type == MEM_SHM || td->mem_type == MEM_SHMHUGE) { + else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE) { int flags = IPC_CREAT | SHM_R | SHM_W; - if (td->mem_type == MEM_SHMHUGE) + if (td->o.mem_type == MEM_SHMHUGE) flags |= SHM_HUGETLB; td->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, flags); if (td->shm_id < 0) { - td_verror(td, errno); - perror("shmget"); + td_verror(td, errno, "shmget"); + if (geteuid() != 0 && errno == ENOMEM) + log_err("fio: you may need to run this job as root\n"); + if (errno == EINVAL && td->o.mem_type == MEM_SHMHUGE) + log_err("fio: check that you have free huge pages and that hugepage-size is correct.\n"); + return 1; } td->orig_buffer = shmat(td->shm_id, NULL, 0); if (td->orig_buffer == (void *) -1) { - td_verror(td, errno); - perror("shmat"); + td_verror(td, errno, "shmat"); td->orig_buffer = NULL; return 1; } - } else if (td->mem_type == MEM_MMAP || td->mem_type == MEM_MMAPHUGE) { + } else if (td->o.mem_type == MEM_MMAP || + td->o.mem_type == MEM_MMAPHUGE) { int flags = MAP_PRIVATE; - td->hugefd = 0; + td->mmapfd = 0; - if (td->mem_type == MEM_MMAPHUGE) { - fprintf(stderr, "file=%s\n", td->hugefile); - td->hugefd = open(td->hugefile, O_RDWR|O_CREAT, 0644); + if (td->mmapfile) { + td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644); - if (td->hugefd < 0) { - td_verror(td, errno); - perror("open huge file"); + if (td->mmapfd < 0) { + td_verror(td, errno, "open mmap file"); + td->orig_buffer = NULL; + return 1; + } + if (ftruncate(td->mmapfd, td->orig_buffer_size) < 0) { + td_verror(td, errno, "truncate mmap file"); td->orig_buffer = NULL; return 1; } } else flags |= OS_MAP_ANON; - fprintf(stderr, "mmaping %lu\n", (unsigned long) td->orig_buffer_size); - td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, flags, td->hugefd, 0); - fprintf(stderr, "mmaped %p\n", td->orig_buffer); + td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, flags, td->mmapfd, 0); if (td->orig_buffer == MAP_FAILED) { - td_verror(td, errno); - perror("mmap"); + td_verror(td, errno, "mmap"); td->orig_buffer = NULL; - if (td->hugefd) - close(td->hugefd); + if (td->mmapfd) { + close(td->mmapfd); + unlink(td->mmapfile); + } return 1; } @@ -118,22 +123,23 @@ int allocate_io_mem(struct thread_data *td) void free_io_mem(struct thread_data *td) { - if (td->mem_type == MEM_MALLOC) + if (td->o.mem_type == MEM_MALLOC) free(td->orig_buffer); - else if (td->mem_type == MEM_SHM || td->mem_type == MEM_SHMHUGE) { + else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE) { struct shmid_ds sbuf; shmdt(td->orig_buffer); shmctl(td->shm_id, IPC_RMID, &sbuf); - } else if (td->mem_type == MEM_MMAP || td->mem_type == MEM_MMAPHUGE) { + } else if (td->o.mem_type == MEM_MMAP || + td->o.mem_type == MEM_MMAPHUGE) { munmap(td->orig_buffer, td->orig_buffer_size); - if (td->mem_type == MEM_MMAPHUGE) { - close(td->hugefd); - unlink(td->hugefile); - free(td->hugefile); + if (td->mmapfile) { + close(td->mmapfd); + unlink(td->mmapfile); + free(td->mmapfile); } } else - log_err("Bad memory type %u\n", td->mem_type); + log_err("Bad memory type %u\n", td->o.mem_type); td->orig_buffer = NULL; }