[v1] sched_ext: use correct function name in pick_task_scx() warning message

[PATCH] sched_ext: use correct function name in pick_task_scx() warning message

Posted by Honglei Wang 1 month, 2 weeks ago

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)

Re: [PATCH] sched_ext: use correct function name in pick_task_scx() warning message

Posted by David Vernet 1 month, 2 weeks ago

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;

Re: [PATCH] sched_ext: use correct function name in pick_task_scx() warning message

Posted by Honglei Wang 1 month, 2 weeks ago


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;

Re: [PATCH] sched_ext: use correct function name in pick_task_scx() warning message

Posted by Tejun Heo 1 month, 2 weeks ago

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