From patchwork Thu Jul 19 12:15:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 10534255 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 E85FF601D2 for ; Thu, 19 Jul 2018 12:16:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7968293A6 for ; Thu, 19 Jul 2018 12:16:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9DFD294F4; Thu, 19 Jul 2018 12:16:11 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, 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 A5DEB293A6 for ; Thu, 19 Jul 2018 12:16:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731573AbeGSM7B (ORCPT ); Thu, 19 Jul 2018 08:59:01 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:38086 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731313AbeGSM7B (ORCPT ); Thu, 19 Jul 2018 08:59:01 -0400 Received: by mail-pl0-f66.google.com with SMTP id b1-v6so3577888pls.5 for ; Thu, 19 Jul 2018 05:16:08 -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=jL/6YSOrNyL/s7T74f7jW6HHfWELAyr7TPcJtMb86yk=; b=CavB5tmOx/YDEIys4RvgT2p6mAK95q4AZjp4IThQhZsu5rt5LwoRSxU2PV1fH6LojU SSS8BEL3ZmVIMn9aJKTwTxRlZlXsysFI8ELcegq2E/AZt91XQvWaBenLU2nJd/gqwlHB Spt+m2fIGmFl7P+wM4fPVvudtZFvql+W+PUw6POxciuVaEbze73vvHoL1YDwKtVQ8FNz Vn3iF6kvsuNCYtC/072s6VCfRz2Bh9ornjgiBwpblKVVHC/bj9C5WSUjllf8uZt7XOgH sV3kbIydNLrpPw8zRj2ptoWaAY/wq9k1BRLuWHTH4O39oYMbhXRb5F1qmQhDCOP5cobq GonA== 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=jL/6YSOrNyL/s7T74f7jW6HHfWELAyr7TPcJtMb86yk=; b=H1IcNvVo41R4Dne2plnGcsYGjP0iddD44/l0mm7Ypx/ArKHIIiWjmgldtTWiIoNodx eSsF2UThMqJoaFMFPCpztOxApw7a3HNlz53XpA8zsFe+t+yaFyeDUqeEyUvO/8l1zHNQ v7nls4nn1VOT5bk9B5iGmGIufhYC0B4IdhyhiGKPBa7rDOvs8n0bDJ4aJQgGR8/9wlpf WvclYcAPC6vDIpPAKJwY3wd7NYDdmZfURfFVSXfuo/Pq8Sh0srULfgISAUtRjum3y6Lc txY7rKcAF7Q2YhGcCcpz5LdwRN4jM5rPnud75mLYMFd5rPHz/TW7HIpTu6vFAJR3rd50 gbTw== X-Gm-Message-State: AOUpUlH26qr6gGXxipsme20gtZEs/I5cfhp+oaBJIfVO8UxKXkwQuTpd 8LiBgJMkzUqPv4QHgzMriO0= X-Google-Smtp-Source: AAOMgpdRFhLQGFOuDoLK8+53PHsuaQb2i3Fi4BFpHQW5AiSPV6kt5CLvtO8kvxDG1v1wa3iWFOdIEg== X-Received: by 2002:a17:902:8207:: with SMTP id x7-v6mr9787553pln.57.1532002568733; Thu, 19 Jul 2018 05:16:08 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.37]) by smtp.gmail.com with ESMTPSA id h190-v6sm21270456pge.85.2018.07.19.05.16.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jul 2018 05:16:08 -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, dgilbert@redhat.com, peterx@redhat.com, wei.w.wang@intel.com, jiang.biao2@zte.com.cn, eblake@redhat.com, Xiao Guangrong Subject: [PATCH v2 8/8] migration: do not flush_compressed_data at the end of each iteration Date: Thu, 19 Jul 2018 20:15:20 +0800 Message-Id: <20180719121520.30026-9-xiaoguangrong@tencent.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180719121520.30026-1-xiaoguangrong@tencent.com> References: <20180719121520.30026-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 flush_compressed_data() needs to wait all compression threads to finish their work, after that all threads are free until the migration feeds new request to them, reducing its call can improve the throughput and use CPU resource more effectively We do not need to flush all threads at the end of iteration, the data can be kept locally until the memory block is changed or memory migration starts over in that case we will meet a dirtied page which may still exists in compression threads's ring Signed-off-by: Xiao Guangrong --- migration/ram.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 89305c7af5..fdab13821d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -315,6 +315,8 @@ struct RAMState { uint64_t iterations; /* number of dirty bits in the bitmap */ uint64_t migration_dirty_pages; + /* last dirty_sync_count we have seen */ + uint64_t dirty_sync_count; /* protects modification of the bitmap */ QemuMutex bitmap_mutex; /* The RAMBlock used in the last src_page_requests */ @@ -2532,6 +2534,7 @@ static void ram_save_cleanup(void *opaque) } xbzrle_cleanup(); + flush_compressed_data(*rsp); compress_threads_save_cleanup(); ram_state_cleanup(rsp); } @@ -3203,6 +3206,17 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) ram_control_before_iterate(f, RAM_CONTROL_ROUND); + /* + * if memory migration starts over, we will meet a dirtied page which + * may still exists in compression threads's ring, so we should flush + * the compressed data to make sure the new page is not overwritten by + * the old one in the destination. + */ + if (ram_counters.dirty_sync_count != rs->dirty_sync_count) { + rs->dirty_sync_count = ram_counters.dirty_sync_count; + flush_compressed_data(rs); + } + t0 = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); i = 0; while ((ret = qemu_file_rate_limit(f)) == 0 || @@ -3235,7 +3249,6 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) } i++; } - flush_compressed_data(rs); rcu_read_unlock(); /*