From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617939982; cv=none; d=zohomail.com; s=zohoarc; b=FwtCsio+qwVxTajW8+Wc+3OPXZDQErHpt6xOB5kExFrxecYx+iMJgaM1iWdjOuOJxe44PATQYM2HFBH28VWK0yUzx+v0YjhCpgWL/blk1nP5/pgg5eQ1sGLOiFmMbrsCaFzwsOYY4iRSpjYcP97K8WF4cMg0yEeRL96ydiSJb1A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617939982; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=NqZOOpe0B4aJygqjCP06wFek/PizpE3Gc2VaWlmDH0s=; b=kzEsnlyTFEWq+k+cGST+VbGAer2yY1mHc9K9YpORNH/Wuc1b4PB82nP3ba6qQD0VHu3yzhJd4hL/7HHHpFxGbVqSdJ2A+S2ID0X5cKbrNwBEdB6yEubfuhcKtP3sGoq+BZTYlcqyWUyc2jXWP9Ehgiy1RkNFqnf+WdLeHGMDCX0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617939982856217.43552819001206; Thu, 8 Apr 2021 20:46:22 -0700 (PDT) Received: from localhost ([::1]:46312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi69-0007gz-Mp for importer@patchew.org; Thu, 08 Apr 2021 23:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2S-0002zb-2P for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:32 -0400 Received: from mga05.intel.com ([192.55.52.43]:12397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2P-0007Ip-DP for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:31 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:26 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:24 -0700 IronPort-SDR: z40Z3hcN69QzkGqmmYn7v8Spc2txo0Mxm/UJKo38/0CknJQTtxnkl3jZQqpKaQv//L5+MDwVRg BjgNl8Bt+5/w== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957315" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957315" IronPort-SDR: 9cFeHY+ajijbdYbPlK67UgHI5j8HlxhEQQ8BNYLRsb9ODA5wbBbg/+zE2WaLxcuuEtPw744mg+ rZmT4hVdQT8g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416080999" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 01/10] Remove some duplicate trace code. Date: Thu, 8 Apr 2021 23:20:47 -0400 Message-Id: <1617938456-315058-2-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" There is the same trace code in the colo_compare_packet_payload. Signed-off-by: Lei Rao Reviewed-by: Li Zhijian Reviewed-by: Zhang Chen Reviewed-by: Lukas Straub Tested-by: Lukas Straub --- net/colo-compare.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 9d1ad99..c142c08 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -590,19 +590,6 @@ static int colo_packet_compare_other(Packet *spkt, Pac= ket *ppkt) uint16_t offset =3D ppkt->vnet_hdr_len; =20 trace_colo_compare_main("compare other"); - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_IP_INFO)) { - char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20= ]; - - strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); - strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst)); - strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src)); - strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst)); - - trace_colo_compare_ip_info(ppkt->size, pri_ip_src, - pri_ip_dst, spkt->size, - sec_ip_src, sec_ip_dst); - } - if (ppkt->size !=3D spkt->size) { trace_colo_compare_main("Other: payload size of packets are differ= ent"); return -1; --=20 1.8.3.1 From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617940079; cv=none; d=zohomail.com; s=zohoarc; b=lYxlNXR+eg+fn6ec3g9wqjdy0e5hCf8svSShlICv64CCxZFABeshwNQkhq/vR+dvgXuiKY7TE6N6mgzZ1u9/xq8eEvBwo8GSyOFZ//wPCXZoLM345fwQ4kPZoldIgneOddpomURdcSSK9voBpNPuNsW/KyTWAZM+1zES5a790rw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617940079; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=pO3XoMvODBqKMSzpG2sTH1jfzXc+Mr+iPXl777jI6SY=; b=GaW3z7koSg7xbRntAE7cUEXSFHEe2hancj28mAJlyevKStheiF5CNbVfyrV4ZEDLNZ+G7naxZWrH6vkPsiPON3Jia7WDOh3zciKvEa+pX8LmD3Yeg7lD2401OTJFKAO/Jkk7piTm3GAB18JLSOQnUj9gvAjElVP4oSvz70RPZco= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617940079430231.15405960145972; Thu, 8 Apr 2021 20:47:59 -0700 (PDT) Received: from localhost ([::1]:51944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi7i-0001ee-An for importer@patchew.org; Thu, 08 Apr 2021 23:47:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2U-000304-3x for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:34 -0400 Received: from mga05.intel.com ([192.55.52.43]:12390) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2R-0007GF-SF for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:33 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:31 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:28 -0700 IronPort-SDR: vYsFMx5aLhhmO92xHUl8/7jlSrwZeRfo9oRubhPF/JlsqSkw4VxM6wC3IMSahVa2wQ+PRDUlQ7 z55QhUIo9ZXQ== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957319" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957319" IronPort-SDR: TOqLop/HCOpVXTli4kd84cqrlaXzll6CJDlU0ptLjF9ZAB6iO9GOkWgNLxDpTzCNtnNcWUfgj9 HmdcnQGzEv9w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416081035" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 02/10] Fix the qemu crash when guest shutdown during checkpoint Date: Thu, 8 Apr 2021 23:20:48 -0400 Message-Id: <1617938456-315058-3-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" This patch fixes the following: qemu-system-x86_64: invalid runstate transition: 'colo' ->'shutdown' Aborted (core dumped) Signed-off-by: Lei Rao Reviewed-by: Li Zhijian Reviewed-by: Zhang Chen Reviewed-by: Lukas Straub Tested-by: Lukas Straub --- softmmu/runstate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/softmmu/runstate.c b/softmmu/runstate.c index ce8977c..1564057 100644 --- a/softmmu/runstate.c +++ b/softmmu/runstate.c @@ -126,6 +126,7 @@ static const RunStateTransition runstate_transitions_de= f[] =3D { { RUN_STATE_RESTORE_VM, RUN_STATE_PRELAUNCH }, =20 { RUN_STATE_COLO, RUN_STATE_RUNNING }, + { RUN_STATE_COLO, RUN_STATE_SHUTDOWN}, =20 { RUN_STATE_RUNNING, RUN_STATE_DEBUG }, { RUN_STATE_RUNNING, RUN_STATE_INTERNAL_ERROR }, --=20 1.8.3.1 From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617939831; cv=none; d=zohomail.com; s=zohoarc; b=FhFfWoYSpWAj+i0el7BL7l4ZEYgMgZpilavs9Bzqz4yTDfeqbeMdN3MFuqtEpxMYyogz+s5j6CJa51EmlG4XGbfyuBzNL8yQY8q4oh/rLTQvQHVvFYeB3KXMsGlS3Ptt+pus0VjJIxH21OnMgUJJXYwnsIFwhkgDmohQrPjpR+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617939831; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Ut+nKfJb7lm/MCntAX1t0vaog2nDqZNcE4aoxcGpPPk=; b=EISmgIu7mgBkonmUsv9dH9JDf+pdK8lnzOtiwdyQCkylZeU3lC4WkT1A6u3BGj7n0Huk5KWoltyxs30jPGFaZCAphJCbHJSzJfSedeh8lVVkKQU6ng0BQZChiwwAoYePi5h6Ps1uwC95aFGq0jhPpNRXKnD3FBa8DAspHjd4raA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617939831518678.4246269974749; Thu, 8 Apr 2021 20:43:51 -0700 (PDT) Received: from localhost ([::1]:38706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi3i-0004XM-Fe for importer@patchew.org; Thu, 08 Apr 2021 23:43:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2Y-000331-GF for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:38 -0400 Received: from mga05.intel.com ([192.55.52.43]:12408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2V-0007NQ-Id for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:38 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:34 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:31 -0700 IronPort-SDR: KkPXgQCQNwk9Og5hGv/L/QaYlcthTEZl2JE191dfOI8ZEavdBbr/zrKY6/kjap30UPZ37+GMuv eOEHn8dbscyA== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957325" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957325" IronPort-SDR: AVvrWFvmXzaTnhaCZefXkB45hExWge1BIuQV9/PRvmRFyNfAkaofrRd1SeB5f3TzmR0AWR6h/k lxKOIV5ScPQg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416081051" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 03/10] Optimize the function of filter_send Date: Thu, 8 Apr 2021 23:20:49 -0400 Message-Id: <1617938456-315058-4-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" The iov_size has been calculated in filter_send(). we can directly return the size.In this way, this is no need to repeat calculations in filter_redirector_receive_iov(); Signed-off-by: Lei Rao Reviewed-by: Li Zhijian Reviewed-by: Zhang Chen Reviewed-by: Lukas Straub Tested-by: Lukas Straub --- net/filter-mirror.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/filter-mirror.c b/net/filter-mirror.c index f8e6500..f20240c 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -88,7 +88,7 @@ static int filter_send(MirrorState *s, goto err; } =20 - return 0; + return size; =20 err: return ret < 0 ? ret : -EIO; @@ -159,7 +159,7 @@ static ssize_t filter_mirror_receive_iov(NetFilterState= *nf, int ret; =20 ret =3D filter_send(s, iov, iovcnt); - if (ret) { + if (ret < 0) { error_report("filter mirror send failed(%s)", strerror(-ret)); } =20 @@ -182,10 +182,10 @@ static ssize_t filter_redirector_receive_iov(NetFilte= rState *nf, =20 if (qemu_chr_fe_backend_connected(&s->chr_out)) { ret =3D filter_send(s, iov, iovcnt); - if (ret) { + if (ret < 0) { error_report("filter redirector send failed(%s)", strerror(-re= t)); } - return iov_size(iov, iovcnt); + return ret; } else { return 0; } --=20 1.8.3.1 From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617939832; cv=none; d=zohomail.com; s=zohoarc; b=lk4a+r3rteDNTjRLe51o/fSk+kpG1KFglR5A3I8wVo2yF/z8YSJVRa3Xq9sNJg4drJCnOarIKf2xzVBnbY5Igjp9P3be04QLNuvMlYC/+UjB+Ow/IVjrBcKvlJpQTge0R0WpP7hCCV7PGjFeuTnstbacrDz2vPLD7VGSHBdNyuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617939832; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=TjLeX/2Uo94kb9PCsQks+9Wge8zVkkP8p2YczRyxmq4=; b=QvhlQ8VnLEMYZXXgxbp1qm16ezjOXsGsyJE/xHo2BXeKKCBdL8HUdZiE2nqgnYy2Z8c4pdFfewR59RHv8ADoDXEMNBm+KpzNan47AXdt3v24kkCjxASj0DOd/lXSxeJMGSjBL53sq0tuXfs0oPQWHSV0PlKjfS4ycb7W3N+98rE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161793983264264.24954823767177; Thu, 8 Apr 2021 20:43:52 -0700 (PDT) Received: from localhost ([::1]:38816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi3j-0004a0-FC for importer@patchew.org; Thu, 08 Apr 2021 23:43:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2Z-00034L-Jv for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:39 -0400 Received: from mga05.intel.com ([192.55.52.43]:12409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2X-0007NR-SX for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:39 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:37 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:34 -0700 IronPort-SDR: 9KMicSLLzLfteZsclOXu5J89HhcUKc+eTE9divWgCczw0TzQ/jmi2g0KHjIFKb3Uf7g69uId/Y iv6YkBJGJQRA== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957326" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957326" IronPort-SDR: zb8u+B0G5QYE0VKirgTusnXQpn5Ra+ZUEfoxGt+6gkxX5FgQcfcvYakYpSxPxivqbj4MM+LKIK xxixhNG+2KyA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416081062" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 04/10] Remove migrate_set_block_enabled in checkpoint Date: Thu, 8 Apr 2021 23:20:50 -0400 Message-Id: <1617938456-315058-5-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" We can detect disk migration in migrate_prepare, if disk migration is enabled in COLO mode, we can directly report an error.and there is no need to disable block migration at every checkpoint. Signed-off-by: Lei Rao Signed-off-by: Zhang Chen Reviewed-by: Li Zhijian Reviewed-by: Zhang Chen Reviewed-by: Lukas Straub Tested-by: Lukas Straub --- migration/colo.c | 6 ------ migration/migration.c | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index de27662..1aaf316 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -435,12 +435,6 @@ static int colo_do_checkpoint_transaction(MigrationSta= te *s, if (failover_get_state() !=3D FAILOVER_STATUS_NONE) { goto out; } - - /* Disable block migration */ - migrate_set_block_enabled(false, &local_err); - if (local_err) { - goto out; - } qemu_mutex_lock_iothread(); =20 #ifdef CONFIG_REPLICATION diff --git a/migration/migration.c b/migration/migration.c index 8ca0341..c85b926 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2227,6 +2227,10 @@ static bool migrate_prepare(MigrationState *s, bool = blk, bool blk_inc, } =20 if (blk || blk_inc) { + if (migrate_colo_enabled()) { + error_setg(errp, "No disk migration is required in COLO mode"); + return false; + } if (migrate_use_block() || migrate_use_block_incremental()) { error_setg(errp, "Command options are incompatible with " "current migration capabilities"); --=20 1.8.3.1 From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617940161; cv=none; d=zohomail.com; s=zohoarc; b=B18DvOeRqoGF5KhFfBYcv9x/bbrZ3jPtlv1fo7s6hFTlACDO2BzR7K1/zXO9ldd43pZXaRi8xLJSKFFXBwDianhm4Rx/v/LLX5l2Tt4Fq3MJCkbnRgyoEqBK2LglqxUbCOt0oseVHno8ilOL4aSP+UAA8Rbpcaq+36cqGyXtof4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617940161; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=j6fR00x98G0Dd8UBKFYj8LU8CbgNxT+pYTSe14Y54EU=; b=I+07dmrcE+MdpgZY3o00hgamrSiACOjxuUBn2L29QT4/KJdWKpRpHKwBg3Mbuwi8zhIy37qR+F3DgJoyWy6pTKOWHTyorZGIDMx9LG5JOPE54SWREYFWoYPNuPVN8MEgQnZKpbM5jl8vN4SuBAPipanogm17uNrdflPsxRZmWZc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617940161544816.4708356227426; Thu, 8 Apr 2021 20:49:21 -0700 (PDT) Received: from localhost ([::1]:55438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi92-00036T-8e for importer@patchew.org; Thu, 08 Apr 2021 23:49:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2d-0003DA-Lo for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:43 -0400 Received: from mga05.intel.com ([192.55.52.43]:12420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2b-0007T4-Eh for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:43 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:40 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:37 -0700 IronPort-SDR: pr8pH6sEk04IaP+9r4Ct4Jken3UJ3SgtxCBhwdnZqa0JyC/uQd1GgjEDbkZHaW8nUaYUSTB095 zeWIniLZ6uqQ== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957331" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957331" IronPort-SDR: mO/f90HndSGxdclSIquutWVxKbgESKrNeluVTW0skAaWISld8orvHQFRpJ4dJswTC9KZLiED9/ u0wZ53zxQDNg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416081077" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 05/10] Add a function named packet_new_nocopy for COLO. Date: Thu, 8 Apr 2021 23:20:51 -0400 Message-Id: <1617938456-315058-6-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" Use the packet_new_nocopy instead of packet_new in the filter-rewriter module. There will be one less memory copy in the processing of each network packet. Signed-off-by: Lei Rao Reviewed-by: Zhang Chen --- net/colo.c | 25 +++++++++++++++++-------- net/colo.h | 1 + net/filter-rewriter.c | 3 +-- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/net/colo.c b/net/colo.c index ef00609..3a3e6e8 100644 --- a/net/colo.c +++ b/net/colo.c @@ -157,19 +157,28 @@ void connection_destroy(void *opaque) =20 Packet *packet_new(const void *data, int size, int vnet_hdr_len) { - Packet *pkt =3D g_slice_new(Packet); + Packet *pkt =3D g_slice_new0(Packet); =20 pkt->data =3D g_memdup(data, size); pkt->size =3D size; pkt->creation_ms =3D qemu_clock_get_ms(QEMU_CLOCK_HOST); pkt->vnet_hdr_len =3D vnet_hdr_len; - pkt->tcp_seq =3D 0; - pkt->tcp_ack =3D 0; - pkt->seq_end =3D 0; - pkt->header_size =3D 0; - pkt->payload_size =3D 0; - pkt->offset =3D 0; - pkt->flags =3D 0; + + return pkt; +} + +/* + * packet_new_nocopy will not copy data, so the caller can't release + * the data. And it will be released in packet_destroy. + */ +Packet *packet_new_nocopy(void *data, int size, int vnet_hdr_len) +{ + Packet *pkt =3D g_slice_new0(Packet); + + pkt->data =3D data; + pkt->size =3D size; + pkt->creation_ms =3D qemu_clock_get_ms(QEMU_CLOCK_HOST); + pkt->vnet_hdr_len =3D vnet_hdr_len; =20 return pkt; } diff --git a/net/colo.h b/net/colo.h index 573ab91..d91cd24 100644 --- a/net/colo.h +++ b/net/colo.h @@ -101,6 +101,7 @@ bool connection_has_tracked(GHashTable *connection_trac= k_table, ConnectionKey *key); void connection_hashtable_reset(GHashTable *connection_track_table); Packet *packet_new(const void *data, int size, int vnet_hdr_len); +Packet *packet_new_nocopy(void *data, int size, int vnet_hdr_len); void packet_destroy(void *opaque, void *user_data); void packet_destroy_partial(void *opaque, void *user_data); =20 diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 10fe393..cb3a96c 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -270,8 +270,7 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState= *nf, vnet_hdr_len =3D nf->netdev->vnet_hdr_len; } =20 - pkt =3D packet_new(buf, size, vnet_hdr_len); - g_free(buf); + pkt =3D packet_new_nocopy(buf, size, vnet_hdr_len); =20 /* * if we get tcp packet --=20 1.8.3.1 From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617939988; cv=none; d=zohomail.com; s=zohoarc; b=W9wAFX8R+9FKurKoggcvCrUXNiElNk77Z0TgAuld6UoGN51L6j8Ioqn6dftwMS2hE6mp2at75loAu9HK/DRmuZi6AIqgk7i1m9/iBos59gbwtoMhcmyNT+7YmPU9e9vzOTEF/ICYtkV5zYNAzyaRgWenK0IWxGfRFXJR9xpCSsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617939988; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=U4Qd2t4xhlrnsjYsyhrIB4YSjg/h1UAkCVXNIltGeDk=; b=H2hsSpdlr2L9MokG/mZQCVZWaSAoYlGHNxyxas73BWED3/vyR1yNbgZ1cIfXAVbfABzB9XPloL9m6C6/WWSZy5PiMSH4m8wkCSiEiF5W4HDxkPD8Q+IMP9H497V3bDnVlOk39yYwJdiM33wHFO/MR28VZKgMbwjwS1cTgk9nLIQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161793998829212.858916961246791; Thu, 8 Apr 2021 20:46:28 -0700 (PDT) Received: from localhost ([::1]:46702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi6E-0007r0-AD for importer@patchew.org; Thu, 08 Apr 2021 23:46:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2f-0003IK-Tk for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:45 -0400 Received: from mga05.intel.com ([192.55.52.43]:12420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2e-0007T4-3u for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:45 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:43 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:41 -0700 IronPort-SDR: GKD2L64tI7xJmfXjrG6031+yG4ePEzT1vgUaqKU6+QM82NltIVWC4sx+Xx2XhL7MiIcUpSHq1J /QTceGtQplvg== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957339" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957339" IronPort-SDR: k5aBjMyvY9i8vcf//axDYa3ZNCGgofr/3VTAy4oUFgsyjVOzcDrN1yQWEJ7eO+hZPj0FUrbQ37 vmIe8tYiZ6PQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416081095" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 06/10] Add the function of colo_compare_cleanup Date: Thu, 8 Apr 2021 23:20:52 -0400 Message-Id: <1617938456-315058-7-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" This patch fixes the following: #0 __GI_raise (sig=3Dsig@entry=3D6) at ../sysdeps/unix/sysv/linux/rais= e.c:50 #1 0x00007f6ae4559859 in __GI_abort () at abort.c:79 #2 0x0000559aaa386720 in error_exit (err=3D16, msg=3D0x559aaa5973d0 <_= _func__.16227> "qemu_mutex_destroy") at util/qemu-thread-posix.c:36 #3 0x0000559aaa3868c5 in qemu_mutex_destroy (mutex=3D0x559aabffe828) a= t util/qemu-thread-posix.c:69 #4 0x0000559aaa2f93a8 in char_finalize (obj=3D0x559aabffe800) at chard= ev/char.c:285 #5 0x0000559aaa23318a in object_deinit (obj=3D0x559aabffe800, type=3D0= x559aabfd7d20) at qom/object.c:606 #6 0x0000559aaa2331b8 in object_deinit (obj=3D0x559aabffe800, type=3D0= x559aabfd9060) at qom/object.c:610 #7 0x0000559aaa233200 in object_finalize (data=3D0x559aabffe800) at qo= m/object.c:620 #8 0x0000559aaa234202 in object_unref (obj=3D0x559aabffe800) at qom/ob= ject.c:1074 #9 0x0000559aaa2356b6 in object_finalize_child_property (obj=3D0x559aa= c0dac10, name=3D0x559aac778760 "compare0-0", opaque=3D0x559aabffe800) at qo= m/object.c:1584 #10 0x0000559aaa232f70 in object_property_del_all (obj=3D0x559aac0dac10= ) at qom/object.c:557 #11 0x0000559aaa2331ed in object_finalize (data=3D0x559aac0dac10) at qo= m/object.c:619 #12 0x0000559aaa234202 in object_unref (obj=3D0x559aac0dac10) at qom/ob= ject.c:1074 #13 0x0000559aaa2356b6 in object_finalize_child_property (obj=3D0x559aa= c0c75c0, name=3D0x559aac0dadc0 "chardevs", opaque=3D0x559aac0dac10) at qom/= object.c:1584 #14 0x0000559aaa233071 in object_property_del_child (obj=3D0x559aac0c75= c0, child=3D0x559aac0dac10, errp=3D0x0) at qom/object.c:580 #15 0x0000559aaa233155 in object_unparent (obj=3D0x559aac0dac10) at qom= /object.c:599 #16 0x0000559aaa2fb721 in qemu_chr_cleanup () at chardev/char.c:1159 #17 0x0000559aa9f9b110 in main (argc=3D54, argv=3D0x7ffeb62fa998, envp= =3D0x7ffeb62fab50) at vl.c:4539 When chardev is cleaned up, chr_write_lock needs to be destroyed. But the colo-compare module is not cleaned up normally before it when the guest poweroff. It is holding chr_write_lock at this time. This will cause qemu crash.So we add the function of colo_compare_cleanup() before qemu_chr_cleanup() to fix the bug. Signed-off-by: Lei Rao Reviewed-by: Zhang Chen Reviewed-by: Lukas Straub Tested-by: Lukas Straub --- net/colo-compare.c | 10 ++++++++++ net/colo-compare.h | 1 + net/net.c | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/net/colo-compare.c b/net/colo-compare.c index c142c08..5b538f4 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -1402,6 +1402,16 @@ static void colo_compare_init(Object *obj) compare_set_vnet_hdr); } =20 +void colo_compare_cleanup(void) +{ + CompareState *tmp =3D NULL; + CompareState *n =3D NULL; + + QTAILQ_FOREACH_SAFE(tmp, &net_compares, next, n) { + object_unparent(OBJECT(tmp)); + } +} + static void colo_compare_finalize(Object *obj) { CompareState *s =3D COLO_COMPARE(obj); diff --git a/net/colo-compare.h b/net/colo-compare.h index 22ddd51..b055270 100644 --- a/net/colo-compare.h +++ b/net/colo-compare.h @@ -20,5 +20,6 @@ void colo_notify_compares_event(void *opaque, int event, Error **errp); void colo_compare_register_notifier(Notifier *notify); void colo_compare_unregister_notifier(Notifier *notify); +void colo_compare_cleanup(void); =20 #endif /* QEMU_COLO_COMPARE_H */ diff --git a/net/net.c b/net/net.c index 725a4e1..8fcb2e7 100644 --- a/net/net.c +++ b/net/net.c @@ -53,6 +53,7 @@ #include "sysemu/sysemu.h" #include "sysemu/runstate.h" #include "sysemu/sysemu.h" +#include "net/colo-compare.h" #include "net/filter.h" #include "qapi/string-output-visitor.h" #include "qapi/hmp-output-visitor.h" @@ -1463,6 +1464,9 @@ void net_cleanup(void) { NetClientState *nc; =20 + /*cleanup colo compare module for COLO*/ + colo_compare_cleanup(); + /* We may del multiple entries during qemu_del_net_client(), * so QTAILQ_FOREACH_SAFE() is also not safe here. */ --=20 1.8.3.1 From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617940083; cv=none; d=zohomail.com; s=zohoarc; b=TzEzYYiid+Q/zS8n4FfjDNgKtxtBoX4OEymVLN9PaLH57kfUppvP/CjfRfZbVjUrC1S1wDU8vcpaSyAveLsXkTyyu0gCT0nqJM2/i1BEbXviBqJKpq9Yqtw1prBllxx+uaKtYoHGLKLrBwcrEne6cBTTAgdjyaUewGq/CNSXFgk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617940083; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=C0uQ1vM23K2OjTZ8jRBNgMVuV4jay+De0XrLFJTk2l8=; b=mJWsnXF5aEiXBB8tVh4LIX5FzJHuHTfMysekV2uaWjrh48bRY3DsRGJzdmvlgIgOvlvUDEUyHPbrIGYwjmkdi/X1xjUnweW25jVNvOuRZZhuLwqwibS5xk1YBcJwyUvuvQ/Y2IyZXBc+T3jinJkfZH+Q/2Vb3QGOz4ANeuJDGyY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617940083250894.4095753830104; Thu, 8 Apr 2021 20:48:03 -0700 (PDT) Received: from localhost ([::1]:52204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi7m-0001ky-8S for importer@patchew.org; Thu, 08 Apr 2021 23:48:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2k-0003Tp-UV for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:50 -0400 Received: from mga05.intel.com ([192.55.52.43]:12420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2i-0007T4-Ew for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:50 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:47 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:45 -0700 IronPort-SDR: uVkaCUTywj4LSQu2+NHz1Me/T9wopNd7btKs2GZQw9TXyyyzSm8Kw2b1DRbSOynST8OXH1xszG 3Rfdhv86J2UQ== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957347" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957347" IronPort-SDR: F7mdidMqOUK9Gy8QdljmJLkGsObHGdaNnp6IE0kbngQe9FhucgkSJd21jT1qaTNTH6bVoiPKTY sxWkuCZh3t1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416081128" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 07/10] Reset the auto-converge counter at every checkpoint. Date: Thu, 8 Apr 2021 23:20:53 -0400 Message-Id: <1617938456-315058-8-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" if we don't reset the auto-converge counter, it will continue to run with COLO running, and eventually the system will hang due to the CPU throttle reaching DEFAULT_MIGRATE_MAX_CPU_THROTTLE. Signed-off-by: Lei Rao Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Lukas Straub Tested-by: Lukas Straub --- migration/colo.c | 4 ++++ migration/ram.c | 9 +++++++++ migration/ram.h | 1 + 3 files changed, 14 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 1aaf316..723ffb8 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -459,6 +459,10 @@ static int colo_do_checkpoint_transaction(MigrationSta= te *s, if (ret < 0) { goto out; } + + if (migrate_auto_converge()) { + mig_throttle_counter_reset(); + } /* * Only save VM's live state, which not including device state. * TODO: We may need a timeout mechanism to prevent COLO process diff --git a/migration/ram.c b/migration/ram.c index 4682f36..f9d60f0 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -652,6 +652,15 @@ static void mig_throttle_guest_down(uint64_t bytes_dir= ty_period, } } =20 +void mig_throttle_counter_reset(void) +{ + RAMState *rs =3D ram_state; + + rs->time_last_bitmap_sync =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + rs->num_dirty_pages_period =3D 0; + rs->bytes_xfer_prev =3D ram_counters.transferred; +} + /** * xbzrle_cache_zero_page: insert a zero page in the XBZRLE cache * diff --git a/migration/ram.h b/migration/ram.h index 4833e9f..cb6f58a 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -50,6 +50,7 @@ bool ramblock_is_ignored(RAMBlock *block); int xbzrle_cache_resize(uint64_t new_size, Error **errp); uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_total(void); +void mig_throttle_counter_reset(void); =20 uint64_t ram_pagesize_summary(void); int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t = len); --=20 1.8.3.1 From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617939988; cv=none; d=zohomail.com; s=zohoarc; b=nmUdxFRmh6o35e71oIYkpzirX/DyjQL1uTDEXOkJFFvp7HQHFAGqN3G27tF01qZ50h8U6WMUopND5IFrdDA6144NSUH9q+pIDcXLx4fljDR0pxcwj9N736rZ0aeLDZXD8kZN5lp+Z0nb9Wp1xcJhSDsnD1TszoxomaphepNcgUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617939988; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ZLvpEQzWDxQVD7kAy1QqEESNey6SF76r6N/iU1odW2I=; b=GmMD00UYYACJ6p1pPZJ1xz2swbRKIlIHcYyxzZ0VVDl0jHR16h27MrOFJYsKtWta5RGyguWatXRLpwsvfpmRhuATAgZx4iLtDSiQzSUe8jEEnDCQUNhNlbou9YY4WDhmGMuH3sona3cr996lClUsoUeX7/HeA/Y7hUw0q2PRlKU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617939988175910.333511995299; Thu, 8 Apr 2021 20:46:28 -0700 (PDT) Received: from localhost ([::1]:46814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi6F-0007tq-49 for importer@patchew.org; Thu, 08 Apr 2021 23:46:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2n-0003a4-CJ for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:53 -0400 Received: from mga05.intel.com ([192.55.52.43]:12420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2l-0007T4-L6 for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:53 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:51 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:48 -0700 IronPort-SDR: 6o8rLchXohsKCWSJkmEbkG8Oy7j93VxbujKB1A0qd8jJZxCvILwqYLrIr7j6f1wzj2alfYGT3X xTuHIi1cPA7Q== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957356" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957356" IronPort-SDR: HE+EyU4nCCBPg0WgRjene2detCeELippOgYGuGHu0XTT8DLgEMZ2w4TjXQIzrFpwqcab1bHzuT uuiGCKvszi6Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416081143" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 08/10] Reduce the PVM stop time during Checkpoint Date: Thu, 8 Apr 2021 23:20:54 -0400 Message-Id: <1617938456-315058-9-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" When flushing memory from ram cache to ram during every checkpoint on secondary VM, we can copy continuous chunks of memory instead of 4096 bytes per time to reduce the time of VM stop during checkpoint. Signed-off-by: Lei Rao Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Lukas Straub Tested-by: Lukas Straub --- migration/ram.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index f9d60f0..8661d82 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -822,6 +822,41 @@ unsigned long migration_bitmap_find_dirty(RAMState *rs= , RAMBlock *rb, return next; } =20 +/* + * colo_bitmap_find_diry:find contiguous dirty pages from start + * + * Returns the page offset within memory region of the start of the contig= uout + * dirty page + * + * @rs: current RAM state + * @rb: RAMBlock where to search for dirty pages + * @start: page where we start the search + * @num: the number of contiguous dirty pages + */ +static inline +unsigned long colo_bitmap_find_dirty(RAMState *rs, RAMBlock *rb, + unsigned long start, unsigned long *n= um) +{ + unsigned long size =3D rb->used_length >> TARGET_PAGE_BITS; + unsigned long *bitmap =3D rb->bmap; + unsigned long first, next; + + *num =3D 0; + + if (ramblock_is_ignored(rb)) { + return size; + } + + first =3D find_next_bit(bitmap, size, start); + if (first >=3D size) { + return first; + } + next =3D find_next_zero_bit(bitmap, size, first + 1); + assert(next >=3D first); + *num =3D next - first; + return first; +} + static inline bool migration_bitmap_clear_dirty(RAMState *rs, RAMBlock *rb, unsigned long page) @@ -3730,19 +3765,26 @@ void colo_flush_ram_cache(void) block =3D QLIST_FIRST_RCU(&ram_list.blocks); =20 while (block) { - offset =3D migration_bitmap_find_dirty(ram_state, block, offse= t); + unsigned long num =3D 0; =20 + offset =3D colo_bitmap_find_dirty(ram_state, block, offset, &n= um); if (((ram_addr_t)offset) << TARGET_PAGE_BITS >=3D block->used_length) { offset =3D 0; + num =3D 0; block =3D QLIST_NEXT_RCU(block, next); } else { - migration_bitmap_clear_dirty(ram_state, block, offset); + unsigned long i =3D 0; + + for (i =3D 0; i < num; i++) { + migration_bitmap_clear_dirty(ram_state, block, offset = + i); + } dst_host =3D block->host + (((ram_addr_t)offset) << TARGET_PAGE_BITS); src_host =3D block->colo_cache + (((ram_addr_t)offset) << TARGET_PAGE_BITS); - memcpy(dst_host, src_host, TARGET_PAGE_SIZE); + memcpy(dst_host, src_host, TARGET_PAGE_SIZE * num); + offset +=3D num; } } } --=20 1.8.3.1 From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617939873; cv=none; d=zohomail.com; s=zohoarc; b=AGMLdJoXiCc0VLP/Faphe/7wBfonL/mP09u5rszkWHxXnELC+gbWY+T8lnz6skNUbvCK435ZbxmhqHmkBNvIXJpubfAaDiQr1g4z+5mPskXZBxWtBuPUmJr6Y8HfRa3Q7LocqRQHAWaFtnrgJTOQiW/HZ32N0w9D4D5sX0mJJdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617939873; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=w58RTgC9EsbNTgUybkBUpJ/8pq8X6mSabumGDSGbI/o=; b=kd21c1KtfSLnRrm48ljjYIXSWt9gbTTKllinJ6b0Mvy1K+mVyyNCYG58t5J2Jg4Ps0Zmf0KcHUHNLSQIcR5FFiL7nZSoEoUvVZBZAlaJC4KkrVdmR1GJx4KmlGVwHYqVGsh6CQu+lDE7DDMoISaOoSuB0kCX65zyBcpFDzHrVCM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617939873442447.096940110407; Thu, 8 Apr 2021 20:44:33 -0700 (PDT) Received: from localhost ([::1]:40584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi4O-0005JA-Bv for importer@patchew.org; Thu, 08 Apr 2021 23:44:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2s-0003fO-BP for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:43:00 -0400 Received: from mga05.intel.com ([192.55.52.43]:12420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2p-0007T4-KB for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:42:58 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:55 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:52 -0700 IronPort-SDR: fmsJs6bfNwy0wqZfGWrfq3EXQto5puMGdD4tyNSqYhd/1Fmjb4kM8K3jh9IREzsIDC2e2JFkKO PCrVZKebiJzg== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957370" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957370" IronPort-SDR: vvuZ+A8Vq+LlWFR6A+2atACfpWSjlVJhde3R+f48B2/FvbFuGBskyCRj8jmCkySl4G2XV3EXXS L+OtHXNalrSQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416081168" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 09/10] Add the function of colo_bitmap_clear_dirty Date: Thu, 8 Apr 2021 23:20:55 -0400 Message-Id: <1617938456-315058-10-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" When we use continuous dirty memory copy for flushing ram cache on secondary VM, we can also clean up the bitmap of contiguous dirty page memory. This also can reduce the VM stop time during checkpoint. The performance test for COLO as follow: Server configuraton: CPU :Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz MEM :251G(type:DDR4 Speed:2666 MT/s) SSD :Intel 730 and DC S35x0/3610/3700 Series SSDs dirty pages:3189376 migration_bitmap_clear_dirty time consuming(ns):105194= 000 dirty pages:3189784 migration_bitmap_clear_dirty time consuming(ns):105297= 000 dirty pages:3190501 migration_bitmap_clear_dirty time consuming(ns):105410= 000 dirty pages:3188734 migration_bitmap_clear_dirty time consuming(ns):105138= 000 dirty pages:3189464 migration_bitmap_clear_dirty time consuming(ns):111736= 000 dirty pages:3188558 migration_bitmap_clear_dirty time consuming(ns):105079= 000 dirty pages:3239489 migration_bitmap_clear_dirty time consuming(ns):106761= 000 dirty pages:3190240 colo_bitmap_clear_dirty time consuming(ns):8369000 dirty pages:3189293 colo_bitmap_clear_dirty time consuming(ns):8388000 dirty pages:3189171 colo_bitmap_clear_dirty time consuming(ns):8641000 dirty pages:3189099 colo_bitmap_clear_dirty time consuming(ns):8280000 dirty pages:3189974 colo_bitmap_clear_dirty time consuming(ns):8352000 dirty pages:3189471 colo_bitmap_clear_dirty time consuming(ns):8348000 dirty pages:3189681 colo_bitmap_clear_dirty time consuming(ns):8426000 it can be seen from the data that colo_bitmap_clear_dirty is more efficient. Signed-off-by: Lei Rao Reviewed-by: Lukas Straub Tested-by: Lukas Straub --- migration/ram.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 8661d82..11275cd 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -857,6 +857,36 @@ unsigned long colo_bitmap_find_dirty(RAMState *rs, RAM= Block *rb, return first; } =20 +/** + * colo_bitmap_clear_dirty:when we flush ram cache to ram, we will use + * continuous memory copy, so we can also clean up the bitmap of contiguous + * dirty memory. + */ +static inline bool colo_bitmap_clear_dirty(RAMState *rs, + RAMBlock *rb, + unsigned long start, + unsigned long num) +{ + bool ret; + unsigned long i =3D 0; + + /* + * Since flush ram cache to ram can only happen on Secondary VM. + * and the clear bitmap always is NULL on destination side. + * Therefore, there is unnecessary to judge whether the + * clear_bitmap needs clear. + */ + QEMU_LOCK_GUARD(&rs->bitmap_mutex); + for (i =3D 0; i < num; i++) { + ret =3D test_and_clear_bit(start + i, rb->bmap); + if (ret) { + rs->migration_dirty_pages--; + } + } + + return ret; +} + static inline bool migration_bitmap_clear_dirty(RAMState *rs, RAMBlock *rb, unsigned long page) @@ -3774,11 +3804,7 @@ void colo_flush_ram_cache(void) num =3D 0; block =3D QLIST_NEXT_RCU(block, next); } else { - unsigned long i =3D 0; - - for (i =3D 0; i < num; i++) { - migration_bitmap_clear_dirty(ram_state, block, offset = + i); - } + colo_bitmap_clear_dirty(ram_state, block, offset, num); dst_host =3D block->host + (((ram_addr_t)offset) << TARGET_PAGE_BITS); src_host =3D block->colo_cache --=20 1.8.3.1 From nobody Fri May 3 10:23:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1617940213; cv=none; d=zohomail.com; s=zohoarc; b=MyYqUMr4taUlag3QNaGt9SYISfp93rp/z7gL+ScJ3tnzhqKL9Dtbdqqfp2xdFw8av5hywIfyA1dDf7A9kvlBq8qHZTr4e+nomM54H/DQl+i6mmpu2XHVjk9IM/QVvLcmsCxjiqKwyWMNMB9P24M3izQWLqNZz1G6ozEL1OfWl/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617940213; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UuraCU8R0WAeMQ8aiN+kS9PjXzFhPPSK1ZSp7Xx9vf4=; b=lmE3ZSbx6jDfzzQY+7aDuaNOWwUiB20TUgmc/mW3bz/rplQEM/l5DN5XcaS4x/lnQ87PqI3Lv1hcEVxTH7f2UtopcJytlzAj1PjoBKQsTzxuqJ2RlMy6j4TNjF4LdFpkPbagL1+g9F5ilVakYL0p/vrUH2nmbeocB5C7jdZ0DyI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617940213026777.1636394802052; Thu, 8 Apr 2021 20:50:13 -0700 (PDT) Received: from localhost ([::1]:57686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUi9r-00043s-VR for importer@patchew.org; Thu, 08 Apr 2021 23:50:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi30-0003gd-45 for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:43:06 -0400 Received: from mga05.intel.com ([192.55.52.43]:12420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUi2u-0007T4-6X for qemu-devel@nongnu.org; Thu, 08 Apr 2021 23:43:05 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2021 20:42:59 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga008.fm.intel.com with ESMTP; 08 Apr 2021 20:42:55 -0700 IronPort-SDR: 1HW3xaI7qv1nWAqzPDsiJxjyx3Zxbogbx/bdwQkMAse+Jw1VZeViIPXmHvrrtS6mdBu5PXa7zw UYKzdxsOrybQ== X-IronPort-AV: E=McAfee;i="6000,8403,9948"; a="278957379" X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="278957379" IronPort-SDR: f+8V7EB4C13tcAqHML82w2Eb0Wdf0pFmqTDe43AryzW15wlmSxWvumDTi5c3ECFIpuFaSzV4WA qRfZ18nv6COg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,208,1613462400"; d="scan'208";a="416081186" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v6 10/10] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() Date: Thu, 8 Apr 2021 23:20:56 -0400 Message-Id: <1617938456-315058-11-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com> References: <1617938456-315058-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=lei.rao@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" The data pointer has skipped vnet_hdr_len in the function of parse_packet_early().So, we can not subtract vnet_hdr_len again when calculating pkt->header_size in fill_pkt_tcp_info(). Otherwise, it will cause network packet comparsion errors and greatly increase the frequency of checkpoints. Signed-off-by: Lei Rao Signed-off-by: Zhang Chen Reviewed-by: Li Zhijian Reviewed-by: Zhang Chen Reviewed-by: Lukas Straub Tested-by: Lukas Straub --- net/colo-compare.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 5b538f4..b100e7b 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -211,7 +211,7 @@ static void fill_pkt_tcp_info(void *data, uint32_t *max= _ack) pkt->tcp_ack =3D ntohl(tcphd->th_ack); *max_ack =3D *max_ack > pkt->tcp_ack ? *max_ack : pkt->tcp_ack; pkt->header_size =3D pkt->transport_header - (uint8_t *)pkt->data - + (tcphd->th_off << 2) - pkt->vnet_hdr_len; + + (tcphd->th_off << 2); pkt->payload_size =3D pkt->size - pkt->header_size; pkt->seq_end =3D pkt->tcp_seq + pkt->payload_size; pkt->flags =3D tcphd->th_flags; --=20 1.8.3.1