X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=memory.c;h=e06cab2900a531e1515308fb166e626b6076274f;hp=b94cd6df35feed843659bc9bf88921bf55ba9be4;hb=d7213923067aa49922962a469a691c3ec951064d;hpb=ca7e0ddb08fece35c95e9056ca877e0806f1e6ef diff --git a/memory.c b/memory.c index b94cd6df..e06cab29 100644 --- a/memory.c +++ b/memory.c @@ -5,56 +5,56 @@ #include #include #include -#include #include #include "fio.h" +#ifndef FIO_NO_HAVE_SHM_H +#include +#endif -static void *pinned_mem; - -void fio_unpin_memory(void) +void fio_unpin_memory(struct thread_data *td) { - if (pinned_mem) { - dprint(FD_MEM, "unpinning %llu bytes\n", mlock_size); - if (munlock(pinned_mem, mlock_size) < 0) + if (td->pinned_mem) { + dprint(FD_MEM, "unpinning %llu bytes\n", td->o.lockmem); + if (munlock(td->pinned_mem, td->o.lockmem) < 0) perror("munlock"); - munmap(pinned_mem, mlock_size); - pinned_mem = NULL; + munmap(td->pinned_mem, td->o.lockmem); + td->pinned_mem = NULL; } } -int fio_pin_memory(void) +int fio_pin_memory(struct thread_data *td) { unsigned long long phys_mem; - if (!mlock_size) + if (!td->o.lockmem) return 0; - dprint(FD_MEM, "pinning %llu bytes\n", mlock_size); + dprint(FD_MEM, "pinning %llu bytes\n", td->o.lockmem); /* * Don't allow mlock of more than real_mem-128MB */ phys_mem = os_phys_mem(); if (phys_mem) { - if ((mlock_size + 128 * 1024 * 1024) > phys_mem) { - mlock_size = phys_mem - 128 * 1024 * 1024; + if ((td->o.lockmem + 128 * 1024 * 1024) > phys_mem) { + td->o.lockmem = phys_mem - 128 * 1024 * 1024; log_info("fio: limiting mlocked memory to %lluMB\n", - mlock_size >> 20); + td->o.lockmem >> 20); } } - pinned_mem = mmap(NULL, mlock_size, PROT_READ | PROT_WRITE, + td->pinned_mem = mmap(NULL, td->o.lockmem, PROT_READ | PROT_WRITE, MAP_PRIVATE | OS_MAP_ANON, -1, 0); - if (pinned_mem == MAP_FAILED) { + if (td->pinned_mem == MAP_FAILED) { perror("malloc locked mem"); - pinned_mem = NULL; + td->pinned_mem = NULL; return 1; } - if (mlock(pinned_mem, mlock_size) < 0) { + if (mlock(td->pinned_mem, td->o.lockmem) < 0) { perror("mlock"); - munmap(pinned_mem, mlock_size); - pinned_mem = NULL; + munmap(td->pinned_mem, td->o.lockmem); + td->pinned_mem = NULL; return 1; } @@ -63,7 +63,7 @@ int fio_pin_memory(void) 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; @@ -115,38 +115,52 @@ static void free_mem_shm(struct thread_data *td) shmctl(td->shm_id, IPC_RMID, &sbuf); } -static int alloc_mem_mmap(struct thread_data *td, unsigned int total_mem) +static int alloc_mem_mmap(struct thread_data *td, size_t total_mem) { - int flags = MAP_PRIVATE; + int flags = 0; td->mmapfd = 1; - if (td->mmapfile) { - td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644); + if (td->o.mem_type == MEM_MMAPHUGE) { + unsigned long mask = td->o.hugepage_size - 1; + + /* TODO: make sure the file is a real hugetlbfs file */ + if (!td->o.mmapfile) + flags |= MAP_HUGETLB; + total_mem = (total_mem + mask) & ~mask; + } + + if (td->o.mmapfile) { + td->mmapfd = open(td->o.mmapfile, O_RDWR|O_CREAT, 0644); if (td->mmapfd < 0) { td_verror(td, errno, "open mmap file"); td->orig_buffer = NULL; return 1; } - if (ftruncate(td->mmapfd, total_mem) < 0) { + if (td->o.mem_type != MEM_MMAPHUGE && + ftruncate(td->mmapfd, total_mem) < 0) { td_verror(td, errno, "truncate mmap file"); td->orig_buffer = NULL; return 1; } + if (td->o.mem_type == MEM_MMAPHUGE) + flags |= MAP_SHARED; + else + flags |= MAP_PRIVATE; } else - flags |= OS_MAP_ANON; + flags |= OS_MAP_ANON | MAP_PRIVATE; 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); + dprint(FD_MEM, "mmap %llu/%d %p\n", (unsigned long long) total_mem, + td->mmapfd, td->orig_buffer); if (td->orig_buffer == MAP_FAILED) { td_verror(td, errno, "mmap"); td->orig_buffer = NULL; if (td->mmapfd) { close(td->mmapfd); - unlink(td->mmapfile); + unlink(td->o.mmapfile); } return 1; @@ -155,21 +169,23 @@ static int alloc_mem_mmap(struct thread_data *td, unsigned int total_mem) return 0; } -static void free_mem_mmap(struct thread_data *td, unsigned int total_mem) +static void free_mem_mmap(struct thread_data *td, size_t total_mem) { - dprint(FD_MEM, "munmap %u %p\n", total_mem, td->orig_buffer); + dprint(FD_MEM, "munmap %llu %p\n", (unsigned long long) total_mem, + td->orig_buffer); munmap(td->orig_buffer, td->orig_buffer_size); - if (td->mmapfile) { + if (td->o.mmapfile) { close(td->mmapfd); - unlink(td->mmapfile); - free(td->mmapfile); + unlink(td->o.mmapfile); + free(td->o.mmapfile); } } -static int alloc_mem_malloc(struct thread_data *td, unsigned int total_mem) +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); + dprint(FD_MEM, "malloc %llu %p\n", (unsigned long long) total_mem, + td->orig_buffer); return td->orig_buffer == NULL; } @@ -181,11 +197,11 @@ static void free_mem_malloc(struct thread_data *td) } /* - * 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) { - unsigned int total_mem; + size_t total_mem; int ret = 0; if (td->io_ops->flags & FIO_NOIO) @@ -200,6 +216,8 @@ int allocate_io_mem(struct thread_data *td) total_mem += td->o.mem_align - page_size; } + dprint(FD_MEM, "Alloc %llu for buffers\n", (unsigned long long) total_mem); + if (td->o.mem_type == MEM_MALLOC) ret = alloc_mem_malloc(td, total_mem); else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE)