From patchwork Fri Dec 23 14:28:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 708496 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tlbmq0jb3z9t1F for ; Sat, 24 Dec 2016 05:01:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="RovNnwG6"; dkim-atps=neutral Received: from localhost ([::1]:40270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKU9n-0007zK-2i for incoming@patchwork.ozlabs.org; Fri, 23 Dec 2016 13:01:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKU93-0007dx-VC for qemu-devel@nongnu.org; Fri, 23 Dec 2016 13:00:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cKU93-00049r-4R for qemu-devel@nongnu.org; Fri, 23 Dec 2016 13:00:42 -0500 Received: from mail-he1eur01on0131.outbound.protection.outlook.com ([104.47.0.131]:38303 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cKU8v-00046F-Ui; Fri, 23 Dec 2016 13:00:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=OcZyOYy6ryE5Imh6+JTbLY9pVlOeuIVvvdKoh0Ed59w=; b=RovNnwG62IISTl23e0la1cCpYTQU9Ou8rd3plO5RHk6mYotq+4cfZPTUqeLAK9GUp+T8FqnWDXRCJCvej+dcgQ+61+bBRj7bwZfPhtQ2QMSbsT17wNLZHsHiFMm/7Ew/MYBTiG2Ga6VSbLVrQur5/iXKvXEFLCeg+QH0NfKJG2U= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; Received: from vova-amd.qa.sw.ru (31.173.86.249) by HE1PR0801MB2058.eurprd08.prod.outlook.com (10.168.95.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11; Fri, 23 Dec 2016 14:29:21 +0000 From: Vladimir Sementsov-Ogievskiy To: , Date: Fri, 23 Dec 2016 17:28:45 +0300 Message-ID: <1482503344-6424-3-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1482503344-6424-1-git-send-email-vsementsov@virtuozzo.com> References: <1482503344-6424-1-git-send-email-vsementsov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [31.173.86.249] X-ClientProxiedBy: AM5PR0101CA0022.eurprd01.prod.exchangelabs.com (10.169.240.32) To HE1PR0801MB2058.eurprd08.prod.outlook.com (10.168.95.23) X-MS-Office365-Filtering-Correlation-Id: b5924a40-eea5-4ac8-47f6-08d42b40172c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:HE1PR0801MB2058; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2058; 3:2I9Vtk4nvfwNONWFspoOCkuGAbAnqO7siXgxjTKYs5ppJMkgwNl5j1rj61uMbyuum2mmXlG2kl441E52bOLx6z1quCnsLX9Si7NJc4jNL4kBTjNlqHSgpQbSKsledGQIaFrqQ6A51rui37J8abYZeBa4PBA4JyvHWUXP0VqcqS89qBNHtayan3x788k4aGNN3H7RHWu8WWe1HgCp+hbZiS4qVypntE5oI4RNvU7uZjnC+Xugjs9s6D2U7XjbsM6vFCflmnw2yg1agM90ZgWNKA==; 25:8+4CJJAJexwwv1A9ejeAqf20q671Gb06PSuSkkVyioU/gIw9NFqqQ0exfLxamiQcZbTCamogzzUTRVw4FKJCHaFbejMW4ekl9otjZbEh1VJAelHlzU4DbaNuJJQcuFQEjI9k17GnVSquC2cBzQSS64zrEu3QGTq/aRQE/sSI3CyNwAKLcvBZxFVnQaTKRcaMYy989otGJz1Pyjt/fnzIPdFdjTiIguI39QxKErPXIBtXOGp1FEKVnmCu8Tng0NEuSAvej+0XbHEFBbRqiKd+sRt/IoKq5DM5ZFtNON2viKga7kzElAO5orDdsxNwkC93d4IGuSN3KMfJM8KoHTQEoVnKY6rXwEmBLOn4Nu26KMIMy7vWvO5IpW8kmiH+A2FDOWT5UCPESPob8hKQ57ZFDynRtXiZzLiSE96J4m2+DpCEXNcW2Oxg+g1VclwXV4OuUep3glrugQwLDcZ5Wzi9hA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2058; 31:d9b0ofi6Lr9ikJeq8o7OnLXKEH69a5LhrrUjUWjS291JPZNiw++I4jUNSrY+9PKW7SA41VG0TprbFWpbsXss4LECDUef7eLcKCFHLc3H48E9RNluOxtZ8bMhotvHvtorsHDPTrZFMZP/LQ7MG/+8qIhMwQMkqmYu/zkysUPHbo3v4Q4lB3d3WowkFQHrStf0+5nJKUC/7qUx2+MjzNNYtBjO2hsvwfwMmR0UpHfxZ2521idQY6Wrx4B045qcQdhY; 20:qZuXPTCnAd7kv8nfxZNtIbm3ez0yWfxSyHVWFl6D2bXFWLuCFb0Bj5QAmsUF9WzjapLrTkCp8PQqCWW6kGR0h+zG/6rtBhLCNQkWhScXpYzX5jkJabV5KcezWePtHLOpURyMURo76lw1yntvt3a0uQJJoFO3dagt+0Yxot7rFNJ5vkRU0klmCIG4E49UCxf821B7f3mms/w7dJWqmVuhJeRoXjQqFZRYQx7a6kwtkbcz/yCxbuJOg0gfkAejkLl7 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123560025)(20161123562025)(6072148); SRVR:HE1PR0801MB2058; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB2058; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2058; 4:lG5C5xInodteJnyG58gDSMQvvUCpLKhTtzJqo9kBJ7KwEn/Y8ybogusNlnDQAe59ceUQ9/bayazsD4y3QjPsAYwTUt1HRZ4A09KfnuDptFoxK/mSbf15JLp0rAsbpvW5oP34JBWFRTZ6w9PP3GNMEry9KkEjxuaky5+SR+xz6i0KVpfXdPshJckIoNK1oMrj1/mNmAZA9yABAwJl8lV/ED502yEnsdnj29DnqM9Tqfz7vCJ9U/W9HSyhEftjhtDOft6Ajt7XxVbDp7l9JWHkILvqVI/FADOwWosV9fkAiO+iscHFFVtT1f/tHStlnTHo2KPEn2RtkQDz5KZ0EnFp4KwpgDAcqJ/xjhovCOIFWLqdSjSyE/LT0VSkCe2S0i2yXmT+dfYi7Y639e1OTr7g+uBtHK9UrHEIxd037e4T08h1CgIcyJ1miRF4UtufbWJVW8Sw2g6x4NH4NKr3IbeIHBt1Va6sKDxP5afAQLkeTRlsoc8HexBT/jWL2JRcPur+GtagjTpbPjLDIIQ0p6xGNASDAD60j+bgIJ+5Sx8aLjA/spwWHzuZM/PuvprSLtiF X-Forefront-PRVS: 016572D96D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(39450400003)(189002)(199003)(105586002)(50466002)(38730400001)(106356001)(2906002)(50986999)(25786008)(6486002)(6512006)(6506006)(53416004)(3846002)(33646002)(5001770100001)(6116002)(97736004)(42186005)(5660300001)(47776003)(101416001)(189998001)(36756003)(66066001)(48376002)(7736002)(305945005)(4326007)(6666003)(86362001)(8676002)(81156014)(92566002)(5003940100001)(76176999)(2950100002)(50226002)(68736007)(81166006)(7099028); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB2058; H:vova-amd.qa.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0801MB2058; 23:TB7jpEv8be5BebApOe0dqg24F01OHOLdEsNhpfc?= =?us-ascii?Q?9lO5Z88Piq2Qr95p7b8IEWNmj+Wl814qWooy4phTMfaLWud4NBZHQ0l0MUZw?= =?us-ascii?Q?Xm7hgy1ppZWSeJ8gmHKfEECsQEj9m6JJbKdkzKWyA1AaBQ5Mig6tf+mzFEFI?= =?us-ascii?Q?iQ09ZjmPae2Dc87CuLDJFsjANLUuByhb8J+PYvDjGHlF28Cr+in3zdaLQO2v?= =?us-ascii?Q?wVbymSl+lvAhCcvFh5HOwJrmic2vh0Y0nwQWNzACKblJ25DmsjAGs4j7Pixq?= =?us-ascii?Q?UGWQh5ot+XVKzGiFCn3vSL5wWf78SKNEv2jI8uSZX2LsftgadIyQTjR2wI5O?= =?us-ascii?Q?L2UgX8qKpN1jxTxvySQnsYu5nkHIAMhw5zaW5o82p53/QuB9NCIpmJ+KfiQE?= =?us-ascii?Q?5A14adrctg8FWpxM80Ns4lvBpLM9ChRRRD8G32hJUX909rlOw2kuEmUcRO1X?= =?us-ascii?Q?Lf3T4w7whN8pe63eT0FeWOPrBWJ3cX7k2Vo/DPwxg6cIyDRqwSJvd364ET42?= =?us-ascii?Q?aRfsWm97IER2qUHSkGc0a4qyF3yCwQhePNwY5Dd86VjkCcQ35J7d/C9u1urX?= =?us-ascii?Q?LNJs9Qn8gKXf32ZIHTmjLsouIyVYOUGBydOi6/aK8l7IL+sJiZGsdQTsjlCy?= =?us-ascii?Q?E9JBc8b7qE/3DqPC2X1hGTetWnsjSCs8/cBF5GRQANFMox8iShgtRg2ng2we?= =?us-ascii?Q?rQ6WW1giG9Vy1NrIS6KLK4Hz/OkpH7UhT137wr0iQy7UfH/VOxL8rQphsbco?= =?us-ascii?Q?Tu92XblYo+HRWjkV42oX1Nihqbh5PA3tM9eVYRKEHdf5PW+i8JdZiD1xsJeO?= =?us-ascii?Q?jaGVoh9i6iZMgauRzpISSYYtsGKc2d+rerSBAjMdM6kQZn8ZP5sKdlOQxjtA?= =?us-ascii?Q?s2oFHP72jWRlOXPv7kapg3strAWiMnIW8Ymzq6Iaza5ip4jffS/OW+pC/9TI?= =?us-ascii?Q?amnYfd4G0QAFTW0z0ukKC9DWMjSu97maWoj9k8ewdRiQrkgKRMWT0cdWGlLh?= =?us-ascii?Q?FI6a699+0CLZB+ZuoNEIKkKD+uJzJxXN9CmsRzjKqQvCisWHeuL2KqH41kBi?= =?us-ascii?Q?DyWbi/heooSrdq0Efm3eRbiVkF+6+tpUDQq+bIo74ef8oYydvTA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2058; 6:WkwWdYY/rWiVHSbr8RhieUZlM+ws4n9o1VxQI+Gvf3+RF0ib3HsbuZzfxM6MsXzmHUsw7NOfALu3rI+3eN677OwsuI9m9JSccxVMsI4yNQvJT85Aar7Fb7r6gfok9m2ss4p9qgx0JdbcZsRBSTyJ5dKbcEyd7zC6rXlMaOCRDtPNdyPxVfghQn3BHp/j986f0okJuahIPJ3VcdEmRgYiNIdVexEvZcYfkCK7ydjG0Cr+XWJBcciLrH0Wii1oBlb5hWgmI3A+AnUcsSqM3a0kHrXH2i+XuP9VZD8q3pEkTCpgO40WRFyJYgKtF1vQygua3093fFyCceexw+5jXrfg9xuMFAKX3JF7hl4j9gC+2Ni9M08VFPWT4bLBJuHs6bEk9+6rjJBbqOxMlI2VrjR/zBy7yPbXkR2n4wtGJRmLbKQ=; 5:OwXNmTDN5DTKAUKxTLXj3tYGt4eyuSbD7VGaJygoZnYoQJOUBNyU5V7wRFNe09dJqWHIxxkwD0soghzOwm8wSghV+fbphevlvoNircx0BOvq007qv6D1QIMhRenaVMbEg/KyZ2G34yo9hOBhmmiDkA==; 24:5trWbLcA2TxozZEb4yOV+iZdXaSL6FiuK21VKzSQ2Eu0KT9caFySmXIebbWN35pRH0GQuJiHe/07cuHEm0W4krf0vtNUebNKre4eJGBf9+g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2058; 7:4KGMM/p5Kg64YYjTgedxVPDSDcI/6YlPzk143Y+rlKEpT6sMkAgxbSJoJQd8ghXC9PLy6BmR2iGZ1Xj6UrBsG4YjoOg21vdGv8jxYHQlyogkKQjwZVOrzhemBavDfNMyU0QzadBdOC5An+ppMQs0/z6dto9QshfrzWo5MC4jCiJu8My5JC3N52o7FctodFOE0OU9ZZ03eBtDaeAXrghHm+L8mbIpYYHNGuHshP+RNyrwx2FNIW8vuzh3L/Xm1XYPSH4XWEp+qwsiszZxEwrQUBb3WG6cMIx3aEmd31bxZmqTAQGyDgMZIYEsJHa5+yZAC3bk4lsA9sh8dDgE47ixy0RlZAJhcz8CS984Gl7ai+eHsofZtZ54WwxCB7pEDCtoY2ZZbXZTIFFZhUsXvX9o4GXkboBpqkCeqiQuQZKt0cZPS/pWMJt/qix22iCnDH5TM6ZviOItU7aFzO97MrWRxg==; 20:52MrOB8Z5rHZt8jCqgECTZ6iXNpOLzjgyeIPOj+DejdNfQzlq4XHf8Cb4S0HpGgNBv2t3z42b9VHY4ywDPRP4QoL6J6+WfwlJJUYxZ6I3w5tpMR0rIi/e5ox5myAwVwnw4KsXGnAOiAmiAYeWjqPs7Lyo3dA6J+tGSc+P0u5jIU= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2016 14:29:21.7028 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB2058 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.0.131 Subject: [Qemu-devel] [PATCH 02/21] backup: init copy_bitmap from sync_bitmap for incremental 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: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, jcody@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We should not copy non-dirty clusters in write notifiers. So, initialize copy_bitmap from sync_bitmap. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/backup.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/block/backup.c b/block/backup.c index 6b27e55..621b1c0 100644 --- a/block/backup.c +++ b/block/backup.c @@ -437,6 +437,34 @@ out: return ret; } +/* init copy_bitmap from sync_bitmap */ +static void backup_incremental_init_copy_bitmap(BackupBlockJob *job) +{ + int64_t sector; + BdrvDirtyBitmapIter *dbi; + uint32_t sect_gran = + bdrv_dirty_bitmap_granularity(job->sync_bitmap) >> BDRV_SECTOR_BITS; + int64_t sz = bdrv_dirty_bitmap_size(job->sync_bitmap); + int64_t sectors_per_cluster = cluster_size_sectors(job); + uint32_t cl_gran = MAX(1, sect_gran / sectors_per_cluster); + + dbi = bdrv_dirty_iter_new(job->sync_bitmap, 0); + while ((sector = bdrv_dirty_iter_next(dbi)) != -1) { + int64_t cluster = sector / sectors_per_cluster; + int64_t next_sector = (cluster + cl_gran) * sectors_per_cluster; + + hbitmap_set(job->copy_bitmap, cluster, cl_gran); + + if (next_sector >= sz) { + break; + } + + bdrv_set_dirty_iter(dbi, (cluster + cl_gran) * sectors_per_cluster); + } + + bdrv_dirty_iter_free(dbi); +} + static void coroutine_fn backup_run(void *opaque) { BackupBlockJob *job = opaque; @@ -453,20 +481,22 @@ static void coroutine_fn backup_run(void *opaque) end = DIV_ROUND_UP(job->common.len, job->cluster_size); job->copy_bitmap = hbitmap_alloc(end, 0); - hbitmap_set(job->copy_bitmap, 0, end); job->before_write.notify = backup_before_write_notify; bdrv_add_before_write_notifier(bs, &job->before_write); if (job->sync_mode == MIRROR_SYNC_MODE_NONE) { + hbitmap_set(job->copy_bitmap, 0, end); while (!block_job_is_cancelled(&job->common)) { /* Yield until the job is cancelled. We just let our before_write * notify callback service CoW requests. */ block_job_yield(&job->common); } } else if (job->sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) { + backup_incremental_init_copy_bitmap(job); ret = backup_run_incremental(job); } else { + hbitmap_set(job->copy_bitmap, 0, end); /* Both FULL and TOP SYNC_MODE's require copying.. */ for (; start < end; start++) { bool error_is_read;