From patchwork Thu Feb 25 03:50:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 587911 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3D99714030F for ; Thu, 25 Feb 2016 14:56:59 +1100 (AEDT) Received: from localhost ([::1]:39857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYn2v-0004Yc-CA for incoming@patchwork.ozlabs.org; Wed, 24 Feb 2016 22:56:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYn2K-0003Vz-VG for qemu-devel@nongnu.org; Wed, 24 Feb 2016 22:56:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYn2F-0000xL-Uh for qemu-devel@nongnu.org; Wed, 24 Feb 2016 22:56:20 -0500 Received: from mga14.intel.com ([192.55.52.115]:14326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYn2F-0000ws-PP for qemu-devel@nongnu.org; Wed, 24 Feb 2016 22:56:15 -0500 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 24 Feb 2016 19:56:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,496,1449561600"; d="scan'208";a="658920867" Received: from ll.sh.intel.com (HELO localhost) ([10.239.13.27]) by FMSMGA003.fm.intel.com with ESMTP; 24 Feb 2016 19:56:14 -0800 From: Liang Li To: quintela@redhat.com, amit.shah@redhat.com Date: Thu, 25 Feb 2016 11:50:26 +0800 Message-Id: <1456372227-10380-2-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456372227-10380-1-git-send-email-liang.z.li@intel.com> References: <1456372227-10380-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Cc: zhang.zhanghailiang@huawei.com, Liang Li , qemu-devel@nongnu.org, dgilbert@redhat.com Subject: [Qemu-devel] [PATCH v3 1/2] qemu-file: Fix qemu_put_compression_data flaw 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 Current qemu_put_compression_data can only work with no writable QEMUFile, and can't work with the writable QEMUFile. But it does not provide any measure to prevent users from using it with a writable QEMUFile. We should fix this flaw to make it works with writable QEMUFile. Suggested-by: Juan Quintela Signed-off-by: Liang Li --- migration/qemu-file.c | 23 +++++++++++++++++++++-- migration/ram.c | 6 +++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 6f4a129..b0ef1f3 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -607,8 +607,14 @@ uint64_t qemu_get_be64(QEMUFile *f) return v; } -/* compress size bytes of data start at p with specific compression +/* Compress size bytes of data start at p with specific compression * level and store the compressed data to the buffer of f. + * + * When f is not writable, return -1 if f has no space to save the + * compressed data. + * When f is wirtable and it has no space to save the compressed data, + * do fflush first, if f still has no space to save the compressed + * data, return -1. */ ssize_t qemu_put_compression_data(QEMUFile *f, const uint8_t *p, size_t size, @@ -617,7 +623,14 @@ ssize_t qemu_put_compression_data(QEMUFile *f, const uint8_t *p, size_t size, ssize_t blen = IO_BUF_SIZE - f->buf_index - sizeof(int32_t); if (blen < compressBound(size)) { - return 0; + if (!qemu_file_is_writable(f)) { + return -1; + } + qemu_fflush(f); + blen = IO_BUF_SIZE - sizeof(int32_t); + if (blen < compressBound(size)) { + return -1; + } } if (compress2(f->buf + f->buf_index + sizeof(int32_t), (uLongf *)&blen, (Bytef *)p, size, level) != Z_OK) { @@ -625,7 +638,13 @@ ssize_t qemu_put_compression_data(QEMUFile *f, const uint8_t *p, size_t size, return 0; } qemu_put_be32(f, blen); + if (f->ops->writev_buffer) { + add_to_iovec(f, f->buf + f->buf_index, blen); + } f->buf_index += blen; + if (f->buf_index == IO_BUF_SIZE) { + qemu_fflush(f); + } return blen + sizeof(int32_t); } diff --git a/migration/ram.c b/migration/ram.c index 704f6a9..4de13c2 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -817,7 +817,11 @@ static int do_compress_ram_page(CompressParam *param) RAM_SAVE_FLAG_COMPRESS_PAGE); blen = qemu_put_compression_data(param->file, p, TARGET_PAGE_SIZE, migrate_compress_level()); - bytes_sent += blen; + if (blen < 0) { + error_report("Insufficient buffer for compressed data!"); + } else { + bytes_sent += blen; + } return bytes_sent; }