git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
devargs: remove limit on parameters length
[dpdk.git]
/
lib
/
librte_eal
/
common
/
eal_common_devargs.c
diff --git
a/lib/librte_eal/common/eal_common_devargs.c
b/lib/librte_eal/common/eal_common_devargs.c
index
c497ea3
..
3aace08
100644
(file)
--- a/
lib/librte_eal/common/eal_common_devargs.c
+++ b/
lib/librte_eal/common/eal_common_devargs.c
@@
-48,32
+48,35
@@
struct rte_devargs_list devargs_list =
int
rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
{
int
rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
{
- struct rte_devargs *devargs;
- char
buf[RTE_DEVARGS_LEN]
;
+ struct rte_devargs *devargs
= NULL
;
+ char
*buf = NULL
;
char *sep;
int ret;
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);
- return -1;
- }
-
/* use malloc instead of rte_malloc as it's called early at init */
devargs = malloc(sizeof(*devargs));
if (devargs == NULL) {
RTE_LOG(ERR, EAL, "cannot allocate devargs\n");
/* use malloc instead of rte_malloc as it's called early at init */
devargs = malloc(sizeof(*devargs));
if (devargs == NULL) {
RTE_LOG(ERR, EAL, "cannot allocate devargs\n");
-
return -1
;
+
goto fail
;
}
memset(devargs, 0, sizeof(*devargs));
devargs->type = devtype;
}
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';
/* 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) {
}
switch (devargs->type) {
@@
-81,28
+84,34
@@
rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
case RTE_DEVTYPE_BLACKLISTED_PCI:
/* try to parse pci identifier */
if (eal_parse_pci_BDF(buf, &devargs->pci.addr) != 0 &&
case RTE_DEVTYPE_BLACKLISTED_PCI:
/* try to parse pci identifier */
if (eal_parse_pci_BDF(buf, &devargs->pci.addr) != 0 &&
- eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0) {
- RTE_LOG(ERR, EAL,
- "invalid PCI identifier <%s>\n", buf);
- free(devargs);
- return -1;
+ eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0) {
+ RTE_LOG(ERR, EAL, "invalid PCI identifier <%s>\n", buf);
+ goto fail;
}
break;
case RTE_DEVTYPE_VIRTUAL:
/* save driver name */
ret = snprintf(devargs->virtual.drv_name,
}
break;
case RTE_DEVTYPE_VIRTUAL:
/* save driver name */
ret = snprintf(devargs->virtual.drv_name,
- sizeof(devargs->virtual.drv_name), "%s", buf);
+
sizeof(devargs->virtual.drv_name), "%s", buf);
if (ret < 0 || ret >= (int)sizeof(devargs->virtual.drv_name)) {
if (ret < 0 || ret >= (int)sizeof(devargs->virtual.drv_name)) {
- RTE_LOG(ERR, EAL,
- "driver name too large: <%s>\n", buf);
- free(devargs);
- return -1;
+ RTE_LOG(ERR, EAL, "driver name too large: <%s>\n", buf);
+ goto fail;
}
break;
}
}
break;
}
+ free(buf);
TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
return 0;
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;
}
/* count the number of devices of a specified type */
}
/* count the number of devices of a specified type */
@@
-122,31
+131,31
@@
rte_eal_devargs_type_count(enum rte_devtype devtype)
/* dump the user devices on the console */
void
/* dump the user devices on the console */
void
-rte_eal_devargs_dump(
void
)
+rte_eal_devargs_dump(
FILE *f
)
{
struct rte_devargs *devargs;
{
struct rte_devargs *devargs;
-
printf(
"User device white list:\n");
+
fprintf(f,
"User device white list:\n");
TAILQ_FOREACH(devargs, &devargs_list, next) {
if (devargs->type == RTE_DEVTYPE_WHITELISTED_PCI)
TAILQ_FOREACH(devargs, &devargs_list, next) {
if (devargs->type == RTE_DEVTYPE_WHITELISTED_PCI)
-
printf(
" PCI whitelist " PCI_PRI_FMT " %s\n",
+
fprintf(f,
" PCI whitelist " PCI_PRI_FMT " %s\n",
devargs->pci.addr.domain,
devargs->pci.addr.bus,
devargs->pci.addr.devid,
devargs->pci.addr.function,
devargs->args);
else if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI)
devargs->pci.addr.domain,
devargs->pci.addr.bus,
devargs->pci.addr.devid,
devargs->pci.addr.function,
devargs->args);
else if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI)
-
printf(
" PCI blacklist " PCI_PRI_FMT " %s\n",
+
fprintf(f,
" PCI blacklist " PCI_PRI_FMT " %s\n",
devargs->pci.addr.domain,
devargs->pci.addr.bus,
devargs->pci.addr.devid,
devargs->pci.addr.function,
devargs->args);
else if (devargs->type == RTE_DEVTYPE_VIRTUAL)
devargs->pci.addr.domain,
devargs->pci.addr.bus,
devargs->pci.addr.devid,
devargs->pci.addr.function,
devargs->args);
else if (devargs->type == RTE_DEVTYPE_VIRTUAL)
-
printf(
" VIRTUAL %s %s\n",
+
fprintf(f,
" VIRTUAL %s %s\n",
devargs->virtual.drv_name,
devargs->args);
else
devargs->virtual.drv_name,
devargs->args);
else
-
printf(
" UNKNOWN %s\n", devargs->args);
+
fprintf(f,
" UNKNOWN %s\n", devargs->args);
}
}
}
}