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

env/vtophys: only print errors in debug builds

Browse Source 
Change-Id: Iaff2b81f0427b27d89e71ee3090bbcf8ec7576e0
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-02-21 16:58:06 -07:00
parent b08738fe92
commit fd63bcdca8
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/env_dpdk/vtophys.c
View File

@ -120,7 +120,9 @@ vtophys_get_map_1gb(uint64_t vfn_2mb)
pthread_mutex_unlock(&vtophys_mutex); pthread_mutex_unlock(&vtophys_mutex);
if (!map_1gb) { if (!map_1gb) {
#ifdef DEBUG
printf("allocation failed\n"); printf("allocation failed\n");
#endif
return NULL; return NULL;
} }
} }
@ -176,7 +178,9 @@ vtophys_get_paddr(uint64_t vaddr)
} }
} }
#ifdef DEBUG
fprintf(stderr, "could not find vaddr 0x%" PRIx64 " in DPDK mem config\n", vaddr); fprintf(stderr, "could not find vaddr 0x%" PRIx64 " in DPDK mem config\n", vaddr);
#endif
return SPDK_VTOPHYS_ERROR; return SPDK_VTOPHYS_ERROR;
} }
@ -189,13 +193,17 @@ _spdk_vtophys_register_one(uint64_t vfn_2mb, uint64_t paddr)
uint16_t *ref_count; uint16_t *ref_count;
if (paddr & MASK_2MB) { if (paddr & MASK_2MB) {
#ifdef DEBUG
fprintf(stderr, "invalid paddr 0x%" PRIx64 " - must be 2MB aligned\n", paddr); fprintf(stderr, "invalid paddr 0x%" PRIx64 " - must be 2MB aligned\n", paddr);
#endif
return; return;
} }
map_1gb = vtophys_get_map_1gb(vfn_2mb); map_1gb = vtophys_get_map_1gb(vfn_2mb);
if (!map_1gb) { if (!map_1gb) {
#ifdef DEBUG
fprintf(stderr, "could not get vfn_2mb %p map\n", (void *)vfn_2mb); fprintf(stderr, "could not get vfn_2mb %p map\n", (void *)vfn_2mb);
#endif
return; return;
} }
@ -203,8 +211,10 @@ _spdk_vtophys_register_one(uint64_t vfn_2mb, uint64_t paddr)
ref_count = &map_1gb->ref_count[idx_1gb]; ref_count = &map_1gb->ref_count[idx_1gb];
if (*ref_count == VTOPHYS_MAX_REF_COUNT) { if (*ref_count == VTOPHYS_MAX_REF_COUNT) {
#ifdef DEBUG
fprintf(stderr, "ref count for %p already at %d\n", fprintf(stderr, "ref count for %p already at %d\n",
(void *)(vfn_2mb << SHIFT_2MB), VTOPHYS_MAX_REF_COUNT); (void *)(vfn_2mb << SHIFT_2MB), VTOPHYS_MAX_REF_COUNT);
#endif
return; return;
} }
@ -223,7 +233,9 @@ _spdk_vtophys_unregister_one(uint64_t vfn_2mb)
map_1gb = vtophys_get_map_1gb(vfn_2mb); map_1gb = vtophys_get_map_1gb(vfn_2mb);
if (!map_1gb) { if (!map_1gb) {
#ifdef DEBUG
fprintf(stderr, "could not get vfn_2mb %p map\n", (void *)vfn_2mb); fprintf(stderr, "could not get vfn_2mb %p map\n", (void *)vfn_2mb);
#endif
return; return;
} }
@ -231,7 +243,9 @@ _spdk_vtophys_unregister_one(uint64_t vfn_2mb)
ref_count = &map_1gb->ref_count[idx_1gb]; ref_count = &map_1gb->ref_count[idx_1gb];
if (map_2mb->paddr_2mb == SPDK_VTOPHYS_ERROR || *ref_count == 0) { if (map_2mb->paddr_2mb == SPDK_VTOPHYS_ERROR || *ref_count == 0) {
#ifdef DEBUG
fprintf(stderr, "vaddr %p not registered\n", (void *)(vfn_2mb << SHIFT_2MB)); fprintf(stderr, "vaddr %p not registered\n", (void *)(vfn_2mb << SHIFT_2MB));
#endif
return; return;
} }
@ -247,13 +261,17 @@ spdk_vtophys_register(void *vaddr, uint64_t len)
uint64_t vfn_2mb; uint64_t vfn_2mb;
if ((uintptr_t)vaddr & ~MASK_128TB) { if ((uintptr_t)vaddr & ~MASK_128TB) {
#ifdef DEBUG
printf("invalid usermode virtual address %p\n", vaddr); printf("invalid usermode virtual address %p\n", vaddr);
#endif
return; return;
} }
if (((uintptr_t)vaddr & MASK_2MB) || (len & MASK_2MB)) { if (((uintptr_t)vaddr & MASK_2MB) || (len & MASK_2MB)) {
#ifdef DEBUG
fprintf(stderr, "invalid %s parameters, vaddr=%p len=%ju\n", fprintf(stderr, "invalid %s parameters, vaddr=%p len=%ju\n",
__func__, vaddr, len); __func__, vaddr, len);
#endif
return; return;
} }
@ -265,7 +283,9 @@ spdk_vtophys_register(void *vaddr, uint64_t len)
uint64_t paddr = vtophys_get_paddr(vaddr); uint64_t paddr = vtophys_get_paddr(vaddr);
if (paddr == RTE_BAD_PHYS_ADDR) { if (paddr == RTE_BAD_PHYS_ADDR) {
#ifdef DEBUG
fprintf(stderr, "could not get phys addr for 0x%" PRIx64 "\n", vaddr); fprintf(stderr, "could not get phys addr for 0x%" PRIx64 "\n", vaddr);
#endif
return; return;
} }
@ -281,13 +301,17 @@ spdk_vtophys_unregister(void *vaddr, uint64_t len)
uint64_t vfn_2mb; uint64_t vfn_2mb;
if ((uintptr_t)vaddr & ~MASK_128TB) { if ((uintptr_t)vaddr & ~MASK_128TB) {
#ifdef DEBUG
printf("invalid usermode virtual address %p\n", vaddr); printf("invalid usermode virtual address %p\n", vaddr);
#endif
return; return;
} }
if (((uintptr_t)vaddr & MASK_2MB) || (len & MASK_2MB)) { if (((uintptr_t)vaddr & MASK_2MB) || (len & MASK_2MB)) {
#ifdef DEBUG
fprintf(stderr, "invalid %s parameters, vaddr=%p len=%ju\n", fprintf(stderr, "invalid %s parameters, vaddr=%p len=%ju\n",
__func__, vaddr, len); __func__, vaddr, len);
#endif
return; return;
} }
@ -331,7 +355,9 @@ spdk_vtophys(void *buf)
vaddr = (uint64_t)buf; vaddr = (uint64_t)buf;
if (spdk_unlikely(vaddr & ~MASK_128TB)) { if (spdk_unlikely(vaddr & ~MASK_128TB)) {
#ifdef DEBUG
printf("invalid usermode virtual address %p\n", buf); printf("invalid usermode virtual address %p\n", buf);
#endif
return SPDK_VTOPHYS_ERROR; return SPDK_VTOPHYS_ERROR;
} }