git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/fm10k: redefine link status semantics
[dpdk.git] / drivers / crypto / scheduler / rte_cryptodev_scheduler.c
diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
index 2f49ad4..df8634a 100644 (file)
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
@@ -64,7 +64,7 @@ sync_caps(struct rte_cryptodev_capabilities *caps,
 
                for (j = 0; j < nb_slave_caps; j++) {
                        const struct rte_cryptodev_capabilities *s_cap =
-                                       &slave_caps[i];
+                                       &slave_caps[j];
 
                        if (s_cap->op != cap->op || s_cap->sym.xform_type !=
                                        cap->sym.xform_type)
@@ -198,7 +198,7 @@ rte_cryptodev_scheduler_slave_attach(uint8_t scheduler_id, uint8_t slave_id)
                return -ENOTSUP;
        }
 
-       if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
+       if (dev->driver_id != cryptodev_driver_id) {
                CS_LOG_ERR("Operation not supported");
                return -ENOTSUP;
        }
@@ -209,7 +209,8 @@ rte_cryptodev_scheduler_slave_attach(uint8_t scheduler_id, uint8_t slave_id)
        }
 
        sched_ctx = dev->data->dev_private;
-       if (sched_ctx->nb_slaves >= MAX_SLAVES_NUM) {
+       if (sched_ctx->nb_slaves >=
+                       RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES) {
                CS_LOG_ERR("Too many slaves attached");
                return -ENOMEM;
        }
@@ -225,12 +226,12 @@ rte_cryptodev_scheduler_slave_attach(uint8_t scheduler_id, uint8_t slave_id)
        rte_cryptodev_info_get(slave_id, &dev_info);
 
        slave->dev_id = slave_id;
-       slave->dev_type = dev_info.dev_type;
+       slave->driver_id = dev_info.driver_id;
        sched_ctx->nb_slaves++;
 
        if (update_scheduler_capability(sched_ctx) < 0) {
                slave->dev_id = 0;
-               slave->dev_type = 0;
+               slave->driver_id = 0;
                sched_ctx->nb_slaves--;
 
                CS_LOG_ERR("capabilities update failed");
@@ -256,7 +257,7 @@ rte_cryptodev_scheduler_slave_detach(uint8_t scheduler_id, uint8_t slave_id)
                return -ENOTSUP;
        }
 
-       if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
+       if (dev->driver_id != cryptodev_driver_id) {
                CS_LOG_ERR("Operation not supported");
                return -ENOTSUP;
        }
@@ -302,7 +303,7 @@ rte_cryptodev_scheduler_slave_detach(uint8_t scheduler_id, uint8_t slave_id)
 }
 
 int
-rte_crpytodev_scheduler_mode_set(uint8_t scheduler_id,
+rte_cryptodev_scheduler_mode_set(uint8_t scheduler_id,
                enum rte_cryptodev_scheduler_mode mode)
 {
        struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(scheduler_id);
@@ -313,7 +314,7 @@ rte_crpytodev_scheduler_mode_set(uint8_t scheduler_id,
                return -ENOTSUP;
        }
 
-       if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
+       if (dev->driver_id != cryptodev_driver_id) {
                CS_LOG_ERR("Operation not supported");
                return -ENOTSUP;
        }
@@ -336,6 +337,27 @@ rte_crpytodev_scheduler_mode_set(uint8_t scheduler_id,
                        return -1;
                }
                break;
+       case CDEV_SCHED_MODE_PKT_SIZE_DISTR:
+               if (rte_cryptodev_scheduler_load_user_scheduler(scheduler_id,
+                               pkt_size_based_distr_scheduler) < 0) {
+                       CS_LOG_ERR("Failed to load scheduler");
+                       return -1;
+               }
+               break;
+       case CDEV_SCHED_MODE_FAILOVER:
+               if (rte_cryptodev_scheduler_load_user_scheduler(scheduler_id,
+                               failover_scheduler) < 0) {
+                       CS_LOG_ERR("Failed to load scheduler");
+                       return -1;
+               }
+               break;
+       case CDEV_SCHED_MODE_MULTICORE:
+               if (rte_cryptodev_scheduler_load_user_scheduler(scheduler_id,
+                               multicore_scheduler) < 0) {
+                       CS_LOG_ERR("Failed to load scheduler");
+                       return -1;
+               }
+               break;
        default:
                CS_LOG_ERR("Not yet supported");
                return -ENOTSUP;
@@ -345,7 +367,7 @@ rte_crpytodev_scheduler_mode_set(uint8_t scheduler_id,
 }
 
 enum rte_cryptodev_scheduler_mode
-rte_crpytodev_scheduler_mode_get(uint8_t scheduler_id)
+rte_cryptodev_scheduler_mode_get(uint8_t scheduler_id)
 {
        struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(scheduler_id);
        struct scheduler_ctx *sched_ctx;
@@ -355,7 +377,7 @@ rte_crpytodev_scheduler_mode_get(uint8_t scheduler_id)
                return -ENOTSUP;
        }
 
-       if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
+       if (dev->driver_id != cryptodev_driver_id) {
                CS_LOG_ERR("Operation not supported");
                return -ENOTSUP;
        }
@@ -377,7 +399,7 @@ rte_cryptodev_scheduler_ordering_set(uint8_t scheduler_id,
                return -ENOTSUP;
        }
 
-       if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
+       if (dev->driver_id != cryptodev_driver_id) {
                CS_LOG_ERR("Operation not supported");
                return -ENOTSUP;
        }
@@ -405,7 +427,7 @@ rte_cryptodev_scheduler_ordering_get(uint8_t scheduler_id)
                return -ENOTSUP;
        }
 
-       if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
+       if (dev->driver_id != cryptodev_driver_id) {
                CS_LOG_ERR("Operation not supported");
                return -ENOTSUP;
        }
@@ -427,7 +449,7 @@ rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
                return -ENOTSUP;
        }
 
