From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id EEC7C1B433 for ; Sat, 2 Feb 2019 08:51:51 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:51:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="140977100" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga004.fm.intel.com with ESMTP; 01 Feb 2019 23:51:50 -0800 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 1 Feb 2019 23:51:50 -0800 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 1 Feb 2019 23:51:49 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.207]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.36]) with mapi id 14.03.0415.000; Sat, 2 Feb 2019 15:51:48 +0800 From: "Zhao, XinfengX" To: "dts@dpdk.org" Thread-Topic: [PATCH V2] tests: rename and modify the cryptodev unit-test Thread-Index: AQHUusl4z/P6wzaXKE6nHjXL4gHTw6XMIrPg Date: Sat, 2 Feb 2019 07:51:47 +0000 Message-ID: <44051B25D8C8784BB77FFB604D6A70CA1202750B@shsmsx102.ccr.corp.intel.com> References: <1549092971-52799-1-git-send-email-xinfengx.zhao@intel.com> In-Reply-To: <1549092971-52799-1-git-send-email-xinfengx.zhao@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V2] tests: rename and modify the cryptodev unit-test X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2019 07:51:52 -0000 Tested-by : Xinfeng Zhao -----Original Message----- From: Zhao, XinfengX=20 Sent: Saturday, February 2, 2019 3:36 PM To: dts@dpdk.org Cc: Zhao, XinfengX Subject: [PATCH V2] tests: rename and modify the cryptodev unit-test Signed-off-by: Xinfeng Zhao --- tests/TestSuite_unit_tests_cryptodev.py | 169 -----------------------= ---- tests/TestSuite_unit_tests_cryptodev_func.py | 139 ++++++++++++++++++++++ 2 files changed, 139 insertions(+), 169 deletions(-) delete mode 100644 t= ests/TestSuite_unit_tests_cryptodev.py create mode 100644 tests/TestSuite_unit_tests_cryptodev_func.py diff --git a/tests/TestSuite_unit_tests_cryptodev.py b/tests/TestSuite_unit= _tests_cryptodev.py deleted file mode 100644 index df83fd9..0000000 --- a/tests/TestSuite_unit_tests_cryptodev.py +++ /dev/null @@ -1,169 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2016-2017 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# mo= dification, are permitted provided that the following conditions -# are met= : -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "= AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED= TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICU= LAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CON= TRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMP= LARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREME= NT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BU= SINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHET= HER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHE= RWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVIS= ED OF THE POSSIBILITY OF SUCH DAMAGE. - -import utils -from test_case import TestCase - - -class UnitTestsCryptodev(TestCase): - - def set_up_all(self): - - self.core_config =3D "1S/2C/1T" - self.number_of_ports =3D 1 - self.dut_ports =3D self.dut.get_ports(self.nic) - self.verify(len(self.dut_ports) >=3D self.number_of_ports, - "Not enough ports for " + self.nic) - self.ports_socket =3D self.dut.get_numa_id(self.dut_ports[0]) - - self.logger.info("core config =3D " + self.core_config) - self.logger.info("number of ports =3D " + str(self.number_of_ports= )) - self.logger.info("dut ports =3D " + str(self.dut_ports)) - self.logger.info("ports_socket =3D " + str(self.ports_socket)) - - self.core_mask =3D utils.create_mask(self.dut.get_core_list( - self.core_config, - socket=3Dself.ports_socket)) - self.port_mask =3D utils.create_mask([self.dut_ports[0]]) - - self.tx_port =3D self.tester.get_local_port(self.dut_ports[0]) - self.rx_port =3D self.tester.get_local_port(self.dut_ports[0]) - - self.tx_interface =3D self.tester.get_interface(self.tx_port) - self.rx_interface =3D self.tester.get_interface(self.rx_port) - - self.logger.info("core mask =3D " + self.core_mask) - self.logger.info("port mask =3D " + self.port_mask) - self.logger.info("tx interface =3D " + self.tx_interface) - self.logger.info("rx interface =3D " + self.rx_interface) - - # Rebuild the dpdk with cryptodev pmds CONFIG_RTE_LIBRTE_PMD_ZUC= =3Dn - self.dut.send_expect("export AESNI_MULTI_BUFFER_LIB_PATH=3D/root/i= psec_043/code/", "#") - self.dut.send_expect("export LIBSSO_SNOW3G_PATH=3D/root/libsso_sno= w3g/snow3g/", "#") - self.dut.send_expect("export LIBSSO_ZUC_PATH=3D/root/libsso_zuc.1.= 0.1.1-8/zuc", "#") - self.dut.send_expect("export LIBSSO_KASUMI_PATH=3D/root/LibSSO_0_3= _1/isg_cid-wireless_libs/ciphers/kasumi/", "#") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT=3Dn$/CON= FIG_RTE_LIBRTE_PMD_QAT=3Dy/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=3D= n$/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=3Dy/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO= =3Dn$/CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO=3Dy/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_SNOW3G=3Dn$/= CONFIG_RTE_LIBRTE_PMD_SNOW3G=3Dy/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_KASUMI=3Dn$/= CONFIG_RTE_LIBRTE_PMD_KASUMI=3Dy/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_OPENSSL=3Dn$= /CONFIG_RTE_LIBRTE_PMD_OPENSSL=3Dy/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=3Dn= $/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=3Dy/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZUC=3Dn$/CON= FIG_RTE_LIBRTE_PMD_ZUC=3Dy/' config/common_base", "# ") - self.dut.skip_setup =3D False - self.dut.build_install_dpdk(self.dut.target) - - # Bind QAT VF devices - out =3D self.dut.send_expect("lspci -d:443|awk '{print $1}'", "# "= , 10) - self.dut.send_expect('echo "8086 0443" > /sys/bus/pci/drivers/igb_= uio/new_id', "# ", 10) - for line in out.replace("\r", "\n").replace("\n\n", "\n").split("\= n"): - cmd =3D "echo 0000:{} > /sys/bus/pci/devices/0000\:{}/driver/u= nbind".format(line, line.replace(":", "\:")) - self.dut.send_expect(cmd, "# ", 10) - cmd =3D "echo 0000:{} > /sys/bus/pci/drivers/igb_uio/bind".for= mat(line) - self.dut.send_expect(cmd, "# ", 10) - - def set_up(self): - pass - - def tear_down(self): - self.dut.kill_all() - - def tear_down_all(self): - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT=3Dy$/CON= FIG_RTE_LIBRTE_PMD_QAT=3Dn/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=3D= y$/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=3Dn/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO= =3Dy$/CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO=3Dn/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_SNOW3G=3Dy$/= CONFIG_RTE_LIBRTE_PMD_SNOW3G=3Dn/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_KASUMI=3Dy$/= CONFIG_RTE_LIBRTE_PMD_KASUMI=3Dn/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_OPENSSL=3Dy$= /CONFIG_RTE_LIBRTE_PMD_OPENSSL=3Dn/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=3Dy= $/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=3Dn/' config/common_base", "# ") - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZUC=3Dy$/CON= FIG_RTE_LIBRTE_PMD_ZUC=3Dn/' config/common_base", "# ") - - def test_cryptodev_qat_autotest(self): - self.__run_unit_test("cryptodev_qat_autotest") - - def test_cryptodev_qat_perftest(self): - self.__run_unit_test("cryptodev_qat_perftest") - - def test_cryptodev_aesni_mb_perftest(self): - self.__run_unit_test("cryptodev_aesni_mb_perftest") - - def test_cryptodev_sw_snow3g_perftest(self): - self.__run_unit_test("cryptodev_sw_snow3g_perftest") - - def test_cryptodev_qat_snow3g_perftest(self): - self.__run_unit_test("cryptodev_qat_snow3g_perftest") - - def test_cryptodev_aesni_gcm_perftest(self): - self.__run_unit_test("cryptodev_aesni_gcm_perftest") - - def test_cryptodev_openssl_perftest(self): - self.__run_unit_test("cryptodev_openssl_perftest") - - def test_cryptodev_qat_continual_perftest(self): - self.__run_unit_test("cryptodev_qat_continual_perftest") - - def test_cryptodev_aesni_mb_autotest(self): - self.__run_unit_test("cryptodev_aesni_mb_autotest") - - def test_cryptodev_openssl_autotest(self): - self.__run_unit_test("cryptodev_openssl_autotest") - - def test_cryptodev_aesni_gcm_autotest(self): - self.__run_unit_test("cryptodev_aesni_gcm_autotest") - - def test_cryptodev_null_autotest(self): - self.__run_unit_test("cryptodev_null_autotest") - - def test_cryptodev_sw_snow3g_autotest(self): - self.__run_unit_test("cryptodev_sw_snow3g_autotest") - - def test_cryptodev_sw_kasumi_autotest(self): - self.__run_unit_test("cryptodev_sw_kasumi_autotest") - - def test_cryptodev_sw_zuc_autotest(self): - self.__run_unit_test("cryptodev_sw_zuc_autotest") - - def __run_unit_test(self, testsuite, timeout=3D600): - self.logger.info("STEP_TEST: " + testsuite) - self.dut.send_expect("dmesg -C", "# ", 30) - self.dut.send_expect("./{target}/app/test -n 1 -c 0xf".format(targ= et=3Dself.dut.target), "RTE>>", 30) - out =3D "" - try: - out =3D self.dut.send_expect(testsuite, "RTE>>", timeout) - self.dut.send_expect("quit", "# ", 30) - except Exception, ex: - self.logger.error("Cryptodev Unit Tests Exception") - dmesg =3D self.dut.alt_session.send_expect("dmesg", "# ", 30) - self.logger.error("dmesg info:") - self.logger.error(dmesg) - - self.logger.info(out) - self.verify("Test OK" in out, "Test Failed") diff --git a/tests/TestSuite_unit_tests_cryptodev_func.py b/tests/TestSuite= _unit_tests_cryptodev_func.py new file mode 100644 index 0000000..adf65da --- /dev/null +++ b/tests/TestSuite_unit_tests_cryptodev_func.py @@ -0,0 +1,139 @@ +# BSD LICENSE +# +# Copyright(c) 2016-2017 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without #=20 +modification, are permitted provided that the following conditions #=20 +are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS #=20 +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT #=20 +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR #=20 +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT #=20 +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, #=20 +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT #=20 +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, #=20 +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY #=20 +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT #=20 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE #=20 +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import json + +from test_case import TestCase + +import cryptodev_common as cc + + +class UnitTestsCryptodev(TestCase): + + def set_up_all(self): + + self._app_path =3D "./{target}/app/test".format(target=3Dself.dut.= target) + if not cc.is_build_skip(self): + cc.build_dpdk_with_cryptodev(self) + self.vf_driver =3D self.get_suite_cfg()['vf_driver'] + cc.bind_qat_device(self, self.vf_driver) + + def set_up(self): + pass + + def tear_down(self): + self.dut.kill_all() + + def tear_down_all(self): + cc.clear_dpdk_config(self) + + def test_cryptodev_qat_autotest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_qat_autotest", eal_opt_str) + + def _test_cryptodev_qat_perftest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_qat_perftest", eal_opt_str) + + def _test_cryptodev_qat_continual_perftest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_qat_continual_perftest",=20 + eal_opt_str) + + def _test_cryptodev_qat_snow3g_perftest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_qat_snow3g_perftest",=20 + eal_opt_str) + + def test_cryptodev_aesni_mb_autotest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_aesni_mb_autotest",=20 + eal_opt_str) + + def _test_cryptodev_aesni_mb_perftest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_aesni_mb_perftest",=20 + eal_opt_str) + + def test_cryptodev_aesni_gcm_autotest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_aesni_gcm_autotest",=20 + eal_opt_str) + + def _test_cryptodev_aesni_gcm_perftest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_aesni_gcm_perftest",=20 + eal_opt_str) + + def test_cryptodev_sw_snow3g_autotest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_sw_snow3g_autotest",=20 + eal_opt_str) + + def _test_cryptodev_sw_snow3g_perftest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_sw_snow3g_perftest",=20 + eal_opt_str) + + def test_cryptodev_sw_kasumi_autotest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_sw_kasumi_autotest",=20 + eal_opt_str) + + def test_cryptodev_sw_zuc_autotest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_sw_zuc_autotest", eal_opt_str) + + def test_cryptodev_null_autotest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_null_autotest", eal_opt_str) + + def test_cryptodev_openssl_autotest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_openssl_autotest", eal_opt_str) + + def _test_cryptodev_openssl_perftest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_openssl_perftest", eal_opt_str) + + def test_cryptodev_scheduler_autotest(self): + eal_opt_str =3D cc.get_eal_opt_str(self) + self.__run_unit_test("cryptodev_scheduler_autotest",=20 + eal_opt_str) + + def __run_unit_test(self, testsuite, eal_opt_str, timeout=3D600): + self.logger.info("STEP_TEST: " + testsuite) + self.dut.send_expect("dmesg -C", "# ", 30) + cmd_str =3D cc.get_dpdk_app_cmd_str(self._app_path, eal_opt_str) + self.dut.send_expect(cmd_str, "RTE>>", 30) + + out =3D "" + try: + out =3D self.dut.send_expect(testsuite, "RTE>>", timeout) + self.dut.send_expect("quit", "# ", 30) + except Exception, ex: + self.logger.error("Cryptodev Unit Tests Exception") + dmesg =3D self.dut.alt_session.send_expect("dmesg", "# ", 30) + self.logger.error("dmesg info:") + self.logger.error(dmesg) + + self.logger.info(out) + self.verify("Test OK" in out, "Test Failed") -- 2.7.4