From nobody Sun Feb 8 23:38:53 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563347537; cv=none; d=zoho.com; s=zohoarc; b=BKKEb9Ihrbh8FTrhj9/YnpirMm46s2GS6FM0i34+4ZhVOvlur2UznNJDKlb6pe+pNtycMC3WRsbTekETRlr8GLe8zn+E5MxhJMN8WiOX131BHCVyd3OkiD3e8yiutmAxDgrxQrArniLz6q8QWpUCceO4I06nZDnvGpLDLMdZspQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563347537; 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=DE9YIrbQMhPDpaiozjjV+TLSrz6OqMRum6fpKppkBgxvxCulEtInYZzPtWeBWgysEmAIslj/1A4WiKgwPb/ogwBjpzJPz7H27r/JiPnbFh6wlARRSqQvA3OBar/ToA+o3Quau1aa7rWYqaByGEL1gX4rIpdyeIxM7EDS7W1v/0E= 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 1563347537269136.00925534959674; Wed, 17 Jul 2019 00:12:17 -0700 (PDT) Received: from localhost ([::1]:54624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hne6q-0005vp-5s for importer@patchew.org; Wed, 17 Jul 2019 03:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51593) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hne6Y-00050f-1S for qemu-devel@nongnu.org; Wed, 17 Jul 2019 03:11:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hne6W-0003uX-UY for qemu-devel@nongnu.org; Wed, 17 Jul 2019 03:11:57 -0400 Received: from mga05.intel.com ([192.55.52.43]:60321) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hne6W-0003sM-L7 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 03:11:56 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2019 00:11:55 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga008.jf.intel.com with ESMTP; 17 Jul 2019 00:11:53 -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,273,1559545200"; d="scan'208";a="161670181" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 15:11:13 +0800 Message-Id: <20190717071114.14772-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190717071114.14772-1-richardw.yang@linux.intel.com> References: <20190717071114.14772-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v2 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 --- 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 Sun Feb 8 23:38:53 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563347551; cv=none; d=zoho.com; s=zohoarc; b=DAvFpZcM3k9jSY8SiU/azidWZx6ZhfCotouJE4H3p0UicffKdJeRPi/b51oZE3Soo3Y9klmrNOjI1QmXLBta08bWMmHSjdXQQLFhZotuocnm+yyov6Ssm7NlvqjquJTw6FoH+p1te9kVx+B1M/oZzhRvOdgQepNdAaEmzyhcBos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563347551; 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=lI191bKzH3sQMIP8lZ6nH1Wix4ZCRtMlxjSeJXEOrjA=; b=FnZJEGoZywgTQdk6UMn2VQporiOjaMBSG5gGRbPqfVzH2YJwoTqTDeexu3/O0RJzmD/stp4YIE0aDC8TKy1VHohSM01RdUmYLRbjPYC6YD6WC5Hukn3n2pPQML8hkcrerIC8X1QlpIo1fneLCkZbJKRJiC0k3BN+Gd2i5S1xjAI= 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 1563347551504912.3418297047642; Wed, 17 Jul 2019 00:12:31 -0700 (PDT) Received: from localhost ([::1]:54632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hne74-00075b-Dk for importer@patchew.org; Wed, 17 Jul 2019 03:12:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51625) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hne6Z-000567-PP for qemu-devel@nongnu.org; Wed, 17 Jul 2019 03:12:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hne6X-0003vN-Mr for qemu-devel@nongnu.org; Wed, 17 Jul 2019 03:11:59 -0400 Received: from mga05.intel.com ([192.55.52.43]:60321) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hne6X-0003sM-Dk for qemu-devel@nongnu.org; Wed, 17 Jul 2019 03:11:57 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2019 00:11:57 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga008.jf.intel.com with ESMTP; 17 Jul 2019 00:11:55 -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,273,1559545200"; d="scan'208";a="161670201" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 15:11:14 +0800 Message-Id: <20190717071114.14772-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190717071114.14772-1-richardw.yang@linux.intel.com> References: <20190717071114.14772-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v2 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 --- tests/test-bitmap.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/test-bitmap.c b/tests/test-bitmap.c index cb7c5e462d..1f0123f604 100644 --- a/tests/test-bitmap.c +++ b/tests/test-bitmap.c @@ -59,12 +59,45 @@ static void check_bitmap_copy_with_offset(void) g_free(bmap3); } =20 +static void check_bitmap_set(void) +{ + unsigned long *bmap; + + bmap =3D bitmap_new(BMAP_SIZE); + + /* Both Aligned, set bits [BITS_PER_LONG, 2*BITS_PER_LONG] */ + bitmap_set(bmap, BITS_PER_LONG, BITS_PER_LONG); + g_assert_cmpint(find_first_bit(bmap, BITS_PER_LONG), =3D=3D, BITS_PER_= LONG); + g_assert_cmpint(find_next_zero_bit(bmap, 2 * BITS_PER_LONG, BITS_PER_L= ONG), + =3D=3D, 2 * BITS_PER_LONG); + + bitmap_clear(bmap, 0, BMAP_SIZE); + /* End Aligned, set bits [BITS_PER_LONG - 5, 2*BITS_PER_LONG] */ + bitmap_set(bmap, BITS_PER_LONG - 5, BITS_PER_LONG + 5); + g_assert_cmpint(find_first_bit(bmap, BITS_PER_LONG), + =3D=3D, BITS_PER_LONG - 5); + g_assert_cmpint(find_next_zero_bit(bmap, + 2 * BITS_PER_LONG, BITS_PER_LONG - = 5), + =3D=3D, 2 * BITS_PER_LONG); + + bitmap_clear(bmap, 0, BMAP_SIZE); + /* Start Aligned, set bits [BITS_PER_LONG, 2*BITS_PER_LONG + 5] */ + bitmap_set(bmap, BITS_PER_LONG, BITS_PER_LONG + 5); + g_assert_cmpint(find_first_bit(bmap, BITS_PER_LONG), + =3D=3D, BITS_PER_LONG); + g_assert_cmpint(find_next_zero_bit(bmap, + 2 * BITS_PER_LONG + 5, BITS_PER_LON= G), + =3D=3D, 2 * BITS_PER_LONG + 5); +} + 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