Commit 67b7cbf4 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

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: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 246b23a7

lib/test_rhashtable.c

+20 −6
Original line number Diff line number Diff line
@@ -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,9 +153,18 @@ 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();
@@ -165,11 +177,13 @@ static s64 __init test_rhashtable(struct rhashtable *ht) 
	for (i = 0; i < entries; i++) {

		u32 key = i * 2;



		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);

		}

	}



	end = ktime_get_ns();

	pr_info("  Duration of test: %lld ns\n", end - start);