* [PATCH] sched_ext: use correct function name in pick_task_scx() warning message
@ 2024-10-09 3:06 Honglei Wang
2024-10-09 16:48 ` Tejun Heo
2024-10-09 17:01 ` David Vernet
0 siblings, 2 replies; 4+ messages in thread
From: Honglei Wang @ 2024-10-09 3:06 UTC (permalink / raw)
To: tj, void
Cc: mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, vschneid, linux-kernel
pick_next_task_scx() was turned into pick_task_scx() since
commit 753e2836d139 ("sched_ext: Unify regular and core-sched pick
task paths"). Update the outdated message.
Signed-off-by: Honglei Wang <jameshongleiwang@126.com>
---
kernel/sched/ext.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index 410a4df8a121..22e18aec4ee1 100644
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -2958,7 +2958,7 @@ static struct task_struct *pick_task_scx(struct rq *rq)
if (unlikely(!p->scx.slice)) {
if (!scx_rq_bypassing(rq) && !scx_warned_zero_slice) {
- printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in pick_next_task_scx()\n",
+ printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in pick_task_scx()\n",
p->comm, p->pid);
scx_warned_zero_slice = true;
}
--
2.24.3 (Apple Git-128)
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] sched_ext: use correct function name in pick_task_scx() warning message 2024-10-09 3:06 [PATCH] sched_ext: use correct function name in pick_task_scx() warning message Honglei Wang @ 2024-10-09 16:48 ` Tejun Heo 2024-10-09 17:01 ` David Vernet 1 sibling, 0 replies; 4+ messages in thread From: Tejun Heo @ 2024-10-09 16:48 UTC (permalink / raw) To: Honglei Wang Cc: void, mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman, vschneid, linux-kernel On Wed, Oct 09, 2024 at 11:06:02AM +0800, Honglei Wang wrote: > pick_next_task_scx() was turned into pick_task_scx() since > commit 753e2836d139 ("sched_ext: Unify regular and core-sched pick > task paths"). Update the outdated message. > > Signed-off-by: Honglei Wang <jameshongleiwang@126.com> Applied to sched_ext/for-6.12-fixes. Thanks. -- tejun ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sched_ext: use correct function name in pick_task_scx() warning message 2024-10-09 3:06 [PATCH] sched_ext: use correct function name in pick_task_scx() warning message Honglei Wang 2024-10-09 16:48 ` Tejun Heo @ 2024-10-09 17:01 ` David Vernet 2024-10-10 1:26 ` Honglei Wang 1 sibling, 1 reply; 4+ messages in thread From: David Vernet @ 2024-10-09 17:01 UTC (permalink / raw) To: Honglei Wang Cc: tj, mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman, vschneid, linux-kernel [-- Attachment #1: Type: text/plain, Size: 1917 bytes --] On Wed, Oct 09, 2024 at 11:06:02AM +0800, Honglei Wang wrote: > pick_next_task_scx() was turned into pick_task_scx() since > commit 753e2836d139 ("sched_ext: Unify regular and core-sched pick > task paths"). Update the outdated message. > > Signed-off-by: Honglei Wang <jameshongleiwang@126.com> > --- > kernel/sched/ext.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c > index 410a4df8a121..22e18aec4ee1 100644 > --- a/kernel/sched/ext.c > +++ b/kernel/sched/ext.c > @@ -2958,7 +2958,7 @@ static struct task_struct *pick_task_scx(struct rq *rq) > > if (unlikely(!p->scx.slice)) { > if (!scx_rq_bypassing(rq) && !scx_warned_zero_slice) { > - printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in pick_next_task_scx()\n", > + printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in pick_task_scx()\n", Doesn't really matter much, but if we ever decide to touch this line again then something like this will be a bit more robust: diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index fe8acae35166..9fde2d3f8df5 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -3020,8 +3020,8 @@ static struct task_struct *pick_task_scx(struct rq *rq) if (unlikely(!p->scx.slice)) { if (!scx_rq_bypassing(rq) && !scx_warned_zero_slice) { - printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in pick_next_task_scx()\n", - p->comm, p->pid); + printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in %s()\n", + p->comm, p->pid, __func__); scx_warned_zero_slice = true; } p->scx.slice = SCX_SLICE_DFL; [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] sched_ext: use correct function name in pick_task_scx() warning message 2024-10-09 17:01 ` David Vernet @ 2024-10-10 1:26 ` Honglei Wang 0 siblings, 0 replies; 4+ messages in thread From: Honglei Wang @ 2024-10-10 1:26 UTC (permalink / raw) To: David Vernet Cc: tj, mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman, vschneid, linux-kernel On 2024/10/10 01:01, David Vernet wrote: > On Wed, Oct 09, 2024 at 11:06:02AM +0800, Honglei Wang wrote: >> pick_next_task_scx() was turned into pick_task_scx() since >> commit 753e2836d139 ("sched_ext: Unify regular and core-sched pick >> task paths"). Update the outdated message. >> >> Signed-off-by: Honglei Wang <jameshongleiwang@126.com> >> --- >> kernel/sched/ext.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c >> index 410a4df8a121..22e18aec4ee1 100644 >> --- a/kernel/sched/ext.c >> +++ b/kernel/sched/ext.c >> @@ -2958,7 +2958,7 @@ static struct task_struct *pick_task_scx(struct rq *rq) >> >> if (unlikely(!p->scx.slice)) { >> if (!scx_rq_bypassing(rq) && !scx_warned_zero_slice) { >> - printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in pick_next_task_scx()\n", >> + printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in pick_task_scx()\n", > > Doesn't really matter much, but if we ever decide to touch this line again then > something like this will be a bit more robust: > Indeed, I'll send a v2 patch later. Thanks, Honglei > diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c > index fe8acae35166..9fde2d3f8df5 100644 > --- a/kernel/sched/ext.c > +++ b/kernel/sched/ext.c > @@ -3020,8 +3020,8 @@ static struct task_struct *pick_task_scx(struct rq *rq) > > if (unlikely(!p->scx.slice)) { > if (!scx_rq_bypassing(rq) && !scx_warned_zero_slice) { > - printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in pick_next_task_scx()\n", > - p->comm, p->pid); > + printk_deferred(KERN_WARNING "sched_ext: %s[%d] has zero slice in %s()\n", > + p->comm, p->pid, __func__); > scx_warned_zero_slice = true; > } > p->scx.slice = SCX_SLICE_DFL; ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-10 1:27 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-10-09 3:06 [PATCH] sched_ext: use correct function name in pick_task_scx() warning message Honglei Wang 2024-10-09 16:48 ` Tejun Heo 2024-10-09 17:01 ` David Vernet 2024-10-10 1:26 ` Honglei Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox