Skip to contentSkip to conversation

blk-cgroup: delete rcu_read_lock_held() WARN_ON_ONCE()

PATCH New Jens Axboe 1 participant 1 message May 18, 2022

Subsystems (2)
lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

PATCH 1/1 blk-cgroup: delete rcu_read_lock_held() WARN_ON_ONCE()

A previous commit got rid of unnecessary rcu_read_lock() inside the IRQ disabling queue_lock, but this debug statement was left. It's now firing since we are indeed not inside a RCU read lock, but we don't need to be as we're still preempt safe.

Get rid of the check, as we have a lockdep assert for holding the queue lock right after it anyway.

Fixes 77c570a1ea85 ("blk-cgroup: Remove unnecessary rcu_read_lock/unlock()")

---

block/blk-cgroup.c +0 -1
index 0676cf7a41b5..40161a3f68d0 100644
@@ -298,7 +298,6 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,
 	struct blkcg_gq *blkg;
 	int i, ret;
 
-	WARN_ON_ONCE(!rcu_read_lock_held());
 	lockdep_assert_held(&q->queue_lock);
 
 	/* request_queue is dying, do not create/recreate a blkg */
Signature · 1 line
Jens Axboe