From: Thomas Graf <tgraf@suug.ch>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, herbert@gondor.apana.org.au
Subject: [PATCH net-next v2] rhashtable: Warn if min_size or max_size are not a power of two
Date: Thu, 19 Mar 2015 19:46:08 +0000 [thread overview]
Message-ID: <20150319194608.GA27962@casper.infradead.org> (raw)
In-Reply-To: <20150319.152450.1573636653085091157.davem@davemloft.net>
The current code correctly limits table size to the next power of two.
This check is solely to catch programming errors.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
---
v2: use is_power_of_2() instead of roundup_pow_of_two()
lib/rhashtable.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 5f8fe3e..5474507 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -933,6 +933,9 @@ int rhashtable_init(struct rhashtable *ht, struct rhashtable_params *params)
if (params->nulls_base && params->nulls_base < (1U << RHT_BASE_SHIFT))
return -EINVAL;
+ WARN_ON(params->min_size && !is_power_of_2(params->min_size));
+ WARN_ON(params->max_size && !is_power_of_2(params->max_size));
+
params->min_size = max(params->min_size, HASH_MIN_SIZE);
if (params->nelem_hint)
--
1.9.3
next prev parent reply other threads:[~2015-03-19 19:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-19 16:34 [PATCH net-next] rhashtable: Warn if min_size or max_size are not a power of two Thomas Graf
2015-03-19 19:24 ` David Miller
2015-03-19 19:46 ` Thomas Graf [this message]
2015-03-19 21:02 ` [PATCH net-next v2] " Herbert Xu
2015-03-19 21:15 ` Thomas Graf
2015-03-19 21:49 ` Herbert Xu
2015-03-19 22:02 ` Herbert Xu
2015-03-19 22:31 ` [PATCH net-next] rhashtable: Round up/down min/max_size to ensure we respect limit Thomas Graf
2015-03-19 22:41 ` Herbert Xu
2015-03-20 1:02 ` David Miller
2015-03-20 10:57 ` [PATCH net-next v2] rhashtable: Warn if min_size or max_size are not a power of two David Laight
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=20150319194608.GA27962@casper.infradead.org \
--to=tgraf@suug.ch \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
/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).