ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env/vtophys: combine DPDK physical address lookups

Browse Source 
vtophys_get_paddr() and vtophys_get_dpdk_paddr() are doing similar
things; combine them into one function that works for all DPDK
memory addresses.

Part of the vtophys test is temporarily disabled until the next commit,
which will register all DPDK memory at startup and stop lookiing up
addresses at runtime.

Change-Id: I91312837aa1e6170bacaf3b0d2adbdc4391d3afa
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-02-21 15:37:20 -07:00
parent 6ea5280b04
commit 7336c0036e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/env_dpdk/vtophys.c
View File

@ -166,6 +166,11 @@ vtophys_get_paddr(uint64_t vaddr)
struct rte_memseg *seg; struct rte_memseg *seg;
uint32_t seg_idx; uint32_t seg_idx;
paddr = vtophys_get_dpdk_paddr((void *)vaddr);
if (paddr != RTE_BAD_PHYS_ADDR) {
return paddr;
}
mcfg = rte_eal_get_configuration()->mem_config; mcfg = rte_eal_get_configuration()->mem_config;
for (seg_idx = 0; seg_idx < RTE_MAX_MEMSEG; seg_idx++) { for (seg_idx = 0; seg_idx < RTE_MAX_MEMSEG; seg_idx++) {
@ -267,11 +272,11 @@ spdk_vtophys_register(void *vaddr, uint64_t len)
len = len >> SHIFT_2MB; len = len >> SHIFT_2MB;
while (len > 0) { while (len > 0) {
void *vaddr = (void *)(vfn_2mb << SHIFT_2MB); uint64_t vaddr = vfn_2mb << SHIFT_2MB;
uint64_t paddr = vtophys_get_dpdk_paddr(vaddr); uint64_t paddr = vtophys_get_paddr(vaddr);
if (paddr == RTE_BAD_PHYS_ADDR) { if (paddr == RTE_BAD_PHYS_ADDR) {
fprintf(stderr, "could not get phys addr for %p\n", vaddr); fprintf(stderr, "could not get phys addr for 0x%" PRIx64 "\n", vaddr);
return; return;
} }

4
test/lib/env/vtophys/vtophys.c vendored
View File

@ -41,11 +41,14 @@
static int static int
vtophys_negative_test(void) vtophys_negative_test(void)
{ {
#if 0
void *p = NULL; void *p = NULL;
int i; int i;
unsigned int size = 1; unsigned int size = 1;
#endif
int rc = 0; int rc = 0;
#if 0 /* Temporarily disabled until DPDK memory is registered at startup */
for (i = 0; i < 31; i++) { for (i = 0; i < 31; i++) {
p = malloc(size); p = malloc(size);
if (p == NULL) if (p == NULL)
@ -61,6 +64,7 @@ vtophys_negative_test(void)
free(p); free(p);
size = size << 1; size = size << 1;
} }
#endif
/* Test addresses that are not in the valid x86-64 usermode range */ /* Test addresses that are not in the valid x86-64 usermode range */