From patchwork Wed Jun 9 07:20:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 94044 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A7330A0C46; Wed, 9 Jun 2021 09:16:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9EDB5410F6; Wed, 9 Jun 2021 09:16:19 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 1194140E3C for ; Wed, 9 Jun 2021 09:16:17 +0200 (CEST) IronPort-SDR: R56+MS3kojjSUfuWbXhApu11Z315WgQKgQELpts6PwGSCN76I2r1UtrpZLS1EGkYhhAGc8zo2y QjORazU8rxrQ== X-IronPort-AV: E=McAfee;i="6200,9189,10009"; a="192337075" X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="192337075" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 00:16:15 -0700 IronPort-SDR: XWHEcSgouS0An5qb9aGMrsKUzhqrXsRrCERnLC5WPT2M/Buyjswcmz/I/5GggXLPP/yo/yd5VN Svuzc3hptwtQ== X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="448191110" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 00:16:14 -0700 From: Yu Jiang To: dts@dpdk.org Cc: Yu Jiang Date: Wed, 9 Jun 2021 15:20:45 +0800 Message-Id: <20210609072046.25987-2-yux.jiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210609072046.25987-1-yux.jiang@intel.com> References: <20210609072046.25987-1-yux.jiang@intel.com> Subject: [dts] [PATCH V2 1/2] tests/virtio_unit_cryptodev_func: support vdev param X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Based on dpdk commit 8bfdd8a7f0f1 ("test/crypto: refactor to use sub test suites"), unit test support vdev param. Signed-off-by: Yu Jiang --- tests/TestSuite_virtio_unit_cryptodev_func.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py index 8d69d5b..bf96b62 100644 --- a/tests/TestSuite_virtio_unit_cryptodev_func.py +++ b/tests/TestSuite_virtio_unit_cryptodev_func.py @@ -158,7 +158,7 @@ class VirtioCryptodevUnitTest(TestCase): return vm, vm_dut def test_cryptodev_virtio_autotest(self): - eal_opt_str = cc.get_eal_opt_str(self, {"a":None, "vdev":None}) + eal_opt_str = cc.get_eal_opt_str(self, {"a":None, "vdev": "crypto_virtio"}) self.__run_unit_test("cryptodev_virtio_autotest", eal_opt_str) def __run_unit_test(self, testsuite, eal_opt_str='', timeout=600): From patchwork Wed Jun 9 07:20:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 94046 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F1139A0C48; Wed, 9 Jun 2021 09:16:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E87F2410FB; Wed, 9 Jun 2021 09:16:20 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 4288A40E3C for ; Wed, 9 Jun 2021 09:16:19 +0200 (CEST) IronPort-SDR: q4yObxu55TWFR23mvHLx77PCeByPDkHyFWgAsExLweUTbJyKLhOIQVCO+bEa0GlRtxdUdav31m Cx8O7iK+vQXg== X-IronPort-AV: E=McAfee;i="6200,9189,10009"; a="192337080" X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="192337080" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 00:16:17 -0700 IronPort-SDR: gbUtedDAjcGM9OTaZxe0t7HUraLmMXMnqK4NncMJ2svhH1DrIspcyFVkZtSDrD50ufC2YWdY+x dJXCYATQ0VGQ== X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="448191115" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 00:16:16 -0700 From: Yu Jiang To: dts@dpdk.org Cc: Yu Jiang Date: Wed, 9 Jun 2021 15:20:46 +0800 Message-Id: <20210609072046.25987-3-yux.jiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210609072046.25987-1-yux.jiang@intel.com> References: <20210609072046.25987-1-yux.jiang@intel.com> Subject: [dts] [PATCH V2 2/2] tests/unit_tests_cryptodev_func: support vdev param X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Based on dpdk commit 8bfdd8a7f0f1 ("test/crypto: refactor to use sub test suites"), unit test support vdev param. Signed-off-by: Yu Jiang --- conf/unit_tests_cryptodev_func.cfg | 32 ++++++++++++++++++ tests/TestSuite_unit_tests_cryptodev_func.py | 34 +++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 conf/unit_tests_cryptodev_func.cfg diff --git a/conf/unit_tests_cryptodev_func.cfg b/conf/unit_tests_cryptodev_func.cfg new file mode 100644 index 0000000..0516293 --- /dev/null +++ b/conf/unit_tests_cryptodev_func.cfg @@ -0,0 +1,32 @@ +[suite] + +# vdev which is supported from 21.05rc3 commit id: 8bfdd8a7f0 test/crypto: refactor to use sub test suites +[test_cryptodev_aesni_gcm_autotest] +devtype="crypto_aesni_gcm" + +[test_cryptodev_aesni_mb_autotest] +devtype="crypto_aesni_mb" + +[test_cryptodev_null_autotest] +devtype="crypto_null" + +[test_cryptodev_openssl_autotest] +devtype="crypto_openssl" + +[test_cryptodev_qat_asym_autotest] +devtype="crypto_qat" + +[test_cryptodev_qat_autotest] +devtype="crypto_qat" + +[test_cryptodev_scheduler_autotest] +devtype="crypto_scheduler" + +[test_cryptodev_sw_kasumi_autotest] +devtype="crypto_kasumi" + +[test_cryptodev_sw_snow3g_autotest] +devtype="crypto_snow3g" + +[test_cryptodev_sw_zuc_autotest] +devtype="crypto_zuc" diff --git a/tests/TestSuite_unit_tests_cryptodev_func.py b/tests/TestSuite_unit_tests_cryptodev_func.py index 98425d4..e51cca4 100644 --- a/tests/TestSuite_unit_tests_cryptodev_func.py +++ b/tests/TestSuite_unit_tests_cryptodev_func.py @@ -53,6 +53,37 @@ class UnitTestsCryptodev(TestCase): def tear_down_all(self): cc.clear_dpdk_config(self) + def _get_crypto_device(self, num): + device = {} + if self.get_case_cfg()["devtype"] == "crypto_aesni_mb": + dev = "crypto_aesni_mb" + elif self.get_case_cfg()["devtype"] == "crypto_qat": + w = cc.get_qat_devices(self, cpm_num=1, num=num) + device["vdev"] = None + elif self.get_case_cfg()["devtype"] == "crypto_openssl": + dev = "crypto_openssl" + elif self.get_case_cfg()["devtype"] == "crypto_aesni_gcm": + dev = "crypto_aesni_gcm" + elif self.get_case_cfg()["devtype"] == "crypto_kasumi": + dev = "crypto_kasumi" + elif self.get_case_cfg()["devtype"] == "crypto_snow3g": + dev = "crypto_snow3g" + elif self.get_case_cfg()["devtype"] == "crypto_zuc": + dev = "crypto_zuc" + elif self.get_case_cfg()["devtype"] == "crypto_null": + dev = "crypto_null" + else: + return {} + + if not device: + vdev_list = [] + for i in range(num): + vdev = "{}{}".format(dev, i) + vdev_list.append(vdev) + device["vdev"] = ' --vdev '.join(vdev_list) + + return device + def test_cryptodev_qat_autotest(self): self.__run_unit_test("cryptodev_qat_autotest") @@ -105,7 +136,8 @@ class UnitTestsCryptodev(TestCase): self.__run_unit_test("cryptodev_scheduler_autotest") def __run_unit_test(self, testsuite, timeout=600): - eal_opt_str = cc.get_eal_opt_str(self) + devices = self._get_crypto_device(num=1) + eal_opt_str = cc.get_eal_opt_str(self, devices) w = cc.get_qat_devices(self, num=1) self.logger.info("STEP_TEST: " + testsuite)