[dts] [PATCH V1 1/4] conf: modify cryptodev virtio perf test plan

[dts] [PATCH V1 1/4] conf: modify cryptodev virtio perf test plan

[xinfeng zhao]

1. add the step to enable common_base items
2. Revise plan format

Signed-off-by: xinfeng zhao <xinfengx.zhao@intel.com>
---
 .../virtio_perf_cryptodev_func_test_plan.rst  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/test_plans/virtio_perf_cryptodev_func_test_plan.rst b/test_plans/virtio_perf_cryptodev_func_test_plan.rst
index 3ad6543..3f58135 100644
--- a/test_plans/virtio_perf_cryptodev_func_test_plan.rst
+++ b/test_plans/virtio_perf_cryptodev_func_test_plan.rst
@@ -100,18 +100,17 @@ Test case setup:
 
 In Host:
 
-# Build DPDK and vhost_crypto app::
+# Enable config item in dpdk:
 
       enable CONFIG_RTE_LIBRTE_VHOST in config/common_base
-      make install -j T=x86_64-native-linuxapp-gcc
-      make -C examples/vhost_crypto
 
-# Compile the latest qemu
+# Build DPDK and app vhost_crypto
+
 # Run the dpdk vhost sample::
 
     ./examples/vhost_crypto/build/vhost-crypto --socket-mem 2048,0 --legacy-mem --vdev crypto_aesni_mb_pmd_1 -l 8,9,10 -n 4  -- --config "(9,0,0),(10,0,0)" --socket-file 9,/tmp/vm0_crypto0.sock --socket-file=10,/tmp/vm0_crypto1.sock
 
-# bind vfio-pci::
+# bind vf or pf with driver vfio-pci::
 
     usertools/dpdk-devbind.py --bind=vfio-pci 0000:60:00.0 0000:60:00.1
 
@@ -135,6 +134,11 @@ In Host:
 
 In VM:
 
+# enable config items in dpdk and compile dpdk:
+
+    enable CONFIG_RTE_EAL_IGB_UIO in config/common_base
+    enable CONFIG_RTE_LIBRTE_PMD_AESNI_MB in config/common_base
+
 # set virtio device::
 
     modprobe uio_pci_generic
@@ -142,9 +146,10 @@ In VM:
     echo -n 0000:00:05.0 > /sys/bus/pci/drivers/virtio-pci/unbind
     echo "1af4 1054" > /sys/bus/pci/drivers/uio_pci_generic/new_id
 
-# Run the virtio performance test cases
+Test Case: Cryptodev AESNI_MB test
+==================================
 
-  1. The AESNI_MB case Command line Eg::
+command::
 
       ./build/app/dpdk-test-crypto-perf -c 0xf --vdev crypto_aesni_mb_pmd  \
       -- --ptest throughput --devtype crypto_aesni_mb --optype cipher-then-auth  \
@@ -152,9 +157,12 @@ In VM:
       --auth-algo sha1-hmac --auth-op generate --auth-key-sz 64 --auth-aad-sz 0 \
       --auth-digest-sz 20 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
 
-  2. The VIRTIO case Command line Eg::
+Test Case: Cryptodev VIRTIO test
+================================
+
+command::
 
       ./build/app/dpdk-test-crypto-perf -c 0xf  -w 00:05.0 -- --ptest throughput \
-      --devtype crypto_qat --optype cipher-then-auth  --cipher-algo aes-cbc --cipher-op encrypt \
+      --devtype crypto_virtio --optype cipher-then-auth  --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 \
       --auth-aad-sz 0 --auth-digest-sz 20 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
-- 
2.17.1

[dts] [PATCH V1 2/4] conf: modify cryptodev virtio ipsec test plan

[xinfeng zhao]

1. add the step to enable common_base items
2. Revise plan format

Signed-off-by: xinfeng zhao <xinfengx.zhao@intel.com>
---
 .../virtio_ipsec_cryptodev_func_test_plan.rst | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst b/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst
index 47dc332..35b2a14 100644
--- a/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst
+++ b/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst
@@ -115,13 +115,11 @@ and compare the payload with correct answer pre-stored in scripts:
 
 In Host:
 
