X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=memory.c;h=443d71d4bbda3de4c2771c055c77abdd49442954;hp=d8924a85e0cf6e5a62af17feb638d953f10fbe64;hb=b9e1b49128450bcfd792165354b98026e3ac2734;hpb=2f9ade3cb72218eb260f4f5e6914218bdcaa2bcc diff --git a/memory.c b/memory.c index d8924a85..443d71d4 100644 --- a/memory.c +++ b/memory.c @@ -1,19 +1,23 @@ /* * Memory helpers */ +#include +#include +#include #include -#include #include #include "fio.h" -#include "os.h" +#ifndef FIO_NO_HAVE_SHM_H +#include +#endif -extern unsigned long long mlock_size; static void *pinned_mem; void fio_unpin_memory(void) { if (pinned_mem) { + dprint(FD_MEM, "unpinning %llu bytes\n", mlock_size); if (munlock(pinned_mem, mlock_size) < 0) perror("munlock"); munmap(pinned_mem, mlock_size); @@ -28,6 +32,8 @@ int fio_pin_memory(void) if (!mlock_size) return 0; + dprint(FD_MEM, "pinning %llu bytes\n", mlock_size); + /* * Don't allow mlock of more than real_mem-128MB */ @@ -35,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; - fprintf(f_out, "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; @@ -55,54 +63,197 @@ int fio_pin_memory(void) return 0; } -/* - * Setup the buffer area we need for io. - */ -int allocate_io_mem(struct thread_data *td) +static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem) { - if (td->mem_type == MEM_MALLOC) - td->orig_buffer = malloc(td->orig_buffer_size); - else if (td->mem_type == MEM_SHM) { - td->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, IPC_CREAT | 0600); - if (td->shm_id < 0) { - td_verror(td, errno); - perror("shmget"); - return 1; + int flags = IPC_CREAT | S_IRUSR | S_IWUSR; + + if (td->o.mem_type == MEM_SHMHUGE) { + unsigned long mask = td->o.hugepage_size - 1; + + flags |= SHM_HUGETLB; + total_mem = (total_mem + mask) & ~mask; + } + + 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 || 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"); + } } - td->orig_buffer = shmat(td->shm_id, NULL, 0); - if (td->orig_buffer == (void *) -1) { - td_verror(td, errno); - perror("shmat"); + return 1; + } + + td->orig_buffer = shmat(td->shm_id, NULL, 0); + dprint(FD_MEM, "shmat %d, %p\n", td->shm_id, td->orig_buffer); + if (td->orig_buffer == (void *) -1) { + td_verror(td, errno, "shmat"); + td->orig_buffer = NULL; + return 1; + } + + return 0; +} + +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 = 0; + + td->mmapfd = 1; + + 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->mmapfile) + flags |= MAP_HUGETLB; + total_mem = (total_mem + mask) & ~mask; + } + + if (td->mmapfile) { + td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644); + + if (td->mmapfd < 0) { + td_verror(td, errno, "open mmap file"); td->orig_buffer = NULL; return 1; } - } else if (td->mem_type == MEM_MMAP) { - td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | OS_MAP_ANON, 0, 0); - if (td->orig_buffer == MAP_FAILED) { - td_verror(td, errno); - perror("mmap"); + 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 | MAP_PRIVATE; + + td->orig_buffer = mmap(NULL, total_mem, PROT_READ | PROT_WRITE, flags, + td->mmapfd, 0); + 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); + } + + return 1; } return 0; } +static void free_mem_mmap(struct thread_data *td, size_t total_mem) +{ + 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) { + close(td->mmapfd); + unlink(td->mmapfile); + free(td->mmapfile); + } +} + +static int alloc_mem_malloc(struct thread_data *td, size_t total_mem) +{ + td->orig_buffer = malloc(total_mem); + dprint(FD_MEM, "malloc %llu %p\n", (unsigned long long) total_mem, + td->orig_buffer); + + 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); +} + +/* + * 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 %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) + 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, total_mem); + else { + log_err("fio: bad mem type: %d\n", td->o.mem_type); + ret = 1; + } + + if (ret) + td_verror(td, ENOMEM, "iomem allocation"); + + return ret; +} + void free_io_mem(struct thread_data *td) { - if (td->mem_type == MEM_MALLOC) - free(td->orig_buffer); - else if (td->mem_type == MEM_SHM) { - struct shmid_ds sbuf; - - shmdt(td->orig_buffer); - shmctl(td->shm_id, IPC_RMID, &sbuf); - } else if (td->mem_type == MEM_MMAP) - munmap(td->orig_buffer, td->orig_buffer_size); + 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 %d\n", td->mem_type); + log_err("Bad memory type %u\n", td->o.mem_type); td->orig_buffer = NULL; + td->orig_buffer_size = 0; }