From patchwork Tue Jul 3 13:52:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 168818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B86AE2C00BF for ; Wed, 4 Jul 2012 00:09:32 +1000 (EST) Received: from localhost ([::1]:50070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sm3Z3-0006xJ-BK for incoming@patchwork.ozlabs.org; Tue, 03 Jul 2012 09:54:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sm3YH-00053k-1g for qemu-devel@nongnu.org; Tue, 03 Jul 2012 09:54:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sm3Y6-0004tA-Su for qemu-devel@nongnu.org; Tue, 03 Jul 2012 09:54:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sm3Y6-0004sn-IN for qemu-devel@nongnu.org; Tue, 03 Jul 2012 09:53:50 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q63Drik4025925 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 3 Jul 2012 09:53:44 -0400 Received: from dhcp-1-120.tlv.redhat.com (vpn-200-144.tlv.redhat.com [10.35.200.144]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q63Dr3Xw004090; Tue, 3 Jul 2012 09:53:40 -0400 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Tue, 3 Jul 2012 16:52:51 +0300 Message-Id: <1341323574-23206-11-git-send-email-owasserm@redhat.com> In-Reply-To: <1341323574-23206-1-git-send-email-owasserm@redhat.com> References: <1341323574-23206-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, Petter Svard , stefanha@gmail.com, mdroth@linux.vnet.ibm.com, Benoit Hudzia , blauwirbel@gmail.com, Orit Wasserman , chegu_vinod@hp.com, avi@redhat.com, Aidan Shribman , pbonzini@redhat.com, eblake@redhat.com Subject: [Qemu-devel] [PATCH v14 10/13] Add xbzrle_encode_buffer and xbzrle_decode_buffer functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benoit Hudzia Signed-off-by: Petter Svard Signed-off-by: Aidan Shribman Signed-off-by: Orit Wasserman --- migration.h | 4 ++ savevm.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 0 deletions(-) diff --git a/migration.h b/migration.h index 1ae99f1..7582ecb 100644 --- a/migration.h +++ b/migration.h @@ -99,4 +99,8 @@ void migrate_add_blocker(Error *reason); */ void migrate_del_blocker(Error *reason); +int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, + uint8_t *dst, int dlen); +int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen); + #endif diff --git a/savevm.c b/savevm.c index d1d9020..2ab0986 100644 --- a/savevm.c +++ b/savevm.c @@ -2374,3 +2374,175 @@ void vmstate_register_ram_global(MemoryRegion *mr) { vmstate_register_ram(mr, NULL); } + +/* + page = zrun nzrun + | zrun nzrun page + + zrun = length + + nzrun = length byte... + + length = uleb128 encoded integer + */ +int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, + uint8_t *dst, int dlen) +{ + uint32_t zrun_len = 0, nzrun_len = 0; + int d = 0, i = 0, start; + long res, xor; + uint8_t *nzrun_start = NULL; + + g_assert(!((uintptr_t)old_buf & (sizeof(long) - 1)) && + !((uintptr_t)new_buf & (sizeof(long) - 1)) && + !(slen & (sizeof(long) - 1))); + + while (i < slen) { + /* overflow */ + if (d + 2 > dlen) { + return -1; + } + + /* not aligned to sizeof(long) */ + res = (slen - i) % sizeof(long); + if (res) { + start = i; + while (!(old_buf[i] ^ new_buf[i]) && (i - start) <= res) { + zrun_len++; + i++; + } + } + + if (zrun_len == res) { + while (i <= (slen - sizeof(long)) && + (*(long *)(old_buf + i)) == (*(long *)(new_buf + i))) { + i += sizeof(long); + zrun_len += sizeof(long); + } + + /* go over the rest */ + while (old_buf[i] == new_buf[i] && ++i <= slen) { + zrun_len++; + } + } + + /* buffer unchanged */ + if (zrun_len == slen) { + return 0; + } + + /* skip last zero run */ + if (i == slen + 1) { + return d; + } + + d += uleb128_encode_small(dst + d, zrun_len); + + /* no nzrun */ + if (i == slen) { + return d; + } + + zrun_len = 0; + nzrun_start = new_buf + i; + + /* not aligned to sizeof(long) */ + res = (slen - i) % sizeof(long); + if (res) { + start = i; + while (old_buf[i] != new_buf[i] && i - start < res) { + i++; + nzrun_len++; + } + } + + if (nzrun_len == res) { + /* truncation to 32-bit long okay */ + long mask = 0x0101010101010101ULL; + xor = *(long *)(old_buf + i) ^ *(long *)(new_buf + i); + printf("cont\n"); + while (i <= (slen - sizeof(long))) { + if ((xor - mask) & ~xor & (mask << 7)) { + /* found the end of an nzrun within the current long */ + while (old_buf[i] != new_buf[i] && ++i <= slen) { + nzrun_len++; + } + break; + } else { + i += sizeof(long); + nzrun_len += sizeof(long); + xor = *(long *)(old_buf + i) ^ *(long *)(new_buf + i); + } + } + + while (old_buf[i] != new_buf[i] && ++i <= slen) { + nzrun_len++; + } + } + + /* overflow */ + if (d + nzrun_len + 2 > dlen) { + return -1; + } + + d += uleb128_encode_small(dst + d, nzrun_len); + memcpy(dst + d, nzrun_start, nzrun_len); + d += nzrun_len; + nzrun_len = 0; + } + + return d; +} + +int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen) +{ + int i = 0, d = 0; + int ret; + uint32_t count = 0; + + while (i < slen) { + + /* zrun */ + if ((slen - i) < 2 && *(src + i) & 0x80) { + return -1; + } + + ret = uleb128_decode_small(src + i, &count); + if (ret < 0) { + return -1; + } + i += ret; + d += count; + + /* overflow */ + if (d > dlen) { + return -1; + } + + /* completed decoding */ + if (i == slen - 1) { + return d; + } + + /* nzrun */ + if ((slen - i) < 2 && *(src + i) & 0x80) { + return -1; + } + ret = uleb128_decode_small(src + i, &count); + if (ret < 0) { + return -1; + } + i += ret; + + /* overflow */ + if (d + count > dlen) { + return -1; + } + + memcpy(dst + d , src + i, count); + d += count; + i += count; + } + + return d; +}