From 83b1d3482fe5136dd848213ee50e263374718740 Mon Sep 17 00:00:00 2001 From: Fiona Trahe Date: Thu, 6 Oct 2016 18:34:29 +0100 Subject: [PATCH] app/test: remove crypto queue number hard-coding ts_params->conf.nb_queue_pairs should not be hard coded with device specific number. It should be retrieved from the device info. Any test which changes it should restore it to orig value. Signed-off-by: Akhil Goyal Signed-off-by: Fiona Trahe --- app/test/test_cryptodev.c | 5 ++++- app/test/test_cryptodev_perf.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 63317bb3c6..2917454695 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -413,7 +413,6 @@ ut_setup(void) memset(ut_params, 0, sizeof(*ut_params)); /* Reconfigure device to default parameters */ - ts_params->conf.nb_queue_pairs = DEFAULT_NUM_QPS_PER_QAT_DEVICE; ts_params->conf.socket_id = SOCKET_ID_ANY; ts_params->conf.session_mp.nb_objs = DEFAULT_NUM_OPS_INFLIGHT; @@ -525,6 +524,7 @@ static int test_device_configure_invalid_queue_pair_ids(void) { struct crypto_testsuite_params *ts_params = &testsuite_params; + uint16_t orig_nb_qps = ts_params->conf.nb_queue_pairs; /* Stop the device in case it's started so it can be configured */ rte_cryptodev_stop(ts_params->valid_devs[0]); @@ -579,6 +579,9 @@ test_device_configure_invalid_queue_pair_ids(void) ts_params->valid_devs[0], ts_params->conf.nb_queue_pairs); + /* revert to original testsuite value */ + ts_params->conf.nb_queue_pairs = orig_nb_qps; + return TEST_SUCCESS; } diff --git a/app/test/test_cryptodev_perf.c b/app/test/test_cryptodev_perf.c index 27d8cf8b93..4aee9afea8 100644 --- a/app/test/test_cryptodev_perf.c +++ b/app/test/test_cryptodev_perf.c @@ -431,7 +431,7 @@ testsuite_setup(void) rte_cryptodev_info_get(ts_params->dev_id, &info); - ts_params->conf.nb_queue_pairs = DEFAULT_NUM_QPS_PER_QAT_DEVICE; + ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs; ts_params->conf.socket_id = SOCKET_ID_ANY; ts_params->conf.session_mp.nb_objs = info.sym.max_nb_sessions; -- 2.20.1