iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhashtable: use cmpxchg() in nested_table_alloc()

Browse Source 
nested_table_alloc() relies on the fact that there is
at most one spinlock allocated for every slot in the top
level nested table, so it is not possible for two threads
to try to allocate the same table at the same time.

This assumption is a little fragile (it is not explicit) and is
unnecessary as cmpxchg() can be used instead.

A future patch will replace the spinlocks by per-bucket bitlocks,
and then we won't be able to protect the slot pointer with a spinlock.

So replace rcu_assign_pointer() with cmpxchg() - which has equivalent
barrier properties.
If it the cmp fails, free the table that was just allocated.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
NeilBrown 2019-04-02 10:07:45 +11:00 committed by David S. Miller
parent 1e045a62ee
commit 7a41c294c1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/rhashtable.c
View File

@ -131,9 +131,11 @@ static union nested_table *nested_table_alloc(struct rhashtable *ht,
INIT_RHT_NULLS_HEAD(ntbl[i].bucket); INIT_RHT_NULLS_HEAD(ntbl[i].bucket);
} }
rcu_assign_pointer(*prev, ntbl); if (cmpxchg(prev, NULL, ntbl) == NULL)
return ntbl;
return ntbl; /* Raced with another thread. */
kfree(ntbl);
return rcu_dereference(*prev);
} }
static struct bucket_table *nested_bucket_table_alloc(struct rhashtable *ht, static struct bucket_table *nested_bucket_table_alloc(struct rhashtable *ht,