Fix broken FIO_OPT_STR option

[fio.git] / memory.c

diff --git a/memory.c b/memory.c
index 9b49d3986fc78584743cc4e047cd11cdfdd7e4ac..7f4cef529a52e55ecbf099c0e23738943ab2b492 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -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) {