| Message ID | 1498780894-8253-3-git-send-email-paulmck@linux.vnet.ibm.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Jun 30, 2017 at 2:01 AM, Paul E. McKenney <paulmck@linux.vnet.ibm.com> wrote: > There is no agreed-upon definition of spin_unlock_wait()'s semantics, > and it appears that all callers could do just as well with a lock/unlock > pair. This commit therefore replaces the spin_unlock_wait() call in > do_task_dead() with spin_lock() followed immediately by spin_unlock(). > This should be safe from a performance perspective because the lock is > this tasks ->pi_lock, and this is called only after the task exits. > > diff --git a/kernel/sched/core.c b/kernel/sched/core.c > index e91138fcde86..6dea3d9728c8 100644 > --- a/kernel/sched/core.c > +++ b/kernel/sched/core.c > @@ -3461,7 +3461,8 @@ void __noreturn do_task_dead(void) > * is held by try_to_wake_up() > */ > smp_mb(); > - raw_spin_unlock_wait(¤t->pi_lock); > + raw_spin_lock(¤t->pi_lock); > + raw_spin_unlock(¤t->pi_lock); Does the raw_spin_lock()/raw_spin_unlock() imply an smp_mb() or stronger? Maybe it would be clearer to remove the extra barrier if so. Arnd
On Fri, Jun 30, 2017 at 12:31:50PM +0200, Arnd Bergmann wrote: > On Fri, Jun 30, 2017 at 2:01 AM, Paul E. McKenney > <paulmck@linux.vnet.ibm.com> wrote: > > There is no agreed-upon definition of spin_unlock_wait()'s semantics, > > and it appears that all callers could do just as well with a lock/unlock > > pair. This commit therefore replaces the spin_unlock_wait() call in > > do_task_dead() with spin_lock() followed immediately by spin_unlock(). > > This should be safe from a performance perspective because the lock is > > this tasks ->pi_lock, and this is called only after the task exits. > > > > diff --git a/kernel/sched/core.c b/kernel/sched/core.c > > index e91138fcde86..6dea3d9728c8 100644 > > --- a/kernel/sched/core.c > > +++ b/kernel/sched/core.c > > @@ -3461,7 +3461,8 @@ void __noreturn do_task_dead(void) > > * is held by try_to_wake_up() > > */ > > smp_mb(); > > - raw_spin_unlock_wait(¤t->pi_lock); > > + raw_spin_lock(¤t->pi_lock); > > + raw_spin_unlock(¤t->pi_lock); > > Does the raw_spin_lock()/raw_spin_unlock() imply an smp_mb() or stronger? > Maybe it would be clearer to remove the extra barrier if so. No, it does not in general, but it does on most architectures, and there are ways to allow those architectures to gain the benefit of their stronger locks. For example, would this work? > > * is held by try_to_wake_up() > > */ > > - smp_mb(); > > - raw_spin_unlock_wait(¤t->pi_lock); > > + smp_mb__before_spinlock(); > > + raw_spin_lock(¤t->pi_lock); > > + raw_spin_unlock(¤t->pi_lock); Thanx, Paul
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index e91138fcde86..6dea3d9728c8 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3461,7 +3461,8 @@ void __noreturn do_task_dead(void) * is held by try_to_wake_up() */ smp_mb(); - raw_spin_unlock_wait(¤t->pi_lock); + raw_spin_lock(¤t->pi_lock); + raw_spin_unlock(¤t->pi_lock); /* Causes final put_task_struct in finish_task_switch(): */ __set_current_state(TASK_DEAD);
There is no agreed-upon definition of spin_unlock_wait()'s semantics, and it appears that all callers could do just as well with a lock/unlock pair. This commit therefore replaces the spin_unlock_wait() call in do_task_dead() with spin_lock() followed immediately by spin_unlock(). This should be safe from a performance perspective because the lock is this tasks ->pi_lock, and this is called only after the task exits. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Will Deacon <will.deacon@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Andrea Parri <parri.andrea@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> --- kernel/sched/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)