p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rhashtable-test: Detect insertion failures 

Account for failed inserts due to memory pressure or EBUSY and
ignore failed entries during the consistency check.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thomas Graf 2015-04-30 22:37:45 +00:00 committed by David S. Miller
parent 246b23a769
commit 67b7cbf420
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/test_rhashtable.c
View File

@ -21,8 +21,8 @@
#include <linux/rhashtable.h> #include <linux/rhashtable.h>
#include <linux/slab.h> #include <linux/slab.h>
#define MAX_ENTRIES 1000000 #define MAX_ENTRIES 1000000
#define TEST_INSERT_FAIL INT_MAX
static int entries = 50000; static int entries = 50000;
module_param(entries, int, 0); module_param(entries, int, 0);
@ -68,6 +68,9 @@ static int __init test_rht_lookup(struct rhashtable *ht)
bool expected = !(i % 2); bool expected = !(i % 2);
u32 key = i; u32 key = i;
if (array[i / 2].value == TEST_INSERT_FAIL)
expected = false;
obj = rhashtable_lookup_fast(ht, &key, test_rht_params); obj = rhashtable_lookup_fast(ht, &key, test_rht_params);
if (expected && !obj) { if (expected && !obj) {
@ -135,7 +138,7 @@ static s64 __init test_rhashtable(struct rhashtable *ht)
{ {
struct test_obj *obj; struct test_obj *obj;
int err; int err;
unsigned int i; unsigned int i, insert_fails = 0;
s64 start, end; s64 start, end;
/* /*
@ -150,10 +153,19 @@ static s64 __init test_rhashtable(struct rhashtable *ht)
obj->value = i * 2; obj->value = i * 2;
err = rhashtable_insert_fast(ht, &obj->node, test_rht_params); err = rhashtable_insert_fast(ht, &obj->node, test_rht_params);
if (err) if (err == -ENOMEM || err == -EBUSY) {
/* Mark failed inserts but continue */
obj->value = TEST_INSERT_FAIL;
insert_fails++;
} else if (err) {
return err; return err;
}
} }
if (insert_fails)
pr_info(" %u insertions failed due to memory pressure\n",
insert_fails);
test_bucket_stats(ht); test_bucket_stats(ht);
rcu_read_lock(); rcu_read_lock();
test_rht_lookup(ht); test_rht_lookup(ht);
@ -165,10 +177,12 @@ static s64 __init test_rhashtable(struct rhashtable *ht)
for (i = 0; i < entries; i++) { for (i = 0; i < entries; i++) {
u32 key = i * 2; u32 key = i * 2;
obj = rhashtable_lookup_fast(ht, &key, test_rht_params); if (array[i].value != TEST_INSERT_FAIL) {
BUG_ON(!obj); obj = rhashtable_lookup_fast(ht, &key, test_rht_params);
BUG_ON(!obj);
rhashtable_remove_fast(ht, &obj->node, test_rht_params); rhashtable_remove_fast(ht, &obj->node, test_rht_params);
}
} }
end = ktime_get_ns(); end = ktime_get_ns();