[dpdk-dev] [PATCH] eal/bsd: don't zero the pages during mmap in contigmem

[Tiwei Bie]

Don't zero the pages during mmap in contigmem. Instead, zero the
pages after mmap in primary process. Otherwise, the multi-process
support will be broken, as the pages will be zeroed when secondary
processes map the memory.

Fixes: 82f931805506 ("contigmem: zero all pages during mmap")
Cc: sta...@dpdk.org

Signed-off-by: Tiwei Bie <tiwei....@intel.com>
---
 lib/librte_eal/bsdapp/contigmem/contigmem.c | 1 -
 lib/librte_eal/bsdapp/eal/eal_memory.c      | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eal/bsdapp/contigmem/contigmem.c 
b/lib/librte_eal/bsdapp/contigmem/contigmem.c
index da971debe..3826055f7 100644
--- a/lib/librte_eal/bsdapp/contigmem/contigmem.c
+++ b/lib/librte_eal/bsdapp/contigmem/contigmem.c
@@ -227,7 +227,6 @@ contigmem_mmap_single(struct cdev *cdev, vm_ooffset_t 
*offset, vm_size_t size,
        if (buffer_index >= contigmem_num_buffers)
                return EINVAL;
 
-       memset(contigmem_buffers[buffer_index], 0, contigmem_buffer_size);
        *offset = (vm_ooffset_t)vtophys(contigmem_buffers[buffer_index]);
        *obj = vm_pager_allocate(OBJT_DEVICE, cdev, size, nprot, *offset,
                        curthread->td_ucred);
diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c 
b/lib/librte_eal/bsdapp/eal/eal_memory.c
index 3614da8db..a2809d66a 100644
--- a/lib/librte_eal/bsdapp/eal/eal_memory.c
+++ b/lib/librte_eal/bsdapp/eal/eal_memory.c
@@ -36,6 +36,7 @@
 #include <sys/sysctl.h>
 #include <inttypes.h>
 #include <fcntl.h>
+#include <string.h>
 
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
@@ -121,6 +122,8 @@ rte_eal_hugepage_init(void)
                        seg->nrank = mcfg->nrank;
                        seg->socket_id = 0;
 
+                       memset(seg->addr, 0, seg->len);
+
                        RTE_LOG(INFO, EAL, "Mapped memory segment %u @ %p: 
physaddr:0x%"
                                        PRIx64", len %zu\n",
                                        seg_idx, addr, physaddr, 
hpi->hugepage_sz);
-- 
2.12.1