From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id E89191B3B1 for ; Wed, 3 Oct 2018 18:52:58 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id a13-v6so6919861wrt.5 for ; Wed, 03 Oct 2018 09:52:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+NW7TIickD/apAJ6e+7m48NNWbC7e5aKkrUw2j72/rQ=; b=gCXlPovEzxFtfnjNGt+YjuQOFw9lpvCV+QCPBv9iwy/vZ8ieXGl4bvBUm9X3q1vJtx M21pDHGhlzCD27ioHildg6LvKU88xQT8w+LF86HHKe/CwCr/ilTD/ayz0hVytHS31sBP d5tQhCN1R/egZTs7dfVAtzXTeWZy0dN/5DK5AOyLrNy5xe9VMiCl/06Pow8qqoJiDc9d SE6hJ3WNdW2aU2D8yU3iaXz+KesUt/7q3C0KUmRaS8NLUTNV/P13NrslHEX0xq49VF7t XYy/FxBfSB1IT7Sdms4vS04lHpVqzTfh8py7AQIBZDh56uX78clsxw0BK64XfktQk9V2 vJPQ== X-Gm-Message-State: ABuFfohpORx4/deXFWkH2cYEs55FIzBFzsHnu1AAlfHbfT9if3VriyMM EbokkmkJLwu8UORzLUHyJTo= X-Google-Smtp-Source: ACcGV61BCygjYeiuQNqj3m0aQJ2sQfsZWHxWKYXIVREIFH9LMgNX5v0zgyCjFtF5SSk9LWq6SledFg== X-Received: by 2002:adf:fd4a:: with SMTP id h10-v6mr2043686wrs.280.1538585578475; Wed, 03 Oct 2018 09:52:58 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id 74-v6sm2629225wmi.23.2018.10.03.09.52.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Oct 2018 09:52:57 -0700 (PDT) From: Luca Boccassi To: Fiona Trahe Cc: Akhil Goyal , dpdk stable Date: Wed, 3 Oct 2018 17:52:39 +0100 Message-Id: <20181003165239.8531-6-bluca@debian.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181003165239.8531-1-bluca@debian.org> References: <20181003162121.16364-1-bluca@debian.org> <20181003165239.8531-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/crypto: fix number of queue pairs' has been queued to LTS release 16.11.9 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: Wed, 03 Oct 2018 16:52:59 -0000 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 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 --- 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 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 Acked-by: Akhil Goyal --- - 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 */