workqueue: remove in_workqueue_context()
Tejun Heo
maintainerRFC PATCH 1/1 workqueue: remove in_workqueue_context()
Commit a25909a4 (lockdep: Add an in_workqueue_context() lockdep-based test function) added in_workqueue_context() but there hasn't been any in-kernel user and the lockdep annotation in workqueue is scheduled to change. Remove the unused function.
---
Paul, I was looking through lockdep annotations to see how they can be improved and noticed that in_workqueue_context() isn't used by anyone and it seems like there hasn't been any in-kernel user either. Can this be removed or do you expect to use it somewhere?
Thanks.
include/linux/workqueue.h | 4 ---- kernel/workqueue.c | 15 --------------- 2 files changed, 19 deletions(-)
include/linux/workqueue.h +0 -4
@@ -429,8 +429,4 @@ extern bool freeze_workqueues_busy(void);extern void thaw_workqueues (void );#endif /* CONFIG_FREEZER */ -#ifdef CONFIG_LOCKDEP -int in_workqueue_context (struct workqueue_struct *wq); -#endif -#endif
kernel/workqueue.c +0 -15
@@ -310,21 +310,6 @@ static inline int __next_wq_cpu(int cpu, const struct cpumask *mask, (cpu) <WORK_CPU_NONE ; \ (cpu) = __next_wq_cpu((cpu), cpu_possible_mask, (wq))) -#ifdef CONFIG_LOCKDEP -/** -* in_workqueue_context() - in context of specified workqueue? -* @wq: the workqueue of interest -* -* Checks lockdep state to see if the current task is executing from -* within a workqueue item. This function exists only if lockdep is -* enabled. -*/ -int in_workqueue_context (struct workqueue_struct *wq) -{ -return lock_is_held (&wq->lockdep_map); -} -#endif -#ifdef CONFIG_DEBUG_OBJECTS_WORK static struct debug_obj_descr work_debug_descr;
Quoted 5 lines · Tejun Heo
Commit
a25909a4(lockdep: Add anin_workqueue_context()lockdep-based test function) addedin_workqueue_context()but there hasn't been any in-kernel user and the lockdep annotation in workqueue is scheduled to change. Remove the unused function.
Quoted 7 lines
Signed-off-by Tejun Heo <[email protected]>Cc Paul E. McKenney <[email protected]>---
Paul, I was looking through lockdep annotations to see how they can be improved and noticed thatin_workqueue_context()isn't used by anyone and it seems like there hasn't been any in-kernel user either. Can this be removed or do you expect to use it somewhere?
I added it for the drivers/vhost changes. They were using a variant of RCU where executing in workqueue context acted as an RCU read-side critical section and where flushing workqueues acted as an RCU grace period. The in_workqueue_context() was then passed to rcu_dereference_check() to verify correct usage.
But you are right, I don't see it being used any more, though I do still see the big block comment documenting this in drivers/vhost/vhost.h.
Michael, what are Tejun and I missing here?
Thanx, Paul
Quoted 45 lines
Thanks.
include/linux/workqueue.h | 4 ---- kernel/workqueue.c | 15 --------------- 2 files changed, 19 deletions(-)include/linux/workqueue.h +0
-4@@ -429,8 +429,4 @@ extern bool freeze_workqueues_busy(void);extern void thaw_workqueues (void );#endif /* CONFIG_FREEZER */ -#ifdef CONFIG_LOCKDEP -int in_workqueue_context (struct workqueue_struct *wq); -#endif -#endif kernel/workqueue.c +0
-15@@ -310,21 +310,6 @@ static inline int __next_wq_cpu(int cpu, const struct cpumask *mask, (cpu) <WORK_CPU_NONE ; \ (cpu) = __next_wq_cpu((cpu), cpu_possible_mask, (wq))) -#ifdef CONFIG_LOCKDEP -/** -* in_workqueue_context() - in context of specified workqueue? -* @wq: the workqueue of interest -* -* Checks lockdep state to see if the current task is executing from -* within a workqueue item. This function exists only if lockdep is -* enabled. -*/ -int in_workqueue_context (struct workqueue_struct *wq) -{ -return lock_is_held (&wq->lockdep_map); -} -#endif -#ifdef CONFIG_DEBUG_OBJECTS_WORK static struct debug_obj_descr work_debug_descr;
Tejun Heo
maintainerQuoted 20 lines · Paul E. McKenney
Quoted 5 lines · Tejun Heo
Commit
a25909a4(lockdep: Add anin_workqueue_context()lockdep-based test function) addedin_workqueue_context()but there hasn't been any in-kernel user and the lockdep annotation in workqueue is scheduled to change. Remove the unused function.Quoted 7 lines
Signed-off-by Tejun Heo <[email protected]>Cc Paul E. McKenney <[email protected]>---
Paul, I was looking through lockdep annotations to see how they can be improved and noticed thatin_workqueue_context()isn't used by anyone and it seems like there hasn't been any in-kernel user either. Can this be removed or do you expect to use it somewhere?I added it for the
drivers/vhostchanges. They were using a variant of RCU where executing in workqueue context acted as an RCU read-side critical section and where flushing workqueues acted as an RCU grace period. Thein_workqueue_context()was then passed torcu_dereference_check()to verify correct usage.
Quoted 4 lines
But you are right, I don't see it being used any more, though I do still see the big block comment documenting this in
drivers/vhost/vhost.h.Michael, what are Tejun and I missing here?
Ping. Shall I go forward with this patch?
Thanks.
Signature · 1 line
tejun
Quoted 6 lines · Tejun Heo
Quoted 6 lines
I added it for the
drivers/vhostchanges. They were using a variant of RCU where executing in workqueue context acted as an RCU read-side critical section and where flushing workqueues acted as an RCU grace period. Thein_workqueue_context()was then passed torcu_dereference_check()to verify correct usage.
Quoted 6 lines
Quoted 4 lines
But you are right, I don't see it being used any more, though I do still see the big block comment documenting this in
drivers/vhost/vhost.h.Michael, what are Tejun and I missing here?
Ping. Shall I go forward with this patch?
Applied to wq#for-next. Scream if this should be reverted.
Thanks.
Signature · 1 line
tejun