From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gowrishankar Subject: [PATCH 2/2] eal/malloc: fix heap index to correctly insert memseg Date: Thu, 3 May 2018 15:41:36 +0530 Message-ID: References: Cc: Anatoly Burakov , dev@dpdk.org, Thomas Monjalon , Gowrishankar Muthukrishnan , stable@dpdk.org To: Sergio Gonzalez Monroy Return-path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by dpdk.org (Postfix) with ESMTP id B161734EF for ; Thu, 3 May 2018 12:11:49 +0200 (CEST) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w43A8qCG146905 for ; Thu, 3 May 2018 06:11:49 -0400 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 2hr08rgkdf-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 03 May 2018 06:11:48 -0400 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 3 May 2018 11:11:46 +0100 In-Reply-To: In-Reply-To: References: List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Gowrishankar Muthukrishnan When there are multiple memsegs created and adding new memseg would cause bigger heap size, its index in free_head list should be based on new size of heap. Currently, only the size of elem is accounted as in malloc_elem_free_list_insert. As heap total size gets bigger, list of those memsegs should be at the right index, so that malloc_heap_alloc would find suitable element for the requested memory size by applications. Fixes: b0489e7bca ("malloc: fix linear complexity") Cc: stable@dpdk.org Signed-off-by: Gowrishankar Muthukrishnan --- Eg. Below heap is in one numa socket, for the size of 1G (i.e 64*16MB). All corresponding malloc_elem are always added in heap index 8, as their size is always 16MB (and due to which, index is also 8 always). free_head = {{lh_first = 0x0}, {lh_first = 0x0}, {lh_first = 0x0}, { lh_first = 0x0}, {lh_first = 0x0}, {lh_first = 0x0}, {lh_first = 0x0}, { lh_first = 0x0}, {lh_first = 0x7efd3f000000}, {lh_first = 0x0}, {lh_first = 0x0}, { lh_first = 0x0}, {lh_first = 0x0}}, alloc_count = 6, total_size = 1073733632}, Ideally, this list of memsegs should ideally be at slot 12, as they grow heap for 1G. --- lib/librte_eal/common/malloc_heap.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c index 1cacf7f..f686e5e 100644 --- a/lib/librte_eal/common/malloc_heap.c +++ b/lib/librte_eal/common/malloc_heap.c @@ -105,10 +105,32 @@ ms->len - MALLOC_ELEM_OVERHEAD); end_elem = RTE_PTR_ALIGN_FLOOR(end_elem, RTE_CACHE_LINE_SIZE); const size_t elem_size = (uintptr_t)end_elem - (uintptr_t)start_elem; + size_t cur_idx, new_idx, heap_size; malloc_elem_init(start_elem, heap, ms, elem_size); malloc_elem_mkend(end_elem, start_elem); + + /* Compare heap index based on its current size as well as + * its new size with memseg added. If new size needs new index + * move its free_head to the new slot. + */ + cur_idx = malloc_elem_free_list_index(heap->total_size); + heap_size = heap->total_size + elem_size; + new_idx = malloc_elem_free_list_index(heap_size); + if (cur_idx != new_idx) { + heap->free_head[new_idx] = heap->free_head[cur_idx]; + memset(&heap->free_head[cur_idx], + 0, sizeof(heap->free_head[cur_idx])); + } + + /* malloc_elem_free_list_insert calculates index based on + * elem->size, hence we set elem->size as new heap size, + * while inserting this elem. After that, we reset elem->size + * to its original value. A minor hack though!. + */ + start_elem->size = heap_size; malloc_elem_free_list_insert(start_elem); + start_elem->size = elem_size; heap->total_size += elem_size; } -- 1.9.1