* [PATCH] sched: Update comment of try_invoke_on_locked_down_task()
@ 2023-07-31 8:57 Zhang Qiao
2023-10-04 9:31 ` Ingo Molnar
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Zhang Qiao @ 2023-07-31 8:57 UTC (permalink / raw)
To: mingo, peterz, juri.lelli, vincent.guittot
Cc: dietmar.eggemann, rostedt, bsegall, mgorman, bristot, vschneid,
linux-kernel, Zhang Qiao
Since commit 9b3c4ab3045e ("sched,rcu: Rework
try_invoke_on_locked_down_task()") renamed
try_invoke_on_locked_down_task() to task_call_func().
Now, update some comment about it.
Signed-off-by: Zhang Qiao <zhangqiao22@huawei.com>
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 0d18c3969f90..540ac33ddb80 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4186,7 +4186,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
* Pairs with the LOCK+smp_mb__after_spinlock() on rq->lock in
* __schedule(). See the comment for smp_mb__after_spinlock().
*
- * A similar smb_rmb() lives in try_invoke_on_locked_down_task().
+ * A similar smb_rmb() lives in task_call_func().
*/
smp_rmb();
if (READ_ONCE(p->on_rq) && ttwu_runnable(p, wake_flags))
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] sched: Update comment of try_invoke_on_locked_down_task()
2023-07-31 8:57 [PATCH] sched: Update comment of try_invoke_on_locked_down_task() Zhang Qiao
@ 2023-10-04 9:31 ` Ingo Molnar
2023-10-04 9:33 ` Peter Zijlstra
2023-10-04 9:42 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2023-10-07 17:11 ` tip-bot2 for Ingo Molnar
2 siblings, 1 reply; 6+ messages in thread
From: Ingo Molnar @ 2023-10-04 9:31 UTC (permalink / raw)
To: Zhang Qiao
Cc: mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, bristot, vschneid, linux-kernel
* Zhang Qiao <zhangqiao22@huawei.com> wrote:
> Since commit 9b3c4ab3045e ("sched,rcu: Rework
> try_invoke_on_locked_down_task()") renamed
> try_invoke_on_locked_down_task() to task_call_func().
> Now, update some comment about it.
>
> Signed-off-by: Zhang Qiao <zhangqiao22@huawei.com>
> ---
> kernel/sched/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 0d18c3969f90..540ac33ddb80 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -4186,7 +4186,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
> * Pairs with the LOCK+smp_mb__after_spinlock() on rq->lock in
> * __schedule(). See the comment for smp_mb__after_spinlock().
> *
> - * A similar smb_rmb() lives in try_invoke_on_locked_down_task().
> + * A similar smb_rmb() lives in task_call_func().
Except the matching smp_rmb() doesn't live in task_call_func() anymore, so
you now turned a stale comment into a misleading one ...
And how about fixing the obvious 'smb/smp' typo as well?
Thanks,
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] sched: Update comment of try_invoke_on_locked_down_task()
2023-10-04 9:31 ` Ingo Molnar
@ 2023-10-04 9:33 ` Peter Zijlstra
2023-10-04 9:39 ` [PATCH] sched/core: Update stale comment in try_to_wake_up() Ingo Molnar
0 siblings, 1 reply; 6+ messages in thread
From: Peter Zijlstra @ 2023-10-04 9:33 UTC (permalink / raw)
To: Ingo Molnar
Cc: Zhang Qiao, mingo, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, bristot, vschneid, linux-kernel
On Wed, Oct 04, 2023 at 11:31:26AM +0200, Ingo Molnar wrote:
>
> * Zhang Qiao <zhangqiao22@huawei.com> wrote:
>
> > Since commit 9b3c4ab3045e ("sched,rcu: Rework
> > try_invoke_on_locked_down_task()") renamed
> > try_invoke_on_locked_down_task() to task_call_func().
> > Now, update some comment about it.
> >
> > Signed-off-by: Zhang Qiao <zhangqiao22@huawei.com>
> > ---
> > kernel/sched/core.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> > index 0d18c3969f90..540ac33ddb80 100644
> > --- a/kernel/sched/core.c
> > +++ b/kernel/sched/core.c
> > @@ -4186,7 +4186,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
> > * Pairs with the LOCK+smp_mb__after_spinlock() on rq->lock in
> > * __schedule(). See the comment for smp_mb__after_spinlock().
> > *
> > - * A similar smb_rmb() lives in try_invoke_on_locked_down_task().
> > + * A similar smb_rmb() lives in task_call_func().
>
> Except the matching smp_rmb() doesn't live in task_call_func() anymore, so
> you now turned a stale comment into a misleading one ...
It moved, *again*, it's now in __task_needs_rq_lock() :-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] sched/core: Update stale comment in try_to_wake_up()
2023-10-04 9:33 ` Peter Zijlstra
@ 2023-10-04 9:39 ` Ingo Molnar
0 siblings, 0 replies; 6+ messages in thread
From: Ingo Molnar @ 2023-10-04 9:39 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Zhang Qiao, mingo, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, bristot, vschneid, linux-kernel
* Peter Zijlstra <peterz@infradead.org> wrote:
> On Wed, Oct 04, 2023 at 11:31:26AM +0200, Ingo Molnar wrote:
> >
> > * Zhang Qiao <zhangqiao22@huawei.com> wrote:
> >
> > > Since commit 9b3c4ab3045e ("sched,rcu: Rework
> > > try_invoke_on_locked_down_task()") renamed
> > > try_invoke_on_locked_down_task() to task_call_func().
> > > Now, update some comment about it.
> > >
> > > Signed-off-by: Zhang Qiao <zhangqiao22@huawei.com>
> > > ---
> > > kernel/sched/core.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> > > index 0d18c3969f90..540ac33ddb80 100644
> > > --- a/kernel/sched/core.c
> > > +++ b/kernel/sched/core.c
> > > @@ -4186,7 +4186,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
> > > * Pairs with the LOCK+smp_mb__after_spinlock() on rq->lock in
> > > * __schedule(). See the comment for smp_mb__after_spinlock().
> > > *
> > > - * A similar smb_rmb() lives in try_invoke_on_locked_down_task().
> > > + * A similar smb_rmb() lives in task_call_func().
> >
> > Except the matching smp_rmb() doesn't live in task_call_func() anymore, so
> > you now turned a stale comment into a misleading one ...
>
> It moved, *again*, it's now in __task_needs_rq_lock() :-)
Yeah, I know, see:
bdf85bec2b1e ("sched/core: Update stale comment in try_to_wake_up()")
Thanks,
Ingo
====================>
From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 4 Oct 2023 11:33:36 +0200
Subject: [PATCH] sched/core: Update stale comment in try_to_wake_up()
The following commit:
9b3c4ab3045e ("sched,rcu: Rework try_invoke_on_locked_down_task()")
... renamed try_invoke_on_locked_down_task() to task_call_func(),
but forgot to update the comment in try_to_wake_up().
But it turns out that the smp_rmb() doesn't live in task_call_func()
either, it was moved to __task_needs_rq_lock() in:
91dabf33ae5d ("sched: Fix race in task_call_func()")
Fix that now.
Also fix the s/smb/smp typo while at it.
Reported-by: Zhang Qiao <zhangqiao22@huawei.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230731085759.11443-1-zhangqiao22@huawei.com
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 65e10ac34660..f5783cb16791 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4237,7 +4237,7 @@ int try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
* Pairs with the LOCK+smp_mb__after_spinlock() on rq->lock in
* __schedule(). See the comment for smp_mb__after_spinlock().
*
- * A similar smb_rmb() lives in try_invoke_on_locked_down_task().
+ * A similar smp_rmb() lives in __task_needs_rq_lock().
*/
smp_rmb();
if (READ_ONCE(p->on_rq) && ttwu_runnable(p, wake_flags))
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip: sched/core] sched/core: Update stale comment in try_to_wake_up()
2023-07-31 8:57 [PATCH] sched: Update comment of try_invoke_on_locked_down_task() Zhang Qiao
2023-10-04 9:31 ` Ingo Molnar
@ 2023-10-04 9:42 ` tip-bot2 for Ingo Molnar
2023-10-07 17:11 ` tip-bot2 for Ingo Molnar
2 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Ingo Molnar @ 2023-10-04 9:42 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Zhang Qiao, Ingo Molnar, x86, linux-kernel
The following commit has been merged into the sched/core branch of tip:
Commit-ID: bdf85bec2b1ea852daf415cf6f1c9ef7d584c8c5
Gitweb: https://git.kernel.org/tip/bdf85bec2b1ea852daf415cf6f1c9ef7d584c8c5
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Wed, 04 Oct 2023 11:33:36 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 04 Oct 2023 11:34:34 +02:00
sched/core: Update stale comment in try_to_wake_up()
The following commit:
9b3c4ab3045e ("sched,rcu: Rework try_invoke_on_locked_down_task()")
... renamed try_invoke_on_locked_down_task() to task_call_func(),
but forgot to update the comment in try_to_wake_up().
But it turns out that the smp_rmb() doesn't live in task_call_func()
either, it was moved to __task_needs_rq_lock() in:
91dabf33ae5d ("sched: Fix race in task_call_func()")
Fix that now.
Also fix the s/smb/smp typo while at it.
Reported-by: Zhang Qiao <zhangqiao22@huawei.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230731085759.11443-1-zhangqiao22@huawei.com
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 65e10ac..f5783cb 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4237,7 +4237,7 @@ int try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
* Pairs with the LOCK+smp_mb__after_spinlock() on rq->lock in
* __schedule(). See the comment for smp_mb__after_spinlock().
*
- * A similar smb_rmb() lives in try_invoke_on_locked_down_task().
+ * A similar smp_rmb() lives in __task_needs_rq_lock().
*/
smp_rmb();
if (READ_ONCE(p->on_rq) && ttwu_runnable(p, wake_flags))
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip: sched/core] sched/core: Update stale comment in try_to_wake_up()
2023-07-31 8:57 [PATCH] sched: Update comment of try_invoke_on_locked_down_task() Zhang Qiao
2023-10-04 9:31 ` Ingo Molnar
2023-10-04 9:42 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
@ 2023-10-07 17:11 ` tip-bot2 for Ingo Molnar
2 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Ingo Molnar @ 2023-10-07 17:11 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Zhang Qiao, Ingo Molnar, x86, linux-kernel
The following commit has been merged into the sched/core branch of tip:
Commit-ID: ea41bb514fe286bf50498b3c6d7f7a5dc2b6c5e0
Gitweb: https://git.kernel.org/tip/ea41bb514fe286bf50498b3c6d7f7a5dc2b6c5e0
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Wed, 04 Oct 2023 11:33:36 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sat, 07 Oct 2023 11:33:28 +02:00
sched/core: Update stale comment in try_to_wake_up()
The following commit:
9b3c4ab3045e ("sched,rcu: Rework try_invoke_on_locked_down_task()")
... renamed try_invoke_on_locked_down_task() to task_call_func(),
but forgot to update the comment in try_to_wake_up().
But it turns out that the smp_rmb() doesn't live in task_call_func()
either, it was moved to __task_needs_rq_lock() in:
91dabf33ae5d ("sched: Fix race in task_call_func()")
Fix that now.
Also fix the s/smb/smp typo while at it.
Reported-by: Zhang Qiao <zhangqiao22@huawei.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230731085759.11443-1-zhangqiao22@huawei.com
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 65e10ac..f5783cb 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4237,7 +4237,7 @@ int try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
* Pairs with the LOCK+smp_mb__after_spinlock() on rq->lock in
* __schedule(). See the comment for smp_mb__after_spinlock().
*
- * A similar smb_rmb() lives in try_invoke_on_locked_down_task().
+ * A similar smp_rmb() lives in __task_needs_rq_lock().
*/
smp_rmb();
if (READ_ONCE(p->on_rq) && ttwu_runnable(p, wake_flags))
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-07 17:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-31 8:57 [PATCH] sched: Update comment of try_invoke_on_locked_down_task() Zhang Qiao
2023-10-04 9:31 ` Ingo Molnar
2023-10-04 9:33 ` Peter Zijlstra
2023-10-04 9:39 ` [PATCH] sched/core: Update stale comment in try_to_wake_up() Ingo Molnar
2023-10-04 9:42 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2023-10-07 17:11 ` tip-bot2 for Ingo Molnar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.