git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mbuf: update Tx VLAN and QinQ flags documentation
[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
ed574cc
..
1fef88f
100644
(file)
--- a/
drivers/crypto/scheduler/rte_cryptodev_scheduler.c
+++ b/
drivers/crypto/scheduler/rte_cryptodev_scheduler.c
@@
-1,6
+1,7
@@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2017 Intel Corporation
*/
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2017 Intel Corporation
*/
+#include <rte_string_fns.h>
#include <rte_reorder.h>
#include <rte_cryptodev.h>
#include <rte_cryptodev_pmd.h>
#include <rte_reorder.h>
#include <rte_cryptodev.h>
#include <rte_cryptodev_pmd.h>
@@
-9,6
+10,8
@@
#include "rte_cryptodev_scheduler.h"
#include "scheduler_pmd_private.h"
#include "rte_cryptodev_scheduler.h"
#include "scheduler_pmd_private.h"
+int scheduler_logtype_driver;
+
/** update the scheduler pmd's capability with attaching device's
* capability.
* For each device to be attached, the scheduler's capability should be
/** update the scheduler pmd's capability with attaching device's
* capability.
* For each device to be attached, the scheduler's capability should be
@@
-168,30
+171,30
@@
rte_cryptodev_scheduler_slave_attach(uint8_t scheduler_id, uint8_t slave_id)
uint32_t i;
if (!dev) {
uint32_t i;
if (!dev) {
- C
S_LOG_ERR(
"Operation not supported");
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
- if (dev->driver_id != cryptodev_driver_id) {
- C
S_LOG_ERR(
"Operation not supported");
+ if (dev->driver_id != cryptodev_
scheduler_
driver_id) {
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
if (dev->data->dev_started) {
return -ENOTSUP;
}
if (dev->data->dev_started) {
- C
S_LOG_ERR(
"Illegal operation");
+ C
R_SCHED_LOG(ERR,
"Illegal operation");
return -EBUSY;
}
sched_ctx = dev->data->dev_private;
if (sched_ctx->nb_slaves >=
RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES) {
return -EBUSY;
}
sched_ctx = dev->data->dev_private;
if (sched_ctx->nb_slaves >=
RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES) {
- C
S_LOG_ERR(
"Too many slaves attached");
+ C
R_SCHED_LOG(ERR,
"Too many slaves attached");
return -ENOMEM;
}
for (i = 0; i < sched_ctx->nb_slaves; i++)
if (sched_ctx->slaves[i].dev_id == slave_id) {
return -ENOMEM;
}
for (i = 0; i < sched_ctx->nb_slaves; i++)
if (sched_ctx->slaves[i].dev_id == slave_id) {
- C
S_LOG_ERR(
"Slave already added");
+ C
R_SCHED_LOG(ERR,
"Slave already added");
return -ENOTSUP;
}
return -ENOTSUP;
}
@@
-208,7
+211,7
@@
rte_cryptodev_scheduler_slave_attach(uint8_t scheduler_id, uint8_t slave_id)
slave->driver_id = 0;
sched_ctx->nb_slaves--;
slave->driver_id = 0;
sched_ctx->nb_slaves--;
- C
S_LOG_ERR(
"capabilities update failed");
+ C
R_SCHED_LOG(ERR,
"capabilities update failed");
return -ENOTSUP;
}
return -ENOTSUP;
}
@@
-227,17
+230,17
@@
rte_cryptodev_scheduler_slave_detach(uint8_t scheduler_id, uint8_t slave_id)
uint32_t i, slave_pos;
if (!dev) {
uint32_t i, slave_pos;
if (!dev) {
- C
S_LOG_ERR(
"Operation not supported");
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
- if (dev->driver_id != cryptodev_driver_id) {
- C
S_LOG_ERR(
"Operation not supported");
+ if (dev->driver_id != cryptodev_
scheduler_
driver_id) {
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
if (dev->data->dev_started) {
return -ENOTSUP;
}
if (dev->data->dev_started) {
- C
S_LOG_ERR(
"Illegal operation");
+ C
R_SCHED_LOG(ERR,
"Illegal operation");
return -EBUSY;
}
return -EBUSY;
}
@@
-247,12
+250,12
@@
rte_cryptodev_scheduler_slave_detach(uint8_t scheduler_id, uint8_t slave_id)
if (sched_ctx->slaves[slave_pos].dev_id == slave_id)
break;
if (slave_pos == sched_ctx->nb_slaves) {
if (sched_ctx->slaves[slave_pos].dev_id == slave_id)
break;
if (slave_pos == sched_ctx->nb_slaves) {
- C
S_LOG_ERR(
"Cannot find slave");
+ C
R_SCHED_LOG(ERR,
"Cannot find slave");
return -ENOTSUP;
}
if (sched_ctx->ops.slave_detach(dev, slave_id) < 0) {
return -ENOTSUP;
}
if (sched_ctx->ops.slave_detach(dev, slave_id) < 0) {
- C
S_LOG_ERR(
"Failed to detach slave");
+ C
R_SCHED_LOG(ERR,
"Failed to detach slave");
return -ENOTSUP;
}
return -ENOTSUP;
}
@@
-265,7
+268,7
@@
rte_cryptodev_scheduler_slave_detach(uint8_t scheduler_id, uint8_t slave_id)
sched_ctx->nb_slaves--;
if (update_scheduler_capability(sched_ctx) < 0) {
sched_ctx->nb_slaves--;
if (update_scheduler_capability(sched_ctx) < 0) {
- C
S_LOG_ERR(
"capabilities update failed");
+ C
R_SCHED_LOG(ERR,
"capabilities update failed");
return -ENOTSUP;
}
return -ENOTSUP;
}
@@
-284,17
+287,17
@@
rte_cryptodev_scheduler_mode_set(uint8_t scheduler_id,
struct scheduler_ctx *sched_ctx;
if (!dev) {
struct scheduler_ctx *sched_ctx;
if (!dev) {
- C
S_LOG_ERR(
"Operation not supported");
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
- if (dev->driver_id != cryptodev_driver_id) {
- C
S_LOG_ERR(
"Operation not supported");
+ if (dev->driver_id != cryptodev_
scheduler_
driver_id) {
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
if (dev->data->dev_started) {
return -ENOTSUP;
}
if (dev->data->dev_started) {
- C
S_LOG_ERR(
"Illegal operation");
+ C
R_SCHED_LOG(ERR,
"Illegal operation");
return -EBUSY;
}
return -EBUSY;
}
@@
-306,34
+309,34
@@
rte_cryptodev_scheduler_mode_set(uint8_t scheduler_id,
switch (mode) {
case CDEV_SCHED_MODE_ROUNDROBIN:
if (rte_cryptodev_scheduler_load_user_scheduler(scheduler_id,
switch (mode) {
case CDEV_SCHED_MODE_ROUNDROBIN:
if (rte_cryptodev_scheduler_load_user_scheduler(scheduler_id,
-
roundrobin_scheduler
) < 0) {
- C
S_LOG_ERR(
"Failed to load scheduler");
+
crypto_scheduler_roundrobin
) < 0) {
+ C
R_SCHED_LOG(ERR,
"Failed to load scheduler");
return -1;
}
break;
case CDEV_SCHED_MODE_PKT_SIZE_DISTR:
if (rte_cryptodev_scheduler_load_user_scheduler(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_schedule
r) < 0) {
- C
S_LOG_ERR(
"Failed to load scheduler");
+
crypto_scheduler_pkt_size_based_dist
r) < 0) {
+ C
R_SCHED_LOG(ERR,
"Failed to load scheduler");
return -1;
}
break;
case CDEV_SCHED_MODE_FAILOVER:
if (rte_cryptodev_scheduler_load_user_scheduler(scheduler_id,
return -1;
}
break;
case CDEV_SCHED_MODE_FAILOVER:
if (rte_cryptodev_scheduler_load_user_scheduler(scheduler_id,
-
failover_schedul
er) < 0) {
- C
S_LOG_ERR(
"Failed to load scheduler");
+
crypto_scheduler_failov
er) < 0) {
+ C
R_SCHED_LOG(ERR,
"Failed to load scheduler");
return -1;
}
break;
case CDEV_SCHED_MODE_MULTICORE:
if (rte_cryptodev_scheduler_load_user_scheduler(scheduler_id,
return -1;
}
break;
case CDEV_SCHED_MODE_MULTICORE:
if (rte_cryptodev_scheduler_load_user_scheduler(scheduler_id,
-
multicore_scheduler
) < 0) {
- C
S_LOG_ERR(
"Failed to load scheduler");
+
crypto_scheduler_multicore
) < 0) {
+ C
R_SCHED_LOG(ERR,
"Failed to load scheduler");
return -1;
}
break;
default:
return -1;
}
break;
default:
- C
S_LOG_ERR(
"Not yet supported");
+ C
R_SCHED_LOG(ERR,
"Not yet supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
@@
-347,12
+350,12
@@
rte_cryptodev_scheduler_mode_get(uint8_t scheduler_id)
struct scheduler_ctx *sched_ctx;
if (!dev) {
struct scheduler_ctx *sched_ctx;
if (!dev) {
- C
S_LOG_ERR(
"Operation not supported");
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
- if (dev->driver_id != cryptodev_driver_id) {
- C
S_LOG_ERR(
"Operation not supported");
+ if (dev->driver_id != cryptodev_
scheduler_
driver_id) {
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
@@
-369,17
+372,17
@@
rte_cryptodev_scheduler_ordering_set(uint8_t scheduler_id,
struct scheduler_ctx *sched_ctx;
if (!dev) {
struct scheduler_ctx *sched_ctx;
if (!dev) {
- C
S_LOG_ERR(
"Operation not supported");
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
- if (dev->driver_id != cryptodev_driver_id) {
- C
S_LOG_ERR(
"Operation not supported");
+ if (dev->driver_id != cryptodev_
scheduler_
driver_id) {
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
if (dev->data->dev_started) {
return -ENOTSUP;
}
if (dev->data->dev_started) {
- C
S_LOG_ERR(
"Illegal operation");
+ C
R_SCHED_LOG(ERR,
"Illegal operation");
return -EBUSY;
}
return -EBUSY;
}
@@
-397,12
+400,12
@@
rte_cryptodev_scheduler_ordering_get(uint8_t scheduler_id)
struct scheduler_ctx *sched_ctx;
if (!dev) {
struct scheduler_ctx *sched_ctx;
if (!dev) {
- C
S_LOG_ERR(
"Operation not supported");
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
- if (dev->driver_id != cryptodev_driver_id) {
- C
S_LOG_ERR(
"Operation not supported");
+ if (dev->driver_id != cryptodev_
scheduler_
driver_id) {
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
@@
-419,40
+422,39
@@
rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
struct scheduler_ctx *sched_ctx;
if (!dev) {
struct scheduler_ctx *sched_ctx;
if (!dev) {
- C
S_LOG_ERR(
"Operation not supported");
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
- if (dev->driver_id != cryptodev_driver_id) {
- C
S_LOG_ERR(
"Operation not supported");
+ if (dev->driver_id != cryptodev_
scheduler_
driver_id) {
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
if (dev->data->dev_started) {
return -ENOTSUP;
}
if (dev->data->dev_started) {
- C
S_LOG_ERR(
"Illegal operation");
+ C
R_SCHED_LOG(ERR,
"Illegal operation");
return -EBUSY;
}
sched_ctx = dev->data->dev_private;
if (strlen(scheduler->name) > RTE_CRYPTODEV_NAME_MAX_LEN - 1) {
return -EBUSY;
}
sched_ctx = dev->data->dev_private;
if (strlen(scheduler->name) > RTE_CRYPTODEV_NAME_MAX_LEN - 1) {
- C
S_LOG_ERR(
"Invalid name %s, should be less than "
- "%u bytes.
\n
", scheduler->name,
+ C
R_SCHED_LOG(ERR,
"Invalid name %s, should be less than "
+ "%u bytes.", scheduler->name,
RTE_CRYPTODEV_NAME_MAX_LEN);
return -EINVAL;
}
RTE_CRYPTODEV_NAME_MAX_LEN);
return -EINVAL;
}
- snprintf(sched_ctx->name, sizeof(sched_ctx->name), "%s",
- scheduler->name);
+ strlcpy(sched_ctx->name, scheduler->name, sizeof(sched_ctx->name));
if (strlen(scheduler->description) >
RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN - 1) {
if (strlen(scheduler->description) >
RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN - 1) {
- C
S_LOG_ERR(
"Invalid description %s, should be less than "
- "%u bytes.
\n
", scheduler->description,
+ C
R_SCHED_LOG(ERR,
"Invalid description %s, should be less than "
+ "%u bytes.", scheduler->description,
RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN - 1);
return -EINVAL;
}
RTE_CRYPTODEV_SCHEDULER_DESC_MAX_LEN - 1);
return -EINVAL;
}
- s
nprintf(sched_ctx->description, sizeof(sched_ctx->description), "%s"
,
-
scheduler->description
);
+ s
trlcpy(sched_ctx->description, scheduler->description
,
+
sizeof(sched_ctx->description)
);
/* load scheduler instance operations functions */
sched_ctx->ops.config_queue_pair = scheduler->ops->config_queue_pair;
/* load scheduler instance operations functions */
sched_ctx->ops.config_queue_pair = scheduler->ops->config_queue_pair;
@@
-473,7
+475,7
@@
rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
int ret = (*sched_ctx->ops.create_private_ctx)(dev);
if (ret < 0) {
int ret = (*sched_ctx->ops.create_private_ctx)(dev);
if (ret < 0) {
- C
S_LOG_ERR(
"Unable to create scheduler private "
+ C
R_SCHED_LOG(ERR,
"Unable to create scheduler private "
"context");
return ret;
}
"context");
return ret;
}
@@
-492,12
+494,12
@@
rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t *slaves)
uint32_t nb_slaves = 0;
if (!dev) {
uint32_t nb_slaves = 0;
if (!dev) {
- C
S_LOG_ERR(
"Operation not supported");
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
- if (dev->driver_id != cryptodev_driver_id) {
- C
S_LOG_ERR(
"Operation not supported");
+ if (dev->driver_id != cryptodev_
scheduler_
driver_id) {
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
@@
-525,17
+527,17
@@
rte_cryptodev_scheduler_option_set(uint8_t scheduler_id,
if (option_type == CDEV_SCHED_OPTION_NOT_SET ||
option_type >= CDEV_SCHED_OPTION_COUNT) {
if (option_type == CDEV_SCHED_OPTION_NOT_SET ||
option_type >= CDEV_SCHED_OPTION_COUNT) {
- C
S_LOG_ERR(
"Invalid option parameter");
+ C
R_SCHED_LOG(ERR,
"Invalid option parameter");
return -EINVAL;
}
if (!option) {
return -EINVAL;
}
if (!option) {
- C
S_LOG_ERR(
"Invalid option parameter");
+ C
R_SCHED_LOG(ERR,
"Invalid option parameter");
return -EINVAL;
}
if (dev->data->dev_started) {
return -EINVAL;
}
if (dev->data->dev_started) {
- C
S_LOG_ERR(
"Illegal operation");
+ C
R_SCHED_LOG(ERR,
"Illegal operation");
return -EBUSY;
}
return -EBUSY;
}
@@
-555,17
+557,17
@@
rte_cryptodev_scheduler_option_get(uint8_t scheduler_id,
struct scheduler_ctx *sched_ctx;
if (!dev) {
struct scheduler_ctx *sched_ctx;
if (!dev) {
- C
S_LOG_ERR(
"Operation not supported");
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
if (!option) {
return -ENOTSUP;
}
if (!option) {
- C
S_LOG_ERR(
"Invalid option parameter");
+ C
R_SCHED_LOG(ERR,
"Invalid option parameter");
return -EINVAL;
}
return -EINVAL;
}
- if (dev->driver_id != cryptodev_driver_id) {
- C
S_LOG_ERR(
"Operation not supported");
+ if (dev->driver_id != cryptodev_
scheduler_
driver_id) {
+ C
R_SCHED_LOG(ERR,
"Operation not supported");
return -ENOTSUP;
}
return -ENOTSUP;
}
@@
-575,3
+577,8
@@
rte_cryptodev_scheduler_option_get(uint8_t scheduler_id,
return (*sched_ctx->ops.option_get)(dev, option_type, option);
}
return (*sched_ctx->ops.option_get)(dev, option_type, option);
}
+
+RTE_INIT(scheduler_init_log)
+{
+ scheduler_logtype_driver = rte_log_register("pmd.crypto.scheduler");
+}