New upstream version 18.02.1
[deb_dpdk.git] / drivers / crypto / scheduler / rte_cryptodev_scheduler.c
index 319dcf0..140c8b4 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>
@@ -198,7 +170,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 +198,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 +229,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;
        }
@@ -314,7 +286,7 @@ rte_cryptodev_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 +323,13 @@ rte_cryptodev_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;
@@ -359,13 +338,6 @@ rte_cryptodev_scheduler_mode_set(uint8_t scheduler_id,
        return 0;
 }
 
-int
-rte_crpytodev_scheduler_mode_set(uint8_t scheduler_id,
-               enum rte_cryptodev_scheduler_mode mode)
-{
-       return rte_cryptodev_scheduler_mode_set(scheduler_id, mode);
-}
-
 enum rte_cryptodev_scheduler_mode
 rte_cryptodev_scheduler_mode_get(uint8_t scheduler_id)
 {
@@ -377,7 +349,7 @@ rte_cryptodev_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;
        }
@@ -387,12 +359,6 @@ rte_cryptodev_scheduler_mode_get(uint8_t scheduler_id)
        return sched_ctx->mode;
 }
 
-enum rte_cryptodev_scheduler_mode
-rte_crpytodev_scheduler_mode_get(uint8_t scheduler_id)
-{
-       return rte_cryptodev_scheduler_mode_get(scheduler_id);
-}
-
 int
 rte_cryptodev_scheduler_ordering_set(uint8_t scheduler_id,
                uint32_t enable_reorder)
@@ -405,7 +371,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;
        }
@@ -433,7 +399,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;
        }
@@ -455,7 +421,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;
        }
@@ -467,10 +433,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;
@@ -512,7 +492,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;
        }
@@ -580,7 +560,7 @@ rte_cryptodev_scheduler_option_get(uint8_t scheduler_id,
                return -EINVAL;
        }
 
-       if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
+       if (dev->driver_id != cryptodev_driver_id) {
                CS_LOG_ERR("Operation not supported");
                return -ENOTSUP;
        }