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 23871A056F; Tue, 3 Mar 2020 09:19:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1646C1BFF4; Tue, 3 Mar 2020 09:19:24 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id CA1C62C02 for ; Tue, 3 Mar 2020 09:19:21 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Mar 2020 00:19:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,510,1574150400"; d="scan'208";a="412661781" Received: from unknown (HELO dpdk-xinfengx-dut.sh.intel.com) ([10.67.117.16]) by orsmga005.jf.intel.com with ESMTP; 03 Mar 2020 00:19:19 -0800 From: xinfengx To: dts@dpdk.org Cc: xinfengx Date: Tue, 3 Mar 2020 06:58:36 +0800 Message-Id: <20200302225836.26508-4-xinfengx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200302225836.26508-1-xinfengx.zhao@intel.com> References: <20200302225836.26508-1-xinfengx.zhao@intel.com> Subject: [dts] [PATCH 4/4] conf: modify the config files for cryptodev virtio test suites 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/virtio_ipsec_cryptodev_func.cfg | 27 +++++++++++---------------- conf/virtio_perf_cryptodev_func.cfg | 17 +++++------------ conf/virtio_unit_cryptodev_func.cfg | 16 +++++----------- 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/conf/virtio_ipsec_cryptodev_func.cfg b/conf/virtio_ipsec_cryptodev_func.cfg index 0b51b7d..de6724d 100644 --- a/conf/virtio_ipsec_cryptodev_func.cfg +++ b/conf/virtio_ipsec_cryptodev_func.cfg @@ -2,20 +2,17 @@ # Cryptodev common options qat device id crypto_dev_id="37c9" -# PCI Pass-through -vfio_pci="0000:60:00.0 0000:60:00.1 0000:3b:00.0 0000:3b:00.1" - # default crypto device and sw device config -w="0000:1a:01.0" vdev="crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2" +w="0000:00:00.0" [vm0] qemu = - path=/root/qemu-2/bin/qemu-system-x86_64; + path=/opt/qemu-2.12.0/bin/qemu-system-x86_64; cpu = model=host,number=4,cpupin=11 12 13 14; mem = - size=5120,hugepage=yes; + size=4096,hugepage=yes; crypto = enable=yes,opt_num=2; daemon = @@ -23,20 +20,19 @@ daemon = login = user=root,password=tester; disk = - file=/root/VMs/virtio_crypto_test_710_1.img; + file=/home/image/ubuntu16-0.img; vnc = displayNum=1; -device = - driver=vfio-pci,opt_host=0000:3b:00.0; - driver=vfio-pci,opt_host=0000:3b:00.1; +start = + wait_seconds=200; [vm1] qemu = - path=/root/qemu-2/bin/qemu-system-x86_64; + path=/opt/qemu-2.12.0/bin/qemu-system-x86_64; cpu = model=host,number=4,cpupin=15 16 17 18; mem = - size=5120,hugepage=yes; + size=4096,hugepage=yes; crypto = enable=yes,opt_num=2; daemon = @@ -44,9 +40,8 @@ daemon = login = user=root,password=tester; disk = - file=/root/VMs/virtio_crypto_test_710_2.img; + file=/home/image/ubuntu16-1.img; vnc = displayNum=2; -device = - driver=vfio-pci,opt_host=0000:60:00.0; - driver=vfio-pci,opt_host=0000:60:00.1; +start = + wait_seconds=200; diff --git a/conf/virtio_perf_cryptodev_func.cfg b/conf/virtio_perf_cryptodev_func.cfg index cdadf31..0cd766b 100644 --- a/conf/virtio_perf_cryptodev_func.cfg +++ b/conf/virtio_perf_cryptodev_func.cfg @@ -2,12 +2,9 @@ # Cryptodev common options qat device id crypto_dev_id="37c9" -# PCI Pass-through -vfio_pci="0000:60:00.0 0000:60:00.1" - -# Vhost-crypto option config -w="0000:1a:01.0" +# default crypto device and sw device config vdev="crypto_aesni_mb_pmd_1" +w="0000:00:00.0" [test_aesni_mb_aes_cbc_sha1_hmac] buffer-sz="64,128,256,512,1024,2048" @@ -30,7 +27,6 @@ total-ops=100000 buffer-sz="64,128,256,512,1024,2048" l="0,1" socket-mem="512,0" -w="00:05.0" optype="cipher-then-auth" devtype="crypto_virtio" cipher-algo="aes-cbc" @@ -45,11 +41,11 @@ total-ops=100000 [vm0] qemu = - path=/root/qemu-2/bin/qemu-system-x86_64; + path=/opt/qemu-2.12.0/bin/qemu-system-x86_64; cpu = model=host,number=4,cpupin=11 12 13 14; mem = - size=5120,hugepage=yes; + size=4096,hugepage=yes; crypto = enable=yes,opt_num=2; daemon = @@ -57,9 +53,6 @@ daemon = login = user=root,password=tester; disk = - file=/root/VMs/virtio_crypto_test_710_1.img; + file=/home/image/ubuntu16-0.img; vnc = displayNum=1; -device = - driver=vfio-pci,opt_host=0000:60:00.0; - driver=vfio-pci,opt_host=0000:60:00.1; diff --git a/conf/virtio_unit_cryptodev_func.cfg b/conf/virtio_unit_cryptodev_func.cfg index f8165bd..53611e3 100644 --- a/conf/virtio_unit_cryptodev_func.cfg +++ b/conf/virtio_unit_cryptodev_func.cfg @@ -2,20 +2,17 @@ # Cryptodev common options qat device id crypto_dev_id="37c9" -# PCI Pass-through -vfio_pci="0000:60:00.0 0000:60:00.1" - -# Vhost-crypto option config -w="0000:1a:01.0" +# default crypto device and sw device config vdev="crypto_aesni_mb_pmd_1" +w="0000:00:00.0" [vm0] qemu = - path=/root/qemu-2/bin/qemu-system-x86_64; + path=/opt/qemu-2.12.0/bin/qemu-system-x86_64; cpu = model=host,number=4,cpupin=11 12 13 14; mem = - size=5120,hugepage=yes; + size=4096,hugepage=yes; crypto = enable=yes,opt_num=2; daemon = @@ -23,9 +20,6 @@ daemon = login = user=root,password=tester; disk = - file=/root/VMs/virtio_crypto_test_710_1.img; + file=/home/image/ubuntu16-0.img; vnc = displayNum=1; -device = - driver=vfio-pci,opt_host=0000:60:00.0; - driver=vfio-pci,opt_host=0000:60:00.1; -- 2.17.1