From patchwork Tue Dec 13 07:08:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 120799 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 DBA39A0540; Tue, 13 Dec 2022 08:16:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D71F1410D3; Tue, 13 Dec 2022 08:16:05 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 99DC740146 for ; Tue, 13 Dec 2022 08:16: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=1670915763; x=1702451763; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=niehNN8oAd/ViAptgHd+PfoGnG0YS2YVNuq1JB11MhU=; b=AM8NBPgx3JWYCoN8ig5qdQBjpdM2Khw11HZEqPPcveK0LjS5D053wNxX LctODSqrzMbEnChktA+OuaIm27oGPh5KZPeVdR9f/i9E2hfe+peDVY26H YY6ULLTp5RKqiMgWifAsbKIeMpw31g7Ldgg5ceZ+KmeAXIvdskVivCyvr ZsUC0XOjyoO3zVe42fKj8TRbDq75rwyFgxWKOgqNIYxqt89zyIpcZ4V3u N6+q5dPOcmKQpdlKqJ+cTR4VVEqxxZe6nhlQpj7gc+E3Mhzn7/DjUUzUq KkigMXOqnh4yyfZ5Q1YAYy/FIyOItpcHYbpUTlPrFXDOebnP4fkidZbV4 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="382367599" X-IronPort-AV: E=Sophos;i="5.96,240,1665471600"; d="scan'208";a="382367599" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 23:16:02 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="755273982" X-IronPort-AV: E=Sophos;i="5.96,240,1665471600"; d="scan'208";a="755273982" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 23:16:01 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V5 1/2] framework/qemu_kvm: support pin VM's thread to vhost CPU lcore Date: Tue, 13 Dec 2022 15:08:38 +0800 Message-Id: <20221213070838.3355331-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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)Support pin VM's thread to vhost CPU lcore. 2)Fix add_vm_daemon method issue. Signed-off-by: Wei Ling --- framework/qemu_kvm.py | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py index 20aa8008..555c328c 100644 --- a/framework/qemu_kvm.py +++ b/framework/qemu_kvm.py @@ -1241,7 +1241,7 @@ class QEMUKvm(VirtBase): By default VM will start with the daemonize status. Not support starting it on the stdin now. """ - if "daemon" in list(options.keys()) and options["enable"] == "no": + if "enable" in list(options.keys()) and options["enable"] == "no": pass else: daemon_boot_line = "-daemonize" @@ -1377,6 +1377,11 @@ class QEMUKvm(VirtBase): self.__get_pci_mapping() + # pin VM threads with host CPU cores + if pin_threads: + lcores = self.vcpus_pinned_to_vm.split(" ") + self.pin_threads(lcores=lcores) + # query status self.update_status() @@ -2004,13 +2009,32 @@ class QEMUKvm(VirtBase): def pin_threads(self, lcores): """ Pin thread to assigned cores - """ - thread_reg = r"CPU #(\d+): .* thread_id=(\d+)" + If threads <= lcores, like: threads=[427756, 427757], lcores=[48, 49, 50]: + taskset -pc 48 427756 + taskset -pc 49 427757 + + If threads > lcores, like threads=[427756, 427757, 427758, 427759, 427760], lcores=[48,49,50] + taskset -pc 48 427756 + taskset -pc 49 427757 + taskset -pc 50 427758 + taskset -pc 48 427759 + taskset -pc 49 427760 + """ + thread_reg = r"CPU #\d+: thread_id=(\d+)" output = self.__monitor_session("info", "cpus") - thread_cores = re.findall(thread_reg, output) - cores_map = list(zip(thread_cores, lcores)) - for thread_info, core_id in cores_map: - cpu_id, thread_id = thread_info - self.host_session.send_expect( - "taskset -pc %d %s" % (core_id, thread_id), "#" + threads = re.findall(thread_reg, output) + if len(threads) <= len(lcores): + map = list(zip(threads, lcores)) + else: + self.host_logger.warning( + "lcores is less than VM's threads, 1 lcore will pin multiple VM's threads" ) + lcore_len = len(lcores) + for item in threads: + thread_idx = threads.index(item) + if thread_idx >= lcore_len: + lcore_idx = thread_idx % lcore_len + lcores.append(lcores[lcore_idx]) + map = list(zip(threads, lcores)) + for thread, lcore in map: + self.host_session.send_expect("taskset -pc %s %s" % (lcore, thread), "#") From patchwork Tue Dec 13 07:08:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 120800 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 047A1A0540; Tue, 13 Dec 2022 08:16:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 001E640684; Tue, 13 Dec 2022 08:16:13 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 6C94440146 for ; Tue, 13 Dec 2022 08:16:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670915772; x=1702451772; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=EZwSAA4ORDUqnnxJumb6oLPCPQMZaYIWu3UhUkrQviQ=; b=W3teWLrAWZ18j5RhbXD/wKx+n+2gm7cC7cv7FtZJhiXnRbvOlTAVrDm0 zByLMxQT6XPymQ/qp33qT2J1y0atsK91Yct9DJQVfDHecrcpDUy5Llv4S udcRFH6+gClngEpV+/9uDsezsbmeMuU//cWOPLCzNtFyksm6bMMSNiCa5 e0hF+4VuazuLNWdjjaHV/qYFnRQoVh+C9Cxdg/i/5VK10OBWPc1U1awD7 seFBLCju/+jZNtSEYzesmWi/2WJ51fXskxw5R2uytVbHLZgyXC7DIuwwg nx5fzTF0+gx9sct+9/LhIv4Q1E3zJgIPTJ9XwlFl9ogvaxFLQCOBGxS6h A==; X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="382367610" X-IronPort-AV: E=Sophos;i="5.96,240,1665471600"; d="scan'208";a="382367610" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 23:16:11 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="755273992" X-IronPort-AV: E=Sophos;i="5.96,240,1665471600"; d="scan'208";a="755273992" Received: from unknown (HELO localhost.localdomain) ([10.239.252.222]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 23:16:10 -0800 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Subject: [dts][PATCH V5 2/2] framework/virt_base: add pin_threads parameter when start VM Date: Tue, 13 Dec 2022 15:08:47 +0800 Message-Id: <20221213070847.3355391-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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 Add pin_threads parameter when start VM default pin_threads=True. Signed-off-by: Wei Ling --- framework/virt_base.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/framework/virt_base.py b/framework/virt_base.py index a7fc8c4e..04b712e1 100644 --- a/framework/virt_base.py +++ b/framework/virt_base.py @@ -273,7 +273,14 @@ class VirtBase(object): self._attach_vm() return None - def start(self, load_config=True, set_target=True, cpu_topo="", bind_dev=True): + def start( + self, + load_config=True, + set_target=True, + cpu_topo="", + bind_dev=True, + pin_threads=True, + ): """ Start VM and instantiate the VM with VirtDut. """ @@ -284,7 +291,7 @@ class VirtBase(object): self.compose_boot_param() # start virtual machine - self._start_vm() + self._start_vm(pin_threads=pin_threads) if self.vm_status is ST_RUNNING: # connect vm dut and init running environment @@ -382,7 +389,7 @@ class VirtBase(object): else: return False - def _start_vm(self): + def _start_vm(self, pin_threads=True): """ Start VM. """