cryptodev: add tracepoints

Add tracepoints at important and mandatory APIs for tracing support.

Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
Acked-by: David Marchand <david.marchand@redhat.com>

diff --git a/lib/librte_cryptodev/Makefile b/lib/librte_cryptodev/Makefile
index 2ba0dbe..73e77a2 100644 (file)
--- a/lib/librte_cryptodev/Makefile
+++ b/lib/librte_cryptodev/Makefile
@@ -13,14 +13,16 @@ LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf
 LDLIBS += -lrte_kvargs
 
 # library source files
-SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c
+SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c cryptodev_trace_points.c
 
 # export include files
 SYMLINK-y-include += rte_crypto.h
+SYMLINK-y-include += rte_crypto_asym.h
 SYMLINK-y-include += rte_crypto_sym.h
 SYMLINK-y-include += rte_cryptodev.h
 SYMLINK-y-include += rte_cryptodev_pmd.h
-SYMLINK-y-include += rte_crypto_asym.h
+SYMLINK-y-include += rte_cryptodev_trace.h
+SYMLINK-y-include += rte_cryptodev_trace_fp.h
 
 # versioning export map
 EXPORT_MAP := rte_cryptodev_version.map

diff --git a/lib/librte_cryptodev/cryptodev_trace_points.c b/lib/librte_cryptodev/cryptodev_trace_points.c
new file mode 100644 (file)
index 0000000..9df213e
--- /dev/null
+++ b/lib/librte_cryptodev/cryptodev_trace_points.c
@@ -0,0 +1,69 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2020 Marvell International Ltd.
+ */
+
+#define RTE_TRACE_POINT_REGISTER_SELECT
+
+#include "rte_cryptodev_trace.h"
+
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_configure);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_start);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_stop);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_close);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_queue_pair_setup);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_sym_session_pool_create);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_sym_session_create);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_asym_session_create);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_sym_session_free);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_asym_session_free);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_sym_session_init);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_asym_session_init);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_sym_session_clear);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_asym_session_clear);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_enqueue_burst);
+RTE_TRACE_POINT_DEFINE(rte_cryptodev_trace_dequeue_burst);
+
+RTE_INIT(cryptodev_trace_init)
+{
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_configure,
+               lib.cryptodev.configure);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_start,
+               lib.cryptodev.start);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_stop,
+               lib.cryptodev.stop);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_close,
+               lib.cryptodev.close);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_queue_pair_setup,
+               lib.cryptodev.queue.pair.setup);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_sym_session_pool_create,
+               lib.cryptodev.sym.pool.create);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_sym_session_create,
+               lib.cryptodev.sym.create);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_asym_session_create,
+               lib.cryptodev.asym.create);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_sym_session_free,
+               lib.cryptodev.sym.free);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_asym_session_free,
+               lib.cryptodev.asym.free);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_sym_session_init,
+               lib.cryptodev.sym.init);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_asym_session_init,
+               lib.cryptodev.asym.init);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_enqueue_burst,
+               lib.cryptodev.enq.burst);
+
+       RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_dequeue_burst,
+               lib.cryptodev.deq.burst);
+}

diff --git a/lib/librte_cryptodev/meson.build b/lib/librte_cryptodev/meson.build
index 42825a8..c4c6b3b 100644 (file)
--- a/lib/librte_cryptodev/meson.build
+++ b/lib/librte_cryptodev/meson.build
@@ -1,9 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-sources = files('rte_cryptodev.c', 'rte_cryptodev_pmd.c')
+sources = files('rte_cryptodev.c', 'rte_cryptodev_pmd.c', 'cryptodev_trace_points.c')
 headers = files('rte_cryptodev.h',
        'rte_cryptodev_pmd.h',
+       'rte_cryptodev_trace.h',
+       'rte_cryptodev_trace_fp.h',
        'rte_crypto.h',
        'rte_crypto_sym.h',
        'rte_crypto_asym.h')

diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c
index 2849b2e..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_cryptodev_trace.h"
 
 static uint8_t nb_drivers;
 
@@ -916,6 +917,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)
                return diag;
        }
 
+       rte_cryptodev_trace_configure(dev_id, config);
        return (*dev->dev_ops->dev_configure)(dev, config);
 }
 
@@ -944,6 +946,7 @@ rte_cryptodev_start(uint8_t dev_id)
        }
 
        diag = (*dev->dev_ops->dev_start)(dev);
+       rte_cryptodev_trace_start(dev_id, diag);
        if (diag == 0)
                dev->data->dev_started = 1;
        else
@@ -973,6 +976,7 @@ rte_cryptodev_stop(uint8_t dev_id)
        }
 
        (*dev->dev_ops->dev_stop)(dev);
+       rte_cryptodev_trace_stop(dev_id);
        dev->data->dev_started = 0;
 }
 
