Recent changes (master)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The following changes since commit 8425687edef1b2961a17bd58341686f7b598cf28:

  Use unique seed for zipf/pareto init if rand_repeat is not set (2012-11-17 10:06:36 -0700)

are available in the git repository at:
  git://git.kernel.dk/fio.git master

Jens Axboe (1):
      memory: wire up mmap huge page support

 memory.c |    7 +++++++
 os/os.h  |    1 +
 2 files changed, 8 insertions(+), 0 deletions(-)

---

Diff of recent changes:

diff --git a/memory.c b/memory.c
index 82a79bd..b4ee475 100644
--- a/memory.c
+++ b/memory.c
@@ -121,6 +121,13 @@ static int alloc_mem_mmap(struct thread_data *td, size_t total_mem)
 
 	td->mmapfd = 1;
 
+	if (td->o.mem_type == MEM_MMAPHUGE) {
+		unsigned long mask = td->o.hugepage_size - 1;
+
+		flags |= MAP_HUGETLB;
+		total_mem = (total_mem + mask) & ~mask;
+	}
+
 	if (td->mmapfile) {
 		td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
 
diff --git a/os/os.h b/os/os.h
index c6da0c3..f783e92 100644
--- a/os/os.h
+++ b/os/os.h
@@ -95,6 +95,7 @@ typedef unsigned long os_cpu_mask_t;
 
 #ifndef FIO_HAVE_HUGETLB
 #define SHM_HUGETLB			0
+#define MAP_HUGETLB			0
 #ifndef FIO_HUGE_PAGE
 #define FIO_HUGE_PAGE			0
 #endif
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux SCSI]     [Linux IDE]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux