diff options
| author | Eric Dumazet <edumazet@google.com> | 2018-10-10 22:29:55 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-08 13:25:31 +0300 |
| commit | bf5ea30ff5a143cf7ccb068259d16f4d2d1a2dd9 (patch) | |
| tree | 76ed2982fcef6422d7b6deb26d55aff35fbb6093 | |
| parent | 9e5f4d0b79f8708db79c912404e68c915eb54f4d (diff) | |
| download | linux-bf5ea30ff5a143cf7ccb068259d16f4d2d1a2dd9.tar.xz | |
rhashtable: add schedule points
commit ae6da1f503abb5a5081f9f6c4a6881de97830f3e upstream.
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>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | lib/rhashtable.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 991bee32e52e..7bb8649429bf 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -250,8 +250,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); @@ -842,6 +844,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; |