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

env_dpdk: make spdk_env_init return real errnos

Browse Source 
The header file already says it returns negative errnos,
but the env_dpdk implementation was just returning -1
on failure.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ie2236f83094672548327dba945b33e3f28fee338

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471421
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Jim Harris 2019-10-15 07:36:04 -07:00
parent e502b3d340
commit 37c0a02e1c
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/env_dpdk/init.c
View File

@ -40,6 +40,7 @@
#include <rte_config.h> #include <rte_config.h>
#include <rte_eal.h> #include <rte_eal.h>
#include <rte_errno.h>
#define SPDK_ENV_DPDK_DEFAULT_NAME "spdk" #define SPDK_ENV_DPDK_DEFAULT_NAME "spdk"
#define SPDK_ENV_DPDK_DEFAULT_SHM_ID -1 #define SPDK_ENV_DPDK_DEFAULT_SHM_ID -1
@ -389,15 +390,20 @@ spdk_build_eal_cmdline(const struct spdk_env_opts *opts)
int int
spdk_env_dpdk_post_init(void) spdk_env_dpdk_post_init(void)
{ {
int rc;
spdk_pci_init(); spdk_pci_init();
if (spdk_mem_map_init() < 0) { rc = spdk_mem_map_init();
if (rc < 0) {
fprintf(stderr, "Failed to allocate mem_map\n"); fprintf(stderr, "Failed to allocate mem_map\n");
return -1; return rc;
} }
if (spdk_vtophys_init() < 0) {
rc = spdk_vtophys_init();
if (rc < 0) {
fprintf(stderr, "Failed to initialize vtophys\n"); fprintf(stderr, "Failed to initialize vtophys\n");
return -1; return rc;
} }
return 0; return 0;
@ -423,7 +429,7 @@ spdk_env_init(const struct spdk_env_opts *opts)
rc = spdk_build_eal_cmdline(opts); rc = spdk_build_eal_cmdline(opts);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "Invalid arguments to initialize DPDK\n"); fprintf(stderr, "Invalid arguments to initialize DPDK\n");
return -1; return -EINVAL;
} }
printf("Starting %s / %s initialization...\n", SPDK_VERSION_STRING, rte_version()); printf("Starting %s / %s initialization...\n", SPDK_VERSION_STRING, rte_version());
@ -440,7 +446,7 @@ spdk_env_init(const struct spdk_env_opts *opts)
dpdk_args = calloc(g_eal_cmdline_argcount, sizeof(char *)); dpdk_args = calloc(g_eal_cmdline_argcount, sizeof(char *));
if (dpdk_args == NULL) { if (dpdk_args == NULL) {
fprintf(stderr, "Failed to allocate dpdk_args\n"); fprintf(stderr, "Failed to allocate dpdk_args\n");
return -1; return -ENOMEM;
} }
memcpy(dpdk_args, g_eal_cmdline, sizeof(char *) * g_eal_cmdline_argcount); memcpy(dpdk_args, g_eal_cmdline, sizeof(char *) * g_eal_cmdline_argcount);
@ -454,7 +460,7 @@ spdk_env_init(const struct spdk_env_opts *opts)
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "Failed to initialize DPDK\n"); fprintf(stderr, "Failed to initialize DPDK\n");
return -1; return -rte_errno;
} }
if (opts->shm_id < 0 && !opts->hugepage_single_segments) { if (opts->shm_id < 0 && !opts->hugepage_single_segments) {

4
lib/env_dpdk/memory.c
View File

@ -739,7 +739,7 @@ spdk_mem_map_init(void)
g_mem_reg_map = spdk_mem_map_alloc(0, NULL, NULL); g_mem_reg_map = spdk_mem_map_alloc(0, NULL, NULL);
if (g_mem_reg_map == NULL) { if (g_mem_reg_map == NULL) {
DEBUG_PRINT("memory registration map allocation failed\n"); DEBUG_PRINT("memory registration map allocation failed\n");
return -1; return -ENOMEM;
} }
/* /*
@ -1348,7 +1348,7 @@ spdk_vtophys_init(void)
g_vtophys_map = spdk_mem_map_alloc(SPDK_VTOPHYS_ERROR, &vtophys_map_ops, NULL); g_vtophys_map = spdk_mem_map_alloc(SPDK_VTOPHYS_ERROR, &vtophys_map_ops, NULL);
if (g_vtophys_map == NULL) { if (g_vtophys_map == NULL) {
DEBUG_PRINT("vtophys map allocation failed\n"); DEBUG_PRINT("vtophys map allocation failed\n");
return -1; return -ENOMEM;
} }
return 0; return 0;
} }