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>

diff --git a/lib/test_rhashtable.c b/lib/test_rhashtable.c
index 3a9a3d9c0cbf5e86c4ac5156a59bb7b584b7b077..6893e57e6782e2bca4e67d88554b3ebec4b06a41 100644 (file)
--- a/lib/test_rhashtable.c
+++ b/lib/test_rhashtable.c
@@ -21,8 +21,8 @@
 #include <linux/rhashtable.h>
 #include <linux/slab.h>
 
-
 #define MAX_ENTRIES    1000000
+#define TEST_INSERT_FAIL INT_MAX
 
 static int entries = 50000;
 module_param(entries, int, 0);
@@ -68,6 +68,9 @@ static int __init test_rht_lookup(struct rhashtable *ht)
                bool expected = !(i % 2);
                u32 key = i;
 
+               if (array[i / 2].value == TEST_INSERT_FAIL)
+                       expected = false;
+
                obj = rhashtable_lookup_fast(ht, &key, test_rht_params);
 
                if (expected && !obj) {
@@ -135,7 +138,7 @@ static s64 __init test_rhashtable(struct rhashtable *ht)
 {
        struct test_obj *obj;
        int err;
-       unsigned int i;
+       unsigned int i, insert_fails = 0;
        s64 start, end;
 
        /*
@@ -150,10 +153,19 @@ static s64 __init test_rhashtable(struct rhashtable *ht)
                obj->value = i * 2;
 
                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;
+               }
        }
 
+       if (insert_fails)
+               pr_info("  %u insertions failed due to memory pressure\n",
+                       insert_fails);
+
        test_bucket_stats(ht);
        rcu_read_lock();
        test_rht_lookup(ht);
@@ -165,10 +177,12 @@ static s64 __init test_rhashtable(struct rhashtable *ht)
        for (i = 0; i < entries; i++) {
                u32 key = i * 2;
 
-               obj = rhashtable_lookup_fast(ht, &key, test_rht_params);
-               BUG_ON(!obj);
+               if (array[i].value != TEST_INSERT_FAIL) {
+                       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();