From nobody Wed Dec 17 17:40:50 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A4DBC3DA50 for ; Thu, 17 Aug 2023 16:56:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353750AbjHQQzb (ORCPT ); Thu, 17 Aug 2023 12:55:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353769AbjHQQzH (ORCPT ); Thu, 17 Aug 2023 12:55:07 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 500882D77 for ; Thu, 17 Aug 2023 09:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692291301; x=1723827301; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xvArrxaGRN2ebRffrgKTECVmDHXVftRrB25CaScT3Zo=; b=P3BLo8hFWTqGNOIF2SV5XekDxpQKQ7Vnvh+wiJ4y+sLmamuzSlIrRrpq N2QHseuL1kDz9yA6pnNLd1UFq8PSlufIoT7wDJ0qJ356o0adYVnqwQw7V zrZgIXo/lRJ/l6+CB8lr/aiG5W9J9YNAogUENI/LDzfYvWqv6kxxtEMOi tUbZUGZlj1D4h5GerqYxsQ+qe6ROze+RMg/MYAv4g0IPPg8veHRtcOFHZ qhVAAo+IgTyhzM3eRpSwDKId887frBvjsym+r/Oo17NKK37hp57X/xa8k oLELcH3hCP78EOqwWgzA2Buqql6t9cTpd5qBZwMYM3DYIDmYHA/y7hLqF g==; X-IronPort-AV: E=McAfee;i="6600,9927,10805"; a="375651650" X-IronPort-AV: E=Sophos;i="6.01,180,1684825200"; d="scan'208";a="375651650" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2023 09:55:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10805"; a="737788825" X-IronPort-AV: E=Sophos;i="6.01,180,1684825200"; d="scan'208";a="737788825" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 17 Aug 2023 09:54:57 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 497C4D87; Thu, 17 Aug 2023 19:54:56 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Yury Norov , linux-kernel@vger.kernel.org Cc: Rasmus Villemoes Subject: [PATCH v1 1/2] bitmap: Use constants and macros from bits.h Date: Thu, 17 Aug 2023 19:54:52 +0300 Message-Id: <20230817165453.713353-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230817165453.713353-1-andriy.shevchenko@linux.intel.com> References: <20230817165453.713353-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use BITS_PER_LONG and BITS_PER_BYTE for BITMAP_MEM_ALIGNMENT. Calculate bytes from bits for memcmp() and memset() with BITS_TO_BYTES(). Signed-off-by: Andy Shevchenko --- include/linux/bitmap.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 1516ff979315..2d5042d1b501 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -354,9 +354,9 @@ static inline void bitmap_complement(unsigned long *dst= , const unsigned long *sr } =20 #ifdef __LITTLE_ENDIAN -#define BITMAP_MEM_ALIGNMENT 8 +#define BITMAP_MEM_ALIGNMENT BITS_PER_BYTE #else -#define BITMAP_MEM_ALIGNMENT (8 * sizeof(unsigned long)) +#define BITMAP_MEM_ALIGNMENT BITS_PER_LONG #endif #define BITMAP_MEM_MASK (BITMAP_MEM_ALIGNMENT - 1) =20 @@ -367,7 +367,7 @@ static inline bool bitmap_equal(const unsigned long *sr= c1, return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)); if (__builtin_constant_p(nbits & BITMAP_MEM_MASK) && IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT)) - return !memcmp(src1, src2, nbits / 8); + return !memcmp(src1, src2, BITS_TO_BYTES(nbits)); return __bitmap_equal(src1, src2, nbits); } =20 @@ -454,7 +454,7 @@ static __always_inline void bitmap_set(unsigned long *m= ap, unsigned int start, IS_ALIGNED(start, BITMAP_MEM_ALIGNMENT) && __builtin_constant_p(nbits & BITMAP_MEM_MASK) && IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT)) - memset((char *)map + start / 8, 0xff, nbits / 8); + memset((char *)map + BITS_TO_BYTES(start), 0xff, BITS_TO_BYTES(nbits)); else __bitmap_set(map, start, nbits); } @@ -470,7 +470,7 @@ static __always_inline void bitmap_clear(unsigned long = *map, unsigned int start, IS_ALIGNED(start, BITMAP_MEM_ALIGNMENT) && __builtin_constant_p(nbits & BITMAP_MEM_MASK) && IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT)) - memset((char *)map + start / 8, 0, nbits / 8); + memset((char *)map + BITS_TO_BYTES(start), 0x00, BITS_TO_BYTES(nbits)); else __bitmap_clear(map, start, nbits); } --=20 2.40.0.1.gaa8946217a0b From nobody Wed Dec 17 17:40:50 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E18DC3DA58 for ; Thu, 17 Aug 2023 16:56:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353756AbjHQQzc (ORCPT ); Thu, 17 Aug 2023 12:55:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353771AbjHQQzH (ORCPT ); Thu, 17 Aug 2023 12:55:07 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE7AD2D7E for ; Thu, 17 Aug 2023 09:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692291301; x=1723827301; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lM+eCG4oKhGdnhkZCnYZscEzceLlhb1YwBucmrl2U6E=; b=B3tJ2SQqECpjQ3SWzZe9vBTGKemByDjQiG+NfXT44sht6pjp5LBf86KE Aeb2T9GzXjvkpQH3Jm9wzeYrDMyXOsovXIB0gzLXj25EJ23B794T/pPYM iEbAZDqHPZaXkgccwB2zCwMM0OLhs1k7GEvWUNuLlMxl2gMDVSB32NFx6 jcdp54NfmGy0rxcVH4Nx7eSj1Mh2MDKTCZq48l6P+tCd+euzVrCopjcp8 TQ5iRTpHLKg1Itw3I7EMpRXVt00CrVBJWuAe55QTkWQ1BuQI/7kmgUbOh ek0QRtuX1u4ignWEk9hjuKc1pA+0rKDP7Yn7XxfR2KKynwdm6riRMu2JJ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10805"; a="371772543" X-IronPort-AV: E=Sophos;i="6.01,180,1684825200"; d="scan'208";a="371772543" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2023 09:54:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10805"; a="858294510" X-IronPort-AV: E=Sophos;i="6.01,180,1684825200"; d="scan'208";a="858294510" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 17 Aug 2023 09:54:57 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 53CBBE2E; Thu, 17 Aug 2023 19:54:56 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Yury Norov , linux-kernel@vger.kernel.org Cc: Rasmus Villemoes Subject: [PATCH v1 2/2] bitmap: Optimize memset() calls Date: Thu, 17 Aug 2023 19:54:53 +0300 Message-Id: <20230817165453.713353-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230817165453.713353-1-andriy.shevchenko@linux.intel.com> References: <20230817165453.713353-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Intead of byte memset() calls use 32- or 64-bit version depending on the compile-time BITS_PER_LONG value. Signed-off-by: Andy Shevchenko --- include/linux/bitmap.h | 16 ++++++++++++---- lib/bitmap.c | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 2d5042d1b501..6eec4d4fd623 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -234,22 +234,30 @@ extern int bitmap_print_list_to_buf(char *buf, const = unsigned long *maskp, =20 static inline void bitmap_zero(unsigned long *dst, unsigned int nbits) { - unsigned int len =3D BITS_TO_LONGS(nbits) * sizeof(unsigned long); + unsigned int len =3D BITS_TO_LONGS(nbits); =20 if (small_const_nbits(nbits)) *dst =3D 0; else - memset(dst, 0, len); +#if BITS_PER_LONG =3D=3D 64 + memset64((uint64_t *)dst, 0, len); +#else + memset32((uint32_t *)dst, 0, len); +#endif } =20 static inline void bitmap_fill(unsigned long *dst, unsigned int nbits) { - unsigned int len =3D BITS_TO_LONGS(nbits) * sizeof(unsigned long); + unsigned int len =3D BITS_TO_LONGS(nbits); =20 if (small_const_nbits(nbits)) *dst =3D ~0UL; else - memset(dst, 0xff, len); +#if BITS_PER_LONG =3D=3D 64 + memset64((uint64_t *)dst, GENMASK(63, 0), len); +#else + memset32((uint32_t *)dst, GENMASK(31, 0), len); +#endif } =20 static inline void bitmap_copy(unsigned long *dst, const unsigned long *sr= c, diff --git a/lib/bitmap.c b/lib/bitmap.c index 935e0f96e785..df0fb37a5732 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -128,7 +128,7 @@ void __bitmap_shift_right(unsigned long *dst, const uns= igned long *src, dst[k] =3D lower | upper; } if (off) - memset(&dst[lim - off], 0, off*sizeof(unsigned long)); + bitmap_zero(&dst[lim - off], off); } EXPORT_SYMBOL(__bitmap_shift_right); =20 @@ -166,7 +166,7 @@ void __bitmap_shift_left(unsigned long *dst, const unsi= gned long *src, dst[k + off] =3D lower | upper; } if (off) - memset(dst, 0, off*sizeof(unsigned long)); + bitmap_zero(dst, off); } EXPORT_SYMBOL(__bitmap_shift_left); =20 --=20 2.40.0.1.gaa8946217a0b