X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=memory.c;h=39fb9f237bb6fcb3d2a378997ed6debe71e2f236;hb=3f77f72359e90175d86d549e82c9b2a3488df6dc;hp=d3ef2cba9adda00bf9ab4f8d7bff9a7a47889665;hpb=829a602cdc0a1a1264b51310ba4df694f47e57f8;p=fio.git

diff --git a/memory.c b/memory.c
index d3ef2cba..39fb9f23 100644
--- 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);
 		}
 	}
@@ -63,16 +63,20 @@ 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;
 
-	if (td->o.mem_type == MEM_SHMHUGE)
 		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) {
@@ -177,7 +181,7 @@ 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)
 {
@@ -188,8 +192,13 @@ 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 ||
+	    (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;
+	}
 
 	if (td->o.mem_type == MEM_MALLOC)
 		ret = alloc_mem_malloc(td, total_mem);