[PATCH] mem: get memzone from any CPU socket when hugepages are disabled

[PATCH] mem: get memzone from any CPU socket when hugepages are disabled

[Adrien Mazarguil]

When huge pages are disabled, memory is allocated for a single, undefined
CPU socket using malloc(), causing rte_memzone_reserve_aligned() to fail
most of the time.

This patch causes that memory to use SOCKET_ID_ANY instead of 0, and allow
it to be used in place of any socket ID specified by user.

Signed-off-by: Adrien Mazarguil <adrien.mazarguil-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
---
 lib/librte_eal/common/eal_common_memzone.c | 1 +
 lib/librte_eal/linuxapp/eal/eal_memory.c   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c
index 5532f0d..9872070 100644
--- a/lib/librte_eal/common/eal_common_memzone.c
+++ b/lib/librte_eal/common/eal_common_memzone.c
@@ -150,6 +150,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, uint64_t len,
 
 		/* bad socket ID */
 		if (socket_id != SOCKET_ID_ANY &&
+		    free_memseg[i].socket_id != SOCKET_ID_ANY &&
 		    socket_id != free_memseg[i].socket_id)
 			continue;
 
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index ce0c2d8..d50726d 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -786,7 +786,7 @@ rte_eal_hugepage_init(void)
 		mcfg->memseg[0].phys_addr = (phys_addr_t)(uintptr_t)addr;
 		mcfg->memseg[0].addr = addr;
 		mcfg->memseg[0].len = internal_config.memory;
-		mcfg->memseg[0].socket_id = 0;
+		mcfg->memseg[0].socket_id = SOCKET_ID_ANY;
 		return 0;
 	}
 
-- 
1.7.12

Re: [PATCH] mem: get memzone from any CPU socket when hugepages are disabled

[Damien Millescamps]

On 07/26/2013 04:35 PM, Adrien Mazarguil wrote:
> When huge pages are disabled, memory is allocated for a single, undefined
> CPU socket using malloc(), causing rte_memzone_reserve_aligned() to fail
> most of the time.
>
> This patch causes that memory to use SOCKET_ID_ANY instead of 0, and allow
> it to be used in place of any socket ID specified by user.
>
> Signed-off-by: Adrien Mazarguil <adrien.mazarguil-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> ---
>  lib/librte_eal/common/eal_common_memzone.c | 1 +
>  lib/librte_eal/linuxapp/eal/eal_memory.c   | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
ack

Re: [PATCH] mem: get memzone from any CPU socket when hugepages are disabled

[Thomas Monjalon]

26/07/2013 16:56, Damien Millescamps :
> On 07/26/2013 04:35 PM, Adrien Mazarguil wrote:
> > When huge pages are disabled, memory is allocated for a single, undefined
> > CPU socket using malloc(), causing rte_memzone_reserve_aligned() to fail
> > most of the time.
> > 
> > This patch causes that memory to use SOCKET_ID_ANY instead of 0, and
> > allow it to be used in place of any socket ID specified by user.
> > 
> > Signed-off-by: Adrien Mazarguil <adrien.mazarguil-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> > ---
> > 
> >  lib/librte_eal/common/eal_common_memzone.c | 1 +
> >  lib/librte_eal/linuxapp/eal/eal_memory.c   | 2 +-
> >  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> ack

applied

-- 
Thomas