Skip to content

Commit

Permalink
rhashtable: Free bucket tables asynchronously after rehash
Browse files Browse the repository at this point in the history
There is in fact no need to wait for an RCU grace period in the
rehash function, since all insertions are guaranteed to go into
the new table through spin locks.

This patch uses call_rcu to free the old/rehashed table at our
leisure.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Herbert Xu authored and David S. Miller committed Mar 15, 2015
1 parent 5269b53 commit 9d901bc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions include/linux/rhashtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ struct rhash_head {
* @locks_mask: Mask to apply before accessing locks[]
* @locks: Array of spinlocks protecting individual buckets
* @walkers: List of active walkers
* @rcu: RCU structure for freeing the table
* @buckets: size * hash buckets
*/
struct bucket_table {
Expand All @@ -63,6 +64,7 @@ struct bucket_table {
unsigned int locks_mask;
spinlock_t *locks;
struct list_head walkers;
struct rcu_head rcu;

struct rhash_head __rcu *buckets[] ____cacheline_aligned_in_smp;
};
Expand Down
9 changes: 6 additions & 3 deletions lib/rhashtable.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@ static void bucket_table_free(const struct bucket_table *tbl)
kvfree(tbl);
}

static void bucket_table_free_rcu(struct rcu_head *head)
{
bucket_table_free(container_of(head, struct bucket_table, rcu));
}

static struct bucket_table *bucket_table_alloc(struct rhashtable *ht,
size_t nbuckets)
{
Expand Down Expand Up @@ -288,9 +293,7 @@ static void rhashtable_rehash(struct rhashtable *ht,
* table, and thus no references to the old table will
* remain.
*/
synchronize_rcu();

bucket_table_free(old_tbl);
call_rcu(&old_tbl->rcu, bucket_table_free_rcu);
}

/**
Expand Down

0 comments on commit 9d901bc

Please sign in to comment.