From nobody Sat May 18 23:55:21 2024 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563411968; cv=none; d=zoho.com; s=zohoarc; b=QzAc1ioOp/xcbET++5yhyohvrqxXx61p8w4SruxTLDfdkLrMuv80b7iqC9Vc62sp835/bZMWaO/xu2yDfWvNVJEXHKiZH+NXNJnCKtcx88TtWcTb7gfWNi2p/E/nerd1yiquaJgspNmKy7Vbu0qt24ViqiGHjdujwVaIoH5oZXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563411968; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=m3AqCasUMtUuD9d1Nk9pNnwrqjP9H+/enBY8F5yOdcY=; b=KEAbiUmyYaw7wwMyXY/kQITmU5YEl4a4SCVpDqBd8FqyF4Pf5A2cuRxyRA9L1YQcFSSe8nQ62oA/hqX32V3fJQt4E8rNttXWygdT4D46o8PfNDAV7oAZZkacbf47jF4mw2QNk0JlDT4fBIfD+W/vN2TdmHt7cYev3zuuxJv79sg= 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 1563411968351321.27803777351676; Wed, 17 Jul 2019 18:06:08 -0700 (PDT) Received: from localhost ([::1]:33520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnus2-0004hA-6q for importer@patchew.org; Wed, 17 Jul 2019 21:06:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51906) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnurk-0003kd-HS for qemu-devel@nongnu.org; Wed, 17 Jul 2019 21:05:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnurj-0003jv-Jd for qemu-devel@nongnu.org; Wed, 17 Jul 2019 21:05:48 -0400 Received: from mga02.intel.com ([134.134.136.20]:12087) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnurj-0003j4-Bm for qemu-devel@nongnu.org; Wed, 17 Jul 2019 21:05:47 -0400 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2019 18:05:45 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga004.jf.intel.com with ESMTP; 17 Jul 2019 18:05:44 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,276,1559545200"; d="scan'208";a="319489324" From: Wei Yang To: qemu-devel@nongnu.org Date: Thu, 18 Jul 2019 09:04:55 +0800 Message-Id: <20190718010456.4234-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718010456.4234-1-richardw.yang@linux.intel.com> References: <20190718010456.4234-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH v3 1/2] bitmap: get last word mask from nr directly 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: quintela@redhat.com, corentincj@iksaif.net, pl@kamp.de, peterx@redhat.com, kraxel@redhat.com, pbonzini@redhat.com, Wei Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The value left in nr is the number of bits for the last word, which could be calculate the last word mask directly. Remove the unnecessary size. Signed-off-by: Wei Yang Reviewed-by: Peter Xu --- v2: refine bitmap_set_atomic too, suggested from Peter --- util/bitmap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/util/bitmap.c b/util/bitmap.c index 1753ff7f5b..5b15249796 100644 --- a/util/bitmap.c +++ b/util/bitmap.c @@ -160,7 +160,6 @@ int slow_bitmap_andnot(unsigned long *dst, const unsign= ed long *bitmap1, void bitmap_set(unsigned long *map, long start, long nr) { unsigned long *p =3D map + BIT_WORD(start); - const long size =3D start + nr; int bits_to_set =3D BITS_PER_LONG - (start % BITS_PER_LONG); unsigned long mask_to_set =3D BITMAP_FIRST_WORD_MASK(start); =20 @@ -174,7 +173,7 @@ void bitmap_set(unsigned long *map, long start, long nr) p++; } if (nr) { - mask_to_set &=3D BITMAP_LAST_WORD_MASK(size); + mask_to_set &=3D BITMAP_LAST_WORD_MASK(nr); *p |=3D mask_to_set; } } @@ -182,7 +181,6 @@ void bitmap_set(unsigned long *map, long start, long nr) void bitmap_set_atomic(unsigned long *map, long start, long nr) { unsigned long *p =3D map + BIT_WORD(start); - const long size =3D start + nr; int bits_to_set =3D BITS_PER_LONG - (start % BITS_PER_LONG); unsigned long mask_to_set =3D BITMAP_FIRST_WORD_MASK(start); =20 @@ -208,7 +206,7 @@ void bitmap_set_atomic(unsigned long *map, long start, = long nr) =20 /* Last word */ if (nr) { - mask_to_set &=3D BITMAP_LAST_WORD_MASK(size); + mask_to_set &=3D BITMAP_LAST_WORD_MASK(nr); atomic_or(p, mask_to_set); } else { /* If we avoided the full barrier in atomic_or(), issue a @@ -221,7 +219,6 @@ void bitmap_set_atomic(unsigned long *map, long start, = long nr) void bitmap_clear(unsigned long *map, long start, long nr) { unsigned long *p =3D map + BIT_WORD(start); - const long size =3D start + nr; int bits_to_clear =3D BITS_PER_LONG - (start % BITS_PER_LONG); unsigned long mask_to_clear =3D BITMAP_FIRST_WORD_MASK(start); =20 @@ -235,7 +232,7 @@ void bitmap_clear(unsigned long *map, long start, long = nr) p++; } if (nr) { - mask_to_clear &=3D BITMAP_LAST_WORD_MASK(size); + mask_to_clear &=3D BITMAP_LAST_WORD_MASK(nr); *p &=3D ~mask_to_clear; } } --=20 2.17.1 From nobody Sat May 18 23:55:21 2024 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563411986; cv=none; d=zoho.com; s=zohoarc; b=ZiDP/J5uRO4WxuxIiDJmTEsdzYEApT/rZqF1Jq/WrpF+dmLz16JSxciK/jIOrFPsb4nry3dYedKvlvU8EF/17dVrLxzgY9bz0oCZbf/drVgqBBIvxVGivt/9wrXUyzjgFmdNKKol3FDhFpaMXPCf/7h3njZHHdWEz/dCArfkJsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563411986; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=bFJCEoneRPHblPx99Ftz5cmz1IBJHJLdHiNGo9/quhA=; b=ETZjUwN0KZAWiBUCWJQgMzWC1QRHcOtxjSDGOPfjt2BRHlFdhj0jhTE2GIAZvZTS1ol3EtwHfgBKBAoNG2UBGFVaDXNNtGPZZ5OPsbHaRvsEtEpgffRSIr/YvDXnkZyjH8+JxWE1Y6VBXoLjjABMj+T+suDBUJRlsYrcwh+ojnU= 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 1563411986272872.0162590493305; Wed, 17 Jul 2019 18:06:26 -0700 (PDT) Received: from localhost ([::1]:33530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnusL-0006Cb-8q for importer@patchew.org; Wed, 17 Jul 2019 21:06:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51921) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnuro-00040b-4n for qemu-devel@nongnu.org; Wed, 17 Jul 2019 21:05:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnurn-0003m4-45 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 21:05:52 -0400 Received: from mga02.intel.com ([134.134.136.20]:12087) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnurm-0003j4-ST for qemu-devel@nongnu.org; Wed, 17 Jul 2019 21:05:51 -0400 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2019 18:05:50 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga004.jf.intel.com with ESMTP; 17 Jul 2019 18:05:47 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,276,1559545200"; d="scan'208";a="319489334" From: Wei Yang To: qemu-devel@nongnu.org Date: Thu, 18 Jul 2019 09:04:56 +0800 Message-Id: <20190718010456.4234-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718010456.4234-1-richardw.yang@linux.intel.com> References: <20190718010456.4234-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH v3 2/2] test-bitmap: add test for bitmap_set 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: quintela@redhat.com, corentincj@iksaif.net, pl@kamp.de, peterx@redhat.com, kraxel@redhat.com, pbonzini@redhat.com, Wei Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add a test for bitmap_set. There are three cases: * Both start and end is BITS_PER_LONG aligned * Only start is BITS_PER_LONG aligned * Only end is BITS_PER_LONG aligned Signed-off-by: Wei Yang Reviewed-by: Peter Xu --- v3: * free bmap * all 1's set correctly * expand range to 2 long * check each possible of offset * add a skeleton to test both bitmap_set and bitmap_set_atomic --- tests/test-bitmap.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tests/test-bitmap.c b/tests/test-bitmap.c index cb7c5e462d..18aa584591 100644 --- a/tests/test-bitmap.c +++ b/tests/test-bitmap.c @@ -59,12 +59,67 @@ static void check_bitmap_copy_with_offset(void) g_free(bmap3); } =20 +typedef void (*bmap_set_func)(unsigned long *map, long i, long len); +static void bitmap_set_case(bmap_set_func set_func) +{ + unsigned long *bmap; + int offset; + + bmap =3D bitmap_new(BMAP_SIZE); + + /* Both Aligned, set bits [BITS_PER_LONG, 3*BITS_PER_LONG] */ + set_func(bmap, BITS_PER_LONG, 2 * BITS_PER_LONG); + g_assert_cmpuint(bmap[1], =3D=3D, -1ul); + g_assert_cmpuint(bmap[2], =3D=3D, -1ul); + g_assert_cmpint(find_first_bit(bmap, BITS_PER_LONG), =3D=3D, BITS_PER_= LONG); + g_assert_cmpint(find_next_zero_bit(bmap, 3 * BITS_PER_LONG, BITS_PER_L= ONG), + =3D=3D, 3 * BITS_PER_LONG); + + for (offset =3D 0; offset <=3D BITS_PER_LONG; offset++) { + bitmap_clear(bmap, 0, BMAP_SIZE); + /* End Aligned, set bits [BITS_PER_LONG - offset, 3*BITS_PER_LONG]= */ + set_func(bmap, BITS_PER_LONG - offset, 2 * BITS_PER_LONG + offset); + g_assert_cmpuint(bmap[1], =3D=3D, -1ul); + g_assert_cmpuint(bmap[2], =3D=3D, -1ul); + g_assert_cmpint(find_first_bit(bmap, BITS_PER_LONG), + =3D=3D, BITS_PER_LONG - offset); + g_assert_cmpint(find_next_zero_bit(bmap, + 3 * BITS_PER_LONG, + BITS_PER_LONG - offset), + =3D=3D, 3 * BITS_PER_LONG); + } + + for (offset =3D 0; offset <=3D BITS_PER_LONG; offset++) { + bitmap_clear(bmap, 0, BMAP_SIZE); + /* Start Aligned, set bits [BITS_PER_LONG, 3*BITS_PER_LONG + offse= t] */ + set_func(bmap, BITS_PER_LONG, 2 * BITS_PER_LONG + offset); + g_assert_cmpuint(bmap[1], =3D=3D, -1ul); + g_assert_cmpuint(bmap[2], =3D=3D, -1ul); + g_assert_cmpint(find_first_bit(bmap, BITS_PER_LONG), + =3D=3D, BITS_PER_LONG); + g_assert_cmpint(find_next_zero_bit(bmap, + 3 * BITS_PER_LONG + offset, + BITS_PER_LONG), + =3D=3D, 3 * BITS_PER_LONG + offset); + } + + g_free(bmap); +} + +static void check_bitmap_set(void) +{ + bitmap_set_case(bitmap_set); + bitmap_set_case(bitmap_set_atomic); +} + int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); =20 g_test_add_func("/bitmap/bitmap_copy_with_offset", check_bitmap_copy_with_offset); + g_test_add_func("/bitmap/bitmap_set", + check_bitmap_set); =20 g_test_run(); =20 --=20 2.17.1