From: Alexander Lobakin <aleksander.lobakin@intel.com>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Alexander Lobakin <aleksander.lobakin@intel.com>,
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>,
Marcin Szycik <marcin.szycik@linux.intel.com>,
Wojciech Drewek <wojciech.drewek@intel.com>,
Yury Norov <yury.norov@gmail.com>,
Andy Shevchenko <andy@kernel.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Alexander Potapenko <glider@google.com>,
Jiri Pirko <jiri@resnulli.us>, Ido Schimmel <idosch@nvidia.com>,
Przemek Kitszel <przemyslaw.kitszel@intel.com>,
Simon Horman <horms@kernel.org>,
linux-btrfs@vger.kernel.org, dm-devel@redhat.com,
ntfs3@lists.linux.dev, linux-s390@vger.kernel.org,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Syed Nayyar Waris <syednwaris@gmail.com>,
Arnd Bergmann <arnd@arndb.de>,
William Breathitt Gray <william.gray@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH net-next v5 01/21] lib/bitmap: add bitmap_{read,write}()
Date: Thu, 1 Feb 2024 13:21:56 +0100 [thread overview]
Message-ID: <20240201122216.2634007-2-aleksander.lobakin@intel.com> (raw)
In-Reply-To: <20240201122216.2634007-1-aleksander.lobakin@intel.com>
From: Syed Nayyar Waris <syednwaris@gmail.com>
The two new functions allow reading/writing values of length up to
BITS_PER_LONG bits at arbitrary position in the bitmap.
The code was taken from "bitops: Introduce the for_each_set_clump macro"
by Syed Nayyar Waris with a number of changes and simplifications:
- instead of using roundup(), which adds an unnecessary dependency
on <linux/math.h>, we calculate space as BITS_PER_LONG-offset;
- indentation is reduced by not using else-clauses (suggested by
checkpatch for bitmap_get_value());
- bitmap_get_value()/bitmap_set_value() are renamed to bitmap_read()
and bitmap_write();
- some redundant computations are omitted.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Syed Nayyar Waris <syednwaris@gmail.com>
Signed-off-by: William Breathitt Gray <william.gray@linaro.org>
Link: https://lore.kernel.org/lkml/fe12eedf3666f4af5138de0e70b67a07c7f40338.1592224129.git.syednwaris@gmail.com/
Suggested-by: Yury Norov <yury.norov@gmail.com>
Co-developed-by: Alexander Potapenko <glider@google.com>
Signed-off-by: Alexander Potapenko <glider@google.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Yury Norov <yury.norov@gmail.com>
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
---
include/linux/bitmap.h | 77 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 99451431e4d6..7ca0379be8c1 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -79,6 +79,10 @@ struct device;
* bitmap_to_arr64(buf, src, nbits) Copy nbits from buf to u64[] dst
* bitmap_get_value8(map, start) Get 8bit value from map at start
* bitmap_set_value8(map, value, start) Set 8bit value to map at start
+ * bitmap_read(map, start, nbits) Read an nbits-sized value from
+ * map at start
+ * bitmap_write(map, value, start, nbits) Write an nbits-sized value to
+ * map at start
*
* Note, bitmap_zero() and bitmap_fill() operate over the region of
* unsigned longs, that is, bits behind bitmap till the unsigned long
@@ -636,6 +640,79 @@ static inline void bitmap_set_value8(unsigned long *map, unsigned long value,
map[index] |= value << offset;
}
+/**
+ * bitmap_read - read a value of n-bits from the memory region
+ * @map: address to the bitmap memory region
+ * @start: bit offset of the n-bit value
+ * @nbits: size of value in bits, nonzero, up to BITS_PER_LONG
+ *
+ * Returns: value of @nbits bits located at the @start bit offset within the
+ * @map memory region. For @nbits = 0 and @nbits > BITS_PER_LONG the return
+ * value is undefined.
+ */
+static inline unsigned long bitmap_read(const unsigned long *map,
+ unsigned long start,
+ unsigned long nbits)
+{
+ size_t index = BIT_WORD(start);
+ unsigned long offset = start % BITS_PER_LONG;
+ unsigned long space = BITS_PER_LONG - offset;
+ unsigned long value_low, value_high;
+
+ if (unlikely(!nbits || nbits > BITS_PER_LONG))
+ return 0;
+
+ if (space >= nbits)
+ return (map[index] >> offset) & BITMAP_LAST_WORD_MASK(nbits);
+
+ value_low = map[index] & BITMAP_FIRST_WORD_MASK(start);
+ value_high = map[index + 1] & BITMAP_LAST_WORD_MASK(start + nbits);
+ return (value_low >> offset) | (value_high << space);
+}
+
+/**
+ * bitmap_write - write n-bit value within a memory region
+ * @map: address to the bitmap memory region
+ * @value: value to write, clamped to nbits
+ * @start: bit offset of the n-bit value
+ * @nbits: size of value in bits, nonzero, up to BITS_PER_LONG.
+ *
+ * bitmap_write() behaves as-if implemented as @nbits calls of __assign_bit(),
+ * i.e. bits beyond @nbits are ignored:
+ *
+ * for (bit = 0; bit < nbits; bit++)
+ * __assign_bit(start + bit, bitmap, val & BIT(bit));
+ *
+ * For @nbits == 0 and @nbits > BITS_PER_LONG no writes are performed.
+ */
+static inline void bitmap_write(unsigned long *map, unsigned long value,
+ unsigned long start, unsigned long nbits)
+{
+ size_t index;
+ unsigned long offset;
+ unsigned long space;
+ unsigned long mask;
+ bool fit;
+
+ if (unlikely(!nbits || nbits > BITS_PER_LONG))
+ return;
+
+ mask = BITMAP_LAST_WORD_MASK(nbits);
+ value &= mask;
+ offset = start % BITS_PER_LONG;
+ space = BITS_PER_LONG - offset;
+ fit = space >= nbits;
+ index = BIT_WORD(start);
+
+ map[index] &= (fit ? (~(mask << offset)) : ~BITMAP_FIRST_WORD_MASK(start));
+ map[index] |= value << offset;
+ if (fit)
+ return;
+
+ map[index + 1] &= BITMAP_FIRST_WORD_MASK(start + nbits);
+ map[index + 1] |= (value >> space);
+}
+
#endif /* __ASSEMBLY__ */
#endif /* __LINUX_BITMAP_H */
--
2.43.0
next prev parent reply other threads:[~2024-02-01 12:23 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-01 12:21 [PATCH net-next v5 00/21] ice: add PFCP filter support Alexander Lobakin
2024-02-01 12:21 ` Alexander Lobakin [this message]
2024-02-01 13:23 ` [PATCH net-next v5 01/21] lib/bitmap: add bitmap_{read,write}() Arnd Bergmann
2024-02-01 13:45 ` Alexander Potapenko
2024-02-01 14:02 ` Arnd Bergmann
2024-02-28 16:10 ` Yury Norov
2024-02-01 15:49 ` Alexander Lobakin
2024-02-01 12:21 ` [PATCH net-next v5 02/21] lib/test_bitmap: add tests for bitmap_{read,write}() Alexander Lobakin
2024-02-28 16:13 ` Yury Norov
2024-02-01 12:21 ` [PATCH net-next v5 03/21] lib/test_bitmap: use pr_info() for non-error messages Alexander Lobakin
2024-02-28 16:16 ` Yury Norov
2024-02-01 12:21 ` [PATCH net-next v5 04/21] bitops: add missing prototype check Alexander Lobakin
2024-02-28 16:18 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 05/21] bitops: make BYTES_TO_BITS() treewide-available Alexander Lobakin
2024-02-28 16:20 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 06/21] bitops: let the compiler optimize {__,}assign_bit() Alexander Lobakin
2024-02-28 16:23 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 07/21] linkmode: convert linkmode_{test,set,clear,mod}_bit() to macros Alexander Lobakin
2024-02-28 16:24 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 08/21] s390/cio: rename bitmap_size() -> idset_bitmap_size() Alexander Lobakin
2024-02-26 17:13 ` Peter Oberparleiter
2024-02-01 12:22 ` [PATCH net-next v5 09/21] fs/ntfs3: add prefix to bitmap_size() and use BITS_TO_U64() Alexander Lobakin
2024-02-28 16:26 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 10/21] btrfs: rename bitmap_set_bits() -> btrfs_bitmap_set_bits() Alexander Lobakin
2024-02-28 16:27 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 11/21] tools: move alignment-related macros to new <linux/align.h> Alexander Lobakin
2024-02-02 11:37 ` Przemek Kitszel
2024-02-28 16:28 ` Yury Norov
2024-02-28 16:29 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 12/21] bitmap: introduce generic optimized bitmap_size() Alexander Lobakin
2024-02-28 16:31 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 13/21] bitmap: make bitmap_{get,set}_value8() use bitmap_{read,write}() Alexander Lobakin
2024-02-02 11:39 ` Przemek Kitszel
2024-02-28 16:31 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 14/21] lib/bitmap: add compile-time test for __assign_bit() optimization Alexander Lobakin
2024-02-28 16:32 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 15/21] ip_tunnel: use a separate struct to store tunnel params in the kernel Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 16/21] ip_tunnel: convert __be16 tunnel flags to bitmaps Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 17/21] lib/bitmap: add tests for IP tunnel flags conversion helpers Alexander Lobakin
2024-02-28 16:38 ` Yury Norov
2024-03-26 12:20 ` Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 18/21] pfcp: add PFCP module Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 19/21] pfcp: always set pfcp metadata Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 20/21] ice: refactor ICE_TC_FLWR_FIELD_ENC_OPTS Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 21/21] ice: Add support for PFCP hardware offload in switchdev Alexander Lobakin
2024-02-06 12:46 ` [PATCH net-next v5 00/21] ice: add PFCP filter support Alexander Lobakin
2024-02-06 15:37 ` Jakub Kicinski
2024-02-07 15:05 ` Jakub Kicinski
2024-02-12 11:35 ` [Intel-wired-lan] " Alexander Lobakin
2024-02-28 16:46 ` Yury Norov
2024-04-02 10:59 ` Niklas Schnelle
2024-04-02 11:00 ` Alexander Lobakin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240201122216.2634007-2-aleksander.lobakin@intel.com \
--to=aleksander.lobakin@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy@kernel.org \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=dm-devel@redhat.com \
--cc=edumazet@google.com \
--cc=glider@google.com \
--cc=horms@kernel.org \
--cc=idosch@nvidia.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=marcin.szycik@linux.intel.com \
--cc=michal.swiatkowski@linux.intel.com \
--cc=netdev@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=pabeni@redhat.com \
--cc=przemyslaw.kitszel@intel.com \
--cc=syednwaris@gmail.com \
--cc=william.gray@linaro.org \
--cc=wojciech.drewek@intel.com \
--cc=yury.norov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox