cryptodev: move device-specific structures
[dpdk.git] / drivers / crypto / scheduler / scheduler_roundrobin.c
index 0116276..ace2dec 100644 (file)
@@ -1,47 +1,19 @@
-/*-
- *   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_cryptodev.h>
+#include <cryptodev_pmd.h>
 #include <rte_malloc.h>
 
 #include "rte_cryptodev_scheduler_operations.h"
 #include "scheduler_pmd_private.h"
 
 struct rr_scheduler_qp_ctx {
-       struct scheduler_slave slaves[RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES];
-       uint32_t nb_slaves;
+       struct scheduler_worker workers[RTE_CRYPTODEV_SCHEDULER_MAX_NB_WORKERS];
+       uint32_t nb_workers;
 
-       uint32_t last_enq_slave_idx;
-       uint32_t last_deq_slave_idx;
+       uint32_t last_enq_worker_idx;
+       uint32_t last_deq_worker_idx;
 };
 
 static uint16_t
@@ -49,11 +21,9 @@ schedule_enqueue(void *qp, struct rte_crypto_op **ops, uint16_t nb_ops)
 {
        struct rr_scheduler_qp_ctx *rr_qp_ctx =
                        ((struct scheduler_qp_ctx *)qp)->private_qp_ctx;
-       uint32_t slave_idx = rr_qp_ctx->last_enq_slave_idx;
-       struct scheduler_slave *slave = &rr_qp_ctx->slaves[slave_idx];
+       uint32_t worker_idx = rr_qp_ctx->last_enq_worker_idx;
+       struct scheduler_worker *worker = &rr_qp_ctx->workers[worker_idx];
        uint16_t i, processed_ops;
-       struct rte_cryptodev_sym_session *sessions[nb_ops];
-       struct scheduler_session *sess0, *sess1, *sess2, *sess3;
 
        if (unlikely(nb_ops == 0))
                return 0;
@@ -61,52 +31,13 @@ schedule_enqueue(void *qp, struct rte_crypto_op **ops, uint16_t nb_ops)
        for (i = 0; i < nb_ops && i < 4; i++)
                rte_prefetch0(ops[i]->sym->session);
 
-       for (i = 0; (i < (nb_ops - 8)) && (nb_ops > 8); i += 4) {
-               sess0 = (struct scheduler_session *)
-                               ops[i]->sym->session->_private;
-               sess1 = (struct scheduler_session *)
-                               ops[i+1]->sym->session->_private;
-               sess2 = (struct scheduler_session *)
-                               ops[i+2]->sym->session->_private;
-               sess3 = (struct scheduler_session *)
-                               ops[i+3]->sym->session->_private;
-
-               sessions[i] = ops[i]->sym->session;
-               sessions[i + 1] = ops[i + 1]->sym->session;
-               sessions[i + 2] = ops[i + 2]->sym->session;
-               sessions[i + 3] = ops[i + 3]->sym->session;
-
-               ops[i]->sym->session = sess0->sessions[slave_idx];
-               ops[i + 1]->sym->session = sess1->sessions[slave_idx];
-               ops[i + 2]->sym->session = sess2->sessions[slave_idx];
-               ops[i + 3]->sym->session = sess3->sessions[slave_idx];
-
-               rte_prefetch0(ops[i + 4]->sym->session);
-               rte_prefetch0(ops[i + 5]->sym->session);
-               rte_prefetch0(ops[i + 6]->sym->session);
-               rte_prefetch0(ops[i + 7]->sym->session);
-       }
-
-       for (; i < nb_ops; i++) {
-               sess0 = (struct scheduler_session *)
-                               ops[i]->sym->session->_private;
-               sessions[i] = ops[i]->sym->session;
-               ops[i]->sym->session = sess0->sessions[slave_idx];
-       }
+       processed_ops = rte_cryptodev_enqueue_burst(worker->dev_id,
+                       worker->qp_id, ops, nb_ops);
 
-       processed_ops = rte_cryptodev_enqueue_burst(slave->dev_id,
-                       slave->qp_id, ops, nb_ops);
+       worker->nb_inflight_cops += processed_ops;
 
-       slave->nb_inflight_cops += processed_ops;
-
-       rr_qp_ctx->last_enq_slave_idx += 1;
-       rr_qp_ctx->last_enq_slave_idx %= rr_qp_ctx->nb_slaves;
-
-       /* recover session if enqueue is failed */
-       if (unlikely(processed_ops < nb_ops)) {
-               for (i = processed_ops; i < nb_ops; i++)
-                       ops[i]->sym->session = sessions[i];
-       }
+       rr_qp_ctx->last_enq_worker_idx += 1;
+       rr_qp_ctx->last_enq_worker_idx %= rr_qp_ctx->nb_workers;
 
        return processed_ops;
 }
