diff mbox series

malloc: fix external heap allocation in no huge mode

Message ID 0a032f701099558dfbe4c9684df90874583a4544.1540465344.git.anatoly.burakov@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series malloc: fix external heap allocation in no huge mode |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Anatoly Burakov Oct. 25, 2018, 11:06 a.m. UTC 
  When no-huge mode is enabled, we always overwrite the socket ID to be
SOCKET_ID_ANY in rte_malloc, because there is no NUMA awareness in no-huge
mode. However, with external memory support, a socket ID may have other
meaning, and we cannot overwrite the socket ID in those cases.

Fixes: 65ff37b105f7 ("malloc: add function to check if socket is external")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/rte_malloc.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Thomas Monjalon Oct. 26, 2018, 8:27 p.m. UTC | #1 
25/10/2018 13:06, Anatoly Burakov:
> When no-huge mode is enabled, we always overwrite the socket ID to be
> SOCKET_ID_ANY in rte_malloc, because there is no NUMA awareness in no-huge
> mode. However, with external memory support, a socket ID may have other
> meaning, and we cannot overwrite the socket ID in those cases.
> 
> Fixes: 65ff37b105f7 ("malloc: add function to check if socket is external")
> 
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>

Applied, thanks
diff mbox series

Patch

diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c
index b27a8ad2e..9e61dc41b 100644
--- a/lib/librte_eal/common/rte_malloc.c
+++ b/lib/librte_eal/common/rte_malloc.c
@@ -46,7 +46,13 @@  rte_malloc_socket(const char *type, size_t size, unsigned int align,
 	if (size == 0 || (align && !rte_is_power_of_2(align)))
 		return NULL;
 
-	if (!rte_eal_has_hugepages())
+	/* if there are no hugepages and if we are not allocating from an
+	 * external heap, use memory from any socket available. checking for
+	 * socket being external may return -1 in case of invalid socket, but
+	 * that's OK - if there are no hugepages, it doesn't matter.
+	 */
+	if (rte_malloc_heap_socket_is_external(socket_arg) != 1 &&
+				!rte_eal_has_hugepages())
 		socket_arg = SOCKET_ID_ANY;
 
 	return malloc_heap_alloc(type, size, socket_arg, 0,