d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

devargs: remove limit on parameters length

Browse Source 
As far as I know, there is no reason why we should have a limit on the length of
parameters that can be given for a device.
Remove this limit by using dynamic allocations.

Signed-off-by: David Marchand <david.marchand@6wind.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
This commit is contained in:
David Marchand 2015-02-13 16:03:14 +01:00 committed by Thomas Monjalon
parent 0215a4c61f
commit c07691ae10
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/librte_eal/common/eal_common_devargs.c
View File

@ -49,17 +49,10 @@ int
rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
{
struct rte_devargs *devargs = NULL;
char buf[RTE_DEVARGS_LEN];
char *buf = NULL;
char *sep;
int ret;
ret = snprintf(buf, sizeof(buf), "%s", devargs_str);
if (ret < 0 || ret >= (int)sizeof(buf)) {
RTE_LOG(ERR, EAL, "user device args too large: <%s>\n",
devargs_str);
goto fail;
}
/* use malloc instead of rte_malloc as it's called early at init */
devargs = malloc(sizeof(*devargs));
if (devargs == NULL) {
@ -69,11 +62,21 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
memset(devargs, 0, sizeof(*devargs));
devargs->type = devtype;
buf = strdup(devargs_str);
if (buf == NULL) {
RTE_LOG(ERR, EAL, "cannot allocate temp memory for devargs\n");
goto fail;
}
/* set the first ',' to '\0' to split name and arguments */
sep = strchr(buf, ',');
if (sep != NULL) {
sep[0] = '\0';
snprintf(devargs->args, sizeof(devargs->args), "%s", sep + 1);
devargs->args = strdup(sep + 1);
if (devargs->args == NULL) {
RTE_LOG(ERR, EAL, "cannot allocate for devargs args\n");
goto fail;
}
}
switch (devargs->type) {
@ -97,10 +100,15 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
break;
}
free(buf);
TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
return 0;
fail:
if (devargs->args)
free(devargs->args);
if (buf)
free(buf);
if (devargs)
free(devargs);
return -1;

4
lib/librte_eal/common/include/rte_devargs.h
View File

@ -88,8 +88,8 @@ struct rte_devargs {
char drv_name[32];
} virtual;
};
#define RTE_DEVARGS_LEN 256
char args[RTE_DEVARGS_LEN]; /**< Arguments string as given by user. */
/** Arguments string as given by user. */
char *args;
};
/** user device double-linked queue type definition */