Fix broken FIO_OPT_STR option

[fio.git] / memory.c

diff --git a/memory.c b/memory.c
index d3ef2cba9adda00bf9ab4f8d7bff9a7a47889665..7f4cef529a52e55ecbf099c0e23738943ab2b492 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -39,7 +39,7 @@ 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",
+                       log_info("fio: limiting mlocked memory to %lluMB\n",
                                                        mlock_size >> 20);
                }
        }
@@ -65,14 +65,18 @@ static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem)
 {
        int flags = IPC_CREAT | SHM_R | SHM_W;
 
-       if (td->o.mem_type == MEM_SHMHUGE)
+       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)
+               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) {
@@ -188,8 +192,12 @@ int allocate_io_mem(struct thread_data *td)
                return 0;
 
        total_mem = td->orig_buffer_size;
-       if (td->o.odirect)
+
+       if (td->o.odirect || td->o.mem_align) {
                total_mem += page_mask;
+               if (td->o.mem_align && td->o.mem_align > page_size)
+                       total_mem += td->o.mem_align - page_size;
+       }
 
        if (td->o.mem_type == MEM_MALLOC)
                ret = alloc_mem_malloc(td, total_mem);