From patchwork Wed Jul 6 17:42:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 12908433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7FD5BC433EF for ; Wed, 6 Jul 2022 17:44:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DN5idwfonUFIXNJmXZTq8LOoap9tD917PawgAHl5AxI=; b=wqw6gZwDUDJqa9 V33zlO5/C47OzDHS7apblwNvVSUgTcm8R4uZm3OtJE9V3VHBOK4rblpEvMYb0bZtVp16rkOSD09wf 3YqhmcsbE8HZZ8dVf2TmEhq+IpdqwhQeQN4dlCp+PNgBb62vn684pf3R8TRtt9G0OgoHywP0tlw6V EX/bS8MWsQGUXQw9bS04Yju87gDB94Keqd3VO3IIWBkcOImrkvAQz+OCnrBPlbpcGKM4mqzXpGzeK 0nGVw69Jxu4yefOwxTVmzM09oO3vXjLuUfMEa61i/w/Yx19P0byZu1xZnkIPlWDjWuaz7xFH8bTh0 rgN+jhqRB6vu7pbDlDuw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9940-00BmFj-0O; Wed, 06 Jul 2022 17:43:48 +0000 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o993F-00Blqg-Vq for linux-arm-kernel@lists.infradead.org; Wed, 06 Jul 2022 17:43:04 +0000 Received: by mail-qt1-x833.google.com with SMTP id i11so19283265qtr.4 for ; Wed, 06 Jul 2022 10:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5zrDKrgWjWYoqhLNgKXCX7OnjR9UTrCEG+O0rRKPH50=; b=heIFXapJdEzowqiFB2mS/xtMJxdMxoc2ubC65bgzqOxHnqbym8ZEcyKW7PFMQuQ0FO U/VqAR1hkNcMHGaETyC9JqpX/Ak1kpp4auixjtWIsc3C0SYoaz0KLazSBI8jT6Iyb7j0 AGFcrdV+9ut6Knb9YEtH1ef3hGVjZfE9lvsyC5b4/0aqs7MckkfzQdmG1rqbQBenK7LD 3A5+KzBgFXm0ePeRRo+I8O8TOvleYFVDuD4YE8OE1YgKTuqjnpiADOVq/zkimux1xOjj DqqYwC8LabwWYX0gke3X5o7qzErBACQTn5tAb+kUmpApr8GPeEl9bWbYPJMxZDdXbSnZ Jtxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5zrDKrgWjWYoqhLNgKXCX7OnjR9UTrCEG+O0rRKPH50=; b=eev2rXnxI7H6XHZKk6yA0Y6D6sSde0GGrjnSzXlFdOSRYKvDmZpR50ywjsqJOQ7WPd S/1GuAFWQlW4uO1k4VipoA4ENuEHNGHiLNhZt9k5n2DdR0l92ZDfJlolAAtYUEJADi9V +xQs3MmbaVLgFYSxtYALj7Qjmfxplz38EZ9g2KkWwwhgv9stFojjrAQGWiZdM2O/93tX XjjQoTnHkIV8CzA32ofWVMod1ulViypxDN4E/sP00ZI9GL1Qk3yPLGnByeJ+4el+zNbV 7fOJM6HxGK7cRzIkQl6/1oYo1oLzqfhRJNmnUkTXCIAyPb6dZ3U7XJca852qHHWCMBOq hUUg== X-Gm-Message-State: AJIora9nnDJZcrwX3RVJlvlc/JQAM4ziesmMmxriQbz3QMd5AFtIUQuh vUKJMRoMTxfCHQ4Fi6v7ops= X-Google-Smtp-Source: AGRyM1sgYG5ZA1Q43on9m/YHXkTTeIV7n/NLBKoToO6i4hQ4nI2FamaIV6GitTV1JyZvJs3oDAcsXQ== X-Received: by 2002:a05:6214:2506:b0:470:2c9c:65fa with SMTP id gf6-20020a056214250600b004702c9c65famr37643155qvb.117.1657129379917; Wed, 06 Jul 2022 10:42:59 -0700 (PDT) Received: from localhost (c-69-254-185-160.hsd1.ar.comcast.net. [69.254.185.160]) by smtp.gmail.com with ESMTPSA id x2-20020ae9e902000000b006a6a6f148e6sm29882134qkf.17.2022.07.06.10.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:42:59 -0700 (PDT) From: Yury Norov To: linux-kernel@vger.kernel.org, Andrew Morton , Andy Shevchenko , David Howells , Ingo Molnar , Geert Uytterhoeven , Jonathan Corbet , "Kirill A . Shutemov" , Matthew Wilcox , NeilBrown , Rasmus Villemoes , Russell King , Vlastimil Babka , William Kucharski , linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Cc: Yury Norov Subject: [PATCH 03/10] lib/bitmap: change type of bitmap_weight to unsigned long Date: Wed, 6 Jul 2022 10:42:46 -0700 Message-Id: <20220706174253.4175492-4-yury.norov@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706174253.4175492-1-yury.norov@gmail.com> References: <20220706174253.4175492-1-yury.norov@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220706_104302_097828_A43B2535 X-CRM114-Status: GOOD ( 13.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org bitmap_weight() doesn't return negative values, so change it's type to unsigned long. It may help compiler to generate better code and catch bugs. Signed-off-by: Yury Norov --- include/linux/bitmap.h | 5 +++-- lib/bitmap.c | 5 ++--- tools/include/linux/bitmap.h | 4 ++-- tools/lib/bitmap.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 85aace699b2b..a92149f415d2 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -163,7 +163,7 @@ bool __bitmap_intersects(const unsigned long *bitmap1, const unsigned long *bitmap2, unsigned int nbits); bool __bitmap_subset(const unsigned long *bitmap1, const unsigned long *bitmap2, unsigned int nbits); -int __bitmap_weight(const unsigned long *bitmap, unsigned int nbits); +unsigned long __bitmap_weight(const unsigned long *bitmap, unsigned int nbits); void __bitmap_set(unsigned long *map, unsigned int start, int len); void __bitmap_clear(unsigned long *map, unsigned int start, int len); @@ -419,7 +419,8 @@ static inline bool bitmap_full(const unsigned long *src, unsigned int nbits) return find_first_zero_bit(src, nbits) == nbits; } -static __always_inline int bitmap_weight(const unsigned long *src, unsigned int nbits) +static __always_inline +unsigned long bitmap_weight(const unsigned long *src, unsigned int nbits) { if (small_const_nbits(nbits)) return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits)); diff --git a/lib/bitmap.c b/lib/bitmap.c index 098fd9db2363..b580b381eca1 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -333,10 +333,9 @@ bool __bitmap_subset(const unsigned long *bitmap1, } EXPORT_SYMBOL(__bitmap_subset); -int __bitmap_weight(const unsigned long *bitmap, unsigned int bits) +unsigned long __bitmap_weight(const unsigned long *bitmap, unsigned int bits) { - unsigned int k, lim = bits/BITS_PER_LONG; - int w = 0; + unsigned long k, w = 0, lim = bits/BITS_PER_LONG; for (k = 0; k < lim; k++) w += hweight_long(bitmap[k]); diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h index 2ae7ab8ed7d1..ae1852e39142 100644 --- a/tools/include/linux/bitmap.h +++ b/tools/include/linux/bitmap.h @@ -11,7 +11,7 @@ #define DECLARE_BITMAP(name,bits) \ unsigned long name[BITS_TO_LONGS(bits)] -int __bitmap_weight(const unsigned long *bitmap, int bits); +unsigned long __bitmap_weight(const unsigned long *bitmap, unsigned int bits); void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, const unsigned long *bitmap2, int bits); bool __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, @@ -61,7 +61,7 @@ static inline bool bitmap_full(const unsigned long *src, unsigned int nbits) return find_first_zero_bit(src, nbits) == nbits; } -static inline int bitmap_weight(const unsigned long *src, unsigned int nbits) +static inline unsigned long bitmap_weight(const unsigned long *src, unsigned int nbits) { if (small_const_nbits(nbits)) return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits)); diff --git a/tools/lib/bitmap.c b/tools/lib/bitmap.c index 2e351d63fdba..e1fafc131a49 100644 --- a/tools/lib/bitmap.c +++ b/tools/lib/bitmap.c @@ -5,9 +5,9 @@ */ #include -int __bitmap_weight(const unsigned long *bitmap, int bits) +unsigned long __bitmap_weight(const unsigned long *bitmap, unsigned int bits) { - int k, w = 0, lim = bits/BITS_PER_LONG; + unsigned long k, w = 0, lim = bits/BITS_PER_LONG; for (k = 0; k < lim; k++) w += hweight_long(bitmap[k]);