From 942b9803f842fc520e9c7518ff2fcffbb5d0f14e Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Tue, 14 Jul 2020 09:41:43 -0400 Subject: [PATCH] dpdk-ipsec: fix show output Fix the shown crypto inflight counts which were reversed. Also improve a couple error descriptions to tell them apart when viewed. Type: fix Signed-off-by: Christian Hopps Change-Id: I6d4054c64aa842658cfcde8969c7aa48f6d21207 --- src/plugins/dpdk/ipsec/cli.c | 2 +- src/plugins/dpdk/ipsec/esp_decrypt.c | 2 +- src/plugins/dpdk/ipsec/esp_encrypt.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/dpdk/ipsec/cli.c b/src/plugins/dpdk/ipsec/cli.c index a2edc8b96c0..fb98d2789c6 100644 --- a/src/plugins/dpdk/ipsec/cli.c +++ b/src/plugins/dpdk/ipsec/cli.c @@ -28,7 +28,7 @@ format_crypto_resource (u8 * s, va_list * args) crypto_resource_t *res = vec_elt_at_index (dcm->resource, res_idx); - s = format (s, "%U thr_id %3d qp %2u enc_inflight %u, dec_inflights %u\n", + 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]); diff --git a/src/plugins/dpdk/ipsec/esp_decrypt.c b/src/plugins/dpdk/ipsec/esp_decrypt.c index dffcc83fa75..d7817100e4c 100644 --- a/src/plugins/dpdk/ipsec/esp_decrypt.c +++ b/src/plugins/dpdk/ipsec/esp_decrypt.c @@ -44,7 +44,7 @@ typedef enum _(DECRYPTION_FAILED, "ESP decryption failed") \ _(REPLAY, "SA replayed packet") \ _(NOT_IP, "Not IP packet (dropped)") \ - _(ENQ_FAIL, "Enqueue failed (buffer full)") \ + _(ENQ_FAIL, "Enqueue decrypt failed (queue full)") \ _(DISCARD, "Not enough crypto operations, discarding frame") \ _(BAD_LEN, "Invalid ciphertext length") \ _(SESSION, "Failed to get crypto session") \ diff --git a/src/plugins/dpdk/ipsec/esp_encrypt.c b/src/plugins/dpdk/ipsec/esp_encrypt.c index 64b862430b5..e78cb2d88d4 100644 --- a/src/plugins/dpdk/ipsec/esp_encrypt.c +++ b/src/plugins/dpdk/ipsec/esp_encrypt.c @@ -45,7 +45,7 @@ typedef enum #define foreach_esp_encrypt_error \ _(RX_PKTS, "ESP pkts received") \ _(SEQ_CYCLED, "Sequence number cycled") \ - _(ENQ_FAIL, "Enqueue failed to crypto device") \ + _(ENQ_FAIL, "Enqueue encrypt failed (queue full)") \ _(DISCARD, "Not enough crypto operations, discarding frame") \ _(SESSION, "Failed to get crypto session") \ _(NOSUP, "Cipher/Auth not supported") -- 2.16.6