-# Build DPDK and vhost_crypto app::
+# Enable config item in dpdk:
 
-    enable CONFIG_RTE_LIBRTE_VHOST in config/common_base
-    make install -j T=x86_64-native-linuxapp-gcc
-    make -C examples/vhost_crypto
+      enable CONFIG_RTE_LIBRTE_VHOST in config/common_base
 
-# Compile the latest qemu
+# Build DPDK and app vhost_crypto
 
 # Run the dpdk vhost sample::
 
@@ -136,7 +134,7 @@ In Host:
     --socket-file=11,/tmp/vm1_crypto0.sock \
     --socket-file=12,/tmp/vm1_crypto1.sock
 
-# bind vfio-pci::
+# bind pf with driver vfio-pci::
 
     usertools/dpdk-devbind.py --bind=vfio-pci 0000:60:00.0 0000:60:00.1 0000:3b:00.0 0000:3b:00.1
 
@@ -168,7 +166,13 @@ In Host:
         -device vfio-pci,host=0000:60:00.0,id=pt_0
         -device vfio-pci,host=0000:60:00.1,id=pt_1
 
-In VM
+In VM:
+
+# enable config items, compile dpdk and app:
+
+    enable CONFIG_RTE_EAL_IGB_UIO in config/common_base
+    enable CONFIG_RTE_LIBRTE_PMD_AESNI_MB in config/common_base
+    compile dpdk and compile test app "ipsec-secgw"
 
 # set virtio device::
 
@@ -177,22 +181,28 @@ In VM
     echo -n 0000:00:05.0 > /sys/bus/pci/drivers/virtio-pci/unbind
     echo "1af4 1054" > /sys/bus/pci/drivers/uio_pci_generic/new_id
 
-# Run the ipsec test cases cmd
+Test Case: Cryptodev AESNI_MB test
+==================================
 
-    1. AESNI_MB case Command line Eg:
-    In vm0::
+In vm0::
 
     ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -w 0000:00:06.0 -w 0000:00:07.0 --vdev crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test0.cfg
 
-    In vm1::
+In vm1::
 
     ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -w 0000:00:06.0 -w 0000:00:07.0 --vdev crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test1.cfg
 
-    2. VIRTIO case Command line Eg:
-    In vm0::
+send packets and verify
+
+Test Case: Cryptodev VIRTIO test
+================================
+
+In vm0::
 
     ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -w 0000:00:06.0 -w 0000:00:07.0 -w 00:04.0 -w 00:05.0 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test0.cfg
 
-    In vm1::
+In vm1::
+
+    ./examples/ipsec-secgw/ibuild/ipsec-secgw --socket-mem 1024,0  -w 0000:00:06.0 -w 0000:00:07.0 -w 00:04.0 -w 00:05.0 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test1.cfg
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -w 0000:00:06.0 -w 0000:00:07.0 -w 00:04.0 -w 00:05.0 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test1.cfg
+send packets and verify
-- 
2.17.1

[dts] [PATCH V1 3/4] conf: modify cryptodev virtio unit test plan

[xinfeng zhao]

Signed-off-by: xinfeng zhao <xinfengx.zhao@intel.com>
---
 .../virtio_unit_cryptodev_func_test_plan.rst  | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/test_plans/virtio_unit_cryptodev_func_test_plan.rst b/test_plans/virtio_unit_cryptodev_func_test_plan.rst
index 3615cb2..d08da69 100644
--- a/test_plans/virtio_unit_cryptodev_func_test_plan.rst
+++ b/test_plans/virtio_unit_cryptodev_func_test_plan.rst
@@ -51,10 +51,9 @@ Unit Test List
 Prerequisites
 =============
 
-qemu version >= 2.12
-in qemu enable vhost-user-crypto:
+qemu version >= 2.12 and enable vhost-user-crypto::
 
