crypto/scheduler: improve parameters parsing

[dpdk.git] / drivers / crypto / scheduler / scheduler_pmd.c

diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c
index 7d9e376..2a92d1e 100644 (file)
--- a/drivers/crypto/scheduler/scheduler_pmd.c
+++ b/drivers/crypto/scheduler/scheduler_pmd.c
@@ -44,9 +44,10 @@
 struct scheduler_init_params {
        struct rte_crypto_vdev_init_params def_p;
        uint32_t nb_slaves;
-       uint8_t slaves[RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES];
        enum rte_cryptodev_scheduler_mode mode;
        uint32_t enable_ordering;
+       char slave_names[RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES]
+                       [RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN];
 };
 
 #define RTE_CRYPTODEV_VDEV_NAME                        ("name")
@@ -86,30 +87,6 @@ const struct scheduler_parse_map scheduler_ordering_map[] = {
                {"disable", 0}
 };
 
-static int
-attach_init_slaves(uint8_t scheduler_id,
-               const uint8_t *slaves, const uint8_t nb_slaves)
-{
-       uint8_t i;
-
-       for (i = 0; i < nb_slaves; i++) {
-               struct rte_cryptodev *dev =
-                               rte_cryptodev_pmd_get_dev(slaves[i]);
-               int status = rte_cryptodev_scheduler_slave_attach(
-                               scheduler_id, slaves[i]);
-
-               if (status < 0 || !dev) {
-                       CS_LOG_ERR("Failed to attach slave cryptodev "
-                                       "%u.\n", slaves[i]);
-                       return status;
-               }
-
-               RTE_LOG(INFO, PMD, "  Attached Slave %s\n", dev->data->name);
-       }
-
-       return 0;
-}
-
 static int
 cryptodev_scheduler_create(const char *name,
        struct scheduler_init_params *init_params)
@@ -150,13 +127,6 @@ cryptodev_scheduler_create(const char *name,
        sched_ctx->max_nb_queue_pairs =
                        init_params->def_p.max_nb_queue_pairs;
 
-       ret = attach_init_slaves(dev->data->dev_id, init_params->slaves,
-                       init_params->nb_slaves);
-       if (ret < 0) {
-               rte_cryptodev_pmd_release_device(dev);
-               return ret;
-       }
-
        if (init_params->mode > CDEV_SCHED_MODE_USERDEFINED &&
                        init_params->mode < CDEV_SCHED_MODE_COUNT) {
                ret = rte_cryptodev_scheduler_mode_set(dev->data->dev_id,
@@ -189,6 +159,28 @@ cryptodev_scheduler_create(const char *name,
                break;
        }
 
+       for (i = 0; i < init_params->nb_slaves; i++) {
+               sched_ctx->init_slave_names[sched_ctx->nb_init_slaves] =
+                       rte_zmalloc_socket(
+                               NULL,
+                               RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN, 0,
+                               SOCKET_ID_ANY);
+
+               if (!sched_ctx->init_slave_names[
+                               sched_ctx->nb_init_slaves]) {
+                       CS_LOG_ERR("driver %s: Insufficient memory",
+                                       name);
+                       return -ENOMEM;
+               }
+
+               strncpy(sched_ctx->init_slave_names[
+                                       sched_ctx->nb_init_slaves],
+                               init_params->slave_names[i],
+                               RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN - 1);
+
+               sched_ctx->nb_init_slaves++;
+       }
+
        return 0;
 }
 
@@ -280,21 +272,14 @@ parse_slave_arg(const char *key __rte_unused,
                const char *value, void *extra_args)
 {
        struct scheduler_init_params *param = extra_args;
-       struct rte_cryptodev *dev =
-                       rte_cryptodev_pmd_get_named_dev(value);
-
-       if (!dev) {
-               RTE_LOG(ERR, PMD, "Invalid slave name %s.\n", value);
-               return -EINVAL;
-       }
 
        if (param->nb_slaves >= RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES - 1) {
                CS_LOG_ERR("Too many slaves.\n");
                return -ENOMEM;
        }
 
-       param->slaves[param->nb_slaves] = dev->data->dev_id;
-       param->nb_slaves++;
+       strncpy(param->slave_names[param->nb_slaves++], value,
+                       RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN - 1);
 
        return 0;
 }
@@ -425,9 +410,9 @@ cryptodev_scheduler_probe(struct rte_vdev_device *vdev)
                        ""
                },
                .nb_slaves = 0,
-               .slaves = {0},
                .mode = CDEV_SCHED_MODE_NOT_SET,
-               .enable_ordering = 0
+               .enable_ordering = 0,
+               .slave_names = { {0} }
        };
 
        scheduler_parse_init_params(&init_params,