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

Commit ae6da1f5 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
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>
parent 483a6e4f

lib/rhashtable.c

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ static int rhashtable_rehash_table(struct rhashtable *ht) 
		err = rhashtable_rehash_chain(ht, old_hash);

		if (err)

			return err;

		cond_resched();

	}



	/* Publish the new table pointer. */
@@ -1112,6 +1113,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(*rht_bucket(tbl, i), ht),

			     next = !rht_is_a_nulls(pos) ?

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