From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 84525A0513; Thu, 4 Jun 2020 02:56:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D73E31D5B2; Thu, 4 Jun 2020 02:56:06 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 5D5161D585 for ; Thu, 4 Jun 2020 02:56:04 +0200 (CEST) IronPort-SDR: NEVGD9KGy1/wsvJZ/8UnpJo8WeCdh35fqC6KogLnof5rYmgqS4rcr/bRKpf1xTqbjUHmsMDFhg 5yF/JcWh1z6Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2020 17:56:03 -0700 IronPort-SDR: PP7Gi6CZyYXjjDBwyjy7Ftp2UP0WIxDtDqLx/SRzes5Sec6IRCto2lWZJ5HCi7nvAAvgZjpvGB jG4vLIXOLaFw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,470,1583222400"; d="scan'208";a="269251907" Received: from unknown (HELO dpdk-xinfengx-dut.sh.intel.com) ([10.67.117.16]) by orsmga003.jf.intel.com with ESMTP; 03 Jun 2020 17:55:59 -0700 From: xinfengx To: dts@dpdk.org Cc: xinfengx Date: Thu, 4 Jun 2020 08:54:40 +0800 Message-Id: <20200604005445.110297-2-xinfengx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200604005445.110297-1-xinfengx.zhao@intel.com> References: <20200604005445.110297-1-xinfengx.zhao@intel.com> Subject: [dts] [PATCH V1 1/6] conf: simplify conf settings for cryptodev 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: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Signed-off-by: xinfengx --- conf/crypto_perf_cryptodev_perf.cfg | 115 ++++++++++++-------- conf/cryptodev_sample.cfg | 6 ++ conf/ipsec_gw_cryptodev_func.cfg | 156 +++++++++------------------- conf/l2fwd_cryptodev_func.cfg | 35 ------- conf/unit_tests_cryptodev_func.cfg | 11 -- 5 files changed, 124 insertions(+), 199 deletions(-) create mode 100644 conf/cryptodev_sample.cfg delete mode 100644 conf/l2fwd_cryptodev_func.cfg delete mode 100644 conf/unit_tests_cryptodev_func.cfg diff --git a/conf/crypto_perf_cryptodev_perf.cfg b/conf/crypto_perf_cryptodev_perf.cfg index 05dc6af..f0c86a4 100644 --- a/conf/crypto_perf_cryptodev_perf.cfg +++ b/conf/crypto_perf_cryptodev_perf.cfg @@ -1,25 +1,15 @@ [suite] -# Cryptodev common options qat device id -crypto_dev_id="37c9" - # eal config l="9,10" -socket-mem="2048,0 --legacy-mem" -n=6 - -# default crypto device and sw device config, it could be overrided by test case -w="0000:1a:01.0" -vdev="crypto_aesni_mb_1" - total-ops=30000000 buffer-sz="64,128,256,512,1024,2048" [test_verify_aesni_mb] -buffer-sz=32 ptest="verify" +devtype="crypto_aesni_mb" +buffer-sz="32" auth-key-sz=64 cipher-key-sz=32 -devtype="crypto_aesni_mb" cipher-iv-sz=16 auth-op="generate" digest-sz=12 @@ -30,11 +20,11 @@ test-name="sha1_hmac_buff_32" test-file="/tmp/test_aes_cbc.data" [test_verify_qat] -buffer-sz=32 ptest="verify" +devtype="crypto_qat" +buffer-sz="32" auth-key-sz=64 cipher-key-sz=32 -devtype="crypto_qat" cipher-iv-sz=16 auth-op="generate" digest-sz=20 @@ -45,9 +35,9 @@ test-name="sha1_hmac_buff_32" test-file="/tmp/test_aes_cbc.data" [test_verify_openssl_qat] -l="9,10,11,12" -vdev="crypto_openssl" +ptest="verify" devtype="crypto_openssl" +buffer-sz="32" aead-algo="aes-gcm" aead-key-sz=16 aead-iv-sz=12 @@ -55,15 +45,13 @@ aead-op="encrypt" aead-aad-sz=16 digest-sz=16 optype="aead" -ptest="verify" -buffer-sz=32 test-name="aes_gcm_buff_32" test-file="/tmp/test_aes_gcm.data" [test_verify_openssl] -l="9,10,11,12" -vdev="crypto_openssl" +ptest="verify" devtype="crypto_openssl" +buffer-sz="32" aead-algo="aes-gcm" aead-key-sz=16 aead-iv-sz=12 @@ -71,25 +59,19 @@ aead-op="encrypt" aead-aad-sz=16 digest-sz=16 optype="aead" -ptest="verify" -buffer-sz=32 test-name="aes_gcm_buff_32" test-file="/tmp/test_aes_gcm.data" [test_latency_qat] -l="9,10,11,12" -w="0000:1a:01.0 -w 0000:1a:01.1 -w 0000:1a:01.2" +ptest="latency" devtype="crypto_qat" cipher-algo="aes-cbc" cipher-key-sz=16 cipher-iv-sz=16 cipher-op="encrypt" optype="cipher-only" -ptest="latency" [test_latency_auth_qat] -l="9,10,11,12" -w="0000:1a:01.0 -w 0000:1a:01.1 -w 0000:1a:01.2" ptest="latency" devtype="crypto_qat" cipher-algo="aes-cbc" @@ -102,31 +84,28 @@ digest-sz=12 silent=None [test_latency_aead_qat] +ptest="latency" +devtype="crypto_qat" aead-key-sz=16 optype="aead" -ptest="latency" aead-aad-sz=16 -devtype="crypto_qat" aead-op="encrypt" digest-sz=16 aead-algo="aes-gcm" aead-iv-sz=12 [test_latency_aesni_gcm] -vdev="crypto_aesni_gcm_pmd_1" +ptest="latency" +devtype="crypto_aesni_gcm" aead-key-sz=16 optype="aead" -ptest="latency" aead-aad-sz=16 -devtype="crypto_aesni_gcm" aead-op="encrypt" digest-sz=16 aead-algo="aes-gcm" aead-iv-sz=12 [test_latency_auth_aesni_mb] -l="9,10,11,12" -vdev="crypto_aesni_mb1 --vdev crypto_aesni_mb2" ptest="latency" devtype="crypto_aesni_mb" cipher-algo="aes-cbc" @@ -139,7 +118,6 @@ silent=None digest-sz=12 [test_latency_aesni_mb] -vdev="crypto_aesni_mb1 --vdev crypto_aesni_mb2" devtype="crypto_aesni_mb" cipher-algo="aes-cbc" cipher-key-sz=16 @@ -203,9 +181,8 @@ aead-aad-sz=16 digest-sz=16 [test_sw_aes_gcm] -vdev="crypto_aesni_gcm_pmd_1" -optype="aead" devtype="crypto_aesni_gcm" +optype="aead" aead-algo="aes-gcm" aead-op="encrypt" aead-key-sz=16 @@ -261,7 +238,6 @@ auth-key-sz=16 digest-sz=4 [test_sw_kasumi] -vdev="crypto_kasumi_1" total-ops=1000000 devtype="crypto_kasumi" cipher-algo="kasumi-f8" @@ -286,7 +262,6 @@ auth-iv-sz=16 digest-sz=4 [test_sw_snow3g] -vdev="crypto_snow3g_1" total-ops=1000000 devtype="crypto_snow3g" cipher-algo="snow3g-uea2" @@ -312,7 +287,6 @@ auth-iv-sz=16 digest-sz=4 [test_sw_zuc] -vdev="crypto_zuc_1" total-ops=1000000 devtype="crypto_zuc" cipher-algo="zuc-eea3" @@ -326,19 +300,68 @@ auth-iv-sz=16 digest-sz=4 [test_scheduler_aes_cbc_sha1_hmac] -test_skip="Y" +devtype="crypto_scheduler" +cipher-algo="aes-cbc" +cipher-op="encrypt" +cipher-key-sz=16 +cipher-iv-sz=16 +auth-algo="sha1-hmac" +auth-op="generate" +auth-key-sz=64 +digest-sz=20 [test_scheduler_aes_cbc_sha2_hmac] -test_skip="Y" +devtype="crypto_scheduler" +cipher-algo="aes-cbc" +cipher-op="encrypt" +cipher-key-sz=16 +cipher-iv-sz=16 +auth-algo="sha2-256-hmac" +auth-op="generate" +auth-key-sz=64 +digest-sz=32 [test_scheduler_aes_gcm] -test_skip="Y" +devtype="crypto_scheduler" +optype="aead" +aead-algo="aes-gcm" +aead-op="encrypt" +aead-key-sz=16 +aead-iv-sz=12 +aead-aad-sz=16 +digest-sz=16 [test_scheduler_kasumi] -test_skip="Y" +devtype="crypto_scheduler" +cipher-algo="kasumi-f8" +cipher-op="encrypt" +cipher-key-sz=16 +cipher-iv-sz=8 +auth-algo="kasumi-f9" +auth-op="generate" +auth-key-sz=16 +digest-sz=4 [test_scheduler_snow3g] -test_skip="Y" +devtype="crypto_scheduler" +cipher-algo="snow3g-uea2" +cipher-op="encrypt" +cipher-key-sz=16 +cipher-iv-sz=16 +auth-algo="snow3g-uia2" +auth-op="generate" +auth-key-sz=16 +auth-iv-sz=16 +digest-sz=4 [test_scheduler_zuc] -test_skip="Y" +devtype="crypto_scheduler" +cipher-algo="zuc-eea3" +cipher-op="encrypt" +cipher-key-sz=16 +cipher-iv-sz=16 +auth-algo="zuc-eia3" +auth-op="generate" +auth-key-sz=16 +auth-iv-sz=16 +digest-sz=4 diff --git a/conf/cryptodev_sample.cfg b/conf/cryptodev_sample.cfg new file mode 100644 index 0000000..4aade66 --- /dev/null +++ b/conf/cryptodev_sample.cfg @@ -0,0 +1,6 @@ +[suite] +# Cryptodev common option qat hardware device id +crypto_dev_id="37c8" + +# your special settings for eal +socket-mem="2048,0" diff --git a/conf/ipsec_gw_cryptodev_func.cfg b/conf/ipsec_gw_cryptodev_func.cfg index b22436d..8ecf7c8 100644 --- a/conf/ipsec_gw_cryptodev_func.cfg +++ b/conf/ipsec_gw_cryptodev_func.cfg @@ -1,20 +1,9 @@ [suite] -# Cryptodev common options qat device id -crypto_dev_id="37c9" - -# eal config -l="9,10,11" -socket-mem="2048,0" - -# enables or disables code-path that uses librte_ipsec +# enable or disable librte_ipsec librte_ipsec=False -# IPsec gw app configuration -f="/root/ipsec_ep0.cfg" - [test_qat_aes_128_cbc_ipv4_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.105.100" src_ip="192.168.105.200" expected_dst_ip="172.16.2.5" @@ -22,8 +11,7 @@ expected_src_ip="172.16.1.5" expected_spi="0x5" [test_qat_aes_128_ctr_ipv4_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.125.100" src_ip="192.168.125.200" expected_dst_ip="172.16.2.6" @@ -31,8 +19,7 @@ expected_src_ip="172.16.1.6" expected_spi="0x2d" [test_qat_aes_256_cbc_ipv4_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.25.100" src_ip="192.168.25.200" expected_dst_ip="172.16.2.5" @@ -40,8 +27,7 @@ expected_src_ip="172.16.1.5" expected_spi="0x23" [test_qat_aes_gcm_ipv4_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.106.100" src_ip="192.168.106.200" expected_dst_ip="172.16.2.6" @@ -49,8 +35,7 @@ expected_src_ip="172.16.1.6" expected_spi="0x6" [test_qat_null_ipv4_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.200.100" src_ip="192.168.200.200" expected_dst_ip="172.16.2.5" @@ -58,8 +43,7 @@ expected_src_ip="172.16.1.5" expected_spi="0xf" [test_qat_3des_cbc_ipv4_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.220.100" src_ip="192.168.220.200" expected_dst_ip="172.16.2.6" @@ -67,8 +51,7 @@ expected_src_ip="172.16.1.6" expected_spi="0x32" [test_qat_aes_128_cbc_ipv4_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.175.100" src_ip="192.168.175.200" expected_dst_ip="192.168.175.100" @@ -76,8 +59,7 @@ expected_src_ip="192.168.175.200" expected_spi="0xa" [test_qat_aes_128_ctr_ipv4_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.76.100" src_ip="192.168.76.200" expected_dst_ip="192.168.76.100" @@ -85,8 +67,7 @@ expected_src_ip="192.168.76.200" expected_spi="0x1f" [test_qat_aes_256_cbc_ipv4_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.26.100" src_ip="192.168.26.200" expected_dst_ip="192.168.26.100" @@ -94,8 +75,7 @@ expected_src_ip="192.168.26.200" expected_spi="0x24" [test_qat_aes_gcm_ipv4_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.176.100" src_ip="192.168.176.200" expected_dst_ip="192.168.176.100" @@ -103,8 +83,7 @@ expected_src_ip="192.168.176.200" expected_spi="0xb" [test_qat_null_ipv4_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.141.100" src_ip="192.168.141.200" expected_dst_ip="192.168.141.100" @@ -112,8 +91,7 @@ expected_src_ip="192.168.141.200" expected_spi="0x38" [test_qat_3des_cbc_ipv4_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.140.100" src_ip="192.168.140.200" expected_dst_ip="192.168.140.100" @@ -121,8 +99,7 @@ expected_src_ip="192.168.140.200" expected_spi="0x37" [test_qat_aes_128_ctr_ipv6_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.126.100" src_ip="192.168.126.200" expected_dst_ip="bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:2222" @@ -130,8 +107,7 @@ expected_src_ip="aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:1111" expected_spi="0x2e" [test_qat_aes_128_cbc_ipv6_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.55.100" src_ip="192.168.55.200" expected_dst_ip="2222:2222:2222:2222:2222:2222:2222:5555" @@ -139,8 +115,7 @@ expected_src_ip="1111:1111:1111:1111:1111:1111:1111:5555" expected_spi="0x19" [test_qat_aes_256_cbc_ipv6_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.75.100" src_ip="192.168.75.200" expected_dst_ip="8888:8888:8888:8888:8888:8888:8888:2222" @@ -148,8 +123,7 @@ expected_src_ip="7777:7777:7777:7777:7777:7777:7777:1111" expected_spi="0x1e" [test_qat_aes_gcm_ipv6_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.56.100" src_ip="192.168.56.200" expected_dst_ip="2222:2222:2222:2222:2222:2222:2222:6666" @@ -157,8 +131,7 @@ expected_src_ip="1111:1111:1111:1111:1111:1111:1111:6666" expected_spi="0x1a" [test_qat_null_ipv6_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.201.100" src_ip="192.168.201.200" expected_dst_ip="5555:5555:5555:5555:5555:5555:5555:2222" @@ -166,8 +139,7 @@ expected_src_ip="4444:4444:4444:4444:4444:4444:4444:1111" expected_spi="0x10" [test_qat_3des_cbc_ipv6_tunnel] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="192.168.221.100" src_ip="192.168.221.200" expected_dst_ip="bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:2222" @@ -175,8 +147,7 @@ expected_src_ip="aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:1111" expected_spi="0x33" [test_qat_aes_128_cbc_ipv6_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="0000:1111:1111:1111:0000:0000:0000:0000" src_ip="0000:1111:1111:1111:0000:0000:0000:1111" expected_dst_ip="0:1111:1111:1111::" @@ -184,8 +155,7 @@ expected_src_ip="0:1111:1111:1111::1111" expected_spi="0x50" [test_qat_aes_128_ctr_ipv6_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="0000:1111:1111:1111:2222:2222:0000:0000" src_ip="0000:1111:1111:1111:2222:2222:0000:1111" expected_dst_ip="0:1111:1111:1111:2222:2222::" @@ -193,8 +163,7 @@ expected_src_ip="0:1111:1111:1111:2222:2222:0:1111" expected_spi="0x52" [test_qat_aes_256_cbc_ipv6_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="0000:1111:1111:1111:3333:3333:0000:0000" src_ip="0000:1111:1111:1111:3333:3333:0000:1111" expected_dst_ip="0:1111:1111:1111:3333:3333::" @@ -202,8 +171,7 @@ expected_src_ip="0:1111:1111:1111:3333:3333:0:1111" expected_spi="0x53" [test_qat_aes_gcm_ipv6_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="0000:1111:1111:1111:1111:1111:0000:0000" src_ip="0000:1111:1111:1111:1111:1111:0000:1111" expected_dst_ip="0:1111:1111:1111:1111:1111::" @@ -211,8 +179,7 @@ expected_src_ip="0:1111:1111:1111:1111:1111:0:1111" expected_spi="0x51" [test_qat_null_ipv6_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="0000:1111:1111:1111:5555:5555:0000:0000" src_ip="0000:1111:1111:1111:5555:5555:0000:1111" expected_dst_ip="0:1111:1111:1111:5555:5555::" @@ -220,8 +187,7 @@ expected_src_ip="0:1111:1111:1111:5555:5555:0:1111" expected_spi="0x55" [test_qat_3des_cbc_ipv6_transport] -w="0000:1a:01.0" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_qat" dst_ip="0000:1111:1111:1111:4444:4444:0000:0000" src_ip="0000:1111:1111:1111:4444:4444:0000:1111" expected_dst_ip="0:1111:1111:1111:4444:4444::" @@ -230,8 +196,7 @@ expected_spi="0x54" ###### SW ####### [test_sw_aes_128_cbc_ipv4_tunnel] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.105.100" src_ip="192.168.105.200" expected_dst_ip="172.16.2.5" @@ -239,8 +204,7 @@ expected_src_ip="172.16.1.5" expected_spi="0x5" [test_sw_aes_128_ctr_ipv4_tunnel] -vdev="crypto_openssl_pmd_1 --vdev=crypto_openssl_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_openssl" dst_ip="192.168.125.100" src_ip="192.168.125.200" expected_dst_ip="172.16.2.6" @@ -248,8 +212,7 @@ expected_src_ip="172.16.1.6" expected_spi="0x2d" [test_sw_aes_256_cbc_ipv4_tunnel] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.25.100" src_ip="192.168.25.200" expected_dst_ip="172.16.2.5" @@ -257,8 +220,7 @@ expected_src_ip="172.16.1.5" expected_spi="0x23" [test_sw_aes_gcm_ipv4_tunnel] -vdev="crypto_aesni_gcm_pmd_1 --vdev=crypto_aesni_gcm_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_gcm" dst_ip="192.168.106.100" src_ip="192.168.106.200" expected_dst_ip="172.16.2.6" @@ -266,8 +228,7 @@ expected_src_ip="172.16.1.6" expected_spi="0x6" [test_sw_null_ipv4_tunnel] -vdev="crypto_null_pmd_1 --vdev=crypto_null_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_null" dst_ip="192.168.200.100" src_ip="192.168.200.200" expected_dst_ip="172.16.2.5" @@ -275,8 +236,7 @@ expected_src_ip="172.16.1.5" expected_spi="0xf" [test_sw_3des_cbc_ipv4_tunnel] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.220.100" src_ip="192.168.220.200" expected_dst_ip="172.16.2.6" @@ -284,8 +244,7 @@ expected_src_ip="172.16.1.6" expected_spi="0x32" [test_sw_aes_128_cbc_ipv4_transport] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.175.100" src_ip="192.168.175.200" expected_dst_ip="192.168.175.100" @@ -293,8 +252,7 @@ expected_src_ip="192.168.175.200" expected_spi="0xa" [test_sw_aes_128_ctr_ipv4_transport] -vdev="crypto_openssl_pmd_1 --vdev=crypto_openssl_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_openssl" dst_ip="192.168.76.100" src_ip="192.168.76.200" expected_dst_ip="192.168.76.100" @@ -302,8 +260,7 @@ expected_src_ip="192.168.76.200" expected_spi="0x1f" [test_sw_aes_256_cbc_ipv4_transport] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.26.100" src_ip="192.168.26.200" expected_dst_ip="192.168.26.100" @@ -311,8 +268,7 @@ expected_src_ip="192.168.26.200" expected_spi="0x24" [test_sw_aes_gcm_ipv4_transport] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.176.100" src_ip="192.168.176.200" expected_dst_ip="192.168.176.100" @@ -320,8 +276,7 @@ expected_src_ip="192.168.176.200" expected_spi="0xb" [test_sw_null_ipv4_transport] -vdev="crypto_null_pmd_1 --vdev=crypto_null_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_null" dst_ip="192.168.141.100" src_ip="192.168.141.200" expected_dst_ip="192.168.141.100" @@ -329,8 +284,7 @@ expected_src_ip="192.168.141.200" expected_spi="0x38" [test_sw_3des_cbc_ipv4_transport] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.140.100" src_ip="192.168.140.200" expected_dst_ip="192.168.140.100" @@ -338,8 +292,7 @@ expected_src_ip="192.168.140.200" expected_spi="0x37" [test_sw_aes_128_cbc_ipv6_tunnel] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.55.100" src_ip="192.168.55.200" expected_dst_ip="2222:2222:2222:2222:2222:2222:2222:5555" @@ -347,8 +300,7 @@ expected_src_ip="1111:1111:1111:1111:1111:1111:1111:5555" expected_spi="0x19" [test_sw_aes_128_ctr_ipv6_tunnel] -vdev="crypto_openssl_pmd_1 --vdev=crypto_openssl_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_openssl" dst_ip="192.168.126.100" src_ip="192.168.126.200" expected_dst_ip="bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:2222" @@ -356,8 +308,7 @@ expected_src_ip="aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:1111" expected_spi="0x2e" [test_sw_aes_256_cbc_ipv6_tunnel] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.75.100" src_ip="192.168.75.200" expected_dst_ip="8888:8888:8888:8888:8888:8888:8888:2222" @@ -365,8 +316,7 @@ expected_src_ip="7777:7777:7777:7777:7777:7777:7777:1111" expected_spi="0x1e" [test_sw_aes_gcm_ipv6_tunnel] -vdev="crypto_aesni_gcm_pmd_1 --vdev=crypto_aesni_gcm_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_gcm" dst_ip="192.168.56.100" src_ip="192.168.56.200" expected_dst_ip="2222:2222:2222:2222:2222:2222:2222:6666" @@ -374,8 +324,7 @@ expected_src_ip="1111:1111:1111:1111:1111:1111:1111:6666" expected_spi="0x1a" [test_sw_null_ipv6_tunnel] -vdev="crypto_null_pmd_1 --vdev=crypto_null_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_null" dst_ip="192.168.201.100" src_ip="192.168.201.200" expected_dst_ip="5555:5555:5555:5555:5555:5555:5555:2222" @@ -383,8 +332,7 @@ expected_src_ip="4444:4444:4444:4444:4444:4444:4444:1111" expected_spi="0x10" [test_sw_3des_cbc_ipv6_tunnel] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="192.168.221.100" src_ip="192.168.221.200" expected_dst_ip="bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:2222" @@ -392,8 +340,7 @@ expected_src_ip="aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:1111" expected_spi="0x33" [test_sw_aes_128_cbc_ipv6_transport] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="0000:1111:1111:1111:0000:0000:0000:0000" src_ip="0000:1111:1111:1111:0000:0000:0000:1111" expected_dst_ip="0:1111:1111:1111::" @@ -401,8 +348,7 @@ expected_src_ip="0:1111:1111:1111::1111" expected_spi="0x50" [test_sw_aes_128_ctr_ipv6_transport] -vdev="crypto_openssl_pmd_1 --vdev=crypto_openssl_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_openssl" dst_ip="0000:1111:1111:1111:2222:2222:0000:0000" src_ip="0000:1111:1111:1111:2222:2222:0000:1111" expected_dst_ip="0:1111:1111:1111:2222:2222::" @@ -410,8 +356,7 @@ expected_src_ip="0:1111:1111:1111:2222:2222:0:1111" expected_spi="0x52" [test_sw_aes_256_cbc_ipv6_transport] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="0000:1111:1111:1111:3333:3333:0000:0000" src_ip="0000:1111:1111:1111:3333:3333:0000:1111" expected_dst_ip="0:1111:1111:1111:3333:3333::" @@ -419,8 +364,7 @@ expected_src_ip="0:1111:1111:1111:3333:3333:0:1111" expected_spi="0x53" [test_sw_aes_gcm_ipv6_transport] -vdev="crypto_aesni_gcm_pmd_1 --vdev=crypto_aesni_gcm_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_gcm" dst_ip="0000:1111:1111:1111:1111:1111:0000:0000" src_ip="0000:1111:1111:1111:1111:1111:0000:1111" expected_dst_ip="0:1111:1111:1111:1111:1111::" @@ -428,8 +372,7 @@ expected_src_ip="0:1111:1111:1111:1111:1111:0:1111" expected_spi="0x51" [test_sw_null_ipv6_transport] -vdev="crypto_null_pmd_1 --vdev=crypto_null_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_null" dst_ip="0000:1111:1111:1111:5555:5555:0000:0000" src_ip="0000:1111:1111:1111:5555:5555:0000:1111" expected_dst_ip="0:1111:1111:1111:5555:5555::" @@ -437,8 +380,7 @@ expected_src_ip="0:1111:1111:1111:5555:5555:0:1111" expected_spi="0x55" [test_sw_3des_cbc_ipv6_transport] -vdev="crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2" -config='"(0,0,10),(1,0,11)"' +devtype="crypto_aesni_mb" dst_ip="0000:1111:1111:1111:4444:4444:0000:0000" src_ip="0000:1111:1111:1111:4444:4444:0000:1111" expected_dst_ip="0:1111:1111:1111:4444:4444::" diff --git a/conf/l2fwd_cryptodev_func.cfg b/conf/l2fwd_cryptodev_func.cfg deleted file mode 100644 index a1b2418..0000000 --- a/conf/l2fwd_cryptodev_func.cfg +++ /dev/null @@ -1,35 +0,0 @@ -[suite] -# Cryptodev common options qat device id -crypto_dev_id="37c9" - -# eal config -l="9,10,66" -socket-mem="2048,0" -n=4 - -# specify the qat devices in eal white list -w="0000:1a:01.0 -w 0000:1c:01.0 -w 0000:1e:01.0" - -[test_scheduler_rr_AES_CBC_auto] -vdev="crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=0000:3f:01.0_qat_sym,slave=0000:3d:01.0_qat_sym,mode=round-robin" - -[test_scheduler_rr_AES_GCM_auto] -vdev="crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=0000:3f:01.0_qat_sym,slave=0000:3d:01.0_qat_sym,mode=round-robin" - -[test_scheduler_psb_AES_CBC_auto] -vdev="crypto_aesni_mb0,name=aesni_mb_1 --vdev crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=aesni_mb_1,mode=packet-size-distr" - -[test_scheduler_psb_AES_GCM_auto] -vdev="crypto_aesni_mb0,name=aesni_mb_1 --vdev crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=aesni_mb_1,mode=packet-size-distr" - -[test_scheduler_fo_AES_CBC_auto] -vdev="crypto_aesni_mb0,name=aesni_mb_1 --vdev crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=aesni_mb_1,mode=fail-over" - -[test_scheduler_fo_AES_GCM_auto] -vdev="crypto_aesni_mb0,name=aesni_mb_1 --vdev crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=aesni_mb_1,mode=fail-over" - -[test_scheduler_mm_AES_CBC_auto] -vdev="crypto_aesni_mb0,name=aesni_mb_1 --vdev crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=aesni_mb_1,mode=multi-core" - -[test_scheduler_mm_AES_GCM_auto] -vdev="crypto_aesni_mb0,name=aesni_mb_1 --vdev crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=aesni_mb_1,mode=multi-core" diff --git a/conf/unit_tests_cryptodev_func.cfg b/conf/unit_tests_cryptodev_func.cfg deleted file mode 100644 index d5b3b30..0000000 --- a/conf/unit_tests_cryptodev_func.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[suite] -# Cryptodev common options qat device id -crypto_dev_id="37c9" - -# eal config -l="9,10,66" -socket-mem="2048,0 --legacy-mem" -n=4 - -# specify the qat device in eal white list to avoid reach the maximum number of crypto devices -w="0000:1a:01.0" -- 2.17.1