[dpdk-stable] patch 'test/crypto: fix number of queue pairs' has been queued to LTS release 16.11.9

[Luca Boccassi <bluca@debian.org>]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/05/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From 1703f13734d62e5a03e7815b4832b86426e55100 Mon Sep 17 00:00:00 2001
From: Fiona Trahe <fiona.trahe@intel.com>
Date: Sat, 22 Sep 2018 14:33:36 +0100
Subject: [PATCH] test/crypto: fix number of queue pairs

[ upstream commit 738ad7b42b63fc5067419bf609296f2c4a6a0cb0 ]

Some of the tests use a QAT-specific value (2) for
maximum nr of queue pairs to create valid/invalid test cases.
This has accidentally worked ok as default max_qps for all PMDs
is larger. It is incorrect however and would fail if a device
had a max lower than the QAT value.
Instead use the value returned by the PMD in the
rte_cryptodev_get_info query, this value is stored in the ts_params.

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

Signed-off-by: Fiona Trahe <fiona.trahe@intel.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 app/test/test_cryptodev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index a1f8717beb..209c4024b4 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -557,7 +557,7 @@ test_device_configure_invalid_queue_pair_ids(void)
 
 
 	/* valid - max value queue pairs */
-	ts_params->conf.nb_queue_pairs = MAX_NUM_QPS_PER_QAT_DEVICE;
+	ts_params->conf.nb_queue_pairs = orig_nb_qps;
 
 	TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
 			&ts_params->conf),
@@ -588,7 +588,7 @@ test_device_configure_invalid_queue_pair_ids(void)
 
 
 	/* invalid - max value + 1 queue pairs */
-	ts_params->conf.nb_queue_pairs = MAX_NUM_QPS_PER_QAT_DEVICE + 1;
+	ts_params->conf.nb_queue_pairs = orig_nb_qps + 1;
 
 	TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
 			&ts_params->conf),
@@ -735,7 +735,7 @@ test_queue_pair_descriptor_setup(void)
 	/* test invalid queue pair id */
 	qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;	/*valid */
 
-	qp_id = DEFAULT_NUM_QPS_PER_QAT_DEVICE;		/*invalid */
+	qp_id = ts_params->conf.nb_queue_pairs;		/*invalid */
 
 	TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
 			ts_params->valid_devs[0],
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-03 17:44:54.714800862 +0100
+++ 0007-test-crypto-fix-number-of-queue-pairs.patch	2018-10-03 17:44:54.578534622 +0100
@@ -1,8 +1,10 @@
-From 738ad7b42b63fc5067419bf609296f2c4a6a0cb0 Mon Sep 17 00:00:00 2001
+From 1703f13734d62e5a03e7815b4832b86426e55100 Mon Sep 17 00:00:00 2001
 From: Fiona Trahe <fiona.trahe@intel.com>
 Date: Sat, 22 Sep 2018 14:33:36 +0100
 Subject: [PATCH] test/crypto: fix number of queue pairs
 
+[ upstream commit 738ad7b42b63fc5067419bf609296f2c4a6a0cb0 ]
+
 Some of the tests use a QAT-specific value (2) for
 maximum nr of queue pairs to create valid/invalid test cases.
 This has accidentally worked ok as default max_qps for all PMDs
@@ -12,19 +14,18 @@
 rte_cryptodev_get_info query, this value is stored in the ts_params.
 
 Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests")
-Cc: stable@dpdk.org
 
 Signed-off-by: Fiona Trahe <fiona.trahe@intel.com>
 Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
 ---
- test/test/test_cryptodev.c | 6 +++---
+ app/test/test_cryptodev.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
-index a6044b261e..c63662d91f 100644
---- a/test/test/test_cryptodev.c
-+++ b/test/test/test_cryptodev.c
-@@ -635,7 +635,7 @@ test_device_configure_invalid_queue_pair_ids(void)
+diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
+index a1f8717beb..209c4024b4 100644
+--- a/app/test/test_cryptodev.c
++++ b/app/test/test_cryptodev.c
+@@ -557,7 +557,7 @@ test_device_configure_invalid_queue_pair_ids(void)
  
  
  	/* valid - max value queue pairs */
@@ -33,7 +34,7 @@
  
  	TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
  			&ts_params->conf),
-@@ -667,7 +667,7 @@ test_device_configure_invalid_queue_pair_ids(void)
+@@ -588,7 +588,7 @@ test_device_configure_invalid_queue_pair_ids(void)
  
  
  	/* invalid - max value + 1 queue pairs */
@@ -42,7 +43,7 @@
  
  	TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
  			&ts_params->conf),
-@@ -819,7 +819,7 @@ test_queue_pair_descriptor_setup(void)
+@@ -735,7 +735,7 @@ test_queue_pair_descriptor_setup(void)
  	/* test invalid queue pair id */
  	qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;	/*valid */