[PATCH] Fix hugetlb problems

[fio.git] / memory.c

diff --git a/memory.c b/memory.c
index 39dc250c52ba052800eeea1ed9815282b427a006..d336c2bcb8cea017b6d9db980e3c39a95d70c717 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -61,8 +61,13 @@ int allocate_io_mem(struct thread_data *td)
 {
        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);
+       else if (td->mem_type == MEM_SHM || td->mem_type == MEM_SHMHUGE) {
+               int flags = IPC_CREAT | SHM_R | SHM_W;
+
+               if (td->mem_type == MEM_SHMHUGE)
+                       flags |= SHM_HUGETLB;
+
+               td->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, flags);
                if (td->shm_id < 0) {
                        td_verror(td, errno);
                        perror("shmget");
@@ -93,7 +98,7 @@ 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) {
+       else if (td->mem_type == MEM_SHM || td->mem_type == MEM_SHMHUGE) {
                struct shmid_ds sbuf;
 
                shmdt(td->orig_buffer);