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
trace: simplify trace point headers
[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
6d1d0e9
..
7693eb6
100644
(file)
--- a/
lib/librte_cryptodev/rte_cryptodev.c
+++ b/
lib/librte_cryptodev/rte_cryptodev.c
@@
-40,6
+40,7
@@
#include "rte_crypto.h"
#include "rte_cryptodev.h"
#include "rte_cryptodev_pmd.h"
#include "rte_crypto.h"
#include "rte_cryptodev.h"
#include "rte_cryptodev_pmd.h"
+#include "rte_cryptodev_trace.h"
static uint8_t nb_drivers;
static uint8_t nb_drivers;
@@
-495,6
+496,10
@@
rte_cryptodev_get_feature_name(uint64_t flag)
return "DIGEST_ENCRYPTED";
case RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO:
return "SYM_CPU_CRYPTO";
return "DIGEST_ENCRYPTED";
case RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO:
return "SYM_CPU_CRYPTO";
+ case RTE_CRYPTODEV_FF_ASYM_SESSIONLESS:
+ return "ASYM_SESSIONLESS";
+ case RTE_CRYPTODEV_FF_SYM_SESSIONLESS:
+ return "SYM_SESSIONLESS";
default:
return NULL;
}
default:
return NULL;
}
@@
-529,7
+534,8
@@
rte_cryptodev_pmd_get_named_dev(const char *name)
static inline uint8_t
rte_cryptodev_is_valid_device_data(uint8_t dev_id)
{
static inline uint8_t
rte_cryptodev_is_valid_device_data(uint8_t dev_id)
{
- if (rte_crypto_devices[dev_id].data == NULL)
+ if (dev_id >= RTE_CRYPTO_MAX_DEVS ||
+ rte_crypto_devices[dev_id].data == NULL)
return 0;
return 1;
return 0;
return 1;
@@
-621,8
+627,9
@@
rte_cryptodev_devices_get(const char *driver_name, uint8_t *devices,
void *
rte_cryptodev_get_sec_ctx(uint8_t dev_id)
{
void *
rte_cryptodev_get_sec_ctx(uint8_t dev_id)
{
- if (rte_crypto_devices[dev_id].feature_flags &
- RTE_CRYPTODEV_FF_SECURITY)
+ if (dev_id < RTE_CRYPTO_MAX_DEVS &&
+ (rte_crypto_devices[dev_id].feature_flags &
+ RTE_CRYPTODEV_FF_SECURITY))
return rte_crypto_devices[dev_id].security_ctx;
return NULL;
return rte_crypto_devices[dev_id].security_ctx;
return NULL;
@@
-793,6
+800,11
@@
rte_cryptodev_queue_pair_count(uint8_t dev_id)
{
struct rte_cryptodev *dev;
{
struct rte_cryptodev *dev;
+ if (!rte_cryptodev_is_valid_device_data(dev_id)) {
+ CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+ return 0;
+ }
+
dev = &rte_crypto_devices[dev_id];
return dev->data->nb_queue_pairs;
}
dev = &rte_crypto_devices[dev_id];
return dev->data->nb_queue_pairs;
}
@@
-905,6
+917,7
@@
rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)
return diag;
}
return diag;
}
+ rte_cryptodev_trace_configure(dev_id, config);
return (*dev->dev_ops->dev_configure)(dev, config);
}
return (*dev->dev_ops->dev_configure)(dev, config);
}
@@
-933,6
+946,7
@@
rte_cryptodev_start(uint8_t dev_id)
}
diag = (*dev->dev_ops->dev_start)(dev);
}
diag = (*dev->dev_ops->dev_start)(dev);
+ rte_cryptodev_trace_start(dev_id, diag);
if (diag == 0)
dev->data->dev_started = 1;
else
if (diag == 0)
dev->data->dev_started = 1;
else
@@
-962,6
+976,7
@@
rte_cryptodev_stop(uint8_t dev_id)
}
(*dev->dev_ops->dev_stop)(dev);
}
(*dev->dev_ops->dev_stop)(dev);
+ rte_cryptodev_trace_stop(dev_id);
dev->data->dev_started = 0;
}
dev->data->dev_started = 0;
}
@@
-998,6
+1013,7
@@
rte_cryptodev_close(uint8_t dev_id)
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_close, -ENOTSUP);
retval = (*dev->dev_ops->dev_close)(dev);
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_close, -ENOTSUP);
retval = (*dev->dev_ops->dev_close)(dev);
+ rte_cryptodev_trace_close(dev_id, retval);
if (retval < 0)
return retval;
if (retval < 0)
return retval;
@@
-1067,6
+1083,7
@@
rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_pair_setup, -ENOTSUP);
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_pair_setup, -ENOTSUP);
+ rte_cryptodev_trace_queue_pair_setup(dev_id, queue_pair_id, qp_conf);
return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, qp_conf,
socket_id);
}
return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, qp_conf,
socket_id);
}
@@
-1258,6
+1275,11
@@
rte_cryptodev_sym_session_init(uint8_t dev_id,
uint8_t index;
int ret;
uint8_t index;
int ret;
+ if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+ CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+ return -EINVAL;
+ }
+
dev = rte_cryptodev_pmd_get_dev(dev_id);
if (sess == NULL || xforms == NULL || dev == NULL)
dev = rte_cryptodev_pmd_get_dev(dev_id);
if (sess == NULL || xforms == NULL || dev == NULL)
@@
-1283,6
+1305,7
@@
rte_cryptodev_sym_session_init(uint8_t dev_id,
}
}
}
}
+ rte_cryptodev_trace_sym_session_init(dev_id, sess, xforms, mp);
sess->sess_data[index].refcnt++;
return 0;
}
sess->sess_data[index].refcnt++;
return 0;
}
@@
-1297,6
+1320,11
@@
rte_cryptodev_asym_session_init(uint8_t dev_id,
uint8_t index;
int ret;
uint8_t index;
int ret;
+ if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+ CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+ return -EINVAL;
+ }
+
dev = rte_cryptodev_pmd_get_dev(dev_id);
if (sess == NULL || xforms == NULL || dev == NULL)
dev = rte_cryptodev_pmd_get_dev(dev_id);
if (sess == NULL || xforms == NULL || dev == NULL)
@@
-1319,6
+1347,7
@@
rte_cryptodev_asym_session_init(uint8_t dev_id,
}
}
}
}
+ rte_cryptodev_trace_asym_session_init(dev_id, sess, xforms, mp);
return 0;
}
return 0;
}
@@
-1359,6
+1388,8
@@
rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts,
pool_priv->nb_drivers = nb_drivers;
pool_priv->user_data_sz = user_data_size;
pool_priv->nb_drivers = nb_drivers;
pool_priv->user_data_sz = user_data_size;
+ rte_cryptodev_trace_sym_session_pool_create(name, nb_elts,
+ elt_size, cache_size, user_data_size, mp);
return mp;
}
return mp;
}
@@
-1403,6
+1434,7
@@
rte_cryptodev_sym_session_create(struct rte_mempool *mp)
memset(sess->sess_data, 0,
rte_cryptodev_sym_session_data_size(sess));
memset(sess->sess_data, 0,
rte_cryptodev_sym_session_data_size(sess));
+ rte_cryptodev_trace_sym_session_create(mp, sess);
return sess;
}
return sess;
}
@@
-1422,6
+1454,7
@@
rte_cryptodev_asym_session_create(struct rte_mempool *mp)
*/
memset(sess, 0, (sizeof(void *) * nb_drivers) + sizeof(uint8_t));
*/
memset(sess, 0, (sizeof(void *) * nb_drivers) + sizeof(uint8_t));
+ rte_cryptodev_trace_asym_session_create(mp, sess);
return sess;
}
return sess;
}
@@
-1432,6
+1465,11
@@
rte_cryptodev_sym_session_clear(uint8_t dev_id,
struct rte_cryptodev *dev;
uint8_t driver_id;
struct rte_cryptodev *dev;
uint8_t driver_id;
+ if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+ CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+ return -EINVAL;
+ }
+
dev = rte_cryptodev_pmd_get_dev(dev_id);
if (dev == NULL || sess == NULL)
dev = rte_cryptodev_pmd_get_dev(dev_id);
if (dev == NULL || sess == NULL)
@@
-1447,6
+1485,7
@@
rte_cryptodev_sym_session_clear(uint8_t dev_id,
dev->dev_ops->sym_session_clear(dev, sess);
dev->dev_ops->sym_session_clear(dev, sess);
+ rte_cryptodev_trace_sym_session_clear(dev_id, sess);
return 0;
}
return 0;
}
@@
-1456,6
+1495,11
@@
rte_cryptodev_asym_session_clear(uint8_t dev_id,
{
struct rte_cryptodev *dev;
{
struct rte_cryptodev *dev;
+ if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+ CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+ return -EINVAL;
+ }
+
dev = rte_cryptodev_pmd_get_dev(dev_id);
if (dev == NULL || sess == NULL)
dev = rte_cryptodev_pmd_get_dev(dev_id);
if (dev == NULL || sess == NULL)
@@
-1465,6
+1509,7
@@
rte_cryptodev_asym_session_clear(uint8_t dev_id,
dev->dev_ops->asym_session_clear(dev, sess);
dev->dev_ops->asym_session_clear(dev, sess);
+ rte_cryptodev_trace_sym_session_clear(dev_id, sess);
return 0;
}
return 0;
}
@@
-1487,6
+1532,7
@@
rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess)
sess_mp = rte_mempool_from_obj(sess);
rte_mempool_put(sess_mp, sess);
sess_mp = rte_mempool_from_obj(sess);
rte_mempool_put(sess_mp, sess);
+ rte_cryptodev_trace_sym_session_free(sess);
return 0;
}
return 0;
}
@@
-1511,6
+1557,7
@@
rte_cryptodev_asym_session_free(struct rte_cryptodev_asym_session *sess)
sess_mp = rte_mempool_from_obj(sess);
rte_mempool_put(sess_mp, sess);
sess_mp = rte_mempool_from_obj(sess);
rte_mempool_put(sess_mp, sess);
+ rte_cryptodev_trace_asym_session_free(sess);
return 0;
}
return 0;
}
@@
-1789,8
+1836,14
@@
rte_cryptodev_driver_id_get(const char *name)
const char *
rte_cryptodev_name_get(uint8_t dev_id)
{
const char *
rte_cryptodev_name_get(uint8_t dev_id)
{
- struct rte_cryptodev *dev
= rte_cryptodev_pmd_get_dev(dev_id)
;
+ struct rte_cryptodev *dev;
+ if (!rte_cryptodev_is_valid_device_data(dev_id)) {
+ CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+ return NULL;
+ }
+
+ dev = rte_cryptodev_pmd_get_dev(dev_id);
if (dev == NULL)
return NULL;
if (dev == NULL)
return NULL;