rcu: Use the proper lockdep annotation in dump_blkd_tasks()
PATCH 1/1 rcu: Use the proper lockdep annotation in dump_blkd_tasks()
Sparse reported this:
| kernel/rcu/tree_plugin.h:814:9: warning: incorrect type in argument 1 (different modifiers) | kernel/rcu/tree_plugin.h:814:9: expected struct lockdep_map const *lock | kernel/rcu/tree_plugin.h:814:9: got struct lockdep_map [noderef] *<noident>
This is caused by using vanilla lockdep annotations on rcu_node::lock, and that requires accessing ->lock of rcu_node directly. However we need to keep rcu_node::lock __private to avoid breaking its extra ordering guarantee. And we have a dedicated lockdep annotation for rcu_node::lock, so use it.
--- kernel/rcu/tree_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/rcu/tree_plugin.h +1 -1
@@ -811,7 +811,7 @@ static void dump_blkd_tasks(struct rcu_node *rnp, int ncheck)int i;struct list_head *lhp; -lockdep_assert_held (&rnp->lock); +raw_lockdep_assert_held_rcu_node (rnp); pr_info("%s: grp: %d-%d level: %d ->qamask %#lx ->gp_tasks %p ->boost_tasks %p ->exp_tasks %p &->blkd_tasks: %p offset: %u\n", __func__, rnp->grplo, rnp->grphi, rnp->level, rnp->qsmask, rnp->gp_tasks, rnp->boost_tasks, rnp->exp_tasks, &rnp->blkd_tasks, (unsigned int)offsetof(typeof(*rnp), blkd_tasks));pr_cont ("\t->blkd_tasks" ); i =0 ;
Signature · 1 line
2.16.2
Quoted 6 lines · Boqun Feng
Sparse reported this:
| kernel/rcu/tree_plugin.h:814:9: warning: incorrect type in argument 1 (different modifiers) | kernel/rcu/tree_plugin.h:814:9: expected struct lockdep_map const *lock | kernel/rcu/tree_plugin.h:814:9: got struct lockdep_map [noderef] *<noident>
Quoted 7 lines
This is caused by using vanilla lockdep annotations on
rcu_node::lock, and that requires accessing ->lock ofrcu_nodedirectly. However we need to keeprcu_node::lock__privateto avoid breaking its extra ordering guarantee. And we have a dedicated lockdep annotation forrcu_node::lock, so use it.Signed-off-by Boqun Feng <[email protected]>
Good eyes! Queued both this and v3 for testing and further review.
Thanx, Paul
Quoted 20 lines
--- kernel/rcu/tree_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/rcu/tree_plugin.h +1
-1@@ -811,7 +811,7 @@ static void dump_blkd_tasks(struct rcu_node *rnp, int ncheck)int i;struct list_head *lhp; -lockdep_assert_held (&rnp->lock); +raw_lockdep_assert_held_rcu_node (rnp); pr_info("%s: grp: %d-%d level: %d ->qamask %#lx ->gp_tasks %p ->boost_tasks %p ->exp_tasks %p &->blkd_tasks: %p offset: %u\n", __func__, rnp->grplo, rnp->grphi, rnp->level, rnp->qsmask, rnp->gp_tasks, rnp->boost_tasks, rnp->exp_tasks, &rnp->blkd_tasks, (unsigned int)offsetof(typeof(*rnp), blkd_tasks));pr_cont ("\t->blkd_tasks" ); i =0 ;Signature · 1 line
2.16.2