[dpdk-dev] [PATCH v2 12/13] ethdev: process declarative eth devargs
Gaetan Rivet
gaetan.rivet at 6wind.com
Wed Sep 19 18:03:42 CEST 2018
Process the eth parameters of a devargs.
For each parameters that have a setter implemented,
the relevant field in rte_eth_dev field is written.
Currently only "name" is implemented.
Signed-off-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
---
lib/librte_ethdev/ethdev_private.h | 5 +++
lib/librte_ethdev/rte_class_eth.c | 72 ++++++++++++++++++++++++++++++
lib/librte_ethdev/rte_ethdev.c | 7 +++
3 files changed, 84 insertions(+)
diff --git a/lib/librte_ethdev/ethdev_private.h b/lib/librte_ethdev/ethdev_private.h
index 0f5c6d5c4..c0c065165 100644
--- a/lib/librte_ethdev/ethdev_private.h
+++ b/lib/librte_ethdev/ethdev_private.h
@@ -19,6 +19,11 @@ struct rte_eth_dev *
eth_find_device(const struct rte_eth_dev *_start, rte_eth_cmp_t cmp,
const void *data);
+/* Generic rte_eth_dev parameters processor. */
+int
+rte_eth_dev_args_parse(struct rte_eth_dev *eth_dev,
+ struct rte_devargs *da);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c
index 66fd48dc2..7a8b81423 100644
--- a/lib/librte_ethdev/rte_class_eth.c
+++ b/lib/librte_ethdev/rte_class_eth.c
@@ -6,9 +6,11 @@
#include <rte_class.h>
#include <rte_compat.h>
+#include <rte_devargs.h>
#include <rte_errno.h>
#include <rte_kvargs.h>
#include <rte_log.h>
+#include <rte_string_fns.h>
#include "rte_ethdev.h"
#include "rte_ethdev_core.h"
@@ -35,6 +37,19 @@ struct eth_dev_match_arg {
.kvlist = (k), \
})
+typedef int (*eth_dev_set_t)(struct rte_eth_dev *edev, const char *value);
+
+static enum eth_params
+ethdev_param_id(const char *key)
+{
+ int i;
+
+ for (i = 0; i < RTE_ETH_PARAMS_MAX; i++)
+ if (strcmp(key, eth_params_keys[i]) == 0)
+ return i;
+ return RTE_ETH_PARAMS_MAX;
+}
+
static int
eth_dev_match(const struct rte_eth_dev *edev,
const void *_arg)
@@ -79,6 +94,63 @@ eth_dev_iterate(const void *start,
return edev;
}
+static int
+eth_dev_set_name(struct rte_eth_dev *edev,
+ const char *value)
+{
+ size_t n;
+
+ n = strlcpy(edev->data->name, value,
+ sizeof(edev->data->name));
+
+ /* Name was truncated. */
+ if (n >= sizeof(edev->data->name)) {
+ RTE_LOG(ERR, EAL, "Name %s is too long\n", value);
+ return -1;
+ }
+ return 0;
+}
+
+static int
+ethdev_args_process(const char *key,
+ const char *value,
+ void *_edev)
+{
+ static eth_dev_set_t eth_dev_set[] = {
+ [RTE_ETH_PARAMS_NAME] = eth_dev_set_name,
+ [RTE_ETH_PARAMS_MAX] = NULL,
+ };
+ struct rte_eth_dev *edev = _edev;
+ int param;
+
+ param = ethdev_param_id(key);
+ if (eth_dev_set[param])
+ return eth_dev_set[param](edev, value);
+ return 0;
+}
+
+int
+rte_eth_dev_args_parse(struct rte_eth_dev *edev,
+ struct rte_devargs *devargs)
+{
+ struct rte_kvargs *kvargs = NULL;
+ int ret;
+
+ if (devargs == NULL || devargs->cls_str == NULL)
+ return 0;
+
+ kvargs = rte_kvargs_parse_delim(devargs->cls_str, eth_params_keys, "/");
+ if (kvargs == NULL) {
+ RTE_LOG(ERR, EAL, "cannot parse argument list\n");
+ return -EINVAL;
+ }
+ ret = rte_kvargs_process(kvargs, NULL, ethdev_args_process, edev);
+ rte_kvargs_free(kvargs);
+ if (ret != 0)
+ return -1;
+ return 0;
+}
+
struct rte_class rte_class_eth = {
.dev_iterate = eth_dev_iterate,
};
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index aa7730ce2..b03fe7f4b 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -41,6 +41,7 @@
#include "rte_ethdev.h"
#include "rte_ethdev_driver.h"
#include "ethdev_profile.h"
+#include "ethdev_private.h"
int rte_eth_dev_logtype;
@@ -3504,6 +3505,12 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
}
}
+ retval = rte_eth_dev_args_parse(ethdev, device->devargs);
+ if (retval) {
+ RTE_LOG(ERR, EAL, "ethdev parsing failed");
+ goto probe_failed;
+ }
+
retval = ethdev_init(ethdev, init_params);
if (retval) {
RTE_LOG(ERR, EAL, "ethdev initialisation failed");
--
2.18.0
More information about the dev
mailing list