Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77983/?format=api
{ "id": 77983, "url": "http://patches.dpdk.org/api/patches/77983/?format=api", "web_url": "http://patches.dpdk.org/project/dts/patch/20200917062806.6335-1-yux.jiang@intel.com/", "project": { "id": 3, "url": "http://patches.dpdk.org/api/projects/3/?format=api", "name": "DTS", "link_name": "dts", "list_id": "dts.dpdk.org", "list_email": "dts@dpdk.org", "web_url": "", "scm_url": "git://dpdk.org/tools/dts", "webscm_url": "http://git.dpdk.org/tools/dts/", "list_archive_url": "https://inbox.dpdk.org/dts", "list_archive_url_format": "https://inbox.dpdk.org/dts/{}", "commit_url_format": "" }, "msgid": "<20200917062806.6335-1-yux.jiang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20200917062806.6335-1-yux.jiang@intel.com", "date": "2020-09-17T06:28:06", "name": "[V1] tests/TestSuite_dpdk_gro_lib: add 1 cbdma script", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6da9f9b7a5d4e4a250476e4039aaf9e868a4f21c", "submitter": { "id": 1709, "url": "http://patches.dpdk.org/api/people/1709/?format=api", "name": "Yu Jiang", "email": "yux.jiang@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dts/patch/20200917062806.6335-1-yux.jiang@intel.com/mbox/", "series": [ { "id": 12301, "url": "http://patches.dpdk.org/api/series/12301/?format=api", "web_url": "http://patches.dpdk.org/project/dts/list/?series=12301", "date": "2020-09-17T06:28:06", "name": "[V1] tests/TestSuite_dpdk_gro_lib: add 1 cbdma script", "version": 1, "mbox": "http://patches.dpdk.org/series/12301/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/77983/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/77983/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dts-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 23BE3A04B6;\n\tThu, 17 Sep 2020 08:28:33 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id BD11B1D508;\n\tThu, 17 Sep 2020 08:28:32 +0200 (CEST)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by dpdk.org (Postfix) with ESMTP id 7A8CF1D453\n for <dts@dpdk.org>; Thu, 17 Sep 2020 08:28:30 +0200 (CEST)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 16 Sep 2020 23:28:29 -0700", "from unknown (HELO localhost.localdomain) ([10.240.183.80])\n by fmsmga001.fm.intel.com with ESMTP; 16 Sep 2020 23:28:28 -0700" ], "IronPort-SDR": [ "\n 7GzfB76H9u/hwGuj+1nW49m1yaLAahNUTpq//UR0KMT36yMBdZ9gv3ZQc3dFDQUccVsOyrlrNN\n S2A0vddxCT3w==", "\n RrFbCs3R3T4se1XZv0GoFy7vj57KfjE73dzB919XzWTB2x4k1eRdWTFaLFGrnKDcTBBKuHwoHP\n hm4Cg/NCXq/A==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9746\"; a=\"177721023\"", "E=Sophos;i=\"5.76,435,1592895600\"; d=\"scan'208\";a=\"177721023\"", "E=Sophos;i=\"5.76,435,1592895600\"; d=\"scan'208\";a=\"409800941\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "JiangYuX <yux.jiang@intel.com>", "To": "dts@dpdk.org", "Cc": "JiangYu <yux.jiang@intel.com>", "Date": "Thu, 17 Sep 2020 14:28:06 +0800", "Message-Id": "<20200917062806.6335-1-yux.jiang@intel.com>", "X-Mailer": "git-send-email 2.17.1", "Subject": "[dts] [PATCH V1] tests/TestSuite_dpdk_gro_lib: add 1 cbdma script", "X-BeenThere": "dts@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "test suite reviews and discussions <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org", "Sender": "\"dts\" <dts-bounces@dpdk.org>" }, "content": "From: JiangYu <yux.jiang@intel.com>\n\n1, add 1 cbdma script: test_vhost_gro_tcp_ipv4_with_cbdma_enable\n2, modify start_vm: csum=on,gso=on\n3, adapt launch_testpmd_gro_on para: mode and queue\n\nSigned-off-by: JiangYu <yux.jiang@intel.com>\n---\n tests/TestSuite_dpdk_gro_lib.py | 121 ++++++++++++++++++++++++++++++++++++----\n 1 file changed, 111 insertions(+), 10 deletions(-)", "diff": "diff --git a/tests/TestSuite_dpdk_gro_lib.py b/tests/TestSuite_dpdk_gro_lib.py\nindex f2b5b0d..3f23e3e 100644\n--- a/tests/TestSuite_dpdk_gro_lib.py\n+++ b/tests/TestSuite_dpdk_gro_lib.py\n@@ -97,6 +97,12 @@ class TestDPDKGROLib(TestCase):\n self.prepare_dpdk()\n self.base_dir = self.dut.base_dir.replace('~', '/root')\n \n+ self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])\n+ # get cbdma device\n+ self.cbdma_dev_infos = []\n+ self.dmas_info = None\n+ self.device_str = None\n+\n def set_up(self):\n #\n # Run before each test case.\n@@ -106,15 +112,60 @@ class TestDPDKGROLib(TestCase):\n self.dut.send_expect(\"killall -s INT %s\" % self.testpmd_name, \"#\")\n self.dut.send_expect(\"killall -s INT qemu-system-x86_64\", \"#\")\n \n- def launch_testpmd_gro_on(self, mode=1):\n+ def get_cbdma_ports_info_and_bind_to_dpdk(self, cbdma_num):\n+ \"\"\"\n+ get all cbdma ports\n+ \"\"\"\n+ str_info = 'Misc (rawdev) devices using kernel driver'\n+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)\n+ device_info = out.split('\\n')\n+ for device in device_info:\n+ pci_info = re.search('\\s*(0000:\\d*:\\d*.\\d*)', device)\n+ if pci_info is not None:\n+ dev_info = pci_info.group(1)\n+ # the numa id of ioat dev, only add the device which\n+ # on same socket with nic dev\n+ bus = int(dev_info[5:7], base=16)\n+ if bus >= 128:\n+ cur_socket = 1\n+ else:\n+ cur_socket = 0\n+ if self.ports_socket == cur_socket:\n+ self.cbdma_dev_infos.append(pci_info.group(1))\n+ self.verify(len(self.cbdma_dev_infos) >= cbdma_num, 'There no enough cbdma device to run this suite')\n+ used_cbdma = self.cbdma_dev_infos[0:cbdma_num]\n+ dmas_info = ''\n+ for dmas in used_cbdma:\n+ number = used_cbdma.index(dmas)\n+ dmas = 'txq{}@{};'.format(number, dmas)\n+ dmas_info += dmas\n+ self.dmas_info = dmas_info[:-1]\n+ self.device_str = ' '.join(self.cbdma_dev_infos)\n+ self.dut.setup_modules(self.target, \"igb_uio\",\"None\")\n+ self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=%s %s' % (\"igb_uio\", self.device_str), '# ', 60)\n+\n+ def bind_cbdma_device_to_kernel(self):\n+ if self.device_str is not None:\n+ self.dut.send_expect('modprobe ioatdma', '# ')\n+ self.dut.send_expect('./usertools/dpdk-devbind.py -u %s' % self.device_str, '# ', 30)\n+ self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=ioatdma %s' % self.device_str, '# ', 60)\n+\n+ def launch_testpmd_gro_on(self, mode=1, queue=1):\n #\n # Launch the vhost sample with different parameters\n # mode 1 : tcp traffic light mode\n # mode 2 : tcp traffic heavy mode\n # mode 3 : vxlan traffic light mode\n # mode 4 : tcp traffic flush 4\n- eal_param = self.dut.create_eal_parameters(cores=self.vhost_list, vdevs=['net_vhost0,iface=%s/vhost-net,queues=1' % self.base_dir])\n- self.testcmd_start = self.path + eal_param + \" -- -i --enable-hw-vlan-strip --tx-offloads=0x00 --txd=1024 --rxd=1024\"\n+ # mode 5 : tcp traffice light mode with cdbma enable\n+ if mode == 5:\n+ self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)\n+ self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=igb_uio %s' % self.pci, '# ', 20)\n+ eal_param = self.dut.create_eal_parameters(cores=self.vhost_list, vdevs=[\"'net_vhost0,iface=%s/vhost-net,queues=%s,dmas=[%s],dmathr=1024'\" % (self.base_dir, queue, self.dmas_info)])\n+ self.testcmd_start = self.path + eal_param + \" -- -i --txd=1024 --rxd=1024 --txq=2 --rxq=2\"\n+ else:\n+ eal_param = self.dut.create_eal_parameters(cores=self.vhost_list, vdevs=['net_vhost0,iface=%s/vhost-net,queues=%s' % (self.base_dir, queue)])\n+ self.testcmd_start = self.path + eal_param + \" -- -i --enable-hw-vlan-strip --tx-offloads=0x00 --txd=1024 --rxd=1024\"\n self.vhost_user = self.dut.new_session(suite=\"user\")\n self.vhost_user.send_expect(self.testcmd_start, \"testpmd> \", 120)\n self.vhost_user.send_expect(\"set fwd csum\", \"testpmd> \", 120)\n@@ -125,13 +176,13 @@ class TestDPDKGROLib(TestCase):\n self.vhost_user.send_expect(\"csum set ip hw 0\", \"testpmd> \", 120)\n self.vhost_user.send_expect(\"csum set tcp hw 1\", \"testpmd> \", 120)\n self.vhost_user.send_expect(\"csum set ip hw 1\", \"testpmd> \", 120)\n- if(mode == 1):\n+ if(mode == 1 or mode == 5):\n self.vhost_user.send_expect(\"set port 0 gro on\", \"testpmd> \", 120)\n self.vhost_user.send_expect(\"set gro flush 1\", \"testpmd> \", 120)\n- if(mode == 2):\n+ elif(mode == 2):\n self.vhost_user.send_expect(\"set port 0 gro on\", \"testpmd> \", 120)\n self.vhost_user.send_expect(\"set gro flush 2\", \"testpmd> \", 120)\n- if (mode == 3):\n+ elif (mode == 3):\n self.vhost_user.send_expect(\"csum parse-tunnel on 1\", \"testpmd> \", 120)\n self.vhost_user.send_expect(\"csum parse-tunnel on 0\", \"testpmd> \", 120)\n self.vhost_user.send_expect(\"csum set outer-ip hw 0\", \"testpmd> \", 120)\n@@ -240,15 +291,18 @@ class TestDPDKGROLib(TestCase):\n vm_config.params[i]['cpu'][0]['number'] = 1\n vm_config.params[i]['cpu'][0]['cpupin'] = self.qemu_cpupin\n \n- def start_vm(self):\n+ def start_vm(self, mode=1, queue=1):\n self.vm1 = VM(self.dut, 'vm0', 'vhost_sample')\n self.vm1.load_config()\n vm_params_1 = {}\n vm_params_1['driver'] = 'vhost-user'\n vm_params_1['opt_path'] = self.base_dir + '/vhost-net'\n vm_params_1['opt_mac'] = self.virtio_mac1\n- vm_params_1[\n- 'opt_settings'] = 'mrg_rxbuf=on,csum=off,gso=off,host_tso4=on,guest_tso4=on'\n+ if mode == 5:\n+ vm_params_1['opt_queue'] = queue\n+ vm_params_1['opt_settings'] = 'mrg_rxbuf=on,csum=on,gso=on,host_tso4=on,guest_tso4=on,mq=on,vectors=15'\n+ else:\n+ vm_params_1['opt_settings'] = 'mrg_rxbuf=on,csum=on,gso=on,host_tso4=on,guest_tso4=on'\n self.vm1.set_vm_device(**vm_params_1)\n self.set_vm_cpu_number(self.vm1)\n try:\n@@ -275,6 +329,15 @@ class TestDPDKGROLib(TestCase):\n self.result_table_print()\n self.output_result = \"Iperf throughput is %s\" % iperfdata[-1]\n self.logger.info(self.output_result)\n+ iperfdata_kb = 0\n+ tmp_value = iperfdata[-1].split(\" \")[0]\n+ if 'Gbits' in iperfdata[-1]:\n+ iperfdata_kb = float(tmp_value)*1000000\n+ elif 'Mbits' in iperfdata[-1]:\n+ iperfdata_kb = float(tmp_value)*1000\n+ else:\n+ iperfdata_kb = float(tmp_value)\n+ return iperfdata_kb\n \n def test_vhost_gro_tcp_lightmode(self):\n self.config_kernel_nic_host(0)\n@@ -299,7 +362,7 @@ class TestDPDKGROLib(TestCase):\n 'ip netns exec ns1 iperf -c %s -i 1 -t 10 -P 1> /root/iperf_client.log &' %\n (self.virtio_ip1), '', 180)\n time.sleep(30)\n- self.iperf_result_verify('GRO lib')\n+ tc1_perfdata = self.iperf_result_verify('GRO lib')\n print((\"the GRO lib %s \" % (self.output_result)))\n self.dut.send_expect('rm /root/iperf_client.log', '#', 10)\n # Turn off DPDK GRO lib and Kernel GRO off\n@@ -313,6 +376,7 @@ class TestDPDKGROLib(TestCase):\n self.dut.send_expect('rm /root/iperf_client.log', '#', 10)\n self.quit_testpmd()\n self.dut.send_expect(\"killall -s INT qemu-system-x86_64\", \"#\")\n+ self.dut.send_expect('echo %s > /root/dpdk_gro_lib_on_iperf_tc1.log' % tc1_perfdata, '#', 10)\n \n def test_vhost_gro_tcp_heavymode(self):\n self.config_kernel_nic_host(0)\n@@ -376,6 +440,42 @@ class TestDPDKGROLib(TestCase):\n self.quit_testpmd()\n self.dut.send_expect(\"killall -s INT qemu-system-x86_64\", \"#\")\n \n+ def test_vhost_gro_tcp_ipv4_with_cbdma_enable(self):\n+ self.config_kernel_nic_host(0)\n+ self.heavymode = 5\n+ self.launch_testpmd_gro_on(self.heavymode, queue=2)\n+ self.start_vm(mode=5, queue=2)\n+ time.sleep(5)\n+ self.dut.get_session_output(timeout=2)\n+ # Get the virtio-net device name\n+ for port in self.vm1_dut.ports_info:\n+ self.vm1_intf = port['intf']\n+ # Start the Iperf test\n+ self.vm1_dut.send_expect('ifconfig -a', '#', 30)\n+ self.vm1_dut.send_expect(\n+ 'ifconfig %s %s up' %\n+ (self.vm1_intf, self.virtio_ip1), '#', 10)\n+ self.vm1_dut.send_expect('ethtool -L %s combined 2' % self.vm1_intf, '#', 10)\n+ self.vm1_dut.send_expect(\n+ 'ethtool -K %s gro off' %\n+ (self.vm1_intf), '#', 10)\n+ self.vm1_dut.send_expect('iperf -s', '', 10)\n+ self.dut.send_expect('rm /root/iperf_client.log', '#', 10)\n+ out = self.dut.send_expect(\n+ 'ip netns exec ns1 iperf -c %s -i 1 -t 60 -m -P 2 > /root/iperf_client.log &' %\n+ (self.virtio_ip1), '', 180)\n+ time.sleep(30)\n+ print(out)\n+ tc4_perfdata = self.iperf_result_verify('GRO lib')\n+ print((\"the GRO lib %s \" % (self.output_result)))\n+ #self.dut.send_expect('rm /root/iperf_client.log', '#', 10)\n+ self.quit_testpmd()\n+ self.dut.send_expect(\"killall -s INT qemu-system-x86_64\", \"#\")\n+ tc1_perfdata = self.dut.send_expect(\"cat /root/dpdk_gro_lib_on_iperf_tc1.log\", \"#\")\n+ self.verify(\"No such file or directory\" not in tc1_perfdata, \"Cannot find dpdk_gro_lib_on_iperf_tc1.log, please run test_vhost_gro_tcp_lightmode firstly\")\n+ if tc1_perfdata:\n+ self.verify(float(tc4_perfdata) > float(tc1_perfdata), \"TestFailed: W/cbdma iperf data is %s Kbits/sec, W/O cbdma iperf data is %s Kbits/sec\" %(tc4_perfdata, tc1_perfdata))\n+\n def tear_down(self):\n \"\"\"\n Run after each test case.\n@@ -390,6 +490,7 @@ class TestDPDKGROLib(TestCase):\n self.dut.send_expect(\n \"./usertools/dpdk-devbind.py -b %s %s\" %\n (self.pci_drv, self.peer_pci), '# ', 30)\n+ self.bind_cbdma_device_to_kernel()\n \n def tear_down_all(self):\n \"\"\"\n", "prefixes": [ "V1" ] }