Removed the use of MAP_HUGETLB for anonymous mapping on ppc64. The
MAP_HUGETLB had previously been added to workaround issues on IBM Power8
systems when mapping /dev/zero (see: commit
284ae3e9ff9a92575c28c858efd2c85c8de6d440). In the current code the
MAP_HUGETLB flag will cause the anonymous mapping to fail on Power9.
Note, Power8 is currently failing to correctly mmap Hugepages, with and
without this change.
Signed-off-by: David Wilder <dwil...@us.ibm.com>
Reviewed-by: Pradeep Satyanarayana <prad...@us.ibm.com>
---
This patch corrects problems with virtual address mapping on IBM Power9 system.
I have tested with primary and secondary process tests. IBM power8 systems
continue to fail with and without this change. I am perusing a fix for power8
and will post a patch when its working. As Power9 is our primary platform I
wanted to get this patch out. I will follow up with a power8 fix when its ready.
Please include this patch in 18.11 as well, this patch is not suitable
for 17.11.
lib/librte_eal/linuxapp/eal/eal_memalloc.c | 3 ---
lib/librte_eal/linuxapp/eal/eal_memory.c | 4 ----
2 files changed, 7 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
index 48b9c7360..784939566 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
@@ -753,9 +753,6 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
munmap(addr, alloc_sz);
unmapped:
flags = MAP_FIXED;
-#ifdef RTE_ARCH_PPC_64
- flags |= MAP_HUGETLB;
-#endif
new_addr = eal_get_virtual_area(addr, &alloc_sz, alloc_sz, 0, flags);
if (new_addr != addr) {
if (new_addr != NULL)
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c
b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 48b23ce19..6f94621d4 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -847,10 +847,6 @@ alloc_va_space(struct rte_memseg_list *msl)
void *addr;
int flags = 0;
-#ifdef RTE_ARCH_PPC_64
- flags |= MAP_HUGETLB;
-#endif
-
page_sz = msl->page_sz;
mem_sz = page_sz * msl->memseg_arr.len;
--
2.19.1
