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

env: don't free DPDK eal arguments

Browse Source 
Documentation of rte_eal_init() lie. At least two parameters (huge-dir
and file-prefix) are held and used internally trought the lifetime of
application.

Change-Id: Ie418b5f2b0d7fbea5c217e47a555a520d3256360
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/382677
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Pawel Wodkowski 2017-10-16 20:16:38 +02:00 committed by Jim Harris
parent 7aba48fe1e
commit cc3c79065c
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/env_dpdk/init.c
View File

@ -45,6 +45,9 @@
#define SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL -1 #define SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL -1
#define SPDK_ENV_DPDK_DEFAULT_CORE_MASK "0x1" #define SPDK_ENV_DPDK_DEFAULT_CORE_MASK "0x1"
static char **eal_cmdline;
static int eal_cmdline_argcount;
static char * static char *
_sprintf_alloc(const char *format, ...) _sprintf_alloc(const char *format, ...)
{ {
@ -133,10 +136,7 @@ spdk_free_args(char **args, int argcount)
{ {
int i; int i;
assert(args != NULL);
for (i = 0; i < argcount; i++) { for (i = 0; i < argcount; i++) {
assert(args[i] != NULL);
free(args[i]); free(args[i]);
} }
@ -164,17 +164,19 @@ spdk_push_arg(char *args[], int *argcount, char *arg)
return tmp; return tmp;
} }
static void
spdk_destruct_eal_cmdline(void)
{
spdk_free_args(eal_cmdline, eal_cmdline_argcount);
}
static int static int
spdk_build_eal_cmdline(const struct spdk_env_opts *opts, char **out[]) spdk_build_eal_cmdline(const struct spdk_env_opts *opts)
{ {
int argcount = 0; int argcount = 0;
char **args; char **args;
if (out == NULL) {
return -1;
}
*out = NULL;
args = NULL; args = NULL;
/* set the program name */ /* set the program name */
@ -250,28 +252,31 @@ spdk_build_eal_cmdline(const struct spdk_env_opts *opts, char **out[])
} }
#endif #endif
*out = args; eal_cmdline = args;
eal_cmdline_argcount = argcount;
if (atexit(spdk_destruct_eal_cmdline) != 0) {
fprintf(stderr, "Failed to register cleanup handler\n");
}
return argcount; return argcount;
} }
void spdk_env_init(const struct spdk_env_opts *opts) void spdk_env_init(const struct spdk_env_opts *opts)
{ {
char **args = NULL;
char **dpdk_args = NULL; char **dpdk_args = NULL;
int argcount, i, rc; int i, rc;
int orig_optind; int orig_optind;
argcount = spdk_build_eal_cmdline(opts, &args); rc = spdk_build_eal_cmdline(opts);
if (argcount <= 0) { if (rc < 0) {
fprintf(stderr, "Invalid arguments to initialize DPDK\n"); fprintf(stderr, "Invalid arguments to initialize DPDK\n");
exit(-1); exit(-1);
} }
printf("Starting %s initialization...\n", rte_version()); printf("Starting %s initialization...\n", rte_version());
printf("[ DPDK EAL parameters: "); printf("[ DPDK EAL parameters: ");
for (i = 0; i < argcount; i++) { for (i = 0; i < eal_cmdline_argcount; i++) {
printf("%s ", args[i]); printf("%s ", eal_cmdline[i]);
} }
printf("]\n"); printf("]\n");
@ -279,20 +284,19 @@ void spdk_env_init(const struct spdk_env_opts *opts)
* before passing so we can still free the individual strings * before passing so we can still free the individual strings
* correctly. * correctly.
*/ */
dpdk_args = calloc(argcount, sizeof(char *)); dpdk_args = calloc(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");
exit(-1); exit(-1);
} }
memcpy(dpdk_args, args, sizeof(char *) * argcount); memcpy(dpdk_args, eal_cmdline, sizeof(char *) * eal_cmdline_argcount);
fflush(stdout); fflush(stdout);
orig_optind = optind; orig_optind = optind;
optind = 1; optind = 1;
rc = rte_eal_init(argcount, dpdk_args); rc = rte_eal_init(eal_cmdline_argcount, dpdk_args);
optind = orig_optind; optind = orig_optind;
spdk_free_args(args, argcount);
free(dpdk_args); free(dpdk_args);
if (rc < 0) { if (rc < 0) {