From nobody Mon Apr 29 01:44:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1559784912; cv=none; d=zoho.com; s=zohoarc; b=PCPoFikf6HiaooIUKvFt/RLW6LZ0HubS0FAUlUoxfdBnfcruie0HIXLzz4M6EjfbIABMBbkrzmnjbVts7Oqxl7zxZKKXiLkOH7t9Hdw+rNG0+lXfhIHbk5wvw2QBeFI0KjiCEqOwkgBKvbPp0FmsB6niyII8KMXC6uJB+yjaalg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559784912; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=VlWdQWNYh59YQO+7mUcv79x8y0ZXBZbSqpbNS2KjkxU=; b=eggf0U2reai6DzXsSBgDBRr0U1B7Ad69jN0HWErPmH0IcpT1dxICoJmqNscd+WG6XlCt2u7edCqPrVkU+EKZRuTuxJ4mD1GOGTzXEvc9EPwgM5ZdSeEezAiyBNUS6uQDWl0k5VNIHgAiSIcKB2q+VHORF2t5Y3FAIDZeVov/kaY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1559784912887202.56603150382603; Wed, 5 Jun 2019 18:35:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:52642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYhJ1-0007hk-Rm for importer@patchew.org; Wed, 05 Jun 2019 21:35:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYhGK-0006Dm-Fr for qemu-devel@nongnu.org; Wed, 05 Jun 2019 21:32:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYhGJ-0001kv-1Y for qemu-devel@nongnu.org; Wed, 05 Jun 2019 21:32:16 -0400 Received: from mga14.intel.com ([192.55.52.115]:32558) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYhGI-0001j2-Pu for qemu-devel@nongnu.org; Wed, 05 Jun 2019 21:32:14 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jun 2019 18:32:11 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by FMSMGA003.fm.intel.com with ESMTP; 05 Jun 2019 18:32:10 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: Wei Yang To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 09:31:37 +0800 Message-Id: <20190606013138.13312-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190606013138.13312-1-richardw.yang@linux.intel.com> References: <20190606013138.13312-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH 1/2] migration/xbzrle: update cache and current_data in one place X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When we are not in the last_stage, we need to update the cache if page is not the same. Currently this procedure is scattered in two places and mixed with encoding status check. This patch extract this general step out to make the code a little bit easy to read. Signed-off-by: Wei Yang --- migration/ram.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index e9b40d636d..878cd8de7a 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1594,25 +1594,24 @@ static int save_xbzrle_page(RAMState *rs, uint8_t *= *current_data, encoded_len =3D xbzrle_encode_buffer(prev_cached_page, XBZRLE.current_= buf, TARGET_PAGE_SIZE, XBZRLE.encoded_bu= f, TARGET_PAGE_SIZE); + + /* + * we need to update the data in the cache, in order to get the same d= ata + */ + if (!last_stage && encoded_len !=3D 0) { + memcpy(prev_cached_page, XBZRLE.current_buf, TARGET_PAGE_SIZE); + *current_data =3D prev_cached_page; + } + if (encoded_len =3D=3D 0) { trace_save_xbzrle_page_skipping(); return 0; } else if (encoded_len =3D=3D -1) { trace_save_xbzrle_page_overflow(); xbzrle_counters.overflow++; - /* update data in the cache */ - if (!last_stage) { - memcpy(prev_cached_page, *current_data, TARGET_PAGE_SIZE); - *current_data =3D prev_cached_page; - } return -1; } =20 - /* we need to update the data in the cache, in order to get the same d= ata */ - if (!last_stage) { - memcpy(prev_cached_page, XBZRLE.current_buf, TARGET_PAGE_SIZE); - } - /* Send XBZRLE based compressed page */ bytes_xbzrle =3D save_page_header(rs, rs->f, block, offset | RAM_SAVE_FLAG_XBZRLE); --=20 2.19.1 From nobody Mon Apr 29 01:44:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1559784826; cv=none; d=zoho.com; s=zohoarc; b=JpnTdD5hf5i/AcMnfsIIokooxeHF+O7bGKa3fbADGhU8gW5peEX7uEsg/8HL3UN8tao3pGDRu8v8K8LCz65IhtDCYvAJnt0iK8ErqpYRRudqiAlnclDNpPa1ViudpMDhYqVlMxLw8o+VLt1ACLt2WjR5N1dLw2K94OklgQrVU5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559784826; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=xEEe+8vMPtuxswEFCJdiMMvPtjvGNKaxvEDqFfF70CI=; b=d2zfr0kpxqvU6QhTH3A8ePX2GN+6dXAYSisPjl2sRzqieFI5u0of6WGfIl6k9tRCdRqqqxeDj+EUHjsPuIpWZVltqBuyqK5bUlnkgbeYUqWU7ko6/2txgh15wXhXkyzXdmF7MGsjzyN+Ob+P9bBiezNNXPwkzSWmJ/lGyVztUy8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559784826431330.24042172197414; Wed, 5 Jun 2019 18:33:46 -0700 (PDT) Received: from localhost ([127.0.0.1]:52634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYhHf-0006nK-I5 for importer@patchew.org; Wed, 05 Jun 2019 21:33:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYhGK-0006Dl-FV for qemu-devel@nongnu.org; Wed, 05 Jun 2019 21:32:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYhGJ-0001l1-2E for qemu-devel@nongnu.org; Wed, 05 Jun 2019 21:32:16 -0400 Received: from mga14.intel.com ([192.55.52.115]:32561) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYhGI-0001jr-Pt for qemu-devel@nongnu.org; Wed, 05 Jun 2019 21:32:15 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jun 2019 18:32:13 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by FMSMGA003.fm.intel.com with ESMTP; 05 Jun 2019 18:32:12 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: Wei Yang To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 09:31:38 +0800 Message-Id: <20190606013138.13312-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190606013138.13312-1-richardw.yang@linux.intel.com> References: <20190606013138.13312-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH 2/2] migration/xbzrle: cleanup the handling cache miss condition X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" For cache miss condition not in last_stage, we need to insert data into cache. When this step succeed, current_data should be updated. While no matter these checks pass or not, -1 is returned. Based on this, the logic in cache miss handling could be simplified a little. Signed-off-by: Wei Yang --- migration/ram.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 878cd8de7a..67ba075cc4 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1572,15 +1572,14 @@ static int save_xbzrle_page(RAMState *rs, uint8_t *= *current_data, if (!cache_is_cached(XBZRLE.cache, current_addr, ram_counters.dirty_sync_count)) { xbzrle_counters.cache_miss++; - if (!last_stage) { - if (cache_insert(XBZRLE.cache, current_addr, *current_data, - ram_counters.dirty_sync_count) =3D=3D -1) { - return -1; - } else { - /* update *current_data when the page has been - inserted into cache */ - *current_data =3D get_cached_data(XBZRLE.cache, current_ad= dr); - } + if (!last_stage && + !cache_insert(XBZRLE.cache, current_addr, *current_data, + ram_counters.dirty_sync_count)) { + /* + * update *current_data when the page has been inserted into + * cache + */ + *current_data =3D get_cached_data(XBZRLE.cache, current_addr); } return -1; } --=20 2.19.1