workqueue: Convert for_each_wq to use built-in list check
Subsystems (3)
PATCH v3 1/1 workqueue: Convert for_each_wq to use built-in list check
list_for_each_entry_rcu now has support to check for RCU reader sections as well as lock. Just use the support in it, instead of explicitly checking in the caller.
---v1->v3: Changed lock_is_held() to lockdep_is_held()
kernel/workqueue.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
kernel/workqueue.c +2 -8
@@ -364,11 +364,6 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); !lockdep_is_held(&wq_pool_mutex), \ "RCU or wq_pool_mutex should be held") -#define assert_rcu_or_wq_mutex (wq) \ - RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ - !lockdep_is_held(&wq->mutex), \ - "RCU or wq->mutex should be held") -#define assert_rcu_or_wq_mutex_or_pool_mutex (wq) \ RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ !lockdep_is_held(&wq->mutex) && \
@@ -425,9 +420,8 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);* ignored. */ #define for_each_pwq (pwq, wq) \ - list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node) \ - if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \ - else + list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node, \ + lockdep_is_held(&(wq->mutex)))#ifdef CONFIG_DEBUG_OBJECTS_WORK
Signature · 1 line
2.23.0.rc1.153.gdeed80330f-goog
Quoted 3 lines · Joel Fernandes (Google)
list_for_each_entry_rcunow has support to check for RCU reader sections as well as lock. Just use the support in it, instead of explicitly checking in the caller.
...
kernel/workqueue.c static void workqueue_sysfs_unregister(struct workqueue_struct *wq); · line 369
Quoted 3 lines
#define
assert_rcu_or_wq_mutex_or_pool_mutex(wq)\kernel/workqueue.c +0
-0RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ !lockdep_is_held(&wq->mutex) && \
Can't you also get rid of this macro?
It's used in one place:
static struct pool_workqueue *unbound_pwq_by_node(struct workqueue_struct *wq,
int node)
{
assert_rcu_or_wq_mutex_or_pool_mutex(wq);
/*
* XXX: @node can be NUMA_NO_NODE if CPU goes offline while a
* delayed item is pending. The plan is to keep CPU -> NODE
* mapping valid and stable across CPU on/offlines. Once that
* happens, this workaround can be removed.
*/
if (unlikely(node == NUMA_NO_NODE))
return wq->dfl_pwq;
return rcu_dereference_raw(wq->numa_pwq_tbl[node]);
}Shouldn't we delete that assert and use
+ return rcu_dereference_check(wq->numa_pwq_tbl[node],
+ lockdep_is_held(&wq->mutex) ||
+ lockdep_is_held(&wq_pool_mutex));
Quoted 5 lines · Matthew Wilcox
Quoted 3 lines · Joel Fernandes (Google)
list_for_each_entry_rcunow has support to check for RCU reader sections as well as lock. Just use the support in it, instead of explicitly checking in the caller.
Quoted 7 lines
...
kernel/workqueue.c static void workqueue_sysfs_unregister(struct workqueue_struct *wq); · line 369
Quoted 3 lines
#define
assert_rcu_or_wq_mutex_or_pool_mutex(wq)\kernel/workqueue.c +0
-0RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ !lockdep_is_held(&wq->mutex) && \Can't you also get rid of this macro?
Could be. But that should be a different patch. I am only cleaning up the RCU list lockdep checking in this series since the series introduces that concept). Please feel free to send a patch for the same.
Arguably, keeping the macro around also can be beneficial in the future.
Quoted 21 lines
It's used in one place:
static struct
pool_workqueue*unbound_pwq_by_node(structworkqueue_struct*wq,
int node){ assert_rcu_or_wq_mutex_or_pool_mutex(wq); /* * XXX: @node can be NUMA_NO_NODE if CPU goes offline while a * delayed item is pending. The plan is to keep CPU -> NODE * mapping valid and stable across CPU on/offlines. Once that * happens, this workaround can be removed. */ if (unlikely(node == NUMA_NO_NODE)) return wq->dfl_pwq; return rcu_dereference_raw(wq->numa_pwq_tbl[node]); }Shouldn't we delete that assert and use
Review
Quoted 3 lines
(quoted diff) +3
-0+ return rcu_dereference_check(wq->numa_pwq_tbl[node], + lockdep_is_held(&wq->mutex) || + lockdep_is_held(&wq_pool_mutex));
Makes sense. This API also does sparse checking. Also hopefully no sparse issues show up because rcu_dereference_check() but anyone such issues should be fixed as well.
thanks,
- Joel
Quoted 1 line
Quoted 6 lines · Joel Fernandes (Google)
list_for_each_entry_rcunow has support to check for RCU reader sections as well as lock. Just use the support in it, instead of explicitly checking in the caller.Acked-by Tejun Heo <[email protected]>Signed-off-by Joel Fernandes (Google) <[email protected]>
Pulled into -rcu for testing and further review, thank you!
Thanx, Paul
Quoted 37 lines
---
v1->v3: Changedlock_is_held()tolockdep_is_held()kernel/workqueue.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)kernel/workqueue.c +2
-8@@ -364,11 +364,6 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); !lockdep_is_held(&wq_pool_mutex), \ "RCU or wq_pool_mutex should be held") -#define assert_rcu_or_wq_mutex (wq) \ - RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ - !lockdep_is_held(&wq->mutex), \ - "RCU or wq->mutex should be held") -#define assert_rcu_or_wq_mutex_or_pool_mutex (wq) \ RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ !lockdep_is_held(&wq->mutex) && \@@ -425,9 +420,8 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);* ignored. */ #define for_each_pwq (pwq, wq) \ - list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node) \ - if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \ - else + list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node, \ + lockdep_is_held(&(wq->mutex)))#ifdef CONFIG_DEBUG_OBJECTS_WORK Signature · 1 line
2.23.0.rc1.153.gdeed80330f-goog