-./configure --target-list=x86_64-softmmu --enable-vhost-crypto --prefix=/root/qemu-2.12 && make && make install
+      ./configure --target-list=x86_64-softmmu --enable-vhost-crypto --prefix=/root/qemu-2.12 && make && make install
 
 the bin is in /root/qemu-2.12 folder, which is your specified
 
@@ -71,13 +70,13 @@ Test Case Setup
 
 In Host:
 
-# Build DPDK and vhost_crypto app
+# Enable config item in dpdk:
 
       enable CONFIG_RTE_LIBRTE_VHOST in config/common_base
-      make install -j T=x86_64-native-linuxapp-gcc
-      make -C examples/vhost_crypto
 
-# Run the dpdk vhost sample
+# Build DPDK and app vhost_crypto
+
+# Run the dpdk vhost sample::
 
       ./examples/vhost_crypto/build/vhost-crypto --file-prefix="vhost_crypto_1"
           [EAL options]
@@ -85,11 +84,11 @@ In Host:
           -- --cdev-queue-id 0
           --socket-file THE PATH OF SOCKET FILE
 
-# bind vfio-pci
+# bind vf or pf with driver vfio-pci::
 
       usertools/dpdk-devbind.py --bind=vfio-pci 0000:60:00.0 0000:60:00.1
 
-# Start VM by the qemu
+# Start VM by the qemu::
 
       taskset -c 11,12,13,14 /root/qemu-2.12/bin/qemu-system-x86_64  -name vm0
           -enable-kvm -pidfile /tmp/.vm0.pid
@@ -108,16 +107,14 @@ In Host:
 
 In VM:
 
-# set virtio device
+# set virtio device::
 
       modprobe uio_pci_generic
       echo -n 0000:00:04.0 > /sys/bus/pci/drivers/virtio-pci/unbind
       echo -n 0000:00:05.0 > /sys/bus/pci/drivers/virtio-pci/unbind
       echo "1af4 1054" > /sys/bus/pci/drivers/uio_pci_generic/new_id
 
-# Build the guest DPDK and app/test
-
-# Manually verify the app/test by this command, as example, in your build folder:
+# Manually verify the app/test by this command, as example, in your build folder::
 
       ./app/test -c 1 -n 1
       RTE>> cryptodev_virtio_autotest
-- 
2.17.1

[dts] [PATCH V1 4/4] tests: remove unnecessary common_base modification and build

[xinfeng zhao]

Signed-off-by: xinfeng zhao <xinfengx.zhao@intel.com>
---
 tests/TestSuite_virtio_unit_cryptodev_func.py | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py
index 47e9c47..d8f56e2 100644
--- a/tests/TestSuite_virtio_unit_cryptodev_func.py
+++ b/tests/TestSuite_virtio_unit_cryptodev_func.py
@@ -86,15 +86,6 @@ class VirtioCryptodevUnitTest(TestCase):
     def dut_execut_cmd(self, cmdline, ex='#', timout=30):
         return self.dut.send_expect(cmdline, ex, timout)
 
