From patchwork Fri Apr 2 07:15:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 90454 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 74183A0548; Fri, 2 Apr 2021 09:16:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 513F1140FE2; Fri, 2 Apr 2021 09:16:34 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 2C17D140FD4 for ; Fri, 2 Apr 2021 09:16:32 +0200 (CEST) IronPort-SDR: 9aqgcub4stPyw9i2u80KwDGSANnNFowQT5XGYTgO81FWwc5Jh98JvuXaTZGCQ0CDSO0IQ6ShE9 Yu8lq7p7IpsQ== X-IronPort-AV: E=McAfee;i="6000,8403,9941"; a="212681389" X-IronPort-AV: E=Sophos;i="5.81,299,1610438400"; d="scan'208";a="212681389" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2021 00:16:31 -0700 IronPort-SDR: Mpiovh4c+e6k+8u0gD2iagcw0eoevcDA7OhB+V2U5vZM+IYvqz+MBHGuyjbZQ4A+OcaA1V1+UX TSEhcX9JBWoQ== X-IronPort-AV: E=Sophos;i="5.81,299,1610438400"; d="scan'208";a="419546624" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2021 00:16:29 -0700 From: Ling Wei To: dts@dpdk.org Cc: Ling Wei Date: Fri, 2 Apr 2021 15:15:09 +0800 Message-Id: <20210402071509.66456-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [dts] [PATCH V1] tests/vhost_event_idx_interrupt: add 2 packed ring cbdma testcase sync with testplan X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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" Add 2 packed ring cbdma testcase 9 and 10 sync with testplan. Signed-off-by: Ling Wei Tested-by: Wei Ling --- tests/TestSuite_vhost_event_idx_interrupt.py | 136 ++++++++++++------- 1 file changed, 86 insertions(+), 50 deletions(-) diff --git a/tests/TestSuite_vhost_event_idx_interrupt.py b/tests/TestSuite_vhost_event_idx_interrupt.py index af3528d6..e4151c83 100644 --- a/tests/TestSuite_vhost_event_idx_interrupt.py +++ b/tests/TestSuite_vhost_event_idx_interrupt.py @@ -199,7 +199,7 @@ class TestVhostEventIdxInterrupt(TestCase): start qemus """ for i in range(vm_num): - vm_info = VM(self.dut, 'vm%d' % i, 'vhost_event_idx_interrupt') + vm_info = VM(self.dut, 'vm%d' % i, 'vm') vm_info.load_config() vm_params = {} vm_params['driver'] = 'vhost-user' @@ -279,6 +279,50 @@ class TestVhostEventIdxInterrupt(TestCase): session_info[sess_index].send_expect("^c", "#") self.vm_dut[vm_index].close_session(session_info[sess_index]) + def bind_nic_driver(self, ports, driver=""): + if driver == "igb_uio": + for port in ports: + netdev = self.dut.ports_info[port]['port'] + driver = netdev.get_nic_driver() + if driver != 'igb_uio': + netdev.bind_driver(driver='igb_uio') + else: + for port in ports: + netdev = self.dut.ports_info[port]['port'] + driver_now = netdev.get_nic_driver() + if driver == "": + driver = netdev.default_driver + if driver != driver_now: + netdev.bind_driver(driver=driver) + + def get_cbdma_ports_info_and_bind_to_dpdk(self): + """ + get all cbdma ports + """ + self.cbdma_dev_infos = [] + out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30) + device_info = out.split('\n') + for device in device_info: + pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device) + if pci_info is not None: + # dev_info = pci_info.group(1) + # the numa id of ioat dev, only add the device which + # on same socket with nic dev + self.cbdma_dev_infos.append(pci_info.group(1)) + self.verify(len(self.cbdma_dev_infos) >= self.queues, 'There no enough cbdma device to run this suite') + if self.queues == 1: + self.cbdma_dev_infos=[self.cbdma_dev_infos[0], self.cbdma_dev_infos[-1]] + self.used_cbdma = self.cbdma_dev_infos[0:self.queues*self.vm_num] + + self.device_str = ' '.join(self.used_cbdma) + self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=%s %s ' % ("igb_uio", self.device_str), '# ', 60) + + def bind_cbdma_device_to_kernel(self): + if self.device_str is not None: + self.dut.send_expect('modprobe ioatdma', '# ') + self.dut.send_expect('./usertools/dpdk-devbind.py -u %s' % self.device_str, '# ', 30) + self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=ioatdma %s' % self.device_str, '# ', 60) + def stop_all_apps(self): """ close all vms @@ -289,7 +333,7 @@ class TestVhostEventIdxInterrupt(TestCase): def test_wake_up_split_ring_vhost_user_core_with_event_idx_interrupt(self): """ - wake up vhost-user core with l3fwd-power sample + Test Case 1: wake up split ring vhost-user core with event idx interrupt mode """ self.vm_num = 1 self.queues = 1 @@ -302,7 +346,7 @@ class TestVhostEventIdxInterrupt(TestCase): def test_wake_up_split_ring_vhost_user_cores_with_event_idx_interrupt_mode_16_queues(self): """ - wake up vhost-user core with l3fwd-power sample when multi queues are enabled + Test Case 2: wake up split ring vhost-user cores with event idx interrupt mode 16 queues test """ self.vm_num = 1 self.queues = 16 @@ -316,7 +360,7 @@ class TestVhostEventIdxInterrupt(TestCase): def test_wake_up_split_ring_vhost_user_cores_by_multi_virtio_net_in_vms_with_event_idx_interrupt(self): """ - wake up vhost-user cores with l3fwd-power sample and multi VMs + Test Case 3: wake up split ring vhost-user cores by multi virtio-net in VMs with event idx interrupt mode """ self.vm_num = 2 self.queues = 1 @@ -342,7 +386,7 @@ class TestVhostEventIdxInterrupt(TestCase): def test_wake_up_packed_ring_vhost_user_cores_with_event_idx_interrupt_mode_16_queues(self): """ - wake up vhost-user core with l3fwd-power sample when multi queues are enabled + Test Case 5: wake up packed ring vhost-user cores with event idx interrupt mode 16 queues test """ self.vm_num = 1 self.queues = 16 @@ -356,7 +400,7 @@ class TestVhostEventIdxInterrupt(TestCase): def test_wake_up_packed_ring_vhost_user_cores_by_multi_virtio_net_in_vms_with_event_idx_interrupt(self): """ - wake up vhost-user cores with l3fwd-power sample and multi VMs + Test Case 6: wake up packed ring vhost-user cores by multi virtio-net in VMs with event idx interrupt mode """ self.vm_num = 2 self.queues = 1 @@ -369,7 +413,7 @@ class TestVhostEventIdxInterrupt(TestCase): def test_wake_up_split_ring_vhost_user_cores_with_event_idx_interrupt_mode_16_queues_with_cbdma(self): """ - wake up vhost-user cores with l3fwd-power sample and multi VMs + Test Case 7: wake up split ring vhost-user cores with event idx interrupt mode and cbdma enabled 16 queues test """ self.vm_num = 1 self.bind_nic_driver(self.dut_ports) @@ -385,6 +429,9 @@ class TestVhostEventIdxInterrupt(TestCase): self.stop_all_apps() def test_wake_up_split_ring_vhost_user_cores_by_multi_virtio_net_in_vms_with_event_idx_interrupt_with_cbdma(self): + """ + Test Case 8: wake up split ring vhost-user cores by multi virtio-net in VMs with event idx interrupt mode and cbdma enabled test + """ self.vm_num = 2 self.bind_nic_driver(self.dut_ports) self.queues = 1 @@ -398,44 +445,39 @@ class TestVhostEventIdxInterrupt(TestCase): self.send_and_verify() self.stop_all_apps() - def bind_nic_driver(self, ports, driver=""): - if driver == "igb_uio": - for port in ports: - netdev = self.dut.ports_info[port]['port'] - driver = netdev.get_nic_driver() - if driver != 'igb_uio': - netdev.bind_driver(driver='igb_uio') - else: - for port in ports: - netdev = self.dut.ports_info[port]['port'] - driver_now = netdev.get_nic_driver() - if driver == "": - driver = netdev.default_driver - if driver != driver_now: - netdev.bind_driver(driver=driver) - - def get_cbdma_ports_info_and_bind_to_dpdk(self): + def test_wake_up_packed_ring_vhost_user_cores_with_event_idx_interrupt_mode_16_queues_with_cbdma(self): """ - get all cbdma ports + Test Case 9: wake up packed ring vhost-user cores with event idx interrupt mode and cbdma enabled 16 queues test """ - self.cbdma_dev_infos = [] - out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30) - device_info = out.split('\n') - for device in device_info: - pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device) - if pci_info is not None: - # dev_info = pci_info.group(1) - # the numa id of ioat dev, only add the device which - # on same socket with nic dev - self.cbdma_dev_infos.append(pci_info.group(1)) - self.verify(len(self.cbdma_dev_infos) >= self.queues, 'There no enough cbdma device to run this suite') - if self.queues == 1: - self.cbdma_dev_infos=[self.cbdma_dev_infos[0], self.cbdma_dev_infos[-1]] - self.used_cbdma = self.cbdma_dev_infos[0:self.queues*self.vm_num] + self.vm_num = 1 + self.bind_nic_driver(self.dut_ports) + self.queues = 16 + self.get_core_mask() + self.nopci=False + self.get_cbdma_ports_info_and_bind_to_dpdk() + self.lanuch_l3fwd_power(cbdma=True) + self.start_vms(vm_num=self.vm_num, packed=True) + self.relanuch_l3fwd_power(cbdma=True) + self.config_virito_net_in_vm() + self.send_and_verify() + self.stop_all_apps() - self.device_str = ' '.join(self.used_cbdma) - self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=%s %s ' % - ("igb_uio", self.device_str), '# ', 60) + def test_wake_up_packed_ring_vhost_user_cores_by_multi_virtio_net_in_vms_with_event_idx_interrupt_with_cbdma(self): + """ + Test Case 10: wake up packed ring vhost-user cores by multi virtio-net in VMs with event idx interrupt mode and cbdma enabled test + """ + self.vm_num = 2 + self.bind_nic_driver(self.dut_ports) + self.queues = 1 + self.get_core_mask() + self.nopci=False + self.get_cbdma_ports_info_and_bind_to_dpdk() + self.lanuch_l3fwd_power(cbdma=True) + self.start_vms(vm_num=self.vm_num,) + self.relanuch_l3fwd_power(cbdma=True) + self.config_virito_net_in_vm() + self.send_and_verify() + self.stop_all_apps() def tear_down(self): """ @@ -445,14 +487,8 @@ class TestVhostEventIdxInterrupt(TestCase): self.dut.send_expect(f"killall {self.l3fwdpower_name}", "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") self.bind_cbdma_device_to_kernel() - self.bind_nic_driver(self.dut_ports, self.drivername) - - def bind_cbdma_device_to_kernel(self): - if self.device_str is not None: - self.dut.send_expect('modprobe ioatdma', '# ') - self.dut.send_expect('./usertools/dpdk-devbind.py -u %s' % self.device_str, '# ', 30) - self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=ioatdma %s' % self.device_str, - '# ', 60) + if "cbdma" in self.running_case: + self.bind_nic_driver(self.dut_ports, self.drivername) def tear_down_all(self): """