crypto/scheduler: fix 64-bit mask of workers cores
[dpdk.git] / drivers / crypto / scheduler / rte_cryptodev_scheduler.c
index 6018857..ed574cc 100644 (file)
@@ -1,33 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2017 Intel Corporation. All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
  */
 #include <rte_reorder.h>
 #include <rte_cryptodev.h>
@@ -64,7 +36,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)
@@ -119,8 +91,10 @@ update_scheduler_capability(struct scheduler_ctx *sched_ctx)
        struct rte_cryptodev_capabilities tmp_caps[256] = { {0} };
        uint32_t nb_caps = 0, i;
 
-       if (sched_ctx->capabilities)
+       if (sched_ctx->capabilities) {
                rte_free(sched_ctx->capabilities);
+               sched_ctx->capabilities = NULL;
+       }
 
        for (i = 0; i < sched_ctx->nb_slaves; i++) {
                struct rte_cryptodev_info dev_info;
@@ -198,7 +172,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;
        }
@@ -226,12 +200,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");
@@ -257,7 +231,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;
        }
@@ -303,7 +277,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);
@@ -314,7 +288,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;
        }
@@ -351,6 +325,13 @@ rte_crpytodev_scheduler_mode_set(uint8_t scheduler_id,
                        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;
@@ -360,7 +341,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;
@@ -370,7 +351,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;
        }
@@ -392,7 +373,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;
        }
@@ -420,7 +401,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;
        }
@@ -442,7 +423,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;
        }
@@ -454,10 +435,24 @@ rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
 
        sched_ctx = dev->data->dev_private;
 
-       strncpy(sched_ctx->name, scheduler->name,
-                       RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN);
-       strncpy(sched_ctx->description, scheduler->description,
-                       RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN);
+       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;
+       }
+       snprintf(sched_ctx->name, sizeof(sched_ctx->name), "%s",
+                       scheduler->name);
+
+       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;
+       }
+       snprintf(sched_ctx->description, sizeof(sched_ctx->description), "%s",
+                       scheduler->description);
 
        /* load scheduler instance operations functions */
        sched_ctx->ops.config_queue_pair = scheduler->ops->config_queue_pair;
@@ -466,9 +461,13 @@ 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)
+       if (sched_ctx->private_ctx) {
                rte_free(sched_ctx->private_ctx);
+               sched_ctx->private_ctx = NULL;
+       }
 
        if (sched_ctx->ops.create_private_ctx) {
                int ret = (*sched_ctx->ops.create_private_ctx)(dev);
@@ -497,7 +496,7 @@ rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t *slaves)
                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;
        }
@@ -515,3 +514,64 @@ rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t *slaves)
 
        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);
+}