From nobody Mon Apr 29 08:25:15 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=1617264718; cv=none; d=zohomail.com; s=zohoarc; b=Yrypc23hHFB+/QGwYRpLZX6kXLnOpwxweBRM2fFxrW+m4deKyTYvNt2TXagsXCXBP5pzVpzqEHvyPjbXq0hetfK8NzVZ0cQHu+Rj6wYqLRkXycUsKffSzKTH+PzsqP7zsiWPvZHbOpUCgdSaTE83Bpyh7id61xjKWqcR4G55LNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617264718; 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=FWjRKNt4r/sH9kTf1O1kzoBUEobetlimcwJOqqtptWU=; b=Kp5Nu+nCyBBIO7BT4b0ZUXb0T0l9AeEmRl3aOn3JFsDhzSQuz1gq2rBzs6HQz7ZmsdUoSTidfpRmNHQOoj7EZZEx/FPeF3VooQLXM/eHCckWRn2QSEjEYB20T4u0Yb0uY2gnnVPgwqqnVl06JCNC+75w8MznCcztJa6/zxgkGyU= 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 1617264718136993.8839571180648; Thu, 1 Apr 2021 01:11:58 -0700 (PDT) Received: from localhost ([::1]:56910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsQk-0003XS-R6 for importer@patchew.org; Thu, 01 Apr 2021 04:11:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPh-0001yo-3y for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:49 -0400 Received: from mga17.intel.com ([192.55.52.151]:36363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPd-0005oP-9l for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:48 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:10:37 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:10:34 -0700 IronPort-SDR: Pxous52pEk3dhkdEKDuGr6GrvbWwzmjBu7ZBSS62al0CQeQVRxmVnce08THvn+Lp9fez0PXizS O8VrW9G/8PLw== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="172211370" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="172211370" IronPort-SDR: GOzRL1TF/IpKP80XU05KS4LVlEOld8cccFmRvsUqyhh4umdBSQ8oF1mgreyS3Awzr8w67+Tv+Y hyXCmvxhExEw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119086" 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 v5 01/10] Remove some duplicate trace code. Date: Thu, 1 Apr 2021 15:47:20 +0800 Message-Id: <1617263249-54501-2-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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.151; envelope-from=lei.rao@intel.com; helo=mga17.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: Lukas Straub Reviewed-by: Zhang Chen 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 Mon Apr 29 08:25:15 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=1617264715; cv=none; d=zohomail.com; s=zohoarc; b=DSuBcVZdMz+G625xStYdc6803sxMFumsJCyf8QC0buQz+8pgmIleU/atuz8MZoNBiCHpj30pZZmIb3O7iv304txt3/4Ueeds17NoP1qg2F09d3U8I5lSUtyXlOuUEgbJbfl2GdDQkfemZlHZjVqOF+8wbOFXNEaqvJiUyUVh6YM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617264715; 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=mFIYEmCr1BC1KWO4TgMvJUvJ+BQOWqQ+UnAtuA/U3OQ=; b=ayWpQrK3I8p5oUBe5EODzcvmXkRu9X7Bjo+yVrEht85CTji+WBIcjFn1oZVnoh5VxRY+Ln8/Q2CZuVlPe524g7Ts7QfIlcxqfF4Gf1iVCQzzn97AuvDM0WbROkPTu6l4Eo2kdZdGtnOKWtXvWyUrBR/CTX92HSb5541eHKSVUmw= 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 1617264714858571.972265473069; Thu, 1 Apr 2021 01:11:54 -0700 (PDT) Received: from localhost ([::1]:56766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsQj-0003Tn-Hm for importer@patchew.org; Thu, 01 Apr 2021 04:11:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPf-0001yd-LN for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:47 -0400 Received: from mga17.intel.com ([192.55.52.151]:36369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPd-0005qU-N1 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:47 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:10:40 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:10:38 -0700 IronPort-SDR: QwmqoLlQmwJVaZG39fq/UHh4kUK/c2E2wB3tiPK2UUlh4SV7mrK7+mYL43pRtL/VkJkU0xMDMS /goq1+Oy2NFg== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="172211375" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="172211375" IronPort-SDR: NTvyJqXMoO4QSwXDjnsEv31nZq/ohxoiVAsFZ0p+BwX7WssXaKXWVpjPHtu8ZcD/5A1DwKR4+s 1uyBOIFnoOJw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119110" 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 v5 02/10] Fix the qemu crash when guest shutdown during checkpoint Date: Thu, 1 Apr 2021 15:47:21 +0800 Message-Id: <1617263249-54501-3-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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.151; envelope-from=lei.rao@intel.com; helo=mga17.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: Lukas Straub Reviewed-by: Zhang Chen 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 Mon Apr 29 08:25:15 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=1617264809; cv=none; d=zohomail.com; s=zohoarc; b=goJfk6Hp35bHA6g1AOw7OCen9P2vbm7tMQ0oueNMmMGRkvcS/oELz9n+82EF17sHy3UoDyA7IkBMY66UBGec5AcpqirfIyZPGUa73seC4zIS+NTRnJWEDXi3AvXzBTkQgxhYbGtd8RJYITuc2AsfDsXSo//lSR7A6pqtFM76v+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617264809; 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=dNNd25QiEN2ATr1KaPTXaGFIhPqB7EECp92ohogMsVo=; b=bv3S1+WxYVXr1kSGvIC+vvcZB3yXGJ+ATq/A9EnXuigpAbMxRLtVkeuzRdr9BfrTzFawxcKek3Nc6PO6VJ8E/t6d+JxuxyPZGRoNaMS4jjJPR647pLhQ5H1/nj91tNb5IlUBzc6L/rph/cRKYjgJ8d1Ja20xzBrrZDGiod+RZns= 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 1617264809698714.5745505875161; Thu, 1 Apr 2021 01:13:29 -0700 (PDT) Received: from localhost ([::1]:36910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsSF-0006qF-Kg for importer@patchew.org; Thu, 01 Apr 2021 04:13:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPh-0001zg-Kt for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:49 -0400 Received: from mga17.intel.com ([192.55.52.151]:36369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPg-0005qU-16 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:49 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:10:43 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:10:41 -0700 IronPort-SDR: 5BXU5UtQ3VBHl7laR5/LNkCXmr9B9fiejZgbOVX3ha6z3bXPNyHn7rG6epALcV41lhg24s6fGa 2T0OFo+ExN4A== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="172211382" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="172211382" IronPort-SDR: SrxsXS4ejI7MqxoIvsKbQ5trWCCMpnWPn5ANH4U/CqV32PfP4pdVsmDkcLcLsD/t9xRHTetTag B8eGr+l1Tnlg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119123" 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 v5 03/10] Optimize the function of filter_send Date: Thu, 1 Apr 2021 15:47:22 +0800 Message-Id: <1617263249-54501-4-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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.151; envelope-from=lei.rao@intel.com; helo=mga17.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: Lukas Straub Reviewed-by: Zhang Chen 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 Mon Apr 29 08:25:15 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=1617264810; cv=none; d=zohomail.com; s=zohoarc; b=evJ0Kn2tLrCCxE8MUPgSxy7bnmUunXoNmEMUCFg9lVGw+C5NvwBKK+oDOBztdpTSuzvmt8glAhSF6aZClms09X5FIIUX+FVZKNmOgevnxZr79swqLUaLX7jJQTMpxABaTvdKrmNh6TA94xjc050/o8jLDI1X7WxAjsdhqlwH5b4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617264810; 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=Bo/XCCiVO+2aZaM4IboRhaWvNMYivMqQIA37cX2NhOM=; b=ZXH6tZIG7A44iKJQmqG3NOlYNcgA0kHrP+wSpH995QiwJsRXj9WEvw4mN9u/4IGSe8y9wxYScekY74m2kE0wR6hxBI7pKA6sgwu2nPlbBN4K7IlMsr3WdMhmuSAmO6n9TcjHRQ0C6HWAF0MCOeeQ+cguJe1ArHnUUZ3RNq3Z4bI= 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 1617264809989669.8407708865633; Thu, 1 Apr 2021 01:13:29 -0700 (PDT) Received: from localhost ([::1]:37074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsSG-0006uC-Sq for importer@patchew.org; Thu, 01 Apr 2021 04:13:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPj-00022q-5H for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:51 -0400 Received: from mga17.intel.com ([192.55.52.151]:36363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPh-0005oP-GN for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:50 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:10:47 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:10:44 -0700 IronPort-SDR: EYF1O2Kd0jeO9wCmsjuxhJ/zrL4yRgx5rBrnCocoiHDjy8Md+GKH6bTwARi5ZE+9d/uU7yvbsL t+s0P60XNcow== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="172211391" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="172211391" IronPort-SDR: grp/+aHUa36VleHPP8U5YqPnsbTcZkyZCshnEpqgEXIcti82RDntAaelTuTAMgG3nhn442SlNy hSadH96/Ra3A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119138" 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 v5 04/10] Remove migrate_set_block_enabled in checkpoint Date: Thu, 1 Apr 2021 15:47:23 +0800 Message-Id: <1617263249-54501-5-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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.151; envelope-from=lei.rao@intel.com; helo=mga17.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: Lukas Straub Reviewed-by: Zhang Chen 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 ca8b97b..4578f22 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2219,6 +2219,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 Mon Apr 29 08:25:15 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=1617264954; cv=none; d=zohomail.com; s=zohoarc; b=mupBtsI1epybybzJZDPWjNvC5H7xtWCgDO9SzwXf0u9UNKlkjH0dyVdl/i3fFmacj3IBai2/HnRFXmuSN7nkkN4aWzHhRpkk3WjfSDtvvVIXiYDRNu2s7rEbnhxwS8ExJIiCxJYf8h47btswKNxNqxdykl1GUGijkXwfMFAsO2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617264954; 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=Qoi3rpCAk6sHT3Q3mmOxmTALRHeyZXmv0zt0JyXHZDE=; b=fletAvh1oGD6jYx9JqxmxPkpUCY/65jTFO01kGHtuF8hJl1zeC+qD7XXDSBJswsmqJmIeOfOPyxSqo+fKieKW2zp32gf6IlAkj292YsyH0S1fVlrcDIPiYaW4N8Dwxi5rDyB8GodH5VeaQIbC3luqgMuPGjduDM2jS/prl7UkZ0= 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 1617264954271527.7305417100962; Thu, 1 Apr 2021 01:15:54 -0700 (PDT) Received: from localhost ([::1]:45032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsUb-0001j3-8s for importer@patchew.org; Thu, 01 Apr 2021 04:15:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPm-00029K-C3 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:54 -0400 Received: from mga17.intel.com ([192.55.52.151]:36374) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPk-0005vK-6O for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:54 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:10:50 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:10:48 -0700 IronPort-SDR: uP/9SF5OoHK8TguIpEaLYPTRQKPAC1MLUbLO0r0l9B2goPLc7gjDYVP2bQQZuQdn5TEeKW8S// jLSrti6cwIbw== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="172211395" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="172211395" IronPort-SDR: c5Czg7RVyaESURNJbs2WBnnMK/Q3CQv0oNttz2Lp3q3hmLkhqFbpT4691Xx9xHSc4c0sJa1uLH PeY1oBilvLWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119158" 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 v5 05/10] Add a function named packet_new_nocopy for COLO. Date: Thu, 1 Apr 2021 15:47:24 +0800 Message-Id: <1617263249-54501-6-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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.151; envelope-from=lei.rao@intel.com; helo=mga17.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: Lukas Straub Tested-by: Lukas Straub --- net/colo.c | 23 +++++++++++++++++++++++ net/colo.h | 1 + net/filter-rewriter.c | 3 +-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/net/colo.c b/net/colo.c index ef00609..58106a8 100644 --- a/net/colo.c +++ b/net/colo.c @@ -174,6 +174,29 @@ Packet *packet_new(const void *data, int size, int vne= t_hdr_len) return pkt; } =20 +/* + * 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_new(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; + 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; +} + void packet_destroy(void *opaque, void *user_data) { Packet *pkt =3D opaque; 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 Mon Apr 29 08:25:15 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=1617264954; cv=none; d=zohomail.com; s=zohoarc; b=dAUJPeO0tCzmx4yqO94CxaEAjkrVB16bZKDQt0hUGFc0KqomGFZf4LH8i8ovIy7zgmRO3no9B/8UICKirGWuDR4HYww/alHp1QFgzIxNLsZw2e/0T0d7dTh/aTZs6GWf03uyGDLO8fueQLg1Cxc0Ftirl/ty6Snr0FgQI1qY0/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617264954; 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=OtED36D+MHweSfjGYyBx0E0yomIIKUBXHg7qgVN89cY=; b=S7cleh7V52fDHxHim4uxps0vczVcJIpwEAFcSWe/Y5nrGcqThUYOK1X4YaRJlTgPWf1O1/1YVyaRdaCLRgUIIL6Cu0jDRUUBjfkCq9ipKtEUz1fICJ8rVj1jKd+c6fMCjWiVTbV2dDiE+/oBL+mvbDi2fqy73qH2kfWxwhZNV9w= 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 1617264954504581.3901771752629; Thu, 1 Apr 2021 01:15:54 -0700 (PDT) Received: from localhost ([::1]:44980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsUb-0001hy-GY for importer@patchew.org; Thu, 01 Apr 2021 04:15:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPp-0002GR-Lh for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:57 -0400 Received: from mga17.intel.com ([192.55.52.151]:36382) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPn-0005yK-St for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:10:57 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:10:54 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:10:51 -0700 IronPort-SDR: pMh1NRTs1CVouyqdEvxzM+d9h5m55Q7uXJHl7kZ1a5FDEYJP3jKVvyzOIW76gfoIINCQIMGIVY UVTlD153j1pQ== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="172211413" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="172211413" IronPort-SDR: aZypngzSSZsygSoFPH/YDw9rd7Sj3otLQuxhw0CtXjmFZISnBFHigD4UsT81S4qbv0/QrxkvpX 7MW+phmo5DQA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119181" 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 v5 06/10] Add the function of colo_compare_cleanup Date: Thu, 1 Apr 2021 15:47:25 +0800 Message-Id: <1617263249-54501-7-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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.151; envelope-from=lei.rao@intel.com; helo=mga17.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: Lukas Straub Reviewed-by: Zhang Chen 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 Mon Apr 29 08:25:15 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=1617264733; cv=none; d=zohomail.com; s=zohoarc; b=aPne47V2mjbFR46keUnHChdFGIGest6qXVleN/uly6+KzSApHkWhsmyFco3C86LrTmP6Zo91GfiwvWqMidxzROdleIPVMe+QRONb5uz/O8fUTxgN9oOkZOLud6Ectp47kIzBChobz+P3cW4jzwZHCBoLFdzmwH5Zo+8nGOHioI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617264733; 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=pqv4p0yEmYTI8WaQtZ7ERcJgkN47qdkY3uauhgGAFsQ=; b=ao8IvjfMvBz7oQgWVJ2w1VH7HDBq+wc74tPgwQqOKl9njSfhDpDsWlmiABEv4HwdqPFNL1XXKOFiTeRWUd4hHgIwLeqzwYPBzm3JpPEyCQCmJJZX286vQ/k5IpS5O66r5yHyw/8HTrm5qDS7kaCpeCzcQcYrOw8dQniSREPbYgA= 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 1617264733492359.46535830875393; Thu, 1 Apr 2021 01:12:13 -0700 (PDT) Received: from localhost ([::1]:58182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsR2-000432-C7 for importer@patchew.org; Thu, 01 Apr 2021 04:12:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPs-0002Lo-KB for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:11:00 -0400 Received: from mga17.intel.com ([192.55.52.151]:36382) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPq-0005yK-L2 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:11:00 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:10:57 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:10:55 -0700 IronPort-SDR: MFQM5x3MkTFMQEpbQlHwYK51Lj9fwzcKWVIN/J4LlSL1j7eSNNp72mPgnJ0zNENF9jKBfVj49u UDh29sPay3tw== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="172211433" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="172211433" IronPort-SDR: V9k7ijxTKyaA3RZX+UknaFEd6hMoGpP/QfOY/ZMJRsq5j+DQ3DP797m1cUmizfv14iBvo2L4vB bFk140KxZI/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119192" 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 v5 07/10] Reset the auto-converge counter at every checkpoint. Date: Thu, 1 Apr 2021 15:47:26 +0800 Message-Id: <1617263249-54501-8-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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.151; envelope-from=lei.rao@intel.com; helo=mga17.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 40e7895..c69a8e0 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 6378bb3..3f78175 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 Mon Apr 29 08:25:15 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=1617265078; cv=none; d=zohomail.com; s=zohoarc; b=A1gaI+7XtKE0fejeVGCLpcacNm7fcTWKnZTsFmHwiAqMTLbOC3gkPx3VZAwIuaY5c8Rp8mB9Dar84qGNxUTkNQDiRqt8BYwR2AVhE/akm/YkaOufbe5piqrWzlWKQ09sbARY/mZq5Zle5NpOkJNFAGsm0AxGJdulXOTop4S3nOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617265078; 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=MlgYpUrtaIThUylz/yvveUv6DHhqq0xsYhkcORghpzs=; b=lNiadJvL8Ti65mnBg2Yj0iCacvA7nl4FpTLA+9GNXKmtq/bw6YDU0ZHyVklcvsorTPvThqPSu+mfd9OTDyjPNzZPEhIzmf3msEs7+utnQoPnrWPCRvqfjl3udLBrhCD5kev2MzkMnN2UgA9dYehotZFEwI/0wBy7QqydmwjLGL0= 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 1617265078460865.7942297418748; Thu, 1 Apr 2021 01:17:58 -0700 (PDT) Received: from localhost ([::1]:49466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsWa-0003dC-TQ for importer@patchew.org; Thu, 01 Apr 2021 04:17:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPz-0002dy-Ed for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:11:07 -0400 Received: from mga03.intel.com ([134.134.136.65]:13082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPx-00067j-HS for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:11:07 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:11:03 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:11:00 -0700 IronPort-SDR: yTabyjwHcxaD2qAc3XlCiWmxFBJEpGumf22cir5xCh+syofNmZ53RisH91w0YHVuLZgUA9qQkZ EkjDB+XflfEg== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="192205138" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="192205138" IronPort-SDR: IodgwkLvwJE3FolasFpBHw8FIelyNgL8NL7YJCTBdNDmU6ltd1wHAcTBWzon6GyoZ7ujnQS9+5 fKTRkEIV4fWw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119214" 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 v5 08/10] Reduce the PVM stop time during Checkpoint Date: Thu, 1 Apr 2021 15:47:27 +0800 Message-Id: <1617263249-54501-9-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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=134.134.136.65; envelope-from=lei.rao@intel.com; helo=mga03.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 c69a8e0..317fa4e 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) @@ -3679,19 +3714,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 Mon Apr 29 08:25:15 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=1617264824; cv=none; d=zohomail.com; s=zohoarc; b=WJasX8PUc3dKO9Qm+j80rKqxsGjuAfTyRek1csXhs2ZDt7QJmu6t6dUuzHB7iqFW/V3fXeDJfvH3Q/GcZHpPi8rPOotbRb30usVA+rGx3VIofn045C2JWpBvtq+x8FInSnWKoW6Tct5CJGF52RNwYyIbB1fHKfUY7co+zxqG85o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617264824; 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=tlex7iRgItgyWCyk9/Fse7WX7ZOoikNHqiBqJWp0YfA=; b=g3YSEJ17piBv762XKd1o/j/T87qqC7P32+JfJVeGUgaYfBkUEjI2SAxQ5lcfF7/6bWP4adrqWRfMdf8zRQSWfGu8hH5zCMyOPTR/bwXZ202diB7Ha3df+X2GW0q6cqMro0oe1QdjCOMLdZyj8iUrRlGQj9f53O7lDCftEodi1SE= 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 1617264824442359.74822876341307; Thu, 1 Apr 2021 01:13:44 -0700 (PDT) Received: from localhost ([::1]:38422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsSV-0007SV-CV for importer@patchew.org; Thu, 01 Apr 2021 04:13:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsQ1-0002k1-Oh for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:11:09 -0400 Received: from mga03.intel.com ([134.134.136.65]:13082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsPz-00067j-SE for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:11:09 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:11:06 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:11:03 -0700 IronPort-SDR: vmTsYzo+znR32h4mFnT9L9fdQ2DFEyCCkABF2Ik6TD5h2/789KeWDUzbN9aWjUO1NQe9vhYHIr 7wgo7+bFoHtQ== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="192205151" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="192205151" IronPort-SDR: /c6H/bAyzP7aU+9Hgi8XQgSW3Da4niUmKVdcT/t/sl4hdQPZk2CSrgH7NaURfFF8HLmdGRNpWM k6iEPvfHtdtg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119235" 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 v5 09/10] Add the function of colo_bitmap_clear_dirty Date: Thu, 1 Apr 2021 15:47:28 +0800 Message-Id: <1617263249-54501-10-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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=134.134.136.65; envelope-from=lei.rao@intel.com; helo=mga03.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 317fa4e..570ffa4 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) @@ -3723,11 +3753,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 Mon Apr 29 08:25:15 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=1617265078; cv=none; d=zohomail.com; s=zohoarc; b=c+DFwMvS1LSMJVRYgWxsTJF8iPlVdXNFX3O6WRJQJXArk/hU9eVpPKgqzM2aTdfceFXnQXddPw1vagTJsinpka74nUXgxkLDMlYYFuDQ/CVOHpKv1PtYZaQdhNUEy5a7xyr538p5p+4Fh/Huu+NnxWLTn8UQ2Qa4OXqSnWjmjgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617265078; 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=yuYlaZLJ2isWx2dgE3pNtnJUNEe0fcs5RIBJwrk3oNo=; b=n5KnrFs3p9PIviwNBXnzCBIqIZN9ZpSgXfVKAVvt1gzqzOWcTiPAdsSXC85SVKjQzi1GTwCKgNi+286g0kHmf5OjeSJW/yjcqbN75oEfQlHM10NE813Y/pHL5Xt1pNSjZ4mN4YBJI67sfvcChVuoQtShs62g8G8Pvxj8wSnMH4A= 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 1617265078684720.1413299219485; Thu, 1 Apr 2021 01:17:58 -0700 (PDT) Received: from localhost ([::1]:49506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRsWb-0003eP-Gb for importer@patchew.org; Thu, 01 Apr 2021 04:17:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsQ4-0002qQ-7O for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:11:12 -0400 Received: from mga03.intel.com ([134.134.136.65]:13085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRsQ2-0006A2-4q for qemu-devel@nongnu.org; Thu, 01 Apr 2021 04:11:11 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 01:11:09 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2021 01:11:06 -0700 IronPort-SDR: 1Rq5LDy3m4FTe/TGo3YkNE8nTN4v9hDw8J392+yO397aQGhdvUyBwTDiWeBEdqtCn4CFU2CMBM q3l1vzMp3LhQ== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="192205165" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="192205165" IronPort-SDR: 2doqGs0S0Bz9yumlWU2Us7O1sHPAEYqPd00VuYGqb+HrIkKrnAdmW5qxp0EUdesat1aGGIVJzc 58xsxgnY4ZMA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="439119264" 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 v5 10/10] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() Date: Thu, 1 Apr 2021 15:47:29 +0800 Message-Id: <1617263249-54501-11-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617263249-54501-1-git-send-email-lei.rao@intel.com> References: <1617263249-54501-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=134.134.136.65; envelope-from=lei.rao@intel.com; helo=mga03.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: Lukas Straub Reviewed-by: Zhang Chen 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