From patchwork Fri Apr 8 06:26:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8781041 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B5FD9C0553 for ; Fri, 8 Apr 2016 06:33:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19694201CD for ; Fri, 8 Apr 2016 06:33:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 53CF4200FF for ; Fri, 8 Apr 2016 06:33:18 +0000 (UTC) Received: from localhost ([::1]:54237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoPyn-0001zL-Lx for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 02:33:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoPty-0000xD-5O for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:28:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoPtv-00072J-8B for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:28:17 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:64130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoPtu-000713-Hs for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:28:15 -0400 Received: from 172.24.1.51 (EHLO szxeml425-hub.china.huawei.com) ([172.24.1.51]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BZM20077; Fri, 08 Apr 2016 14:27:48 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.235.1; Fri, 8 Apr 2016 14:27:42 +0800 From: zhanghailiang To: Date: Fri, 8 Apr 2016 14:26:14 +0800 Message-ID: <1460096797-14916-13-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1460096797-14916-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1460096797-14916-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.57074F65.0058, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: baf40f8c4cfd221bb7a1e302de949d16 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Subject: [Qemu-devel] [PATCH COLO-Frame v16 12/35] ram/COLO: Record the dirty pages that SVM received X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xiecl.fnst@cn.fujitsu.com, lizhijian@cn.fujitsu.com, quintela@redhat.com, armbru@redhat.com, yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, zhanghailiang , arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com, hongyang.yang@easystack.cn Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We record the address of the dirty pages that received, it will help flushing pages that cached into SVM. We record them by re-using migration dirty bitmap. Signed-off-by: zhanghailiang Reviewed-by: Dr. David Alan Gilbert --- v16: - Use the new wrapper memory_region_get_ram_addr() modified in commit 7ebb2745 v12: - Add Reviewed-by tag v11: - Split a new helper function from original host_from_stream_offset() (Dave's suggestion) - Only do recording work in this patch v10: - New patch split from v9's patch 13 - Rebase to master to use 'migration_bitmap_rcu' --- migration/ram.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 85e2378..0af43d4 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2196,6 +2196,9 @@ static inline void *host_from_ram_block_offset(RAMBlock *block, static inline void *colo_cache_from_block_offset(RAMBlock *block, ram_addr_t offset) { + unsigned long *bitmap; + long k; + if (!offset_in_ramblock(block, offset)) { return NULL; } @@ -2204,6 +2207,17 @@ static inline void *colo_cache_from_block_offset(RAMBlock *block, __func__, block->idstr); return NULL; } + + k = (memory_region_get_ram_addr(block->mr) + offset) >> TARGET_PAGE_BITS; + bitmap = atomic_rcu_read(&migration_bitmap_rcu)->bmap; + /* + * During colo checkpoint, we need bitmap of these migrated pages. + * It help us to decide which pages in ram cache should be flushed + * into VM's RAM later. + */ + if (!test_and_set_bit(k, bitmap)) { + migration_dirty_pages++; + } return block->colo_cache + offset; } @@ -2590,6 +2604,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) int colo_init_ram_cache(void) { RAMBlock *block; + int64_t ram_cache_pages = last_ram_offset() >> TARGET_PAGE_BITS; rcu_read_lock(); QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { @@ -2604,6 +2619,15 @@ int colo_init_ram_cache(void) } rcu_read_unlock(); ram_cache_enable = true; + /* + * Record the dirty pages that sent by PVM, we use this dirty bitmap together + * with to decide which page in cache should be flushed into SVM's RAM. Here + * we use the same name 'migration_bitmap_rcu' as for migration. + */ + migration_bitmap_rcu = g_new0(struct BitmapRcu, 1); + migration_bitmap_rcu->bmap = bitmap_new(ram_cache_pages); + migration_dirty_pages = 0; + return 0; out_locked: @@ -2621,9 +2645,15 @@ out_locked: void colo_release_ram_cache(void) { RAMBlock *block; + struct BitmapRcu *bitmap = migration_bitmap_rcu; ram_cache_enable = false; + atomic_rcu_set(&migration_bitmap_rcu, NULL); + if (bitmap) { + call_rcu(bitmap, migration_bitmap_free, rcu); + } + rcu_read_lock(); QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { if (block->colo_cache) {