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

env: Replace asserts with error code returns in vtophys

Browse Source 
Change-Id: Iffce947b4ccd13fd0747cdb9372fdb7587b1f5a2
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/375828
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Ben Walker 2017-08-25 13:33:07 -07:00 committed by Jim Harris
parent fdc397bc2d
commit 382bf2e894
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/env_dpdk/vtophys.c
View File

@ -314,8 +314,16 @@ spdk_mem_map_set_translation(struct spdk_mem_map *map, uint64_t vaddr, uint64_t
uint16_t *ref_count; uint16_t *ref_count;
/* For now, only 2 MB-aligned registrations are supported */ /* For now, only 2 MB-aligned registrations are supported */
assert(size % (2 * 1024 * 1024) == 0); if ((uintptr_t)vaddr & ~MASK_128TB) {
assert((vaddr & MASK_2MB) == 0); DEBUG_PRINT("invalid usermode virtual address %lu\n", vaddr);
return -EINVAL;
}
if (((uintptr_t)vaddr & MASK_2MB) || (size & MASK_2MB)) {
DEBUG_PRINT("invalid %s parameters, vaddr=%lu len=%ju\n",
__func__, vaddr, size);
return -EINVAL;
}
vfn_2mb = vaddr >> SHIFT_2MB; vfn_2mb = vaddr >> SHIFT_2MB;
@ -357,8 +365,16 @@ spdk_mem_map_clear_translation(struct spdk_mem_map *map, uint64_t vaddr, uint64_
uint16_t *ref_count; uint16_t *ref_count;
/* For now, only 2 MB-aligned registrations are supported */ /* For now, only 2 MB-aligned registrations are supported */
assert(size % (2 * 1024 * 1024) == 0); if ((uintptr_t)vaddr & ~MASK_128TB) {
assert((vaddr & MASK_2MB) == 0); DEBUG_PRINT("invalid usermode virtual address %lu\n", vaddr);
return -EINVAL;
}
if (((uintptr_t)vaddr & MASK_2MB) || (size & MASK_2MB)) {
DEBUG_PRINT("invalid %s parameters, vaddr=%lu len=%ju\n",
__func__, vaddr, size);
return -EINVAL;
}
vfn_2mb = vaddr >> SHIFT_2MB; vfn_2mb = vaddr >> SHIFT_2MB;