patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Saoirse O'Donovan <saoirse.odonovan@intel.com>
Cc: Ciara Power <ciara.power@intel.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'test/crypto: fix statistics error messages' has been queued to stable release 21.11.4
Date: Thu, 30 Mar 2023 09:35:57 +0100	[thread overview]
Message-ID: <20230330083600.473876-5-ktraynor@redhat.com> (raw)
In-Reply-To: <20230330083600.473876-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to stable release 21.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/02/23. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/57915a44ed68f9fb9141a37de495148dbb7ced44

Thanks.

Kevin

---
From 57915a44ed68f9fb9141a37de495148dbb7ced44 Mon Sep 17 00:00:00 2001
From: Saoirse O'Donovan <saoirse.odonovan@intel.com>
Date: Mon, 20 Mar 2023 09:29:56 +0000
Subject: [PATCH] test/crypto: fix statistics error messages

[ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ]

The test stats testcase was printing the same error message for
multiple errors in the test stats testcase. This is now replaced
with descriptive error messages, which match the cause of the failure.

Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests")

Signed-off-by: Saoirse O'Donovan <saoirse.odonovan@intel.com>
Acked-by: Ciara Power <ciara.power@intel.com>
---
 .mailmap                  |  1 +
 app/test/test_cryptodev.c | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.mailmap b/.mailmap
index 3337f8a9e6..c1b73055da 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1177,4 +1177,5 @@ Sankar Chokkalingam <sankarx.chokkalingam@intel.com>
 Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>
 Santosh Shukla <santosh.shukla@caviumnetworks.com> <sshukla@mvista.com>
+Saoirse O'Donovan <saoirse.odonovan@intel.com>
 Saori Usami <susami@igel.co.jp>
 Sarath Somasekharan <sarathx.somasekharan@intel.com>
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index a18b15d7c2..f3509bcb22 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -11100,9 +11100,9 @@ test_stats(void)
 		"rte_cryptodev_stats_get returned unexpected enqueued stat");
 	TEST_ASSERT((stats.dequeued_count == 1),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected dequeued stat");
 	TEST_ASSERT((stats.enqueue_err_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected enqueued error count stat");
 	TEST_ASSERT((stats.dequeue_err_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected dequeued error count stat");
 
 	/* invalid device but should ignore and not reset device stats*/
@@ -11112,5 +11112,5 @@ test_stats(void)
 		"rte_cryptodev_stats_get failed");
 	TEST_ASSERT((stats.enqueued_count == 1),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected enqueued stat after invalid reset");
 
 	/* check that a valid reset clears stats */
@@ -11120,7 +11120,7 @@ test_stats(void)
 					  "rte_cryptodev_stats_get failed");
 	TEST_ASSERT((stats.enqueued_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected enqueued stat after valid reset");
 	TEST_ASSERT((stats.dequeued_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected dequeued stat after valid reset");
 
 	return TEST_SUCCESS;
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.412423258 +0100
+++ 0006-test-crypto-fix-statistics-error-messages.patch	2023-03-30 09:30:45.274229272 +0100
@@ -1 +1 @@
-From 051af8d174dd0f100f407269c25c007216c912ad Mon Sep 17 00:00:00 2001
+From 57915a44ed68f9fb9141a37de495148dbb7ced44 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index dc30369117..cac02a6f48 100644
+index 3337f8a9e6..c1b73055da 100644
@@ -24 +25 @@
-@@ -1183,4 +1183,5 @@ Sankar Chokkalingam <sankarx.chokkalingam@intel.com>
+@@ -1177,4 +1177,5 @@ Sankar Chokkalingam <sankarx.chokkalingam@intel.com>
@@ -31 +32 @@
-index f4648755e5..9c670e9a35 100644
+index a18b15d7c2..f3509bcb22 100644
@@ -34 +35 @@
-@@ -12342,9 +12342,9 @@ test_stats(void)
+@@ -11100,9 +11100,9 @@ test_stats(void)
@@ -47 +48 @@
-@@ -12354,5 +12354,5 @@ test_stats(void)
+@@ -11112,5 +11112,5 @@ test_stats(void)
@@ -54 +55 @@
-@@ -12362,7 +12362,7 @@ test_stats(void)
+@@ -11120,7 +11120,7 @@ test_stats(void)


  parent reply	other threads:[~2023-03-30  8:36 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-30  8:35 patch 'examples/qos_sched: fix config entries in wrong sections' " Kevin Traynor
2023-03-30  8:35 ` patch 'net/mlx5: fix build with GCC 12 and ASan' " Kevin Traynor
2023-03-30  8:35 ` patch 'net/mlx5: fix CQE dump for Tx' " Kevin Traynor
2023-03-30  8:35 ` patch 'net/mlx5: fix sysfs port name translation' " Kevin Traynor
2023-03-30  8:35 ` Kevin Traynor [this message]
2023-03-30  8:35 ` patch 'pdump: fix build with GCC 12' " Kevin Traynor
2023-03-30  8:35 ` patch 'acl: fix crash on PPC64 with GCC 11' " Kevin Traynor
2023-03-30  8:36 ` patch 'doc: fix pipeline example path in user guide' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230330083600.473876-5-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=ciara.power@intel.com \
    --cc=saoirse.odonovan@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).