From patchwork Tue Mar 13 07:57:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 10277865 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6CBFE602C2 for ; Tue, 13 Mar 2018 07:58:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 577C328BDA for ; Tue, 13 Mar 2018 07:58:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C24A28BE4; Tue, 13 Mar 2018 07:58:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEA7028BDA for ; Tue, 13 Mar 2018 07:58:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbeCMH6B (ORCPT ); Tue, 13 Mar 2018 03:58:01 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:44864 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089AbeCMH6A (ORCPT ); Tue, 13 Mar 2018 03:58:00 -0400 Received: by mail-pl0-f66.google.com with SMTP id 9-v6so10877843ple.11 for ; Tue, 13 Mar 2018 00:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AhWu5ni7+B7HBhgDVq+1XMx0LwMo8iKYF+uZn6w/NuE=; b=Sc65Xp5xxcduePddcIb4cTfysahY71i47+Vvo2T/1oPewmJuxAdIrB2D64L4Y9litF nfNxKJqoPcXiVzC+BNECELCFIoadeUrk/rkjjcNG1m1rv2OYQLe0fMdo0Qt7gbBDc0Ui OklHTvd4yo1DEKyUhX7lA3pBBLXwxIH8MXawDtxfWdG8DP17NgxvFoQUyw3LBQ0t+YLq vAjUfn2akGF7tYLxevBRsUkPwd2qwPRFrbLbCbg57WNQBhGGLTckqRhr8k1MhOpjPY0K f8uhAGD+Aep/WGMJlL2+hMMtdwPIMIr7J9wwdX9gn065nlc1mT3K9SXNQK80OIJiKjEh /p4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AhWu5ni7+B7HBhgDVq+1XMx0LwMo8iKYF+uZn6w/NuE=; b=E0arzmcjW7FHqMvQ7mQEeOLSBexDA1tx8R7pxbjfdu9+JqEoXKxTqTh2HA7tLGmdsE aK/LqxacjFsiFhLEFoBRPG36P9wm2E36DJQtLRKfovLGRsv2zv0Mn2uEh6ZwWUVQhrKi n7VF8ozgm93vXS2RJWq18ALQViw8xBbDhyeIQ2WZvM6xWIaT1vA9WHnUJ3FOEMQXEhDv 4Is7uKQK76vtQrIw8RXis+DAui2V3ZJ3NNlC8XKXVwMyK/HmTD9h/kaCZS318zpPfYW4 EAqlalInCC/bql0I85wyUQZfuVj8D/qBJLrkFbGJsZlDtlEpUkdfwUUPyD3JRdZBHBNE 4q5g== X-Gm-Message-State: AElRT7E9imoXJp7nG7wY4+cDMw5LcBCwz4auvh5WPybSrR9LWTWstaLT bUWXfldVVP4lLsJwIFpQrKw= X-Google-Smtp-Source: AG47ELtZu92sURJonDydm19Xq8vC7GwbrA/2mCFXTdp+95QNlAC3AQtmzcCp2KsDwiNagCuZbT79yg== X-Received: by 2002:a17:902:8c93:: with SMTP id t19-v6mr10702607plo.304.1520927879869; Tue, 13 Mar 2018 00:57:59 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.35]) by smtp.gmail.com with ESMTPSA id x4sm16756537pgv.72.2018.03.13.00.57.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 00:57:59 -0700 (PDT) From: guangrong.xiao@gmail.com X-Google-Original-From: xiaoguangrong@tencent.com To: pbonzini@redhat.com, mst@redhat.com, mtosatti@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Xiao Guangrong Subject: [PATCH 3/8] migration: support to detect compression and decompression errors Date: Tue, 13 Mar 2018 15:57:34 +0800 Message-Id: <20180313075739.11194-4-xiaoguangrong@tencent.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313075739.11194-1-xiaoguangrong@tencent.com> References: <20180313075739.11194-1-xiaoguangrong@tencent.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Xiao Guangrong Currently the page being compressed is allowed to be updated by the VM on the source QEMU, correspondingly the destination QEMU just ignores the decompression error. However, we completely miss the chance to catch real errors, then the VM is corrupted silently To make the migration more robuster, we copy the page to a buffer first to avoid it being written by VM, then detect and handle the errors of both compression and decompression errors properly Signed-off-by: Xiao Guangrong --- migration/qemu-file.c | 4 ++-- migration/ram.c | 29 +++++++++++++++++++---------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 1ff33a1ffb..137bcc8bdc 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -711,9 +711,9 @@ ssize_t qemu_put_compression_data(QEMUFile *f, z_stream *stream, blen = qemu_compress_data(stream, f->buf + f->buf_index + sizeof(int32_t), blen, p, size); if (blen < 0) { - error_report("Compress Failed!"); - return 0; + return -1; } + qemu_put_be32(f, blen); if (f->ops->writev_buffer) { add_to_iovec(f, f->buf + f->buf_index, blen, false); diff --git a/migration/ram.c b/migration/ram.c index fff3f31e90..c47185d38c 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -273,6 +273,7 @@ struct DecompressParam { bool quit; QemuMutex mutex; QemuCond cond; + QEMUFile *file; void *des; uint8_t *compbuf; int len; @@ -1051,11 +1052,13 @@ static int do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block, { RAMState *rs = ram_state; int bytes_sent, blen; - uint8_t *p = block->host + (offset & TARGET_PAGE_MASK); + uint8_t buf[TARGET_PAGE_SIZE], *p; + p = block->host + (offset & TARGET_PAGE_MASK); bytes_sent = save_page_header(rs, f, block, offset | RAM_SAVE_FLAG_COMPRESS_PAGE); - blen = qemu_put_compression_data(f, stream, p, TARGET_PAGE_SIZE); + memcpy(buf, p, TARGET_PAGE_SIZE); + blen = qemu_put_compression_data(f, stream, buf, TARGET_PAGE_SIZE); if (blen < 0) { bytes_sent = 0; qemu_file_set_error(migrate_get_current()->to_dst_file, blen); @@ -2547,7 +2550,7 @@ static void *do_data_decompress(void *opaque) DecompressParam *param = opaque; unsigned long pagesize; uint8_t *des; - int len; + int len, ret; qemu_mutex_lock(¶m->mutex); while (!param->quit) { @@ -2563,8 +2566,12 @@ static void *do_data_decompress(void *opaque) * not a problem because the dirty page will be retransferred * and uncompress() won't break the data in other pages. */ - qemu_uncompress(¶m->stream, des, pagesize, - param->compbuf, len); + ret = qemu_uncompress(¶m->stream, des, pagesize, + param->compbuf, len); + if (ret < 0) { + error_report("decompress data failed"); + qemu_file_set_error(param->file, ret); + } qemu_mutex_lock(&decomp_done_lock); param->done = true; @@ -2581,12 +2588,12 @@ static void *do_data_decompress(void *opaque) return NULL; } -static void wait_for_decompress_done(void) +static int wait_for_decompress_done(QEMUFile *f) { int idx, thread_count; if (!migrate_use_compression()) { - return; + return 0; } thread_count = migrate_decompress_threads(); @@ -2597,6 +2604,7 @@ static void wait_for_decompress_done(void) } } qemu_mutex_unlock(&decomp_done_lock); + return qemu_file_get_error(f); } static void compress_threads_load_cleanup(void) @@ -2635,7 +2643,7 @@ static void compress_threads_load_cleanup(void) decomp_param = NULL; } -static int compress_threads_load_setup(void) +static int compress_threads_load_setup(QEMUFile *f) { int i, thread_count; @@ -2654,6 +2662,7 @@ static int compress_threads_load_setup(void) } decomp_param[i].stream.opaque = &decomp_param[i]; + decomp_param[i].file = f; qemu_mutex_init(&decomp_param[i].mutex); qemu_cond_init(&decomp_param[i].cond); decomp_param[i].compbuf = g_malloc0(compressBound(TARGET_PAGE_SIZE)); @@ -2708,7 +2717,7 @@ static void decompress_data_with_multi_threads(QEMUFile *f, */ static int ram_load_setup(QEMUFile *f, void *opaque) { - if (compress_threads_load_setup()) { + if (compress_threads_load_setup(f)) { return -1; } @@ -3063,7 +3072,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) } } - wait_for_decompress_done(); + ret |= wait_for_decompress_done(f); rcu_read_unlock(); trace_ram_load_complete(ret, seq_iter); return ret;