android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: 7e1e77636e ("lib: Resizable, Scalable, Concurrent Hash Table")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2015-02-20 21:14:21 +01:00 committed by David S. Miller
parent bf60e50cb3
commit b7f5e5c7f8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/test_rhashtable.c
View File

@ -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),