@@ -133,34 +64,35 @@ schedule_dequeue(void *qp, struct rte_crypto_op **ops, uint16_t nb_ops)
 {
        struct rr_scheduler_qp_ctx *rr_qp_ctx =
                        ((struct scheduler_qp_ctx *)qp)->private_qp_ctx;
-       struct scheduler_slave *slave;
-       uint32_t last_slave_idx = rr_qp_ctx->last_deq_slave_idx;
+       struct scheduler_worker *worker;
+       uint32_t last_worker_idx = rr_qp_ctx->last_deq_worker_idx;
        uint16_t nb_deq_ops;
 
-       if (unlikely(rr_qp_ctx->slaves[last_slave_idx].nb_inflight_cops == 0)) {
+       if (unlikely(rr_qp_ctx->workers[last_worker_idx].nb_inflight_cops
+                       == 0)) {
                do {
-                       last_slave_idx += 1;
+                       last_worker_idx += 1;
 
-                       if (unlikely(last_slave_idx >= rr_qp_ctx->nb_slaves))
-                               last_slave_idx = 0;
+                       if (unlikely(last_worker_idx >= rr_qp_ctx->nb_workers))
+                               last_worker_idx = 0;
                        /* looped back, means no inflight cops in the queue */
-                       if (last_slave_idx == rr_qp_ctx->last_deq_slave_idx)
+                       if (last_worker_idx == rr_qp_ctx->last_deq_worker_idx)
                                return 0;
-               } while (rr_qp_ctx->slaves[last_slave_idx].nb_inflight_cops
+               } while (rr_qp_ctx->workers[last_worker_idx].nb_inflight_cops
                                == 0);
        }
 
-       slave = &rr_qp_ctx->slaves[last_slave_idx];
+       worker = &rr_qp_ctx->workers[last_worker_idx];
 
-       nb_deq_ops = rte_cryptodev_dequeue_burst(slave->dev_id,
-                       slave->qp_id, ops, nb_ops);
+       nb_deq_ops = rte_cryptodev_dequeue_burst(worker->dev_id,
+                       worker->qp_id, ops, nb_ops);
 
-       last_slave_idx += 1;
-       last_slave_idx %= rr_qp_ctx->nb_slaves;
+       last_worker_idx += 1;
+       last_worker_idx %= rr_qp_ctx->nb_workers;
 
-       rr_qp_ctx->last_deq_slave_idx = last_slave_idx;
+       rr_qp_ctx->last_deq_worker_idx = last_worker_idx;
 
-       slave->nb_inflight_cops -= nb_deq_ops;
+       worker->nb_inflight_cops -= nb_deq_ops;
 
        return nb_deq_ops;
 }
@@ -178,15 +110,15 @@ schedule_dequeue_ordering(void *qp, struct rte_crypto_op **ops,
 }
 
 static int
-slave_attach(__rte_unused struct rte_cryptodev *dev,
-               __rte_unused uint8_t slave_id)
+worker_attach(__rte_unused struct rte_cryptodev *dev,
+               __rte_unused uint8_t worker_id)
 {
        return 0;
 }
 
 static int
-slave_detach(__rte_unused struct rte_cryptodev *dev,
-               __rte_unused uint8_t slave_id)
+worker_detach(__rte_unused struct rte_cryptodev *dev,
+               __rte_unused uint8_t worker_id)
 {
        return 0;
 }
@@ -211,19 +143,19 @@ scheduler_start(struct rte_cryptodev *dev)
                                qp_ctx->private_qp_ctx;
                uint32_t j;
 
-               memset(rr_qp_ctx->slaves, 0,
-                               RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES *
-                               sizeof(struct scheduler_slave));
-               for (j = 0; j < sched_ctx->nb_slaves; j++) {
-                       rr_qp_ctx->slaves[j].dev_id =
-                                       sched_ctx->slaves[j].dev_id;
-                       rr_qp_ctx->slaves[j].qp_id = i;
+               memset(rr_qp_ctx->workers, 0,
+                               RTE_CRYPTODEV_SCHEDULER_MAX_NB_WORKERS *
+                               sizeof(struct scheduler_worker));
+               for (j = 0; j < sched_ctx->nb_workers; j++) {
+                       rr_qp_ctx->workers[j].dev_id =
+                                       sched_ctx->workers[j].dev_id;
+                       rr_qp_ctx->workers[j].qp_id = i;
                }
 
-               rr_qp_ctx->nb_slaves = sched_ctx->nb_slaves;
+               rr_qp_ctx->nb_workers = sched_ctx->nb_workers;
 
-               rr_qp_ctx->last_enq_slave_idx = 0;
-               rr_qp_ctx->last_deq_slave_idx = 0;
+               rr_qp_ctx->last_enq_worker_idx = 0;
+               rr_qp_ctx->last_deq_worker_idx = 0;
        }
 
        return 0;
@@ -244,7 +176,7 @@ scheduler_config_qp(struct rte_cryptodev *dev, uint16_t qp_id)
        rr_qp_ctx = rte_zmalloc_socket(NULL, sizeof(*rr_qp_ctx), 0,
                        rte_socket_id());
        if (!rr_qp_ctx) {
-               CS_LOG_ERR("failed allocate memory for private queue pair");
+               CR_SCHED_LOG(ERR, "failed allocate memory for private queue pair");
                return -ENOMEM;
        }
 
@@ -259,9 +191,9 @@ scheduler_create_private_ctx(__rte_unused struct rte_cryptodev *dev)
        return 0;
 }
 
-struct rte_cryptodev_scheduler_ops scheduler_rr_ops = {
-       slave_attach,
-       slave_detach,
+static struct rte_cryptodev_scheduler_ops scheduler_rr_ops = {
+       worker_attach,
+       worker_detach,
        scheduler_start,
        scheduler_stop,
        scheduler_config_qp,
@@ -270,12 +202,12 @@ struct rte_cryptodev_scheduler_ops scheduler_rr_ops = {
        NULL    /* option_get */
 };
 
-struct rte_cryptodev_scheduler scheduler = {
+static struct rte_cryptodev_scheduler scheduler = {
                .name = "roundrobin-scheduler",
                .description = "scheduler which will round robin burst across "
-                               "slave crypto devices",
+                               "worker crypto devices",
                .mode = CDEV_SCHED_MODE_ROUNDROBIN,
                .ops = &scheduler_rr_ops
 };
 
-struct rte_cryptodev_scheduler *roundrobin_scheduler = &scheduler;
+struct rte_cryptodev_scheduler *crypto_scheduler_roundrobin = &scheduler;