git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnxt: fix VF resource allocation
[dpdk.git]
/
test
/
test
/
test_malloc.c
diff --git
a/test/test/test_malloc.c
b/test/test/test_malloc.c
index
d23192c
..
4b5abb4
100644
(file)
--- a/
test/test/test_malloc.c
+++ b/
test/test/test_malloc.c
@@
-12,6
+12,7
@@
#include <rte_common.h>
#include <rte_memory.h>
#include <rte_common.h>
#include <rte_memory.h>
+#include <rte_eal_memconfig.h>
#include <rte_per_lcore.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_launch.h>
#include <rte_eal.h>
@@
-378,7
+379,7
@@
test_realloc(void)
printf("NULL pointer returned from rte_zmalloc\n");
return -1;
}
printf("NULL pointer returned from rte_zmalloc\n");
return -1;
}
- s
nprintf(ptr1, size1, "%s" ,hello_str
);
+ s
trlcpy(ptr1, hello_str, size1
);
char *ptr2 = rte_realloc(ptr1, size2, RTE_CACHE_LINE_SIZE);
if (!ptr2){
rte_free(ptr1);
char *ptr2 = rte_realloc(ptr1, size2, RTE_CACHE_LINE_SIZE);
if (!ptr2){
rte_free(ptr1);
@@
-705,20
+706,22
@@
err_return:
return -1;
}
return -1;
}
+static int
+check_socket_mem(const struct rte_memseg_list *msl, void *arg)
+{
+ int32_t *socket = arg;
+
+ return *socket == msl->socket_id;
+}
+
/* Check if memory is available on a specific socket */
static int
is_mem_on_socket(int32_t socket)
{
/* Check if memory is available on a specific socket */
static int
is_mem_on_socket(int32_t socket)
{
- const struct rte_memseg *ms = rte_eal_get_physmem_layout();
- unsigned i;
-
- for (i = 0; i < RTE_MAX_MEMSEG; i++) {
- if (socket == ms[i].socket_id)
- return 1;
- }
- return 0;
+ return rte_memseg_list_walk(check_socket_mem, &socket);
}
}
+
/*
* Find what socket a memory address is on. Only works for addresses within
* memsegs, not heap or stack...
/*
* Find what socket a memory address is on. Only works for addresses within
* memsegs, not heap or stack...
@@
-726,16
+729,9
@@
is_mem_on_socket(int32_t socket)
static int32_t
addr_to_socket(void * addr)
{
static int32_t
addr_to_socket(void * addr)
{
- const struct rte_memseg *ms = rte_
eal_get_physmem_layout(
);
-
unsigned i
;
+ const struct rte_memseg *ms = rte_
mem_virt2memseg(addr, NULL
);
+
return ms == NULL ? -1 : ms->socket_id
;
- for (i = 0; i < RTE_MAX_MEMSEG; i++) {
- if ((ms[i].addr <= addr) &&
- ((uintptr_t)addr <
- ((uintptr_t)ms[i].addr + (uintptr_t)ms[i].len)))
- return ms[i].socket_id;
- }
- return -1;
}
/* Test using rte_[c|m|zm]alloc_socket() on a specific socket */
}
/* Test using rte_[c|m|zm]alloc_socket() on a specific socket */