-    def build_user_dpdk(self, user_dut):
-        user_dut.send_expect(
-            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y/' config/common_base", '#', 30)
-        user_dut.send_expect(
-            "sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/CONFIG_RTE_EAL_IGB_UIO=y/g' config/common_base", '#', 30)
-        out = user_dut.send_expect("make -j %d install T=%s MAKE_PAUSE=n" % (user_dut.number_of_cores, self.target), "# ", 900)
-        self.verify("Error" not in out, "compilation error 1")
-        self.verify("No such file" not in out, "compilation error 2")
-
     def build_vhost_app(self):
         out = self.dut_execut_cmd("make -C ./examples/vhost_crypto")
 
@@ -155,24 +146,14 @@ class VirtioCryptodevUnitTest(TestCase):
         vm = QEMUKvm(self.dut, vm_name, 'virtio_unit_cryptodev_func')
         vf0 = {'opt_host': self.sriov_vfs_port[0].pci}
         vm.set_vm_device(driver=self.vf_assign_method, **vf0)
-        skip_setup = self.dut.skip_setup
 
         try:
-            self.dut.skip_setup = True
             vm_dut = vm.start()
             if vm_dut is None:
                 print(('{} start failed'.format(vm_name)))
         except Exception as err:
             raise err
 
-        self.dut.skip_setup = skip_setup
-        vm_dut.restore_interfaces()
-
-        if not self.dut.skip_setup:
-            self.build_user_dpdk(vm_dut)
-
-        vm_dut.setup_modules(self.target, "igb_uio", None)
-        vm_dut.bind_interfaces_linux('igb_uio')
         vm.virtio_list = self.set_virtio_pci(vm_dut)
         self.logger.info("{} virtio list: {}".format(vm_name, vm.virtio_list))
         vm.cores = vm_dut.get_core_list("all")
-- 
2.17.1

Re: [dts] [PATCH V1 4/4] tests: remove unnecessary common_base modification and build

[Zhao, XinfengX]

Tested-by:  Zhao, Xinfeng<xinfengx.zhao@intel.com>

-----Original Message-----
From: Zhao, XinfengX 
Sent: Tuesday, August 18, 2020 3:53 PM
To: dts@dpdk.org
Cc: Zhao, XinfengX <xinfengx.zhao@intel.com>
Subject: [dts][PATCH V1 4/4] tests: remove unnecessary common_base modification and build

Signed-off-by: xinfeng zhao <xinfengx.zhao@intel.com>
---
 tests/TestSuite_virtio_unit_cryptodev_func.py | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py
index 47e9c47..d8f56e2 100644
--- a/tests/TestSuite_virtio_unit_cryptodev_func.py
+++ b/tests/TestSuite_virtio_unit_cryptodev_func.py
@@ -86,15 +86,6 @@ class VirtioCryptodevUnitTest(TestCase):
     def dut_execut_cmd(self, cmdline, ex='#', timout=30):
         return self.dut.send_expect(cmdline, ex, timout)
 
-    def build_user_dpdk(self, user_dut):
-        user_dut.send_expect(
-            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y/' config/common_base", '#', 30)
-        user_dut.send_expect(
-            "sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/CONFIG_RTE_EAL_IGB_UIO=y/g' config/common_base", '#', 30)
-        out = user_dut.send_expect("make -j %d install T=%s MAKE_PAUSE=n" % (user_dut.number_of_cores, self.target), "# ", 900)
-        self.verify("Error" not in out, "compilation error 1")
-        self.verify("No such file" not in out, "compilation error 2")
-
     def build_vhost_app(self):
         out = self.dut_execut_cmd("make -C ./examples/vhost_crypto")
 
@@ -155,24 +146,14 @@ class VirtioCryptodevUnitTest(TestCase):
         vm = QEMUKvm(self.dut, vm_name, 'virtio_unit_cryptodev_func')
         vf0 = {'opt_host': self.sriov_vfs_port[0].pci}
         vm.set_vm_device(driver=self.vf_assign_method, **vf0)
-        skip_setup = self.dut.skip_setup
 
         try:
-            self.dut.skip_setup = True
             vm_dut = vm.start()
             if vm_dut is None:
                 print(('{} start failed'.format(vm_name)))
         except Exception as err:
             raise err
 
-        self.dut.skip_setup = skip_setup
-        vm_dut.restore_interfaces()
-
-        if not self.dut.skip_setup:
-            self.build_user_dpdk(vm_dut)
-
-        vm_dut.setup_modules(self.target, "igb_uio", None)
-        vm_dut.bind_interfaces_linux('igb_uio')
         vm.virtio_list = self.set_virtio_pci(vm_dut)
         self.logger.info("{} virtio list: {}".format(vm_name, vm.virtio_list))
         vm.cores = vm_dut.get_core_list("all")
-- 
2.17.1

Re: [dts] [PATCH V1 1/4] conf: modify cryptodev virtio perf test plan

[Tu, Lijuan]

> Subject: [dts] [PATCH V1 1/4] conf: modify cryptodev virtio perf test plan
> 
> 1. add the step to enable common_base items 2. Revise plan format
> 
> Signed-off-by: xinfeng zhao <xinfengx.zhao@intel.com>

Applied the series