blk-cgroup: fix rcu lockdep warning in blkg_lookup()
PATCH 1/1 blk-cgroup: fix rcu lockdep warning in blkg_lookup()
blkg_lookup() is called with either queue_lock or rcu read lock, so use rcu_dereference_check(lockdep_is_held(&q->queue_lock)) for retrieving 'blkg', which way models the check exactly for covering queue lock or rcu read lock.
Fix lockdep warning of "block/blk-cgroup.h:254 suspicious rcu_dereference_check() usage!" from blkg_lookup().
--- block/blk-cgroup.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/blk-cgroup.h +2 -1
@@ -252,7 +252,8 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg,if (blkcg == &blkcg_root)return q->root_blkg; - blkg =rcu_dereference (blkcg->blkg_hint); + blkg =rcu_dereference_check (blkcg->blkg_hint, +lockdep_is_held (&q->queue_lock));if (blkg && blkg->q == q)return blkg;
Signature · 1 line
2.42.0
Quoted 20 lines · Ming Lei
blkg_lookup()is called with eitherqueue_lockor rcu read lock, so use rcu_dereference_check(lockdep_is_held(&q->queue_lock)) for retrieving 'blkg', which way models the check exactly for covering queue lock or rcu read lock.Fix lockdep warning of "
block/blk-cgroup.h:254suspiciousrcu_dereference_check()usage!" fromblkg_lookup().Tested-by Changhui Zhong <[email protected]>Signed-off-by Ming Lei <[email protected]>--- block/blk-cgroup.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)block/blk-cgroup.h +0
-0
block/blk-cgroup.h static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, · line 258
Quoted 8 lines
block/blk-cgroup.h +2
-1@@ -252,7 +252,8 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg,if (blkcg == &blkcg_root)return q->root_blkg; - blkg =rcu_dereference (blkcg->blkg_hint); + blkg =rcu_dereference_check (blkcg->blkg_hint, +lockdep_is_held (&q->queue_lock));if (blkg && blkg->q == q)return blkg;
Hello,
Ping...
Thanks,
Tejun Heo
Acked-byQuoted 7 lines · Ming Lei
Quoted 6 lines · Ming Lei
blkg_lookup()is called with eitherqueue_lockor rcu read lock, so use rcu_dereference_check(lockdep_is_held(&q->queue_lock)) for retrieving 'blkg', which way models the check exactly for covering queue lock or rcu read lock.
Quoted 5 lines
Quoted 5 lines
Fix lockdep warning of "
block/blk-cgroup.h:254suspiciousrcu_dereference_check()usage!" fromblkg_lookup().Tested-by Changhui Zhong <[email protected]>Signed-off-by Ming Lei <[email protected]>
Thanks.
Signature · 1 line
tejun
Hi,
Quoted 19 lines · Ming Lei
blkg_lookup()is called with eitherqueue_lockor rcu read lock, so use rcu_dereference_check(lockdep_is_held(&q->queue_lock)) for retrieving 'blkg', which way models the check exactly for covering queue lock or rcu read lock.Fix lockdep warning of "
block/blk-cgroup.h:254suspiciousrcu_dereference_check()usage!" fromblkg_lookup().Tested-by Changhui Zhong <[email protected]>Signed-off-by Ming Lei <[email protected]>--- block/blk-cgroup.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)block/blk-cgroup.h +0
-0
block/blk-cgroup.h static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, · line 256
Quoted 6 lines
block/blk-cgroup.h +2
-1@@ -252,7 +252,8 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg,if (blkcg == &blkcg_root)return q->root_blkg; - blkg =rcu_dereference (blkcg->blkg_hint); + blkg =rcu_dereference_check (blkcg->blkg_hint, +lockdep_is_held (&q->queue_lock));
This patch itself is correct, and in fact this is a false positive warning.
I noticed that commit 83462a6c971c ("blkcg: Drop unnecessary RCU read [un]locks from blkg_conf_prep/finish()") drop rcu_read_lock/unlock() because 'queue_lock' is held. This is correct, however you add this back for tg_conf_updated() later in commit 27b13e209ddc ("blk-throttle: fix lockdep warning of "cgroup_mutex or RCU read lock required!"") because rcu_read_lock_held() from blkg_lookup() is triggered. And this patch is again another use case cased by commit 83462a6c971c.
I just wonder, with the respect of rcu implementation, is it possible to add preemptible() check directly in rcu_read_lock_held() to bypass all this kind of false positive warning?
Thanks,
Kuai
Quoted 4 lines
block/blk-cgroup.h +0
-0if (blkg && blkg->q == q)return blkg;
Quoted 17 lines · Yu Kuai
Hi,
Quoted 14 lines · Ming Lei
blkg_lookup()is called with eitherqueue_lockor rcu read lock, so use rcu_dereference_check(lockdep_is_held(&q->queue_lock)) for retrieving 'blkg', which way models the check exactly for covering queue lock or rcu read lock.Fix lockdep warning of "
block/blk-cgroup.h:254suspiciousrcu_dereference_check()usage!" fromblkg_lookup().Tested-by Changhui Zhong <[email protected]>Signed-off-by Ming Lei <[email protected]>--- block/blk-cgroup.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 13 lines
block/blk-cgroup.h static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, · line 255
Quoted 10 lines
block/blk-cgroup.h +2
-1@@ -252,7 +252,8 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg,if (blkcg == &blkcg_root)return q->root_blkg; - blkg =rcu_dereference (blkcg->blkg_hint); + blkg =rcu_dereference_check (blkcg->blkg_hint, +lockdep_is_held (&q->queue_lock));This patch itself is correct, and in fact this is a false positive warning.
Yeah, it is, but we always teach lockdep to not trigger warning,
Quoted 8 lines
I noticed that commit
83462a6c971c("blkcg: Drop unnecessary RCU read [un]locks from blkg_conf_prep/finish()") drop rcu_read_lock/unlock() because 'queue_lock' is held. This is correct, however you add this back fortg_conf_updated()later in commit27b13e209ddc("blk-throttle: fix lockdep warning of "cgroup_mutexor RCU read lock required!"") becausercu_read_lock_held()fromblkg_lookup()is triggered. And this patch is again another use case cased by commit83462a6c971c.
We should add:
Quoted 4 lines
I just wonder, with the respect of rcu implementation, is it possible to add
preemptible()check directly inrcu_read_lock_held()to bypass all this kind of false positive warning?
It isn't related with rcu_read_lock_held(), and the check is done in RCU_LOCKDEP_WARN(). rcu_dereference_check() does cover this situation, and no need to invent wheel for avoiding the warning.
Thanks,
Ming
Yu Kuai
Reviewed-byQuoted 43 lines · Ming Lei
Quoted 17 lines · Yu Kuai
Hi,
Quoted 14 lines · Ming Lei
blkg_lookup()is called with eitherqueue_lockor rcu read lock, so use rcu_dereference_check(lockdep_is_held(&q->queue_lock)) for retrieving 'blkg', which way models the check exactly for covering queue lock or rcu read lock.Fix lockdep warning of "
block/blk-cgroup.h:254suspiciousrcu_dereference_check()usage!" fromblkg_lookup().Tested-by Changhui Zhong <[email protected]>Signed-off-by Ming Lei <[email protected]>--- block/blk-cgroup.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Quoted 13 lines
block/blk-cgroup.h static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, · line 255
Quoted 10 lines
block/blk-cgroup.h +2
-1@@ -252,7 +252,8 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg,if (blkcg == &blkcg_root)return q->root_blkg; - blkg =rcu_dereference (blkcg->blkg_hint); + blkg =rcu_dereference_check (blkcg->blkg_hint, +lockdep_is_held (&q->queue_lock));This patch itself is correct, and in fact this is a false positive warning.
Yeah, it is, but we always teach lockdep to not trigger warning,
Quoted 8 lines
I noticed that commit
83462a6c971c("blkcg: Drop unnecessary RCU read [un]locks from blkg_conf_prep/finish()") drop rcu_read_lock/unlock() because 'queue_lock' is held. This is correct, however you add this back fortg_conf_updated()later in commit27b13e209ddc("blk-throttle: fix lockdep warning of "cgroup_mutexor RCU read lock required!"") becausercu_read_lock_held()fromblkg_lookup()is triggered. And this patch is again another use case cased by commit83462a6c971c.
Quoted 3 lines
We should add:
Fixes 83462a6c971c ("blkcg: Drop unnecessary RCU read [un]locks from blkg_conf_prep/finish()")
With the above fix tag,
Quoted 16 lines
Quoted 5 lines
I just wonder, with the respect of rcu implementation, is it possible to add
preemptible()check directly inrcu_read_lock_held()to bypass all this kind of false positive warning?It isn't related with
rcu_read_lock_held(), and the check is done inRCU_LOCKDEP_WARN().rcu_dereference_check()does cover this situation, and no need to invent wheel for avoiding the warning.Thanks,
Ming.
Quoted 9 lines · Ming Lei
blkg_lookup()is called with eitherqueue_lockor rcu read lock, so use rcu_dereference_check(lockdep_is_held(&q->queue_lock)) for retrieving 'blkg', which way models the check exactly for covering queue lock or rcu read lock.Fix lockdep warning of "
block/blk-cgroup.h:254suspiciousrcu_dereference_check()usage!" fromblkg_lookup().[...]
Applied, thanks!
[1/1] blk-cgroup: fix rcu lockdep warning in blkg_lookup()
commit: 393cd8ffd832f23eec3a105553eff622e8198918
Best regards,
Signature · 1 line
Jens Axboe