X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=memory.c;h=4a9dc4af212d05feee7b360c9fd6dd08ea6200f4;hp=be1fd24c8037623864333680c268770785f0e10b;hb=15cf40b2844caad4cf8da0cdaeddd132cd6adefc;hpb=ee56ad500f6692381e131cc37299d23fa910a24a diff --git a/memory.c b/memory.c index be1fd24c..4a9dc4af 100644 --- a/memory.c +++ b/memory.c @@ -1,8 +1,13 @@ /* * Memory helpers */ +#include +#include +#include #include +#ifndef FIO_NO_HAVE_SHM_H #include +#endif #include #include "fio.h" @@ -36,11 +41,13 @@ int fio_pin_memory(void) if (phys_mem) { if ((mlock_size + 128 * 1024 * 1024) > phys_mem) { mlock_size = phys_mem - 128 * 1024 * 1024; - log_info("fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20); + log_info("fio: limiting mlocked memory to %lluMB\n", + mlock_size >> 20); } } - pinned_mem = mmap(NULL, mlock_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | OS_MAP_ANON, 0, 0); + pinned_mem = mmap(NULL, mlock_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | OS_MAP_ANON, -1, 0); if (pinned_mem == MAP_FAILED) { perror("malloc locked mem"); pinned_mem = NULL; @@ -56,28 +63,37 @@ int fio_pin_memory(void) return 0; } -static int alloc_mem_shm(struct thread_data *td) +static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem) { - int flags = IPC_CREAT | SHM_R | SHM_W; + int flags = IPC_CREAT | S_IRUSR | S_IWUSR; + + if (td->o.mem_type == MEM_SHMHUGE) { + unsigned long mask = td->o.hugepage_size - 1; - if (td->o.mem_type == MEM_SHMHUGE) flags |= SHM_HUGETLB; + total_mem = (total_mem + mask) & ~mask; + } - td->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, flags); - dprint(FD_MEM, "shmget %zu, %d\n", td->orig_buffer_size, td->shm_id); + td->shm_id = shmget(IPC_PRIVATE, total_mem, flags); + dprint(FD_MEM, "shmget %u, %d\n", total_mem, td->shm_id); if (td->shm_id < 0) { td_verror(td, errno, "shmget"); - if (geteuid() != 0 && errno == ENOMEM) + if (geteuid() != 0 && (errno == ENOMEM || errno == EPERM)) log_err("fio: you may need to run this job as root\n"); if (td->o.mem_type == MEM_SHMHUGE) { - if (errno == EINVAL) - log_err("fio: check that you have free huge pages and that hugepage-size is correct.\n"); - else if (errno == ENOSYS) - log_err("fio: your system does not appear to support huge pages.\n"); - else if (errno == ENOMEM) - log_err("fio: no huge pages available, do you need to alocate some? See HOWTO.\n"); + if (errno == EINVAL) { + log_err("fio: check that you have free huge" + " pages and that hugepage-size is" + " correct.\n"); + } else if (errno == ENOSYS) { + log_err("fio: your system does not appear to" + " support huge pages.\n"); + } else if (errno == ENOMEM) { + log_err("fio: no huge pages available, do you" + " need to alocate some? See HOWTO.\n"); + } } - + return 1; } @@ -92,11 +108,27 @@ static int alloc_mem_shm(struct thread_data *td) return 0; } -static int alloc_mem_mmap(struct thread_data *td) +static void free_mem_shm(struct thread_data *td) +{ + struct shmid_ds sbuf; + + dprint(FD_MEM, "shmdt/ctl %d %p\n", td->shm_id, td->orig_buffer); + shmdt(td->orig_buffer); + shmctl(td->shm_id, IPC_RMID, &sbuf); +} + +static int alloc_mem_mmap(struct thread_data *td, size_t total_mem) { int flags = MAP_PRIVATE; - td->mmapfd = 0; + td->mmapfd = 1; + + if (td->o.mem_type == MEM_MMAPHUGE) { + unsigned long mask = td->o.hugepage_size - 1; + + flags |= MAP_HUGETLB; + total_mem = (total_mem + mask) & ~mask; + } if (td->mmapfile) { td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644); @@ -106,7 +138,7 @@ static int alloc_mem_mmap(struct thread_data *td) td->orig_buffer = NULL; return 1; } - if (ftruncate(td->mmapfd, td->orig_buffer_size) < 0) { + if (ftruncate(td->mmapfd, total_mem) < 0) { td_verror(td, errno, "truncate mmap file"); td->orig_buffer = NULL; return 1; @@ -114,9 +146,10 @@ static int alloc_mem_mmap(struct thread_data *td) } else flags |= OS_MAP_ANON; - td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, flags, td->mmapfd, 0); - dprint(FD_MEM, "mmap %zu/%d %p\n", td->orig_buffer_size, td->mmapfd, - td->orig_buffer); + td->orig_buffer = mmap(NULL, total_mem, PROT_READ | PROT_WRITE, flags, + td->mmapfd, 0); + dprint(FD_MEM, "mmap %u/%d %p\n", total_mem, td->mmapfd, + td->orig_buffer); if (td->orig_buffer == MAP_FAILED) { td_verror(td, errno, "mmap"); td->orig_buffer = NULL; @@ -124,44 +157,66 @@ static int alloc_mem_mmap(struct thread_data *td) close(td->mmapfd); unlink(td->mmapfile); } - + return 1; } return 0; } -static int alloc_mem_malloc(struct thread_data *td) +static void free_mem_mmap(struct thread_data *td, size_t total_mem) { - unsigned int bsize = td->orig_buffer_size; + dprint(FD_MEM, "munmap %u %p\n", total_mem, td->orig_buffer); + munmap(td->orig_buffer, td->orig_buffer_size); + if (td->mmapfile) { + close(td->mmapfd); + unlink(td->mmapfile); + free(td->mmapfile); + } +} - if (td->o.odirect) - bsize += page_mask; - - td->orig_buffer = malloc(bsize); - dprint(FD_MEM, "malloc %u %p\n", bsize, td->orig_buffer); - if (td->orig_buffer) - return 0; +static int alloc_mem_malloc(struct thread_data *td, size_t total_mem) +{ + td->orig_buffer = malloc(total_mem); + dprint(FD_MEM, "malloc %u %p\n", total_mem, td->orig_buffer); - return 1; + return td->orig_buffer == NULL; +} + +static void free_mem_malloc(struct thread_data *td) +{ + dprint(FD_MEM, "free malloc mem %p\n", td->orig_buffer); + free(td->orig_buffer); } /* - * Setup the buffer area we need for io. + * Set up the buffer area we need for io. */ int allocate_io_mem(struct thread_data *td) { + size_t total_mem; int ret = 0; if (td->io_ops->flags & FIO_NOIO) return 0; + total_mem = td->orig_buffer_size; + + if (td->o.odirect || td->o.mem_align || + (td->io_ops->flags & FIO_MEMALIGN)) { + total_mem += page_mask; + if (td->o.mem_align && td->o.mem_align > page_size) + total_mem += td->o.mem_align - page_size; + } + + dprint(FD_MEM, "Alloc %lu for buffers\n", (size_t) total_mem); + if (td->o.mem_type == MEM_MALLOC) - ret = alloc_mem_malloc(td); + ret = alloc_mem_malloc(td, total_mem); else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE) - ret = alloc_mem_shm(td); + ret = alloc_mem_shm(td, total_mem); else if (td->o.mem_type == MEM_MMAP || td->o.mem_type == MEM_MMAPHUGE) - ret = alloc_mem_mmap(td); + ret = alloc_mem_mmap(td, total_mem); else { log_err("fio: bad mem type: %d\n", td->o.mem_type); ret = 1; @@ -175,27 +230,21 @@ int allocate_io_mem(struct thread_data *td) void free_io_mem(struct thread_data *td) { - if (td->o.mem_type == MEM_MALLOC) { - dprint(FD_MEM, "free mem %p\n", td->orig_buffer); - free(td->orig_buffer); - } else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE) { - struct shmid_ds sbuf; - - dprint(FD_MEM, "shmdt/ctl %d %p\n", td->shm_id,td->orig_buffer); - shmdt(td->orig_buffer); - shmctl(td->shm_id, IPC_RMID, &sbuf); - } else if (td->o.mem_type == MEM_MMAP || - td->o.mem_type == MEM_MMAPHUGE) { - dprint(FD_MEM, "munmap %zu %p\n", td->orig_buffer_size, - td->orig_buffer); - munmap(td->orig_buffer, td->orig_buffer_size); - if (td->mmapfile) { - close(td->mmapfd); - unlink(td->mmapfile); - free(td->mmapfile); - } - } else + unsigned int total_mem; + + total_mem = td->orig_buffer_size; + if (td->o.odirect) + total_mem += page_mask; + + if (td->o.mem_type == MEM_MALLOC) + free_mem_malloc(td); + else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE) + free_mem_shm(td); + else if (td->o.mem_type == MEM_MMAP || td->o.mem_type == MEM_MMAPHUGE) + free_mem_mmap(td, total_mem); + else log_err("Bad memory type %u\n", td->o.mem_type); td->orig_buffer = NULL; + td->orig_buffer_size = 0; }