rhashtable: RCU annotations for next pointers

tgraf · davem330 · commit 5300fdcb7b7e · 2014-08-14T15:13:39.000-07:00
Properly annotate next pointers as access is RCU protected in
the lookup path.

Signed-off-by: Thomas Graf &lt;tgraf@suug.ch&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h
@@ -21,7 +21,7 @@
 #include <linux/rculist.h>
 
 struct rhash_head {
-	struct rhash_head		*next;
+	struct rhash_head __rcu		*next;
 };
 
 #define INIT_HASH_HEAD(ptr) ((ptr)->next = NULL)
@@ -97,7 +97,7 @@ u32 rhashtable_obj_hashfn(const struct rhashtable *ht, void *ptr);
 void rhashtable_insert(struct rhashtable *ht, struct rhash_head *node, gfp_t);
 bool rhashtable_remove(struct rhashtable *ht, struct rhash_head *node, gfp_t);
 void rhashtable_remove_pprev(struct rhashtable *ht, struct rhash_head *obj,
-			     struct rhash_head **pprev, gfp_t flags);
+			     struct rhash_head __rcu **pprev, gfp_t flags);
 
 bool rht_grow_above_75(const struct rhashtable *ht, size_t new_size);
 bool rht_shrink_below_30(const struct rhashtable *ht, size_t new_size);
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
@@ -386,7 +386,7 @@ EXPORT_SYMBOL_GPL(rhashtable_insert);
  * deletion when combined with walking or lookup.
  */
 void rhashtable_remove_pprev(struct rhashtable *ht, struct rhash_head *obj,
-			     struct rhash_head **pprev, gfp_t flags)
+			     struct rhash_head __rcu **pprev, gfp_t flags)
 {
 	struct bucket_table *tbl = rht_dereference(ht->tbl, ht);
 

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ EXPORT_SYMBOL_GPL(rhashtable_insert);`
`386`	`386`	`* deletion when combined with walking or lookup.`
`387`	`387`	`*/`
`388`	`388`	`void rhashtable_remove_pprev(struct rhashtable ht, struct rhash_head obj,`
`389`		`- struct rhash_head **pprev, gfp_t flags)`
	`389`	`+ struct rhash_head __rcu **pprev, gfp_t flags)`
`390`	`390`	`{`
`391`	`391`	`struct bucket_table *tbl = rht_dereference(ht->tbl, ht);`
`392`	`392`