[dpdk-dev] [PATCH 1/2] eal/ppc: fix mmap for memory initialization
Thomas Monjalon
thomas at monjalon.net
Thu Apr 20 09:39:09 CEST 2017
06/04/2017 12:06, Chao Zhu:
> On IBM POWER platform, when mapping /dev/zero file to hugepage memory
> space, mmap will not respect the requested address hint. This will cause
> the memory initilization for the second process fails. This patch adds
> the required mmap flags to make it work. Beside this, users need to set
> the nr_overcommit_hugepages to expand the VA range. When
> doing the initilization, users need to set both nr_hugepages and
> nr_overcommit_hugepages to the same value, like 64, 128, etc.
>
> Signed-off-by: Chao Zhu <chaozhu at linux.vnet.ibm.com>
> ---
> lib/librte_eal/linuxapp/eal/eal_memory.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c
> b/lib/librte_eal/linuxapp/eal/eal_memory.c index a956bb2..e06186b 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_memory.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
> @@ -313,7 +313,11 @@ int rte_xen_dom0_supported(void)
> }
> do {
> addr = mmap(addr,
> +#ifndef RTE_ARCH_PPC_64
> (*size) + hugepage_sz, PROT_READ, MAP_PRIVATE, fd, 0);
> +#else
> + (*size) + hugepage_sz, PROT_READ, MAP_PRIVATE |
> MAP_ANONYMOUS | MAP_HUGETLB, fd, 0); +#endif
> if (addr == MAP_FAILED)
> *size -= hugepage_sz;
> } while (addr == MAP_FAILED && *size > 0);
> @@ -1330,7 +1334,11 @@ static int huge_wrap_sigsetjmp(void)
> * use mmap to get identical addresses as the primary process.
> */
> base_addr = mmap(mcfg->memseg[s].addr, mcfg->memseg[s].len,
> +#ifndef RTE_ARCH_PPC_64
> PROT_READ, MAP_PRIVATE, fd_zero, 0);
> +#else
> + PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB,
> fd_zero, 0); +#endif
> if (base_addr == MAP_FAILED ||
> base_addr != mcfg->memseg[s].addr) {
> max_seg = s;
Indentation and line length are wrong.
Changed to this:
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -331,7 +331,13 @@ get_virtual_area(size_t *size, size_t hugepage_sz)
}
do {
addr = mmap(addr,
- (*size) + hugepage_sz, PROT_READ, MAP_PRIVATE,
fd, 0);
+ (*size) + hugepage_sz, PROT_READ,
+#ifdef RTE_ARCH_PPC_64
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB,
+#else
+ MAP_PRIVATE,
+#endif
+ fd, 0);
if (addr == MAP_FAILED)
*size -= hugepage_sz;
} while (addr == MAP_FAILED && *size > 0);
@@ -1359,7 +1365,13 @@ rte_eal_hugepage_attach(void)
* use mmap to get identical addresses as the primary process.
*/
base_addr = mmap(mcfg->memseg[s].addr, mcfg->memseg[s].len,
- PROT_READ, MAP_PRIVATE, fd_zero, 0);
+ PROT_READ,
+#ifdef RTE_ARCH_PPC_64
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB,
+#else
+ MAP_PRIVATE,
+#endif
+ fd_zero, 0);
if (base_addr == MAP_FAILED ||
base_addr != mcfg->memseg[s].addr) {
max_seg = s;
More information about the dev
mailing list