-       if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
+       if (dev->driver_id != cryptodev_driver_id) {
                CS_LOG_ERR("Operation not supported");
                return -ENOTSUP;
        }
@@ -439,8 +461,22 @@ rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
 
        sched_ctx = dev->data->dev_private;
 
+       if (strlen(scheduler->name) > RTE_CRYPTODEV_NAME_MAX_LEN - 1) {
+               CS_LOG_ERR("Invalid name %s, should be less than "
+                               "%u bytes.\n", scheduler->name,
+                               RTE_CRYPTODEV_NAME_MAX_LEN);
+               return -EINVAL;
+       }
        strncpy(sched_ctx->name, scheduler->name,
                        RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN);
+
+       if (strlen(scheduler->description) >
+                       RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN - 1) {
+               CS_LOG_ERR("Invalid description %s, should be less than "
+                               "%u bytes.\n", scheduler->description,
+                               RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN - 1);
+               return -EINVAL;
+       }
        strncpy(sched_ctx->description, scheduler->description,
                        RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN);
 
@@ -451,6 +487,8 @@ rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
        sched_ctx->ops.scheduler_stop = scheduler->ops->scheduler_stop;
        sched_ctx->ops.slave_attach = scheduler->ops->slave_attach;
        sched_ctx->ops.slave_detach = scheduler->ops->slave_detach;
+       sched_ctx->ops.option_set = scheduler->ops->option_set;
+       sched_ctx->ops.option_get = scheduler->ops->option_get;
 
        if (sched_ctx->private_ctx)
                rte_free(sched_ctx->private_ctx);
@@ -469,3 +507,95 @@ rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
 
        return 0;
 }
+
+int
+rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t *slaves)
+{
+       struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(scheduler_id);
+       struct scheduler_ctx *sched_ctx;
+       uint32_t nb_slaves = 0;
+
+       if (!dev) {
+               CS_LOG_ERR("Operation not supported");
+               return -ENOTSUP;
+       }
+
+       if (dev->driver_id != cryptodev_driver_id) {
+               CS_LOG_ERR("Operation not supported");
+               return -ENOTSUP;
+       }
+
+       sched_ctx = dev->data->dev_private;
+
+       nb_slaves = sched_ctx->nb_slaves;
+
+       if (slaves && nb_slaves) {
+               uint32_t i;
+
+               for (i = 0; i < nb_slaves; i++)
+                       slaves[i] = sched_ctx->slaves[i].dev_id;
+       }
+
+       return (int)nb_slaves;
+}
+
+int
+rte_cryptodev_scheduler_option_set(uint8_t scheduler_id,
+               enum rte_cryptodev_schedule_option_type option_type,
+               void *option)
+{
+       struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(scheduler_id);
+       struct scheduler_ctx *sched_ctx;
+
+       if (option_type == CDEV_SCHED_OPTION_NOT_SET ||
+                       option_type >= CDEV_SCHED_OPTION_COUNT) {
+               CS_LOG_ERR("Invalid option parameter");
+               return -EINVAL;
+       }
+
+       if (!option) {
+               CS_LOG_ERR("Invalid option parameter");
+               return -EINVAL;
+       }
+
+       if (dev->data->dev_started) {
+               CS_LOG_ERR("Illegal operation");
+               return -EBUSY;
+       }
+
+       sched_ctx = dev->data->dev_private;
+
+       RTE_FUNC_PTR_OR_ERR_RET(*sched_ctx->ops.option_set, -ENOTSUP);
+
+       return (*sched_ctx->ops.option_set)(dev, option_type, option);
+}
+
+int
+rte_cryptodev_scheduler_option_get(uint8_t scheduler_id,
+               enum rte_cryptodev_schedule_option_type option_type,
+               void *option)
+{
+       struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(scheduler_id);
+       struct scheduler_ctx *sched_ctx;
+
+       if (!dev) {
+               CS_LOG_ERR("Operation not supported");
+               return -ENOTSUP;
+       }
+
+       if (!option) {
+               CS_LOG_ERR("Invalid option parameter");
+               return -EINVAL;
+       }
+
+       if (dev->driver_id != cryptodev_driver_id) {
+               CS_LOG_ERR("Operation not supported");
+               return -ENOTSUP;
+       }
+
+       sched_ctx = dev->data->dev_private;
+
+       RTE_FUNC_PTR_OR_ERR_RET(*sched_ctx->ops.option_get, -ENOTSUP);
+
+       return (*sched_ctx->ops.option_get)(dev, option_type, option);
+}
DPDK repo used for reviews