Эх сурвалжийг харах

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: Eric Dumazet <edumazet@google.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Eric Dumazet 7 жил өмнө
parent
commit
ae6da1f503

+ 2 - 0
lib/rhashtable.c

@@ -333,6 +333,7 @@ static int rhashtable_rehash_table(struct rhashtable *ht)
 		err = rhashtable_rehash_chain(ht, old_hash);
 		err = rhashtable_rehash_chain(ht, old_hash);
 		if (err)
 		if (err)
 			return err;
 			return err;
+		cond_resched();
 	}
 	}
 
 
 	/* Publish the new table pointer. */
 	/* Publish the new table pointer. */
@@ -1112,6 +1113,7 @@ void rhashtable_free_and_destroy(struct rhashtable *ht,
 		for (i = 0; i < tbl->size; i++) {
 		for (i = 0; i < tbl->size; i++) {
 			struct rhash_head *pos, *next;
 			struct rhash_head *pos, *next;
 
 
+			cond_resched();
 			for (pos = rht_dereference(*rht_bucket(tbl, i), ht),
 			for (pos = rht_dereference(*rht_bucket(tbl, i), ht),
 			     next = !rht_is_a_nulls(pos) ?
 			     next = !rht_is_a_nulls(pos) ?
 					rht_dereference(pos->next, ht) : NULL;
 					rht_dereference(pos->next, ht) : NULL;