Commit 382bf2e8 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

env: Replace asserts with error code returns in vtophys 



Change-Id: Iffce947b4ccd13fd0747cdb9372fdb7587b1f5a2
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/375828


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent fdc397bc

lib/env_dpdk/vtophys.c

+20 −4
Original line number Diff line number Diff line
@@ -314,8 +314,16 @@ spdk_mem_map_set_translation(struct spdk_mem_map *map, uint64_t vaddr, uint64_t 
	uint16_t *ref_count;



	/* For now, only 2 MB-aligned registrations are supported */

	assert(size % (2 * 1024 * 1024) == 0);

	assert((vaddr & MASK_2MB) == 0);

	if ((uintptr_t)vaddr & ~MASK_128TB) {

		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;
@@ -357,8 +365,16 @@ spdk_mem_map_clear_translation(struct spdk_mem_map *map, uint64_t vaddr, uint64_ 
	uint16_t *ref_count;



	/* For now, only 2 MB-aligned registrations are supported */

	assert(size % (2 * 1024 * 1024) == 0);

	assert((vaddr & MASK_2MB) == 0);

	if ((uintptr_t)vaddr & ~MASK_128TB) {

		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;