#include <dpdk/device/dpdk.h>
#include <dpdk/ipsec/ipsec.h>
+static u8 *
+format_crypto_resource (u8 * s, va_list * args)
+{
+ dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
+
+ u32 indent = va_arg (*args, u32);
+ u32 res_idx = va_arg (*args, u32);
+
+ crypto_resource_t *res = vec_elt_at_index (dcm->resource, res_idx);
+
+
+ s = format (s, "%U thr_id %3d qp %2u dec_inflight %u, enc_inflights %u\n",
+ format_white_space, indent, (i16) res->thread_idx,
+ res->qp_id, res->inflights[0], res->inflights[1]);
+
+ return s;
+}
+
static u8 *
format_crypto (u8 * s, va_list * args)
{
crypto_drv_t *drv = vec_elt_at_index (dcm->drv, dev->drv_id);
u64 feat, mask;
u32 i;
- i8 *pre = " ";
+ char *pre = " ";
s = format (s, "%-25s%-20s%-10s\n", dev->name, drv->name,
rte_cryptodevs[dev->id].data->dev_started ? "up" : "down");
s = format (s, " numa_node %u, max_queues %u\n", dev->numa, dev->max_qp);
- s = format (s, " free_resources %u, used_resources %u\n",
- vec_len (dev->free_resources), vec_len (dev->used_resources));
if (dev->features)
{
s = format (s, "%s%s", pre, dcm->auth_algs[i].name);
pre = ", ";
}
- s = format (s, "\n\n");
+ s = format (s, "\n");
+
+ struct rte_cryptodev_stats stats;
+ rte_cryptodev_stats_get (dev->id, &stats);
+
+ s =
+ format (s,
+ " enqueue %-10lu dequeue %-10lu enqueue_err %-10lu dequeue_err %-10lu \n",
+ stats.enqueued_count, stats.dequeued_count,
+ stats.enqueue_err_count, stats.dequeue_err_count);
+
+ u16 *res_idx;
+ s = format (s, " free_resources %u :", vec_len (dev->free_resources));
+
+ u32 indent = format_get_indent (s);
+ s = format (s, "\n");
+
+ /* *INDENT-OFF* */
+ vec_foreach (res_idx, dev->free_resources)
+ s = format (s, "%U", format_crypto_resource, indent, res_idx[0]);
+ /* *INDENT-ON* */
+
+ s = format (s, " used_resources %u :", vec_len (dev->used_resources));
+ indent = format_get_indent (s);
+
+ s = format (s, "\n");
+
+ /* *INDENT-OFF* */
+ vec_foreach (res_idx, dev->used_resources)
+ s = format (s, "%U", format_crypto_resource, indent, res_idx[0]);
+ /* *INDENT-ON* */
+
+ s = format (s, "\n");
return s;
}
+
+static clib_error_t *
+clear_crypto_stats_fn (vlib_main_t * vm, unformat_input_t * input,
+ vlib_cli_command_t * cmd)
+{
+ dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
+ crypto_dev_t *dev;
+
+ /* *INDENT-OFF* */
+ vec_foreach (dev, dcm->dev)
+ rte_cryptodev_stats_reset (dev->id);
+ /* *INDENT-ON* */
+
+ return NULL;
+}
+
+/*?
+ * This command is used to clear the DPDK Crypto device statistics.
+ *
+ * @cliexpar
+ * Example of how to clear the DPDK Crypto device statistics:
+ * @cliexsart{clear dpdk crypto devices statistics}
+ * vpp# clear dpdk crypto devices statistics
+ * @cliexend
+ * Example of clearing the DPDK Crypto device statistic data:
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_dpdk_crypto_stats, static) = {
+ .path = "clear dpdk crypto devices statistics",
+ .short_help = "clear dpdk crypto devices statistics",
+ .function = clear_crypto_stats_fn,
+};
+/* *INDENT-ON* */
+
+
static clib_error_t *
show_dpdk_crypto_fn (vlib_main_t * vm, unformat_input_t * input,
vlib_cli_command_t * cmd)
* Example of how to display the DPDK Crypto device information:
* @cliexsart{show dpdk crypto devices}
* vpp# show dpdk crypto devices
- * cryptodev_aesni_mb_pmd crypto_aesni_mb down
- * numa_node 1, max_queues 8
- * free_resources 2, used_resources 2
- * SYMMETRIC_CRYPTO, SYM_OPERATION_CHAINING, CPU_AVX2, CPU_AESNI
- * Cipher: aes-cbc-128, aes-cbc-192, aes-cbc-256, aes-ctr-128, aes-ctr-192, aes-ctr-256
- * Auth: md5-96, sha1-96, sha-256-128, sha-384-192, sha-512-256
- *
- * cryptodev_aesni_gcm_pmd crypto_aesni_gcm down
- * numa_node 1, max_queues 8
- * free_resources 2, used_resources 2
- * SYMMETRIC_CRYPTO, SYM_OPERATION_CHAINING, CPU_AVX2, CPU_AESNI, MBUF_SCATTER_GATHER
- * Cipher: aes-gcm-128, aes-gcm-192, aes-gcm-256
- * Auth:
+ * aesni_mb0 crypto_aesni_mb up
+ * numa_node 0, max_queues 4
+ * SYMMETRIC_CRYPTO, SYM_OPERATION_CHAINING, CPU_AVX2, CPU_AESNI
+ * Cipher: aes-cbc-128, aes-cbc-192, aes-cbc-256, aes-ctr-128, aes-ctr-192, aes-ctr-256, aes-gcm-128, aes-gcm-192, aes-gcm-256
+ * Auth: md5-96, sha1-96, sha-256-128, sha-384-192, sha-512-256
+ * enqueue 2 dequeue 2 enqueue_err 0 dequeue_err 0
+ * free_resources 3 :
+ * thr_id -1 qp 3 inflight 0
+ * thr_id -1 qp 2 inflight 0
+ * thr_id -1 qp 1 inflight 0
+ * used_resources 1 :
+ * thr_id 1 qp 0 inflight 0
* @cliexend
* Example of displaying the DPDK Crypto device data when enabled:
* @cliexend
crypto_worker_main_t *cwm;
crypto_resource_t *res;
u16 *res_idx;
- i8 *pre, *ind;
+ char *pre, *ind;
u32 i;
cwm = vec_elt_at_index (dcm->workers_main, thread_idx);
{
ind = " ";
res = vec_elt_at_index (dcm->resource, res_idx[0]);
- s = format (s, "%s%-20s dev-id %2u inbound-queue %2u outbound-queue %2u\n",
+ s = format (s, "%s%-20s dev-id %2u queue-pair %2u\n",
ind, vec_elt_at_index (dcm->dev, res->dev_id)->name,
- res->dev_id, res->qp_id, res->qp_id + 1);
+ res->dev_id, res->qp_id);
ind = " ";
if (verbose)
* @cliexstart{show dpdk crypto placement}
* vpp# show dpdk crypto placement
* Thread 1 (vpp_wk_0):
- * cryptodev_aesni_mb_p dev-id 0 inbound-queue 0 outbound-queue 1
- * cryptodev_aesni_gcm_ dev-id 1 inbound-queue 0 outbound-queue 1
+ * cryptodev_aesni_mb_p dev-id 0 queue-pair 0
+ * cryptodev_aesni_gcm_ dev-id 1 queue-pair 0
*
* Thread 2 (vpp_wk_1):
- * cryptodev_aesni_mb_p dev-id 0 inbound-queue 2 outbound-queue 3
- * cryptodev_aesni_gcm_ dev-id 1 inbound-queue 2 outbound-queue 3
+ * cryptodev_aesni_mb_p dev-id 0 queue-pair 1
+ * cryptodev_aesni_gcm_ dev-id 1 queue-pair 1
* @cliexend
?*/
/* *INDENT-OFF* */
* @cliexstart{show dpdk crypto placement verbose}
* vpp# show dpdk crypto placement verbose
* Thread 1 (vpp_wk_0):
- * cryptodev_aesni_mb_p dev-id 0 inbound-queue 0 outbound-queue 1
+ * cryptodev_aesni_mb_p dev-id 0 queue-pair 0
* Cipher: aes-cbc-128, aes-cbc-192, aes-cbc-256, aes-ctr-128, aes-ctr-192, aes-ctr-256
* Auth: md5-96, sha1-96, sha-256-128, sha-384-192, sha-512-256
- * cryptodev_aesni_gcm_ dev-id 1 inbound-queue 0 outbound-queue 1
+ * cryptodev_aesni_gcm_ dev-id 1 queue-pair 0
* Cipher: aes-gcm-128, aes-gcm-192, aes-gcm-256
* Auth:
*
* Thread 2 (vpp_wk_1):
- * cryptodev_aesni_mb_p dev-id 0 inbound-queue 2 outbound-queue 3
+ * cryptodev_aesni_mb_p dev-id 0 queue-pair 1
* Cipher: aes-cbc-128, aes-cbc-192, aes-cbc-256, aes-ctr-128, aes-ctr-192, aes-ctr-256
* Auth: md5-96, sha1-96, sha-256-128, sha-384-192, sha-512-256
- * cryptodev_aesni_gcm_ dev-id 1 inbound-queue 2 outbound-queue 3
+ * cryptodev_aesni_gcm_ dev-id 1 queue-pair 1
* Cipher: aes-gcm-128, aes-gcm-192, aes-gcm-256
* Auth:
*
crypto_dev_t *dev;
u32 thread_idx, i;
u16 res_idx, *idx;
- u8 dev_idx, auto_en;
+ u8 dev_idx, auto_en = 0;
if (!unformat_user (input, unformat_line_input, line_input))
return clib_error_return (0, "invalid syntax");
/* *INDENT-ON* */
/*
- * The thread will not enqueue more operatios to the device but will poll
+ * The thread will not enqueue more operations to the device but will poll
* from it until there are no more inflight operations.
*/
static void
format_dpdk_mempool (u8 * s, va_list * args)
{
struct rte_mempool *mp = va_arg (*args, struct rte_mempool *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
u32 count = rte_mempool_avail_count (mp);
s = format (s, "%s\n%Uavailable %7d, allocated %7d total %7d\n",
{
if (data->crypto_op)
vlib_cli_output (vm, "%U\n", format_dpdk_mempool, data->crypto_op);
-#if ! DPDK_NO_AEAD
if (data->session_h)
vlib_cli_output (vm, "%U\n", format_dpdk_mempool, data->session_h);
struct rte_mempool **mp;
vec_foreach (mp, data->session_drv)
if (mp[0])
- vlib_cli_output (vm, "%U\n", format_dpdk_mempool, mp[0]);
-#endif
+ vlib_cli_output (vm, "%U\n", format_dpdk_mempool, mp[0]);
}
/* *INDENT-ON* */
-#if DPDK_NO_AEAD
- crypto_dev_t *dev;
- /* *INDENT-OFF* */
- vec_foreach (dev, dcm->dev) if (rte_cryptodevs[dev->id].data->session_pool)
- vlib_cli_output (vm, "%U\n", format_dpdk_mempool,
- rte_cryptodevs[dev->id].data->session_pool);
- /* *INDENT-ON* */
-#endif
-
return NULL;
}
* This command is used to display the DPDK Crypto pools information.
*
* @cliexpar
- * Example of how to display the DPDK Cypto pools information:
+ * Example of how to display the DPDK Crypto pools information:
* @cliexstart{show crypto device mapping}
* vpp# show dpdk crypto pools
* crypto_pool_numa1
Code Review / vpp.git / blobdiff