From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 40E533792 for ; Mon, 15 Aug 2016 20:17:10 +0200 (CEST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP; 15 Aug 2016 11:17:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,526,1464678000"; d="scan'208";a="156087295" Received: from jrharri1-mac01.ch.intel.com (HELO [127.0.0.1]) ([10.2.49.132]) by fmsmga004.fm.intel.com with ESMTP; 15 Aug 2016 11:17:09 -0700 From: Jim Harris To: dev@dpdk.org Date: Mon, 15 Aug 2016 11:17:09 -0700 Message-ID: <20160815181708.5586.26252.stgit@jrharri1-mac> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [dpdk-dev] [PATCH] contigmem: zero all pages during mmap X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 18:17:10 -0000 On Linux, all huge pages are zeroed by the kernel before first access by the DPDK application. But on FreeBSD, the contigmem driver would only zero the contiguous memory regions during initial driver load. DPDK commit b78c91751 eliminated the explicit memset() operation for rte_zmalloc(), which was OK on Linux because the kernel zeroes the pages during app start, but this broke FreeBSD. So this patch explicitly zeroes the pages before they are mmap'd, to ensure equivalent behavior to Linux Reported-by: Daniel Verkamp Tested-by: Daniel Verkamp Signed-off-by: Jim Harris --- lib/librte_eal/bsdapp/contigmem/contigmem.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/bsdapp/contigmem/contigmem.c b/lib/librte_eal/bsdapp/contigmem/contigmem.c index c6ca3b9..da971de 100644 --- a/lib/librte_eal/bsdapp/contigmem/contigmem.c +++ b/lib/librte_eal/bsdapp/contigmem/contigmem.c @@ -216,15 +216,19 @@ static int contigmem_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, vm_size_t size, struct vm_object **obj, int nprot) { + uint64_t buffer_index; + /* * The buffer index is encoded in the offset. Divide the offset by * PAGE_SIZE to get the index of the buffer requested by the user * app. */ - if ((*offset/PAGE_SIZE) >= contigmem_num_buffers) + buffer_index = *offset / PAGE_SIZE; + if (buffer_index >= contigmem_num_buffers) return EINVAL; - *offset = (vm_ooffset_t)vtophys(contigmem_buffers[*offset/PAGE_SIZE]); + 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);