Commit b7f5e5c7 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller

rhashtable: don't allocate ht structure on stack in test_rht_init

With object runtime debugging enabled, the rhashtable test suite
will rightfully throw a warning "ODEBUG: object is on stack, but
not annotated" from rhashtable_init().

This is because run_work is (correctly) being initialized via
INIT_WORK(), and not annotated by INIT_WORK_ONSTACK(). Meaning,
rhashtable_init() is okay as is, we just need to move ht e.g.,
into global scope.

It never triggered anything, since test_rhashtable is rather a
controlled environment and effectively runs to completion, so
that stack memory is not vanishing underneath us, we shouldn't
confuse any testers with it though.

Fixes: 7e1e7763 ("lib: Resizable, Scalable, Concurrent Hash Table")
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf60e50c
...@@ -191,9 +191,10 @@ static int __init test_rhashtable(struct rhashtable *ht) ...@@ -191,9 +191,10 @@ static int __init test_rhashtable(struct rhashtable *ht)
return err; return err;
} }
static struct rhashtable ht;
static int __init test_rht_init(void) static int __init test_rht_init(void)
{ {
struct rhashtable ht;
struct rhashtable_params params = { struct rhashtable_params params = {
.nelem_hint = TEST_HT_SIZE, .nelem_hint = TEST_HT_SIZE,
.head_offset = offsetof(struct test_obj, node), .head_offset = offsetof(struct test_obj, node),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment