From nobody Sun Feb 8 14:52:46 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