Re: [PATCH 1/2] malloc: get rid of numa_socket field

[Neil Horman <nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>]

On Fri, Apr 18, 2014 at 02:56:17PM +0200, David Marchand wrote:
> We don't really need this field as it is only used when creating the memzone
> object associated to this heap.
> 
> Signed-off-by: David Marchand <david.marchand-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
Acked-by: Neil Horman <nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>

> ---
>  lib/librte_eal/common/include/rte_malloc_heap.h |    1 -
>  lib/librte_malloc/malloc_heap.c                 |   13 +++++--------
>  2 files changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/lib/librte_eal/common/include/rte_malloc_heap.h b/lib/librte_eal/common/include/rte_malloc_heap.h
> index d9e959d..ea2a3f5 100644
> --- a/lib/librte_eal/common/include/rte_malloc_heap.h
> +++ b/lib/librte_eal/common/include/rte_malloc_heap.h
> @@ -48,7 +48,6 @@ enum heap_state {
>   */
>  struct malloc_heap {
>  	enum heap_state volatile initialised;
> -	unsigned numa_socket;
>  	rte_spinlock_t lock;
>  	struct malloc_elem * volatile free_head;
>  	unsigned mz_count;
> diff --git a/lib/librte_malloc/malloc_heap.c b/lib/librte_malloc/malloc_heap.c
> index f4a0294..375f212 100644
> --- a/lib/librte_malloc/malloc_heap.c
> +++ b/lib/librte_malloc/malloc_heap.c
> @@ -82,6 +82,8 @@ malloc_heap_add_memzone(struct malloc_heap *heap, size_t size, unsigned align)
>  	/* ensure the data we want to allocate will fit in the memzone */
>  	const size_t min_size = size + align + MALLOC_ELEM_OVERHEAD * 2;
>  	const struct rte_memzone *mz = NULL;
> +	struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
> +	unsigned numa_socket = heap - mcfg->malloc_heaps;
>  
>  	size_t mz_size = min_size;
>  	if (mz_size < block_size)
> @@ -89,14 +91,14 @@ malloc_heap_add_memzone(struct malloc_heap *heap, size_t size, unsigned align)
>  
>  	char mz_name[RTE_MEMZONE_NAMESIZE];
>  	rte_snprintf(mz_name, sizeof(mz_name), "MALLOC_S%u_HEAP_%u",
> -			heap->numa_socket, heap->mz_count++);
> +		     numa_socket, heap->mz_count++);
>  
>  	/* try getting a block. if we fail and we don't need as big a block
>  	 * as given in the config, we can shrink our request and try again
>  	 */
>  	do {
> -		mz = rte_memzone_reserve(mz_name, mz_size,
> -				heap->numa_socket, mz_flags);
> +		mz = rte_memzone_reserve(mz_name, mz_size, numa_socket,
> +					 mz_flags);
>  		if (mz == NULL)
>  			mz_size /= 2;
>  	} while (mz == NULL && mz_size > min_size);
> @@ -141,11 +143,6 @@ malloc_heap_init(struct malloc_heap *heap)
>  			heap->mz_count = 0;
>  			heap->alloc_count = 0;
>  			heap->total_size = 0;
> -			/*
> -			 * Find NUMA socket of heap that is being initialised, so that
> -			 * malloc_heaps[n].numa_socket == n
> -			 */
> -			heap->numa_socket = heap - mcfg->malloc_heaps;
>  			rte_spinlock_init(&heap->lock);
>  			heap->initialised = INITIALISED;
>  		}
> -- 
> 1.7.10.4
> 
>