@@ -1009,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_cryptodev_trace_close(dev_id, retval);
 
        if (retval < 0)
                return retval;
@@ -1078,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_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);
 }
@@ -1299,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;
 }
@@ -1340,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;
 }
 
@@ -1380,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;
 
+       rte_cryptodev_trace_sym_session_pool_create(name, nb_elts,
+               elt_size, cache_size, user_data_size, mp);
        return mp;
 }
 
@@ -1424,6 +1434,7 @@ rte_cryptodev_sym_session_create(struct rte_mempool *mp)
        memset(sess->sess_data, 0,
                        rte_cryptodev_sym_session_data_size(sess));
 
+       rte_cryptodev_trace_sym_session_create(mp, sess);
        return sess;
 }
 
@@ -1443,6 +1454,7 @@ rte_cryptodev_asym_session_create(struct rte_mempool *mp)
         */
        memset(sess, 0, (sizeof(void *) * nb_drivers) + sizeof(uint8_t));
 
+       rte_cryptodev_trace_asym_session_create(mp, sess);
        return sess;
 }
 
@@ -1473,6 +1485,7 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id,
 
        dev->dev_ops->sym_session_clear(dev, sess);
 
+       rte_cryptodev_trace_sym_session_clear(dev_id, sess);
        return 0;
 }
 
@@ -1496,6 +1509,7 @@ rte_cryptodev_asym_session_clear(uint8_t dev_id,
 
        dev->dev_ops->asym_session_clear(dev, sess);
 
+       rte_cryptodev_trace_sym_session_clear(dev_id, sess);
        return 0;
 }
 
@@ -1518,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);
 
+       rte_cryptodev_trace_sym_session_free(sess);
        return 0;
 }
 
@@ -1542,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);
 
+       rte_cryptodev_trace_asym_session_free(sess);
        return 0;
 }
 

diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h
index f4846d2..3dbb5ce 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -24,6 +24,8 @@ extern "C" {
 #include <rte_common.h>
 #include <rte_config.h>
 
+#include "rte_cryptodev_trace_fp.h"
+
 extern const char **rte_cyptodev_names;
 
 /* Logging Macros */
@@ -926,6 +928,7 @@ rte_cryptodev_dequeue_burst(uint8_t dev_id, uint16_t qp_id,
        nb_ops = (*dev->dequeue_burst)
                        (dev->data->queue_pairs[qp_id], ops, nb_ops);
 
+       rte_cryptodev_trace_dequeue_burst(dev_id, qp_id, (void **)ops, nb_ops);
        return nb_ops;
 }
 
@@ -966,6 +969,7 @@ rte_cryptodev_enqueue_burst(uint8_t dev_id, uint16_t qp_id,
 {
        struct rte_cryptodev *dev = &rte_cryptodevs[dev_id];
 
+       rte_cryptodev_trace_enqueue_burst(dev_id, qp_id, (void **)ops, nb_ops);
        return (*dev->enqueue_burst)(
                        dev->data->queue_pairs[qp_id], ops, nb_ops);
 }

diff --git a/lib/librte_cryptodev/rte_cryptodev_trace.h b/lib/librte_cryptodev/rte_cryptodev_trace.h
new file mode 100644 (file)
index 0000000..d1f4f06
--- /dev/null
+++ b/lib/librte_cryptodev/rte_cryptodev_trace.h
@@ -0,0 +1,149 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2020 Marvell International Ltd.
+ */
+
+#ifndef _RTE_CRYPTODEV_TRACE_H_
+#define _RTE_CRYPTODEV_TRACE_H_
+
+/**
+ * @file
+ *
+ * API for cryptodev trace support
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_trace_point.h>
+
+#include "rte_cryptodev.h"
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_configure,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id,
+               struct rte_cryptodev_config *conf),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_u16(conf->nb_queue_pairs);
+       rte_trace_point_emit_i64(conf->ff_disable);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_start,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id, int rc),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_int(rc);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_stop,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id),
+       rte_trace_point_emit_u8(dev_id);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_close,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id, int rc),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_int(rc);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_queue_pair_setup,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint16_t queue_pair_id,
+               const struct rte_cryptodev_qp_conf *conf),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_u16(queue_pair_id);
+       rte_trace_point_emit_u32(conf->nb_descriptors);
+       rte_trace_point_emit_ptr(conf->mp_session);
+       rte_trace_point_emit_ptr(conf->mp_session_private);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_sym_session_pool_create,
+       RTE_TRACE_POINT_ARGS(const char *name, uint32_t nb_elts,
+               uint32_t elt_size, uint32_t cache_size,
+               uint16_t user_data_size, void *mempool),
+       rte_trace_point_emit_string(name);
+       rte_trace_point_emit_u32(nb_elts);
+       rte_trace_point_emit_u32(elt_size);
+       rte_trace_point_emit_u32(cache_size);
+       rte_trace_point_emit_u16(user_data_size);
+       rte_trace_point_emit_ptr(mempool);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_sym_session_create,
+       RTE_TRACE_POINT_ARGS(void *mempool,
+               struct rte_cryptodev_sym_session *sess),
+       rte_trace_point_emit_ptr(mempool);
+       rte_trace_point_emit_ptr(sess);
+       rte_trace_point_emit_u64(sess->opaque_data);
+       rte_trace_point_emit_u16(sess->nb_drivers);
+       rte_trace_point_emit_u16(sess->user_data_sz);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_asym_session_create,
+       RTE_TRACE_POINT_ARGS(void *mempool,
+               struct rte_cryptodev_asym_session *sess),
+       rte_trace_point_emit_ptr(mempool);
+       rte_trace_point_emit_ptr(sess);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_sym_session_free,
+       RTE_TRACE_POINT_ARGS(struct rte_cryptodev_sym_session *sess),
+       rte_trace_point_emit_ptr(sess);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_asym_session_free,
+       RTE_TRACE_POINT_ARGS(struct rte_cryptodev_asym_session *sess),
+       rte_trace_point_emit_ptr(sess);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_sym_session_init,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id,
+               struct rte_cryptodev_sym_session *sess, void *xforms,
+               void *mempool),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_ptr(sess);
+       rte_trace_point_emit_u64(sess->opaque_data);
+       rte_trace_point_emit_u16(sess->nb_drivers);
+       rte_trace_point_emit_u16(sess->user_data_sz);
+       rte_trace_point_emit_ptr(xforms);
+       rte_trace_point_emit_ptr(mempool);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_asym_session_init,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id,
+               struct rte_cryptodev_asym_session *sess, void *xforms,
+               void *mempool),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_ptr(sess);
+       rte_trace_point_emit_ptr(xforms);
+       rte_trace_point_emit_ptr(mempool);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_sym_session_clear,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id, void *sess),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_ptr(sess);
+)
+
+RTE_TRACE_POINT(
+       rte_cryptodev_trace_asym_session_clear,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id, void *sess),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_ptr(sess);
+)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_CRYPTODEV_TRACE_H_ */

diff --git a/lib/librte_cryptodev/rte_cryptodev_trace_fp.h b/lib/librte_cryptodev/rte_cryptodev_trace_fp.h
new file mode 100644 (file)
index 0000000..9218997
--- /dev/null
+++ b/lib/librte_cryptodev/rte_cryptodev_trace_fp.h
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2020 Marvell International Ltd.
+ */
+
+#ifndef _RTE_CRYPTODEV_TRACE_FP_H_
+#define _RTE_CRYPTODEV_TRACE_FP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_trace_point.h>
+
+RTE_TRACE_POINT_FP(
+       rte_cryptodev_trace_enqueue_burst,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint16_t qp_id, void **ops,
+               uint16_t nb_ops),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_u16(qp_id);
+       rte_trace_point_emit_ptr(ops);
+       rte_trace_point_emit_u16(nb_ops);
+)
+
+RTE_TRACE_POINT_FP(
+       rte_cryptodev_trace_dequeue_burst,
+       RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint16_t qp_id, void **ops,
+               uint16_t nb_ops),
+       rte_trace_point_emit_u8(dev_id);
+       rte_trace_point_emit_u16(qp_id);
+       rte_trace_point_emit_ptr(ops);
+       rte_trace_point_emit_u16(nb_ops);
+)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_CRYPTODEV_TRACE_FP_H_ */

diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map
index 6e41b4b..87f5cd1 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev_version.map
+++ b/lib/librte_cryptodev/rte_cryptodev_version.map
@@ -78,4 +78,22 @@ EXPERIMENTAL {
        rte_cryptodev_sym_session_set_user_data;
        rte_crypto_asym_op_strings;
        rte_crypto_asym_xform_strings;
+
+       # added in 20.05
+       __rte_cryptodev_trace_configure;
+       __rte_cryptodev_trace_start;
+       __rte_cryptodev_trace_stop;
+       __rte_cryptodev_trace_close;
+       __rte_cryptodev_trace_queue_pair_setup;
+       __rte_cryptodev_trace_sym_session_pool_create;
+       __rte_cryptodev_trace_sym_session_create;
+       __rte_cryptodev_trace_asym_session_create;
+       __rte_cryptodev_trace_sym_session_free;
+       __rte_cryptodev_trace_asym_session_free;
+       __rte_cryptodev_trace_sym_session_init;
+       __rte_cryptodev_trace_asym_session_init;
+       __rte_cryptodev_trace_sym_session_clear;
+       __rte_cryptodev_trace_asym_session_clear;
+       __rte_cryptodev_trace_dequeue_burst;
+       __rte_cryptodev_trace_enqueue_burst;
 };