rhashtable: add schedule points
authorEric Dumazet <edumazet@google.com>
Sat, 31 Mar 2018 19:58:48 +0000 (12:58 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Apr 2018 03:25:39 +0000 (23:25 -0400)
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>
lib/rhashtable.c

index 47de025..2b2b799 100644 (file)
@@ -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;