From patchwork Tue Mar 7 17:17:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 124840 X-Patchwork-Delegate: gakhil@marvell.com 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 6DB1441E06; Tue, 7 Mar 2023 18:17:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3A988410DD; Tue, 7 Mar 2023 18:17:42 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id DFB764067B for ; Tue, 7 Mar 2023 18:17:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678209460; x=1709745460; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/TOM4H6bsqVo3/Zd8kMRZ+GhSdPDAuHcTIRStt9bVJ4=; b=WlSan9HWY/Tewa9uKb0DFI3qKw0OmGOqg7T9hvp36yHlQiRj3fHaKJRN rJnBR8YQxuPWzbMWIgeM5EQXWkQnBXirsuhRJrK9XtfmDkbFnZi3fDJ88 YCFxO0N0X2vlQ18NkkdRrBjD0sAKM7CygVByvnP93Zd7CGykICksduDQU Vv8N8ed766EOaAj6+huOlPkExpSWA+qPovkH774cOnAJrmYznaZoKk2LM pQQ1uZ0P/ovOFGnxHEljwxKVxF/GVmiMT6seYNkxOW8GfJUkjfS7zGB8M vz68NRsIgqvBovEd8/oYxeZCGsjger+2176KcU8XrOsr0oy1wQ02DGP1m A==; X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="316312320" X-IronPort-AV: E=Sophos;i="5.98,241,1673942400"; d="scan'208";a="316312320" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2023 09:17:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="676618798" X-IronPort-AV: E=Sophos;i="5.98,241,1673942400"; d="scan'208";a="676618798" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.222.80]) by orsmga002.jf.intel.com with ESMTP; 07 Mar 2023 09:17:37 -0800 From: Ciara Power To: dev@dpdk.org Cc: kai.ji@intel.com, Ciara Power , Akhil Goyal , Fan Zhang Subject: [PATCH 1/3] test/crypto: fix skip condition for CPU crypto SGL Date: Tue, 7 Mar 2023 17:17:32 +0000 Message-Id: <20230307171734.2872005-2-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307171734.2872005-1-ciara.power@intel.com> References: <20230307171734.2872005-1-ciara.power@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When SGL support was added to AESNI_MB PMD, the feature flag was enabled. This meant SGL testcases were incorrectly running for the cryptodev_cpu_aesni_mb_autotest, and SGL support was not added for CPU crypto. Now skipping the ZUC auth cipher SGL tests for CPU crypto, and GCM authenticated encryption SGL tests for CPU crypto on AESNI_MB only, as AESNI_GCM CPU crypto supports inplace SGL. Fixes: f9dfb59edbcc ("crypto/ipsec_mb: support remaining SGL") Signed-off-by: Ciara Power Acked-by: Kai Ji --- app/test/test_cryptodev.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index aa831d79a2..b7c01a1663 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -6537,6 +6537,9 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, tdata->digest.len) < 0) return TEST_SKIPPED; + if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) + return TEST_SKIPPED; + rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info); uint64_t feat_flags = dev_info.feature_flags; @@ -7896,6 +7899,9 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, } } + if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) + return TEST_SKIPPED; + /* Create the session */ if (verify) retval = create_wireless_algo_cipher_auth_session( @@ -14719,8 +14725,13 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata, &cap_idx) == NULL) return TEST_SKIPPED; - /* OOP not supported with CPU crypto */ - if (oop && gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) + /* + * SGL not supported on AESNI_MB PMD CPU crypto, + * OOP not supported on AESNI_GCM CPU crypto + */ + if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO && + (gbl_driver_id == rte_cryptodev_driver_id_get( + RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) || oop)) return TEST_SKIPPED; /* Detailed check for the particular SGL support flag */ From patchwork Tue Mar 7 17:17:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 124841 X-Patchwork-Delegate: gakhil@marvell.com 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 8960A41E06; Tue, 7 Mar 2023 18:17:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 53D5441151; Tue, 7 Mar 2023 18:17:43 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 996AF410DD for ; Tue, 7 Mar 2023 18:17:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678209461; x=1709745461; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TDhLsR/qyF7OV0m+fI6N95FgZP0cCdKQ3rrDzPpiy7Y=; b=ceYAL5Q7HigBZsqvD0jE69u4vgr58iza4vNWpbJKiFTMwrIS1L4Xfvcq ZGVZm4viKld+TDt9EDKmNtvC5hH925xwlRlIqQ/BUsUzBkzZAjlv617iR 93gmpRWCguGDnZtZT81UQ+zp8Hao8+QC3YaJO7CdeowHw6MX136v/xy2r 6sz+rvXoRR9hCSTY8QVX2jE2lYWfaBQ3e78j+0xIU+SApgJ6afS6M9z8x e2qhQ9YmkUed/MuK0UinMkIr6jBHBfffbAy2mf//RBeEwg7J5WafwtG5m p+BT+J4GjjEy3waGUg0tqK2SbRDRW/yOPnx6CIgFh8b6++Mz46vHbE0yy g==; X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="316312326" X-IronPort-AV: E=Sophos;i="5.98,241,1673942400"; d="scan'208";a="316312326" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2023 09:17:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="676618826" X-IronPort-AV: E=Sophos;i="5.98,241,1673942400"; d="scan'208";a="676618826" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.222.80]) by orsmga002.jf.intel.com with ESMTP; 07 Mar 2023 09:17:39 -0800 From: Ciara Power To: dev@dpdk.org Cc: kai.ji@intel.com, Ciara Power , Akhil Goyal , Fan Zhang Subject: [PATCH 2/3] test/crypto: skip asym test if driver or device missing Date: Tue, 7 Mar 2023 17:17:33 +0000 Message-Id: <20230307171734.2872005-3-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307171734.2872005-1-ciara.power@intel.com> References: <20230307171734.2872005-1-ciara.power@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Asym crypto tests returned FAILED if the required driver wasn't loaded, or no suitable device was found. This is now updated to return SKIPPED in these cases, which better reflects the status of the test, and follows the convention set in the sym crypto tests in similar circumstances. Signed-off-by: Ciara Power --- app/test/test_cryptodev_asym.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index 5b16dcab56..9236817650 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -844,7 +844,7 @@ testsuite_setup(void) valid_devs, RTE_CRYPTO_MAX_DEVS); if (nb_devs < 1) { RTE_LOG(ERR, USER1, "No crypto devices found?\n"); - return TEST_FAILED; + return TEST_SKIPPED; } /* @@ -2256,7 +2256,7 @@ test_cryptodev_openssl_asym(void) if (gbl_driver_id == -1) { RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); - return TEST_FAILED; + return TEST_SKIPPED; } return unit_test_suite_runner(&cryptodev_openssl_asym_testsuite); @@ -2270,7 +2270,7 @@ test_cryptodev_qat_asym(void) if (gbl_driver_id == -1) { RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); - return TEST_FAILED; + return TEST_SKIPPED; } return unit_test_suite_runner(&cryptodev_qat_asym_testsuite); @@ -2283,7 +2283,7 @@ test_cryptodev_octeontx_asym(void) RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); if (gbl_driver_id == -1) { RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); - return TEST_FAILED; + return TEST_SKIPPED; } return unit_test_suite_runner(&cryptodev_octeontx_asym_testsuite); } @@ -2295,7 +2295,7 @@ test_cryptodev_cn9k_asym(void) RTE_STR(CRYPTODEV_NAME_CN9K_PMD)); if (gbl_driver_id == -1) { RTE_LOG(ERR, USER1, "CN9K PMD must be loaded.\n"); - return TEST_FAILED; + return TEST_SKIPPED; } /* Use test suite registered for crypto_octeontx PMD */ @@ -2309,7 +2309,7 @@ test_cryptodev_cn10k_asym(void) RTE_STR(CRYPTODEV_NAME_CN10K_PMD)); if (gbl_driver_id == -1) { RTE_LOG(ERR, USER1, "CN10K PMD must be loaded.\n"); - return TEST_FAILED; + return TEST_SKIPPED; } /* Use test suite registered for crypto_octeontx PMD */ From patchwork Tue Mar 7 17:17:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 124842 X-Patchwork-Delegate: gakhil@marvell.com 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 0CC9841E06; Tue, 7 Mar 2023 18:17:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82182427EE; Tue, 7 Mar 2023 18:17:45 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id EED1D41143 for ; Tue, 7 Mar 2023 18:17:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678209463; x=1709745463; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SPFIwcisjEDr0aw5tP8fH+gxo2yyUadNhqCFcETRJ80=; b=Qx0uHzVLBlVI1aGWv0q0Wqcc7XedkINnrsVIgn4A4daqdNe3oZOMEeQR QNUHLNU9WZDFn8raUrLwlP1PBIVf+R+ashd/nIfXuTeC3J6EEYfYrFzwq dmReO8hzHDGtNTB72Y2etP0mwuUNt/O41yEuuneRFBtOSSk8mQVLq8y4J DT9oR7ah4JG50rX9NdTywJLbFoxzmCQDmUNRRXbkNL3uXG7NisTCyxTyD ZU7i/GcfhzOqg+9kv8P0m9ogd0YyQwuVZG8lhtzdndtAg5ayuWJry7sAj skUB3i8VLskcL5Vt18osUPpeL21n6hsjyF+SvpLpHJuqOyWpwQIQhUBZB g==; X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="316312333" X-IronPort-AV: E=Sophos;i="5.98,241,1673942400"; d="scan'208";a="316312333" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2023 09:17:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="676618837" X-IronPort-AV: E=Sophos;i="5.98,241,1673942400"; d="scan'208";a="676618837" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.222.80]) by orsmga002.jf.intel.com with ESMTP; 07 Mar 2023 09:17:41 -0800 From: Ciara Power To: dev@dpdk.org Cc: kai.ji@intel.com, Ciara Power Subject: [PATCH 3/3] app/test: add more cryptodev tests to meson suite Date: Tue, 7 Mar 2023 17:17:34 +0000 Message-Id: <20230307171734.2872005-4-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307171734.2872005-1-ciara.power@intel.com> References: <20230307171734.2872005-1-ciara.power@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The meson driver-tests suite did not include some ipsec_mb SW Crypto PMD tests, and QAT tests. These are now added to avoid them being missed if the user runs tests only using the meson suite infrastructure. Signed-off-by: Ciara Power --- app/test/meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/test/meson.build b/app/test/meson.build index f34d19e3c3..8c30442b62 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -300,13 +300,18 @@ perf_test_names = [ driver_test_names = [ 'cryptodev_aesni_gcm_autotest', 'cryptodev_aesni_mb_autotest', + 'cryptodev_chacha_poly_mb_autotest', 'cryptodev_cn10k_autotest', 'cryptodev_cn9k_autotest', + 'cryptodev_cpu_aesni_mb_autotest', + 'cryptodev_cpu_aesni_gcm_autotest', 'cryptodev_dpaa2_sec_autotest', 'cryptodev_dpaa_sec_autotest', 'cryptodev_null_autotest', 'cryptodev_openssl_autotest', 'cryptodev_qat_autotest', + 'cryptodev_qat_asym_autotest', + 'cryptodev_qat_raw_api_autotest', 'cryptodev_sw_armv8_autotest', 'cryptodev_sw_kasumi_autotest', 'cryptodev_sw_mvsam_autotest',