On Thu, Mar 12, 2015 at 11:29:24AM +0800, Fengguang Wu wrote:
> Greetings,
>
> 0day kernel testing robot got the below dmesg and the first bad commit is
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git master
>
> commit aa34a6cb0478842452bac58edb50d3ef9e178c92
> Author: Herbert Xu <[email protected]>
> AuthorDate: Wed Mar 11 09:43:48 2015 +1100
> Commit: David S. Miller <[email protected]>
> CommitDate: Wed Mar 11 16:36:21 2015 -0400
Thanks for the report. This patch should fix it.
--8<--
rhashtable: Add annotation to nested lock
Commit aa34a6cb0478842452bac58edb50d3ef9e178c92 ("rhashtable:
Add arbitrary rehash function") killed the annotation on the
nested lock which leads to bitching from lockdep.
Reported-by: Fengguang Wu <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 5f9af45..6ffc793 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -225,7 +225,7 @@ static int rhashtable_rehash_one(struct rhashtable *ht,
unsigned old_hash)
new_bucket_lock = bucket_lock(new_tbl, new_hash);
- spin_lock(new_bucket_lock);
+ spin_lock_nested(new_bucket_lock, RHT_LOCK_NESTED);
head = rht_dereference_bucket(new_tbl->buckets[new_hash],
new_tbl, new_hash);
@@ -406,7 +406,7 @@ static bool __rhashtable_insert(struct rhashtable *ht,
struct rhash_head *obj,
tbl = rht_dereference_rcu(ht->future_tbl, ht);
if (tbl != old_tbl) {
hash = head_hashfn(ht, tbl, obj);
- spin_lock(bucket_lock(tbl, hash));
+ spin_lock_nested(bucket_lock(tbl, hash), RHT_LOCK_NESTED);
}
if (compare &&
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
