From nobody Sun Feb 8 14:53:18 2026 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=1587356226; cv=none; d=zohomail.com; s=zohoarc; b=NxnBZnuJFOV3ymrPQgU68orN4C0yKFHu3vop+LT0XKzbLGk1D+k2Vd7Lhq2aPuANeYzIU8KvBKlerJ98M6V1nDoJdRHoo8si2z8C7K1JgzifTDkYuROnkw6MKX1KjA0QqWqs9aSb4skzw3EvBRMtMvzLB4N2Prm9zX41YYoLKis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587356226; 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=14Z3NBIyuQhptqzA5+m+YhNzRoucbjCMN1kagWe4gtI=; b=h4PdjsMZLXM19dXWooUIndspPbgyqEeMvQqeneNfd7CuH5eBc1a60pobt7BXUVaUAkzv2hryXlOkotBPzJ24s1V+IudeYDqPXYmpDP5vUnZ+KUksDA7s4X2v5FjabAMstNj/YqTJ/pPBtLeUBu8X7A/UGE3F8672Ai1XfgZqudU= 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 1587356226968718.6826095283723; Sun, 19 Apr 2020 21:17:06 -0700 (PDT) Received: from localhost ([::1]:56986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQNrg-0001qE-Sk for importer@patchew.org; Mon, 20 Apr 2020 00:17:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36592 helo=eggs1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQNcH-00075v-DE for qemu-devel@nongnu.org; Mon, 20 Apr 2020 00:01:06 -0400 Received: from Debian-exim by eggs1p.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQNcD-0000iJ-GO for qemu-devel@nongnu.org; Mon, 20 Apr 2020 00:01:05 -0400 Received: from mga09.intel.com ([134.134.136.24]:39949) by eggs1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jQNcC-0000cX-UT for qemu-devel@nongnu.org; Mon, 20 Apr 2020 00:01:01 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2020 21:00:56 -0700 Received: from unknown (HELO devel-ww.sh.intel.com) ([10.239.48.118]) by orsmga001.jf.intel.com with ESMTP; 19 Apr 2020 21:00:54 -0700 IronPort-SDR: mLiZESEn3a88pC5Q5zAkFLL+4hRMxxdkWyEedz3G1AAsrS1tW2TfQu0W2q+tji7q+6fPVOXA+B IfAj4n0Qhodw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: WDCwWHFCDj8FUgWaJzUpOTkebNmdaBqQvGIR/0IfZhkMC2PsylCyX8MvreR3PJSlTGDBOjNaEQ Lq62jRx5cirQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,405,1580803200"; d="scan'208";a="333790702" From: Wei Wang To: qemu-devel@nongnu.org, quintela@redhat.com, dgilbert@redhat.com, peterx@redhat.com Subject: [PATCH v1 1/2] migration/xbzrle: replace transferred xbzrle bytes with encoded bytes Date: Mon, 20 Apr 2020 11:06:42 +0800 Message-Id: <1587352003-3312-2-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587352003-3312-1-git-send-email-wei.w.wang@intel.com> References: <1587352003-3312-1-git-send-email-wei.w.wang@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.24; envelope-from=wei.w.wang@intel.com; helo=mga09.intel.com X-detected-operating-system: by eggs1p.gnu.org: First seen = 2020/04/20 00:00:54 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 134.134.136.24 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: gloryxiao@tencent.com, kevin.tian@intel.com, wei.w.wang@intel.com, yi.y.sun@intel.com 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" Like compressed_size which indicates how many bytes are compressed, we need encoded_size to understand how many bytes are encoded with xbzrle during migration. Replace the old xbzrle_counter.bytes, instead of adding a new counter, because we don't find a usage of xbzrle_counter.bytes currently, which includes 3 more bytes of the migration transfer protocol header (in addition to the encoding header). The encoded_size will further be used to calculate the encoding rate. Signed-off-by: Yi Sun Signed-off-by: Wei Wang --- migration/migration.c | 2 +- migration/ram.c | 18 +++++++++--------- monitor/hmp-cmds.c | 4 ++-- qapi/migration.json | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 187ac0410c..8e7ee0d76b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -926,7 +926,7 @@ static void populate_ram_info(MigrationInfo *info, Migr= ationState *s) info->has_xbzrle_cache =3D true; info->xbzrle_cache =3D g_malloc0(sizeof(*info->xbzrle_cache)); info->xbzrle_cache->cache_size =3D migrate_xbzrle_cache_size(); - info->xbzrle_cache->bytes =3D xbzrle_counters.bytes; + info->xbzrle_cache->encoded_size =3D xbzrle_counters.encoded_size; info->xbzrle_cache->pages =3D xbzrle_counters.pages; info->xbzrle_cache->cache_miss =3D xbzrle_counters.cache_miss; info->xbzrle_cache->cache_miss_rate =3D xbzrle_counters.cache_miss= _rate; diff --git a/migration/ram.c b/migration/ram.c index 04f13feb2e..bca5878f25 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -677,7 +677,7 @@ static int save_xbzrle_page(RAMState *rs, uint8_t **cur= rent_data, ram_addr_t current_addr, RAMBlock *block, ram_addr_t offset, bool last_stage) { - int encoded_len =3D 0, bytes_xbzrle; + int encoded_size =3D 0, bytes_xbzrle; uint8_t *prev_cached_page; =20 if (!cache_is_cached(XBZRLE.cache, current_addr, @@ -702,7 +702,7 @@ static int save_xbzrle_page(RAMState *rs, uint8_t **cur= rent_data, memcpy(XBZRLE.current_buf, *current_data, TARGET_PAGE_SIZE); =20 /* XBZRLE encoding (if there is no overflow) */ - encoded_len =3D xbzrle_encode_buffer(prev_cached_page, XBZRLE.current_= buf, + encoded_size =3D xbzrle_encode_buffer(prev_cached_page, XBZRLE.current= _buf, TARGET_PAGE_SIZE, XBZRLE.encoded_bu= f, TARGET_PAGE_SIZE); =20 @@ -710,7 +710,7 @@ static int save_xbzrle_page(RAMState *rs, uint8_t **cur= rent_data, * Update the cache contents, so that it corresponds to the data * sent, in all cases except where we skip the page. */ - if (!last_stage && encoded_len !=3D 0) { + if (!last_stage && encoded_size !=3D 0) { memcpy(prev_cached_page, XBZRLE.current_buf, TARGET_PAGE_SIZE); /* * In the case where we couldn't compress, ensure that the caller @@ -720,10 +720,10 @@ static int save_xbzrle_page(RAMState *rs, uint8_t **c= urrent_data, *current_data =3D prev_cached_page; } =20 - if (encoded_len =3D=3D 0) { + if (encoded_size =3D=3D 0) { trace_save_xbzrle_page_skipping(); return 0; - } else if (encoded_len =3D=3D -1) { + } else if (encoded_size =3D=3D -1) { trace_save_xbzrle_page_overflow(); xbzrle_counters.overflow++; return -1; @@ -733,11 +733,11 @@ static int save_xbzrle_page(RAMState *rs, uint8_t **c= urrent_data, bytes_xbzrle =3D save_page_header(rs, rs->f, block, offset | RAM_SAVE_FLAG_XBZRLE); qemu_put_byte(rs->f, ENCODING_FLAG_XBZRLE); - qemu_put_be16(rs->f, encoded_len); - qemu_put_buffer(rs->f, XBZRLE.encoded_buf, encoded_len); - bytes_xbzrle +=3D encoded_len + 1 + 2; + qemu_put_be16(rs->f, encoded_size); + qemu_put_buffer(rs->f, XBZRLE.encoded_buf, encoded_size); + bytes_xbzrle +=3D encoded_size + 1 + 2; xbzrle_counters.pages++; - xbzrle_counters.bytes +=3D bytes_xbzrle; + xbzrle_counters.encoded_size +=3D encoded_size; ram_counters.transferred +=3D bytes_xbzrle; =20 return 1; diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 9b94e67879..6d3b35ca64 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -295,8 +295,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) if (info->has_xbzrle_cache) { monitor_printf(mon, "cache size: %" PRIu64 " bytes\n", info->xbzrle_cache->cache_size); - monitor_printf(mon, "xbzrle transferred: %" PRIu64 " kbytes\n", - info->xbzrle_cache->bytes >> 10); + monitor_printf(mon, "xbzrle encoded size: %" PRIu64 " kbytes\n", + info->xbzrle_cache->encoded_size >> 10); monitor_printf(mon, "xbzrle pages: %" PRIu64 " pages\n", info->xbzrle_cache->pages); monitor_printf(mon, "xbzrle cache miss: %" PRIu64 "\n", diff --git a/qapi/migration.json b/qapi/migration.json index eca2981d0a..bf195ff6ac 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -62,7 +62,7 @@ # # @cache-size: XBZRLE cache size # -# @bytes: amount of bytes already transferred to the target VM +# @encoded_size: amount of bytes encoded # # @pages: amount of pages transferred to the target VM # @@ -75,7 +75,7 @@ # Since: 1.2 ## { 'struct': 'XBZRLECacheStats', - 'data': {'cache-size': 'int', 'bytes': 'int', 'pages': 'int', + 'data': {'cache-size': 'int', 'encoded_size': 'int', 'pages': 'int', 'cache-miss': 'int', 'cache-miss-rate': 'number', 'overflow': 'int' } } =20 @@ -333,7 +333,7 @@ # }, # "xbzrle-cache":{ # "cache-size":67108864, -# "bytes":20971520, +# "encoded_size":20971520, # "pages":2444343, # "cache-miss":2244, # "cache-miss-rate":0.123, --=20 2.20.1