moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rhashtable: fix some __rcu annotation errors

Browse Source 
With these annotations, the rhashtable now gets no
warnings when compiled with "C=1" for sparse checking.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
NeilBrown
2019-04-12 11:52:07 +10:00
committed by David S. Miller
parent c252aa3e8e
commit e4edbe3c1f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/rhashtable.h
View File

@@ -40,7 +40,7 @@
* the chain. To avoid dereferencing this pointer without clearing * the chain. To avoid dereferencing this pointer without clearing
* the bit first, we use an opaque 'struct rhash_lock_head *' for the * the bit first, we use an opaque 'struct rhash_lock_head *' for the
* pointer stored in the bucket. This struct needs to be defined so * pointer stored in the bucket. This struct needs to be defined so
* that rcu_derefernce() works on it, but it has no content so a * that rcu_dereference() works on it, but it has no content so a
* cast is needed for it to be useful. This ensures it isn't * cast is needed for it to be useful. This ensures it isn't
* used by mistake with clearing the lock bit first. * used by mistake with clearing the lock bit first.
*/ */
@@ -130,10 +130,10 @@ static inline void rht_unlock(struct bucket_table *tbl,
} }
static inline void rht_assign_unlock(struct bucket_table *tbl, static inline void rht_assign_unlock(struct bucket_table *tbl,
struct rhash_lock_head **bkt, struct rhash_lock_head __rcu **bkt,
struct rhash_head *obj) struct rhash_head *obj)
{ {
struct rhash_head **p = (struct rhash_head **)bkt; struct rhash_head __rcu **p = (struct rhash_head __rcu **)bkt;
lock_map_release(&tbl->dep_map); lock_map_release(&tbl->dep_map);
rcu_assign_pointer(*p, obj); rcu_assign_pointer(*p, obj);
@@ -556,6 +556,7 @@ static inline struct rhash_head *__rhashtable_lookup(
}; };
struct rhash_lock_head __rcu * const *bkt; struct rhash_lock_head __rcu * const *bkt;
struct bucket_table *tbl; struct bucket_table *tbl;
struct rhash_head __rcu *head;
struct rhash_head *he; struct rhash_head *he;
unsigned int hash; unsigned int hash;
@@ -564,8 +565,8 @@ restart:
hash = rht_key_hashfn(ht, tbl, key, params); hash = rht_key_hashfn(ht, tbl, key, params);
bkt = rht_bucket(tbl, hash); bkt = rht_bucket(tbl, hash);
do { do {
he = rht_ptr(rht_dereference_bucket_rcu(*bkt, tbl, hash)); head = rht_ptr(rht_dereference_bucket_rcu(*bkt, tbl, hash));
rht_for_each_rcu_from(he, he, tbl, hash) { rht_for_each_rcu_from(he, head, tbl, hash) {
if (params.obj_cmpfn ? if (params.obj_cmpfn ?
params.obj_cmpfn(&arg, rht_obj(ht, he)) : params.obj_cmpfn(&arg, rht_obj(ht, he)) :
rhashtable_compare(&arg, rht_obj(ht, he))) rhashtable_compare(&arg, rht_obj(ht, he)))

4
lib/rhashtable.c
View File

@@ -223,7 +223,7 @@ static int rhashtable_rehash_one(struct rhashtable *ht,
struct bucket_table *new_tbl = rhashtable_last_table(ht, old_tbl); struct bucket_table *new_tbl = rhashtable_last_table(ht, old_tbl);
int err = -EAGAIN; int err = -EAGAIN;
struct rhash_head *head, *next, *entry; struct rhash_head *head, *next, *entry;
struct rhash_head **pprev = NULL; struct rhash_head __rcu **pprev = NULL;
unsigned int new_hash; unsigned int new_hash;
if (new_tbl->nest) if (new_tbl->nest)
@@ -486,7 +486,7 @@ static void *rhashtable_lookup_one(struct rhashtable *ht,
.ht = ht, .ht = ht,
.key = key, .key = key,
}; };
struct rhash_head **pprev = NULL; struct rhash_head __rcu **pprev = NULL;
struct rhash_head *head; struct rhash_head *head;
int elasticity; int elasticity;