From: Yury Norov <yury.norov@gmail.com>
To: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-arch@vger.kernel.org, linux-sh@vger.kernel.org,
Alexey Klimov <aklimov@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Arnd Bergmann <arnd@arndb.de>, David Sterba <dsterba@suse.com>,
Dennis Zhou <dennis@kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Jianpeng Ma <jianpeng.ma@intel.com>,
Joe Perches <joe@perches.com>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Rich Felker <dalias@libc.org>,
Stefano Brivio <sbrivio@redhat.com>,
Wei Yang <richard.weiyang@linux.alibaba.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Yoshinori Sato <ysato@users.sourceforge.jp>
Subject: Re: [PATCH 06/12] tools: sync small_const_nbits() macro with the kernel
Date: Wed, 24 Mar 2021 12:49:11 -0700 [thread overview]
Message-ID: <20210324194911.GA18844@yury-ThinkPad> (raw)
In-Reply-To: <ef470d38-073d-2c6c-f9f8-909689a52212@rasmusvillemoes.dk>
On Mon, Mar 22, 2021 at 09:34:47AM +0100, Rasmus Villemoes wrote:
> On 21/03/2021 22.54, Yury Norov wrote:
> > Move the macro from tools/include/asm-generic/bitsperlong.h
> > to tools/include/linux/bitmap.h
>
> The patch does it the other way around :)
>
> > Signed-off-by: Yury Norov <yury.norov@gmail.com>
> > ---
> > tools/include/asm-generic/bitsperlong.h | 3 +++
> > tools/include/linux/bitmap.h | 3 ---
> > 2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/tools/include/asm-generic/bitsperlong.h b/tools/include/asm-generic/bitsperlong.h
> > index 8f2283052333..f530da2506cc 100644
> > --- a/tools/include/asm-generic/bitsperlong.h
> > +++ b/tools/include/asm-generic/bitsperlong.h
> > @@ -18,4 +18,7 @@
> > #define BITS_PER_LONG_LONG 64
> > #endif
> >
> > +#define small_const_nbits(nbits) \
> > + (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
> > +
>
> Well, the movement is consistent with the kernel, but shouldn't the
> definition also be updated to exclude constant-zero-size? It's not that
> they exist or ever have, in tools/ or kernel proper, but just if some
> day some oddball CONFIG_ combination ends up creating such a beast, I'd
> rather not have code like
>
> + if (small_const_nbits(size)) {
> + unsigned long val = *addr & GENMASK(size - 1, 0);
>
> blow up at run-time.
>
> Other than that (and the above commit log typo), consider the series
>
> Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Thanks for spotting out this. The proper version of the patch is
below.
Andrew, it seems everything else looks good. If so, should I resubmit
the series, or you can pull it as is, including this patch?
Thanks,
Yury
From 7558697d4448f01a8ef73cd31def5d3e68b44b61 Mon Sep 17 00:00:00 2001
From: Yury Norov <yury.norov@gmail.com>
Date: Wed, 17 Feb 2021 20:05:05 -0800
Subject: [PATCH] tools: sync small_const_nbits() macro with the kernel
Sync implementation with the kernel and move the macro from
tools/include/linux/bitmap.h to tools/include/asm-generic/bitsperlong.h
Signed-off-by: Yury Norov <yury.norov@gmail.com>
---
tools/include/asm-generic/bitsperlong.h | 3 +++
tools/include/linux/bitmap.h | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/include/asm-generic/bitsperlong.h b/tools/include/asm-generic/bitsperlong.h
index 8f2283052333..2093d56ddd11 100644
--- a/tools/include/asm-generic/bitsperlong.h
+++ b/tools/include/asm-generic/bitsperlong.h
@@ -18,4 +18,7 @@
#define BITS_PER_LONG_LONG 64
#endif
+#define small_const_nbits(nbits) \
+ (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG && (nbits) > 0)
+
#endif /* __ASM_GENERIC_BITS_PER_LONG */
diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h
index 4aabc23ec747..330dbf7509cc 100644
--- a/tools/include/linux/bitmap.h
+++ b/tools/include/linux/bitmap.h
@@ -22,9 +22,6 @@ void bitmap_clear(unsigned long *map, unsigned int start, int len);
#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1)))
#define BITMAP_LAST_WORD_MASK(nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1)))
-#define small_const_nbits(nbits) \
- (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
-
static inline void bitmap_zero(unsigned long *dst, unsigned int nbits)
{
if (small_const_nbits(nbits))
--
2.25.1
next prev parent reply other threads:[~2021-03-24 19:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-21 21:54 [PATCH v5 00/12] lib/find_bit: fast path for small bitmaps Yury Norov
2021-03-21 21:54 ` [PATCH 01/12] tools: disable -Wno-type-limits Yury Norov
2021-03-21 21:54 ` [PATCH 02/12] tools: bitmap: sync function declarations with the kernel Yury Norov
2021-03-21 21:54 ` [PATCH 03/12] tools: sync BITMAP_LAST_WORD_MASK() macro " Yury Norov
2021-03-21 21:54 ` [PATCH 04/12] arch: rearrange headers inclusion order in asm/bitops for m68k and sh Yury Norov
2021-03-21 21:54 ` [PATCH 05/12] lib: extend the scope of small_const_nbits() macro Yury Norov
2021-03-21 21:54 ` [PATCH 06/12] tools: sync small_const_nbits() macro with the kernel Yury Norov
2021-03-22 8:34 ` Rasmus Villemoes
2021-03-24 19:49 ` Yury Norov [this message]
2021-03-21 21:54 ` [PATCH 07/12] lib: inline _find_next_bit() wrappers Yury Norov
2021-03-21 21:54 ` [PATCH 08/12] tools: sync find_next_bit implementation Yury Norov
2021-03-21 21:54 ` [PATCH 09/12] lib: add fast path for find_next_*_bit() Yury Norov
2021-03-21 21:54 ` [PATCH 10/12] lib: add fast path for find_first_*_bit() and find_last_bit() Yury Norov
2021-03-21 21:54 ` [PATCH 11/12] tools: sync lib/find_bit implementation Yury Norov
2021-03-21 21:54 ` [PATCH 12/12] MAINTAINERS: Add entry for the bitmap API Yury Norov
2021-04-01 0:31 [PATCH v6 00/12] lib/find_bit: fast path for small bitmaps Yury Norov
2021-04-01 0:31 ` [PATCH 06/12] tools: sync small_const_nbits() macro with the kernel Yury Norov
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=20210324194911.GA18844@yury-ThinkPad \
--to=yury.norov@gmail.com \
--cc=aklimov@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=dalias@libc.org \
--cc=dennis@kernel.org \
--cc=dsterba@suse.com \
--cc=geert@linux-m68k.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=jianpeng.ma@intel.com \
--cc=joe@perches.com \
--cc=jpoimboe@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=richard.weiyang@linux.alibaba.com \
--cc=sbrivio@redhat.com \
--cc=wsa+renesas@sang-engineering.com \
--cc=ysato@users.sourceforge.jp \
/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;
as well as URLs for NNTP newsgroup(s).