locking/percpu-rwsem: Remove WQ_FLAG_EXCLUSIVE flags
Subsystems (3)
PATCH 1/1 locking/percpu-rwsem: Remove WQ_FLAG_EXCLUSIVE flags
From: Zqiang <[email protected]>
Remove WQ_FLAG_EXCLUSIVE from "wq_entry.flags", using function __add_wait_queue_entry_tail_exclusive substitution.
--- kernel/locking/percpu-rwsem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/locking/percpu-rwsem.c +2 -2
@@ -148,8 +148,8 @@ static void percpu_rwsem_wait(struct percpu_rw_semaphore *sem, bool reader)*/ wait = !__percpu_rwsem_trylock (sem, reader);if (wait) { - wq_entry.flags |=WQ_FLAG_EXCLUSIVE | reader *WQ_FLAG_CUSTOM ; -__add_wait_queue_entry_tail (&sem->waiters, &wq_entry); + wq_entry.flags |= reader *WQ_FLAG_CUSTOM ; +__add_wait_queue_entry_tail_exclusive (&sem->waiters, &wq_entry); }spin_unlock_irq (&sem->waiters.lock);
Signature · 1 line
2.24.1
Quoted 15 lines · On Wed, Jul 01, 2020 at 01:57:20PM +0800, [email protected] wrote:
From: Zqiang <[email protected]>
Remove
WQ_FLAG_EXCLUSIVEfrom "wq_entry.flags", using function__add_wait_queue_entry_tail_exclusivesubstitution.Signed-off-by Zqiang <[email protected]>--- kernel/locking/percpu-rwsem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)kernel/locking/percpu-rwsem.c +0
-0
kernel/locking/percpu-rwsem.c static void percpu_rwsem_wait(struct percpu_rw_semaphore *sem, bool reader) · line 154
Quoted 9 lines
kernel/locking/percpu-rwsem.c +2
-2@@ -148,8 +148,8 @@ static void percpu_rwsem_wait(struct percpu_rw_semaphore *sem, bool reader)*/ wait = !__percpu_rwsem_trylock (sem, reader);if (wait) { - wq_entry.flags |=WQ_FLAG_EXCLUSIVE | reader *WQ_FLAG_CUSTOM ; -__add_wait_queue_entry_tail (&sem->waiters, &wq_entry); + wq_entry.flags |= reader *WQ_FLAG_CUSTOM ; +__add_wait_queue_entry_tail_exclusive (&sem->waiters, &wq_entry); }spin_unlock_irq (&sem->waiters.lock);
Seems straightforward enough:
Will
[email protected]
maintainerQuoted 11 lines · Will Deacon
Quoted 10 lines · On Wed, Jul 01, 2020 at 01:57:20PM +0800, [email protected] wrote:
From: Zqiang <[email protected]>
Remove
WQ_FLAG_EXCLUSIVEfrom "wq_entry.flags", using function__add_wait_queue_entry_tail_exclusivesubstitution.Signed-off-by Zqiang <[email protected]>--- kernel/locking/percpu-rwsem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 16 lines
Quoted 5 lines
kernel/locking/percpu-rwsem.c +0
-0kernel/locking/percpu-rwsem.c static void percpu_rwsem_wait(struct percpu_rw_semaphore *sem, bool reader) · line 154
Quoted 9 lines
kernel/locking/percpu-rwsem.c +2
-2@@ -148,8 +148,8 @@ static void percpu_rwsem_wait(struct percpu_rw_semaphore *sem, bool reader)*/ wait = !__percpu_rwsem_trylock (sem, reader);if (wait) { - wq_entry.flags |=WQ_FLAG_EXCLUSIVE | reader *WQ_FLAG_CUSTOM ; -__add_wait_queue_entry_tail (&sem->waiters, &wq_entry); + wq_entry.flags |= reader *WQ_FLAG_CUSTOM ; +__add_wait_queue_entry_tail_exclusive (&sem->waiters, &wq_entry); }spin_unlock_irq (&sem->waiters.lock);Seems straightforward enough:
Yeah, but I wonder why. Qiang, what made you write this patch?
afaict, there is only a single __add_wait_queue_entry_tail_exclusive() user in the entire tree (two after this patch). I'm thinking it would be much better to kill of that one user and remove the entire function.
something like the completely untested thing below, please double check.
---
fs/orangefs/orangefs-bufmap.c +23 -26
@@ -80,17 +80,10 @@ static void put(struct slot_map *m, int slot)static int wait_for_free (struct slot_map *m) { -long left = slot_timeout_secs *HZ ; -DEFINE_WAIT (wait); +long ret, left = slot_timeout_secs *HZ ; do { - long n = left, t; - if (likely(list_empty(&wait.entry))) - __add_wait_queue_entry_tail_exclusive(&m->q, &wait); - set_current_state(TASK_INTERRUPTIBLE); - - if (m->c > 0) - break; + long n = left; if (m->c < 0) { /* we are waiting for map to be installed */
@@ -98,27 +91,31 @@ static int wait_for_free(struct slot_map *m)if (n >ORANGEFS_BUFMAP_WAIT_TIMEOUT_SECS *HZ ) n =ORANGEFS_BUFMAP_WAIT_TIMEOUT_SECS *HZ ; } -spin_unlock (&m->q.lock); - t =schedule_timeout (n); -spin_lock (&m->q.lock); -if (unlikely (!t) && n != left && m->c <0 ) - left = t; -else - left = t + (left - n); -if (signal_pending (current)) - left = -EINTR ; - }while (left >0 ); -if (!list_empty (&wait.entry)) -list_del (&wait.entry); -else if (left <=0 &&waitqueue_active (&m->q)) -__wake_up_locked_key (&m->q,TASK_INTERRUPTIBLE ,NULL ); -__set_current_state (TASK_RUNNING ); + ret =___wait_event (m->q, m->c >0 ,TASK_INTERRUPTIBLE ,1 , n, + + spin_unlock(&m->lock); + __ret =schedule_timeout (__ret); +spin_lock (&m->lock); + + ); -if (likely (left >0 )) +if (ret)/* @cond := true || -ERESTARTSYS */ +break ; + + left -= n; + }while (left >0 ); + +if (!ret)return 0 ; -return left <0 ? -EINTR : -ETIMEDOUT ; +if (ret <0 ) { +if (waitqueue_active (&w->q)) +__wake_up_locked_key (&m->q,TASK_INTERRUPTIBLE ,NULL ); +return -EINTR ; + } + +return -ETIMEDOUT ; }static int get (struct slot_map *m)
include/linux/wait.h +0 -7
@@ -185,13 +185,6 @@ static inline void __add_wait_queue_entry_tail(struct wait_queue_head *wq_head,list_add_tail (&wq_entry->entry, &wq_head->head); } -static inline void -__add_wait_queue_entry_tail_exclusive (struct wait_queue_head *wq_head,struct wait_queue_entry *wq_entry) -{ - wq_entry->flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue_entry_tail (wq_head, wq_entry); -} -static inline void __remove_wait_queue (struct wait_queue_head *wq_head,struct wait_queue_entry *wq_entry) {