From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 8CA90A0096 for ; Tue, 9 Apr 2019 08:43:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8270D5398; Tue, 9 Apr 2019 08:43:52 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id AAB754F9B for ; Tue, 9 Apr 2019 08:43:50 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Apr 2019 23:43:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,328,1549958400"; d="scan'208";a="141172603" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga003.jf.intel.com with ESMTP; 08 Apr 2019 23:43:49 -0700 Received: from fmsmsx153.amr.corp.intel.com (10.18.125.6) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 8 Apr 2019 23:43:49 -0700 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by FMSMSX153.amr.corp.intel.com (10.18.125.6) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 8 Apr 2019 23:43:49 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.153]) with mapi id 14.03.0415.000; Tue, 9 Apr 2019 14:43:44 +0800 From: "Chen, Zhaoyan" To: "Zhao, XinfengX" , "dts@dpdk.org" CC: "Chen, Zhaoyan" Thread-Topic: [dts] [PATCH V1] tests: add test suite and conf for cryptodev virtio perf test Thread-Index: AQHU7dct/8Q1IsoWl0iiMmbeSukHT6YzY3Hg Date: Tue, 9 Apr 2019 06:43:43 +0000 Message-ID: <9DEEADBC57E43F4DA73B571777FECECA41C9C59F@SHSMSX104.ccr.corp.intel.com> References: <1554360713-150164-1-git-send-email-xinfengx.zhao@intel.com> <44051B25D8C8784BB77FFB604D6A70CA1203DACC@shsmsx102.ccr.corp.intel.com> In-Reply-To: <44051B25D8C8784BB77FFB604D6A70CA1203DACC@shsmsx102.ccr.corp.intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1] tests: add test suite and conf for cryptodev virtio perf 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" Acked-by: Zhaoyan, Chen Regards, Zhaoyan Chen > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Zhao, XinfengX > Sent: Monday, April 8, 2019 2:48 PM > To: dts@dpdk.org > Subject: Re: [dts] [PATCH V1] tests: add test suite and conf for cryptode= v virtio perf > test >=20 > Tested-by: Zhao, XinfengX >=20 > -----Original Message----- > From: Zhao, XinfengX > Sent: Thursday, April 4, 2019 2:52 PM > To: dts@dpdk.org > Cc: Zhao, XinfengX > Subject: [dts][PATCH V1] tests: add test suite and conf for cryptodev vir= tio perf test >=20 > Signed-off-by: Xinfeng Zhao > --- > conf/virtio_perf_cryptodev_func.cfg | 64 +++++++ > tests/TestSuite_virtio_perf_cryptodev_func.py | 252 > ++++++++++++++++++++++++++ > 2 files changed, 316 insertions(+) > create mode 100644 conf/virtio_perf_cryptodev_func.cfg > create mode 100644 tests/TestSuite_virtio_perf_cryptodev_func.py >=20 > diff --git a/conf/virtio_perf_cryptodev_func.cfg > b/conf/virtio_perf_cryptodev_func.cfg > new file mode 100644 > index 0000000..5a9b2cb > --- /dev/null > +++ b/conf/virtio_perf_cryptodev_func.cfg > @@ -0,0 +1,64 @@ > +[suite] > +# Cryptodev common options qat device id crypto_dev_id=3D"37c9" > + > +# PCI Pass-through > +vfio_pci=3D"0000:60:00.0 0000:60:00.1" > + > +# Vhost-crypto option config > +vdev=3D"crypto_aesni_mb_pmd_1" > + > +[test_aesni_mb_aes_cbc_sha1_hmac] > +buffer-sz=3D"64,128,256,512,1024,2048" > +l=3D"0,1" > +socket-mem=3D"512,0" > +vdev=3D"crypto_aesni_mb_pmd_1" > +optype=3D"cipher-then-auth" > +devtype=3D"crypto_aesni_mb" > +cipher-algo=3D"aes-cbc" > +cipher-op=3D"encrypt" > +cipher-key-sz=3D16 > +cipher-iv-sz=3D16 > +auth-algo=3D"sha1-hmac" > +auth-op=3D"generate" > +auth-key-sz=3D64 > +digest-sz=3D12 > +total-ops=3D100000 > + > +[test_virtio_aes_cbc_sha1_hmac] > +buffer-sz=3D"64,128,256,512,1024,2048" > +l=3D"0,1" > +socket-mem=3D"512,0" > +w=3D"00:05.0" > +optype=3D"cipher-then-auth" > +devtype=3D"crypto_virtio" > +cipher-algo=3D"aes-cbc" > +cipher-op=3D"encrypt" > +cipher-key-sz=3D16 > +cipher-iv-sz=3D16 > +auth-algo=3D"sha1-hmac" > +auth-op=3D"generate" > +auth-key-sz=3D64 > +digest-sz=3D12 > +total-ops=3D100000 > + > +[vm0] > +qemu =3D > + path=3D/root/qemu-2/bin/qemu-system-x86_64; > +cpu =3D > + model=3Dhost,number=3D4,cpupin=3D11 12 13 14; mem =3D > + size=3D5120,hugepage=3Dyes; > +crypto =3D > + enable=3Dyes,opt_num=3D2; > +daemon =3D > + enable=3Dyes; > +login =3D > + user=3Droot,password=3Dtester; > +disk =3D > + file=3D/root/VMs/virtio_crypto_test_710_1.img; > +vnc =3D > + displayNum=3D1; > +device =3D > + driver=3Dvfio-pci,opt_host=3D0000:60:00.0; > + driver=3Dvfio-pci,opt_host=3D0000:60:00.1; > diff --git a/tests/TestSuite_virtio_perf_cryptodev_func.py > b/tests/TestSuite_virtio_perf_cryptodev_func.py > new file mode 100644 > index 0000000..1f23363 > --- /dev/null > +++ b/tests/TestSuite_virtio_perf_cryptodev_func.py > @@ -0,0 +1,252 @@ > +# BSD LICENSE > +# > +# Copyright(c) 2018-201 Intel Corporation. All rights reserved. > +# All rights reserved. > +# > +# Redistribution and use in source and binary forms, with or without # > +modification, are permitted provided that the following conditions # > +are met: > +# > +# * Redistributions of source code must retain the above copyright > +# notice, this list of conditions and the following disclaimer. > +# * Redistributions in binary form must reproduce the above copyright > +# notice, this list of conditions and the following disclaimer in > +# the documentation and/or other materials provided with the > +# distribution. > +# * Neither the name of Intel Corporation nor the names of its > +# contributors may be used to endorse or promote products derived > +# from this software without specific prior written permission. > +# > +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND > CONTRIBUTORS # > +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # > +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > FOR # > +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > # > +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > # > +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # > +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > # > +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON > ANY # > +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # > +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # > +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > +""" > +DPDK Test suite > +Test DPDK vhost + virtio scenarios > +""" > +import os > +import utils > +import commands > +from test_case import TestCase > +from qemu_kvm import QEMUKvm > +import cryptodev_common as cc > + > +class VirtioCryptodevPerfTest(TestCase): > + def set_up_all(self): > + self.sample_app =3D "./examples/vhost_crypto/build/vhost-crypto" > + self.user_app =3D "./{target}/build/app/test-crypto-perf/dpdk-te= st-crypto- > perf".format(target=3Dself.dut.target) > + self._default_crypto_perf_opts =3D { > + "ptest": "throughput", > + "silent": "", > + "pool-sz": None, > + "total-ops": "1000000", > + "burst-sz": "32", > + "buffer-sz": "64", > + "devtype": None, > + "segments-nb": None, > + "optype": "cipher-then-auth", > + "sessionless": None, > + "out-of-place": None, > + "test-file": None, > + "test-name": None, > + "cipher-algo": None, > + "cipher-op": None, > + "cipher-key-sz": None, > + "cipher-iv-sz": None, > + "auth-algo": None, > + "auth-op": None, > + "auth-key-sz": None, > + "auth-iv-sz": None, > + "aead-algo": None, > + "aead-op": None, > + "aead-key-sz": None, > + "aead-iv-sz": None, > + "aead-aad-sz": None, > + "digest-sz": None, > + "csv-friendly": None > + } > + > + self.vm0, self.vm0_dut =3D None, None > + self.dut.skip_setup =3D True > + > + self.dut_ports =3D self.dut.get_ports(self.nic) > + self.verify(len(self.dut_ports) >=3D 1, 'Insufficient ports for = test') > + self.cores =3D self.dut.get_core_list("1S/3C/1T") > + self.mem_channel =3D self.dut.get_memory_channels() > + > + self.bind_script_path =3D self.dut.get_dpdk_bind_script() > + > + self.vfio_pci =3D self.get_suite_cfg()["vfio_pci"] > + for each in self.vfio_pci.split(): > + cmd =3D "echo {} > /sys/bus/pci/devices/{}/driver/unbind".fo= rmat(each, > each.replace(":", "\:")) > + self.dut_execut_cmd(cmd) > + > + if not cc.is_build_skip(self): > + self.tar_dpdk() > + self.dut.skip_setup =3D False > + cc.build_dpdk_with_cryptodev(self) > + self.build_vhost_app() > + cc.bind_qat_device(self, "vfio-pci") > + > + self.launch_vhost_switch() > + self.bind_vfio_pci() > + > + self.vm0, self.vm0_dut =3D self.launch_virtio_dut("vm0") > + > + def set_up(self): > + pass > + > + def dut_execut_cmd(self, cmdline, ex=3D'#', timout=3D30): > + return self.dut.send_expect(cmdline, ex, timout) > + > + def tar_dpdk(self): > + self.dut_execut_cmd("tar -czf %s/dep/dpdk.tar.gz ../dpdk" % > + os.getcwd(), '#', 100) > + > + def build_user_dpdk(self, user_dut): > + user_dut.send_expect( > + "sed -i > + > 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=3Dn$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB > =3Dy/ > + ' config/common_base", '#', 30) > + > + out =3D user_dut.send_expect("make install T=3D%s" % self.target= , "# ", 600) > + assert ("Error" not in out), "Compilation error..." > + > + def build_vhost_app(self): > + self.dut_execut_cmd("export RTE_SDK=3D`pwd`") > + self.dut_execut_cmd("export RTE_TARGET=3D%s" % self.target) > + out =3D self.dut_execut_cmd("make -C ./examples/vhost_crypto") > + self.verify("Error" not in out, "compilation error") > + > + def build_user_app(self, user_dut): > + user_dut.send_expect("export RTE_SDK=3D`pwd`", '#', 30) > + user_dut.send_expect("export RTE_TARGET=3D%s" % self.target, '#'= , 30) > + out =3D user_dut.send_expect("make -C ./%s test-build" % self.ta= rget, '#', 600) > + self.verify("Error" not in out, "compilation error") > + > + def get_vhost_eal(self): > + default_eal_opts =3D { > + "c": None, > + "l": ','.join(self.cores), > + "w": None, > + "vdev": None, > + "socket-mem": "2048,0", > + "n": self.mem_channel > + } > + opts =3D default_eal_opts.copy() > + > + # Update options with test suite/case config file > + for key in opts.keys(): > + if key in self.get_suite_cfg(): > + opts[key] =3D self.get_suite_cfg()[key] > + > + # Generate option string > + opt_str =3D "" > + for key,value in opts.items(): > + if value is None: > + continue > + dash =3D "-" if len(key) =3D=3D 1 else "--" > + opt_str =3D opt_str + "{0}{1} {2} ".format(dash, key, value) > + > + return opt_str > + > + def launch_vhost_switch(self): > + eal_opt_str =3D self.get_vhost_eal() > + config =3D '"(%s,0,0),(%s,0,0)"' % tuple(self.cores[-2:]) > + socket_file =3D "%s,/tmp/vm0_crypto0.sock --socket- > file=3D%s,/tmp/vm0_crypto1.sock" % tuple(self.cores[-2:]) > + self.vhost_switch_cmd =3D cc.get_dpdk_app_cmd_str(self.sample_ap= p, eal_opt_str, > + '--config %s --socket-file %s' % > + (config, socket_file)) > + > + self.dut_execut_cmd(self.vhost_switch_cmd, "socket created", > + 30) > + > + def bind_vfio_pci(self): > + commands.getoutput("modprobe vfio-pci") > + commands.getoutput('%s -b vfio-pci %s' % > + (os.path.join(self.dut.base_dir, self.bind_script_path), > + self.vfio_pci)) > + > + def set_virtio_pci(self, dut): > + out =3D dut.send_expect("lspci -d:1054|awk '{{print $1}}'", "# "= , 10) > + virtio_list =3D out.replace("\r", "\n").replace("\n\n", "\n").sp= lit("\n") > + dut.send_expect('modprobe uio_pci_generic', '#', 10) > + for line in virtio_list: > + cmd =3D "echo 0000:{} > > /sys/bus/pci/devices/0000\:{}/driver/unbind".format( > + line, line.replace(":", "\:")) > + dut.send_expect(cmd, "# ", 10) > + dut.send_expect('echo "1af4 1054" > > + /sys/bus/pci/drivers/uio_pci_generic/new_id', "# ", 10) > + > + def launch_virtio_dut(self, vm_name): > + # start vm > + vm =3D QEMUKvm(self.dut, vm_name, 'virtio_perf_cryptodev_func') > + > + try: > + vm_dut =3D vm.start(set_target=3DFalse) > + if vm_dut is None: > + print('{} start failed'.format(vm_name)) > + except Exception as err: > + raise err > + > + vm_dut.restore_interfaces() > + > + if not self.dut.skip_setup: > + self.build_user_dpdk(vm_dut) > + self.build_user_app(vm_dut) > + > + vm_dut.setup_modules(self.target, "igb_uio", None) > + vm_dut.bind_interfaces_linux('igb_uio') > + self.set_virtio_pci(vm_dut) > + > + return vm, vm_dut > + > + def test_aesni_mb_aes_cbc_sha1_hmac(self): > + if cc.is_test_skip(self): > + return > + > + eal_opt_str =3D cc.get_eal_opt_str(self, {"w":None}) > + crypto_perf_opt_str =3D cc.get_opt_str(self, self._default_crypt= o_perf_opts) > + out =3D self._run_crypto_perf(eal_opt_str, crypto_perf_opt_str) > + self.logger.info(out) > + self.verify("Failed" not in out, "Test fail") > + self.verify("Error" not in out, "Test fail") > + > + def test_virtio_aes_cbc_sha1_hmac(self): > + if cc.is_test_skip(self): > + return > + > + eal_opt_str =3D cc.get_eal_opt_str(self, {"vdev":None}) > + crypto_perf_opt_str =3D cc.get_opt_str(self, self._default_crypt= o_perf_opts) > + out =3D self._run_crypto_perf(eal_opt_str, crypto_perf_opt_str) > + self.logger.info(out) > + self.verify("Failed" not in out, "Test fail") > + self.verify("Error" not in out, "Test fail") > + > + def _run_crypto_perf(self, eal_opt_str, crypto_perf_opt_str): > + cmd_str =3D cc.get_dpdk_app_cmd_str(self.user_app, > + eal_opt_str, > + crypto_perf_opt_str) > + self.logger.info(cmd_str) > + try: > + out =3D self.vm0_dut.send_expect(cmd_str, "#", 600) > + except Exception as ex: > + self.logger.error(ex) > + raise ex > + > + return out > + > + def tear_down(self): > + pass > + > + def tear_down_all(self): > + if self.vm0: > + self.vm0.stop() > + self.dut.virt_exit() > + self.vm0 =3D None > + > + self.dut_execut_cmd("^C", "# ") > + self.dut_execut_cmd("killall -s INT vhost-crypto") > + self.dut_execut_cmd("killall -s INT qemu-system-x86_64") > + self.dut_execut_cmd("rm -r /tmp/*") > + cc.clear_dpdk_config(self) > -- > 2.7.4