From nobody Mon Feb 9 09:09:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562715058; cv=none; d=zoho.com; s=zohoarc; b=dQgsNHqb6zBSK8gg+dY1I+KDerg3QeHLb+YNLKp/KunLplbyAJe3+bZVmubIQ/1DAnHg8xlbkZojXL0WvxTMBvb3/52cQyeZa58m0gEZQR5ApF9ohdPeK+ez9IADm9VSQpy6ZWZ320N864DYJaYQY10Tl86d4t6yphfHZWQPQ9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562715058; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=aK0QZEXEAUsEalt2U9VgRMO+PCEwb1K+u8537UUt+3M=; b=FLeuv1MoN5HtFLFHcOQVzMsm4LA/thERqPvF/uozTvw+4qSZVQQfC1B0CFofGG2TYdOFEktZdzWW3fXljHe+OXVkbjhZzoI+A6AI9qGz+LATXreQhcrPyfIWT+yrr4YAws3yK48c1LCYLtxqzZPJuWWFX3tezgbBGFtAqinXXdw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562715058701417.1363794043376; Tue, 9 Jul 2019 16:30:58 -0700 (PDT) Received: from localhost ([::1]:56800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkzZS-0001Qk-A8 for importer@patchew.org; Tue, 09 Jul 2019 19:30:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48680) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkzVD-0007Fh-Q7 for qemu-devel@nongnu.org; Tue, 09 Jul 2019 19:26:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkzVB-0002zu-KY for qemu-devel@nongnu.org; Tue, 09 Jul 2019 19:26:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkzV6-0002fz-1E; Tue, 09 Jul 2019 19:26:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 17DE68666A; Tue, 9 Jul 2019 23:26:09 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-215.bos.redhat.com [10.18.17.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF0845B80B; Tue, 9 Jul 2019 23:26:07 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Tue, 9 Jul 2019 19:25:40 -0400 Message-Id: <20190709232550.10724-9-jsnow@redhat.com> In-Reply-To: <20190709232550.10724-1-jsnow@redhat.com> References: <20190709232550.10724-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 09 Jul 2019 23:26:09 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 08/18] hbitmap: enable merging across granularities X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , vsementsov@virtuozzo.com, Juan Quintela , John Snow , Xie Changlong , "Dr. David Alan Gilbert" , Max Reitz , Stefan Hajnoczi , Wen Congyang , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: John Snow Reviewed-by: Max Reitz --- util/hbitmap.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/util/hbitmap.c b/util/hbitmap.c index 3b6acae42b..306bc4876d 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -777,7 +777,27 @@ void hbitmap_truncate(HBitmap *hb, uint64_t size) =20 bool hbitmap_can_merge(const HBitmap *a, const HBitmap *b) { - return (a->size =3D=3D b->size) && (a->granularity =3D=3D b->granulari= ty); + return (a->orig_size =3D=3D b->orig_size); +} + +/** + * hbitmap_sparse_merge: performs dst =3D dst | src + * works with differing granularities. + * best used when src is sparsely populated. + */ +static void hbitmap_sparse_merge(HBitmap *dst, const HBitmap *src) +{ + uint64_t offset =3D 0; + uint64_t count =3D src->orig_size; + + while (hbitmap_next_dirty_area(src, &offset, &count)) { + hbitmap_set(dst, offset, count); + offset +=3D count; + if (offset >=3D src->orig_size) { + break; + } + count =3D src->orig_size - offset; + } } =20 /** @@ -808,10 +828,24 @@ bool hbitmap_merge(const HBitmap *a, const HBitmap *b= , HBitmap *result) return true; } =20 + if (a->granularity !=3D b->granularity) { + if ((a !=3D result) && (b !=3D result)) { + hbitmap_reset_all(result); + } + if (a !=3D result) { + hbitmap_sparse_merge(result, a); + } + if (b !=3D result) { + hbitmap_sparse_merge(result, b); + } + return true; + } + /* This merge is O(size), as BITS_PER_LONG and HBITMAP_LEVELS are cons= tant. * It may be possible to improve running times for sparsely populated = maps * by using hbitmap_iter_next, but this is suboptimal for dense maps. */ + assert(a->size =3D=3D b->size); for (i =3D HBITMAP_LEVELS - 1; i >=3D 0; i--) { for (j =3D 0; j < a->sizes[i]; j++) { result->levels[i][j] =3D a->levels[i][j] | b->levels[i][j]; --=20 2.21.0