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

env/vtophys: eliminate redundant error check

Browse Source 
Change-Id: I238b02e2df154b2ac40c746f156c0746f2518764
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-02-21 15:56:23 -07:00
parent 302804d164
commit f314f0ca4f
1 changed files with 8 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

@ -43,6 +43,8 @@
#include <rte_config.h> #include <rte_config.h>
#include <rte_eal_memconfig.h> #include <rte_eal_memconfig.h>
#include "spdk/assert.h"
/* x86-64 userspace virtual addresses use only the low 47 bits [0..46], /* x86-64 userspace virtual addresses use only the low 47 bits [0..46],
* which is enough to cover 128 TB. * which is enough to cover 128 TB.
*/ */
@ -344,9 +346,12 @@ spdk_vtophys(void *buf)
map_2mb = &map_1gb->map[idx_1gb]; map_2mb = &map_1gb->map[idx_1gb];
paddr_2mb = map_2mb->paddr_2mb; paddr_2mb = map_2mb->paddr_2mb;
if (paddr_2mb == SPDK_VTOPHYS_ERROR) {
return SPDK_VTOPHYS_ERROR;
}
/*
* SPDK_VTOPHYS_ERROR has all bits set, so if the lookup returned SPDK_VTOPHYS_ERROR,
* we will still bitwise-or it with the buf offset below, but the result will still be
* SPDK_VTOPHYS_ERROR.
*/
SPDK_STATIC_ASSERT(SPDK_VTOPHYS_ERROR == UINT64_C(-1), "SPDK_VTOPHYS_ERROR should be all 1s");
return paddr_2mb | ((uint64_t)buf & MASK_2MB); return paddr_2mb | ((uint64_t)buf & MASK_2MB);
} }