From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 1CEC0322C for ; Fri, 30 Nov 2018 00:13:36 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:19:25 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW7Y032075; Fri, 30 Nov 2018 01:13:30 +0200 From: Yongseok Koh To: Fiona Trahe Cc: Akhil Goyal , dpdk stable Date: Thu, 29 Nov 2018 15:10:28 -0800 Message-Id: <20181129231202.30436-34-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'test/crypto: fix number of queue pairs' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 23:13:36 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/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. Yongseok --- >>From c958eab0dc095ed1930ef25f7eaac0847be4112f Mon Sep 17 00:00:00 2001 From: Fiona Trahe 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 Acked-by: Akhil Goyal --- test/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 28f982f42..5136daf93 100644 --- a/test/test/test_cryptodev.c +++ b/test/test/test_cryptodev.c @@ -608,7 +608,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), @@ -640,7 +640,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), @@ -792,7 +792,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.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:46.752188762 -0800 +++ 0034-test-crypto-fix-number-of-queue-pairs.patch 2018-11-29 15:01:45.050959000 -0800 @@ -1,8 +1,10 @@ -From 738ad7b42b63fc5067419bf609296f2c4a6a0cb0 Mon Sep 17 00:00:00 2001 +From c958eab0dc095ed1930ef25f7eaac0847be4112f Mon Sep 17 00:00:00 2001 From: Fiona Trahe 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,7 +14,6 @@ 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 Acked-by: Akhil Goyal @@ -21,10 +22,10 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c -index a6044b261..c63662d91 100644 +index 28f982f42..5136daf93 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) +@@ -608,7 +608,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) +@@ -640,7 +640,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) +@@ -792,7 +792,7 @@ test_queue_pair_descriptor_setup(void) /* test invalid queue pair id */ qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT; /*valid */