From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0C97041C87; Mon, 13 Feb 2023 10:27:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0320E42BD9; Mon, 13 Feb 2023 10:27:05 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 33B42400D6 for ; Mon, 13 Feb 2023 10:27:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676280423; x=1707816423; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=jGYJKM5c8ODa0ABb2a/8NcZqfwHDrK0GIkL91y7j1Sk=; b=IwHHE0MIw6DIVQQeLuEm4FnQYIgS/ltn7Z2I30pWoo55YGsFatUU6CvS Gl32MVWkpMwrasWNHDft05TD6bEHmGq+p2K9nAU6bx84159qn46sYUuP2 e4YzDBzPkoZuCrfik3j5YR3VkCaPWt3zDb9+c/8riEaOIEqD9zANc72iW NUts7rQzyIbdhOGvqr+mkZLbjbrxYjVvYKMW89kUqQ4NB0pyLyEQBsMAR wxziiUcQjODfrrwdeENUSAmdxfCO7E5mMR2EQC9mBMlx59L9mzSY5GD9W XNg/IC1Nn/HDPGjf/DbNIe8vQ4oZCZddmuCruLeRUnk+UFaUODOtqWET8 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10619"; a="310482636" X-IronPort-AV: E=Sophos;i="5.97,293,1669104000"; d="scan'208";a="310482636" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2023 01:27:02 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10619"; a="997630899" X-IronPort-AV: E=Sophos;i="5.97,293,1669104000"; d="scan'208";a="997630899" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2023 01:27:01 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V1] tests/basic_4k_pages_cbdma: fix start QEMU with wrong command issue Date: Mon, 13 Feb 2023 17:14:00 +0800 Message-Id: <20230213091400.3486042-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 1.When start QEMU with multi-queues, the command must include `mq=on,vectors=x` parameter. 2.When configure the hostname in conf/crbs.cfg will start QEMU failed, eg: `hostfwd=tcp:hostname:6000-:22`, so use the get_host_ip() to get the actual IP address, eg: `hostfwd=tcp:192.168.1.1:6000-:22`. Signed-off-by: Wei Ling --- tests/TestSuite_basic_4k_pages_cbdma.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_basic_4k_pages_cbdma.py b/tests/TestSuite_basic_4k_pages_cbdma.py index 02969937..b4d09107 100644 --- a/tests/TestSuite_basic_4k_pages_cbdma.py +++ b/tests/TestSuite_basic_4k_pages_cbdma.py @@ -13,7 +13,7 @@ from framework.packet import Packet from framework.pktgen import PacketGeneratorHelper from framework.pmd_output import PmdOutput from framework.qemu_kvm import QEMUKvm -from framework.settings import CONFIG_ROOT_PATH +from framework.settings import CONFIG_ROOT_PATH, get_host_ip from framework.test_case import TestCase @@ -62,6 +62,8 @@ class TestBasic4kPagesCbdma(TestCase): self.virtio_mac2 = "52:54:00:00:00:02" self.base_dir = self.dut.base_dir.replace("~", "/root") self.random_string = string.ascii_letters + string.digits + self.addr = str(self.dut.get_ip_address()) + self.host_addr = get_host_ip(self.addr).split(":")[0] self.mount_tmpfs_for_4k(number=2) self.vm0_virt_conf = self.get_virt_config(vm_name="vm0") @@ -120,6 +122,7 @@ class TestBasic4kPagesCbdma(TestCase): def start_vm0(self, packed=False, queues=1, server=False): packed_param = ",packed=on" if packed else "" + mq_param = ",mq=on,vectors=%s" % (2 + 2 * queues) if queues > 1 else "" server = ",server" if server else "" self.qemu_cmd0 = ( f"taskset -c {self.vm0_lcore} {self.vm0_qemu_path} -name vm0 -enable-kvm " @@ -128,7 +131,7 @@ class TestBasic4kPagesCbdma(TestCase): f"-chardev socket,id=char0,path=/root/dpdk/vhost-net0{server} " f"-netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues={queues} " f"-device virtio-net-pci,netdev=netdev0,mac=%s," - f"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on{packed_param} " + f"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on{packed_param}{mq_param} " f"-cpu host -smp {self.vm0_lcore_smp} -m {self.vm0_mem_size} -object memory-backend-file,id=mem,size={self.vm0_mem_size}M,mem-path=/mnt/tmpfs_nohuge0,share=on " f"-numa node,memdev=mem -mem-prealloc -drive file={self.vm0_image_path} " f"-chardev socket,path=/tmp/vm0_qga0.sock,server,nowait,id=vm0_qga0 -device virtio-serial " @@ -137,7 +140,7 @@ class TestBasic4kPagesCbdma(TestCase): self.vm0_session = self.dut.new_session(suite="vm0_session") cmd0 = self.qemu_cmd0 % ( - self.dut.get_ip_address(), + self.host_addr, self.virtio_mac1, ) self.vm0_session.send_expect(cmd0, "# ") @@ -148,6 +151,7 @@ class TestBasic4kPagesCbdma(TestCase): def start_vm1(self, packed=False, queues=1, server=False): packed_param = ",packed=on" if packed else "" + mq_param = ",mq=on,vectors=%s" % (2 + 2 * queues) if queues > 1 else "" server = ",server" if server else "" self.qemu_cmd1 = ( f"taskset -c {self.vm1_lcore} {self.vm1_qemu_path} -name vm1 -enable-kvm " @@ -156,7 +160,7 @@ class TestBasic4kPagesCbdma(TestCase): f"-chardev socket,id=char0,path=/root/dpdk/vhost-net1{server} " f"-netdev type=vhost-user,id=netdev0,chardev=char0,vhostforce,queues={queues} " f"-device virtio-net-pci,netdev=netdev0,mac=%s," - f"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on{packed_param} " + f"disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on{packed_param}{mq_param} " f"-cpu host -smp {self.vm1_lcore_smp} -m {self.vm1_mem_size} -object memory-backend-file,id=mem,size={self.vm1_mem_size}M,mem-path=/mnt/tmpfs_nohuge1,share=on " f"-numa node,memdev=mem -mem-prealloc -drive file={self.vm1_image_path} " f"-chardev socket,path=/tmp/vm1_qga0.sock,server,nowait,id=vm1_qga0 -device virtio-serial " @@ -165,7 +169,7 @@ class TestBasic4kPagesCbdma(TestCase): self.vm1_session = self.dut.new_session(suite="vm1_session") cmd1 = self.qemu_cmd1 % ( - self.dut.get_ip_address(), + self.host_addr, self.virtio_mac2, ) self.vm1_session.send_expect(cmd1, "# ") -- 2.25.1