Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb19348b authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

rhashtable: add schedule points 



Rehashing and destroying large hash table takes a lot of time,
and happens in process context. It is safe to add cond_resched()
in rhashtable_rehash_table() and rhashtable_free_and_destroy()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
(cherry picked from commit ae6da1f503abb5a5081f9f6c4a6881de97830f3e)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 620018dd

lib/rhashtable.c

+4 −1
Original line number Diff line number Diff line
@@ -251,8 +251,10 @@ static int rhashtable_rehash_table(struct rhashtable *ht) 
	if (!new_tbl)

		return 0;



	for (old_hash = 0; old_hash < old_tbl->size; old_hash++)

	for (old_hash = 0; old_hash < old_tbl->size; old_hash++) {

		rhashtable_rehash_chain(ht, old_hash);

		cond_resched();

	}



	/* Publish the new table pointer. */

	rcu_assign_pointer(ht->tbl, new_tbl);
@@ -993,6 +995,7 @@ void rhashtable_free_and_destroy(struct rhashtable *ht, 
		for (i = 0; i < tbl->size; i++) {

			struct rhash_head *pos, *next;



			cond_resched();

			for (pos = rht_dereference(tbl->buckets[i], ht),

			     next = !rht_is_a_nulls(pos) ?

					rht_dereference(pos->next, ht) : NULL;