Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 18.11-rc1
[deb_dpdk.git]
/
lib
/
librte_cryptodev
/
rte_cryptodev.c
diff --git
a/lib/librte_cryptodev/rte_cryptodev.c
b/lib/librte_cryptodev/rte_cryptodev.c
index
63ae23f
..
a52eaaa
100644
(file)
--- a/
lib/librte_cryptodev/rte_cryptodev.c
+++ b/
lib/librte_cryptodev/rte_cryptodev.c
@@
-43,19
+43,17
@@
static uint8_t nb_drivers;
static uint8_t nb_drivers;
-struct rte_cryptodev rte_crypto_devices[RTE_CRYPTO_MAX_DEVS];
+st
atic st
ruct rte_cryptodev rte_crypto_devices[RTE_CRYPTO_MAX_DEVS];
-struct rte_cryptodev *rte_cryptodevs =
&rte_crypto_devices[0]
;
+struct rte_cryptodev *rte_cryptodevs =
rte_crypto_devices
;
static struct rte_cryptodev_global cryptodev_globals = {
static struct rte_cryptodev_global cryptodev_globals = {
- .devs =
&rte_crypto_devices[0]
,
+ .devs =
rte_crypto_devices
,
.data = { NULL },
.nb_devs = 0,
.max_devs = RTE_CRYPTO_MAX_DEVS
};
.data = { NULL },
.nb_devs = 0,
.max_devs = RTE_CRYPTO_MAX_DEVS
};
-struct rte_cryptodev_global *rte_cryptodev_globals = &cryptodev_globals;
-
/* spinlock for crypto device callbacks */
static rte_spinlock_t rte_cryptodev_cb_lock = RTE_SPINLOCK_INITIALIZER;
/* spinlock for crypto device callbacks */
static rte_spinlock_t rte_cryptodev_cb_lock = RTE_SPINLOCK_INITIALIZER;
@@
-486,7
+484,7
@@
rte_cryptodev_get_feature_name(uint64_t flag)
struct rte_cryptodev *
rte_cryptodev_pmd_get_dev(uint8_t dev_id)
{
struct rte_cryptodev *
rte_cryptodev_pmd_get_dev(uint8_t dev_id)
{
- return &
rte_cryptodev_globals->
devs[dev_id];
+ return &
cryptodev_globals.
devs[dev_id];
}
struct rte_cryptodev *
}
struct rte_cryptodev *
@@
-498,8
+496,8
@@
rte_cryptodev_pmd_get_named_dev(const char *name)
if (name == NULL)
return NULL;
if (name == NULL)
return NULL;
- for (i = 0; i <
rte_cryptodev_globals->
max_devs; i++) {
- dev = &
rte_cryptodev_globals->
devs[i];
+ for (i = 0; i <
cryptodev_globals.
max_devs; i++) {
+ dev = &
cryptodev_globals.
devs[i];
if ((dev->attached == RTE_CRYPTODEV_ATTACHED) &&
(strcmp(dev->data->name, name) == 0))
if ((dev->attached == RTE_CRYPTODEV_ATTACHED) &&
(strcmp(dev->data->name, name) == 0))
@@
-514,7
+512,7
@@
rte_cryptodev_pmd_is_valid_dev(uint8_t dev_id)
{
struct rte_cryptodev *dev = NULL;
{
struct rte_cryptodev *dev = NULL;
- if (dev_id >=
rte_cryptodev_globals->
nb_devs)
+ if (dev_id >=
cryptodev_globals.
nb_devs)
return 0;
dev = rte_cryptodev_pmd_get_dev(dev_id);
return 0;
dev = rte_cryptodev_pmd_get_dev(dev_id);
@@
-533,10
+531,10
@@
rte_cryptodev_get_dev_id(const char *name)
if (name == NULL)
return -1;
if (name == NULL)
return -1;
- for (i = 0; i <
rte_cryptodev_globals->
nb_devs; i++)
- if ((strcmp(
rte_cryptodev_globals->
devs[i].data->name, name)
+ for (i = 0; i <
cryptodev_globals.
nb_devs; i++)
+ if ((strcmp(
cryptodev_globals.
devs[i].data->name, name)
== 0) &&
== 0) &&
- (
rte_cryptodev_globals->
devs[i].attached ==
+ (
cryptodev_globals.
devs[i].attached ==
RTE_CRYPTODEV_ATTACHED))
return i;
RTE_CRYPTODEV_ATTACHED))
return i;
@@
-546,7
+544,7
@@
rte_cryptodev_get_dev_id(const char *name)
uint8_t
rte_cryptodev_count(void)
{
uint8_t
rte_cryptodev_count(void)
{
- return
rte_cryptodev_globals->
nb_devs;
+ return
cryptodev_globals.
nb_devs;
}
uint8_t
}
uint8_t
@@
-554,9
+552,9
@@
rte_cryptodev_device_count_by_driver(uint8_t driver_id)
{
uint8_t i, dev_count = 0;
{
uint8_t i, dev_count = 0;
- for (i = 0; i <
rte_cryptodev_globals->
max_devs; i++)
- if (
rte_cryptodev_globals->
devs[i].driver_id == driver_id &&
-
rte_cryptodev_globals->
devs[i].attached ==
+ for (i = 0; i <
cryptodev_globals.
max_devs; i++)
+ if (
cryptodev_globals.
devs[i].driver_id == driver_id &&
+
cryptodev_globals.
devs[i].attached ==
RTE_CRYPTODEV_ATTACHED)
dev_count++;
RTE_CRYPTODEV_ATTACHED)
dev_count++;
@@
-568,8
+566,8
@@
rte_cryptodev_devices_get(const char *driver_name, uint8_t *devices,
uint8_t nb_devices)
{
uint8_t i, count = 0;
uint8_t nb_devices)
{
uint8_t i, count = 0;
- struct rte_cryptodev *devs =
rte_cryptodev_globals->
devs;
- uint8_t max_devs =
rte_cryptodev_globals->
max_devs;
+ struct rte_cryptodev *devs =
cryptodev_globals.
devs;
+ uint8_t max_devs =
cryptodev_globals.
max_devs;
for (i = 0; i < max_devs && count < nb_devices; i++) {
for (i = 0; i < max_devs && count < nb_devices; i++) {
@@
-1477,6
+1475,9
@@
rte_crypto_op_pool_create(const char *name, enum rte_crypto_op_type type,
elt_size += sizeof(struct rte_crypto_sym_op);
} else if (type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) {
elt_size += sizeof(struct rte_crypto_asym_op);
elt_size += sizeof(struct rte_crypto_sym_op);
} else if (type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) {
elt_size += sizeof(struct rte_crypto_asym_op);
+ } else if (type == RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+ elt_size += RTE_MAX(sizeof(struct rte_crypto_sym_op),
+ sizeof(struct rte_crypto_asym_op));
} else {
CDEV_LOG_ERR("Invalid op_type\n");
return NULL;
} else {
CDEV_LOG_ERR("Invalid op_type\n");
return NULL;