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);
}
}
{
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) {
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);