* [PATCH]sched/core: Return possibility to set RT and DL classes back
@ 2014-02-27 10:24 Kirill Tkhai
2014-02-28 10:50 ` Kirill Tkhai
0 siblings, 1 reply; 4+ messages in thread
From: Kirill Tkhai @ 2014-02-27 10:24 UTC (permalink / raw)
To: linux-kernel; +Cc: Thomas Gleixner, Peter Zijlstra, Ingo Molnar, tkhai
[PATCH]sched/core: Return possibility to set RT and DL classes back
I found that it's impossible to set RT policy for tasks at the moment.
This is regression after commit [sched: Consider pi boosting in setscheduler()]
[c365c292d05908c6ea6f32708f331e21033fe71d ]
Fix that.
Signed-off-by: Kirill Tkhai <ktkhai@parallels.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Ingo Molnar <mingo@redhat.com>
---
kernel/sched/core.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 84b23ce..30cf9ad 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3193,6 +3193,10 @@ static void __setscheduler_params(struct task_struct *p,
* getparam()/getattr() don't report silly values for !rt tasks.
*/
p->rt_priority = attr->sched_priority;
+
+ p->normal_prio = normal_prio(p);
+ p->prio = rt_mutex_getprio(p);
+
set_load_weight(p);
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]sched/core: Return possibility to set RT and DL classes back
2014-02-27 10:24 [PATCH]sched/core: Return possibility to set RT and DL classes back Kirill Tkhai
@ 2014-02-28 10:50 ` Kirill Tkhai
2014-03-01 18:18 ` Juri Lelli
0 siblings, 1 reply; 4+ messages in thread
From: Kirill Tkhai @ 2014-02-28 10:50 UTC (permalink / raw)
To: linux-kernel; +Cc: Thomas Gleixner, Peter Zijlstra, Ingo Molnar, tkhai
Thomas, have you seen this?
Nothing works at the moment:
now
21 root 20 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/3
16 root 20 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/2
11 root 20 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/1
10 root 20 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/0
22 root 20 0 0 0 0 S 0.0 0.0 0:00.00 migration/3
17 root 20 0 0 0 0 S 0.0 0.0 0:00.00 migration/2
12 root 20 0 0 0 0 S 0.0 0.0 0:00.04 migration/1
9 root 20 0 0 0 0 S 0.0 0.0 0:00.20 migration/0
with fix
21 root RT 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/3
16 root RT 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/2
11 root RT 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/1
10 root RT 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/0
22 root RT 0 0 0 0 S 0.0 0.0 0:00.00 migration/3
17 root RT 0 0 0 0 S 0.0 0.0 0:00.03 migration/2
12 root RT 0 0 0 0 S 0.0 0.0 0:00.00 migration/1
9 root RT 0 0 0 0 S 0.0 0.0 0:00.24 migration/0
В Чт, 27/02/2014 в 14:24 +0400, Kirill Tkhai пишет:
> [PATCH]sched/core: Return possibility to set RT and DL classes back
>
> I found that it's impossible to set RT policy for tasks at the moment.
>
> This is regression after commit [sched: Consider pi boosting in setscheduler()]
> [c365c292d05908c6ea6f32708f331e21033fe71d ]
> Fix that.
>
> Signed-off-by: Kirill Tkhai <ktkhai@parallels.com>
> CC: Thomas Gleixner <tglx@linutronix.de>
> CC: Peter Zijlstra <peterz@infradead.org>
> CC: Ingo Molnar <mingo@redhat.com>
> ---
> kernel/sched/core.c | 4 ++++
> 1 file changed, 4 insertions(+)
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 84b23ce..30cf9ad 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -3193,6 +3193,10 @@ static void __setscheduler_params(struct task_struct *p,
> * getparam()/getattr() don't report silly values for !rt tasks.
> */
> p->rt_priority = attr->sched_priority;
> +
> + p->normal_prio = normal_prio(p);
> + p->prio = rt_mutex_getprio(p);
> +
> set_load_weight(p);
> }
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]sched/core: Return possibility to set RT and DL classes back
2014-02-28 10:50 ` Kirill Tkhai
@ 2014-03-01 18:18 ` Juri Lelli
2014-03-03 9:35 ` Peter Zijlstra
0 siblings, 1 reply; 4+ messages in thread
From: Juri Lelli @ 2014-03-01 18:18 UTC (permalink / raw)
To: Kirill Tkhai
Cc: linux-kernel, Thomas Gleixner, Peter Zijlstra, Ingo Molnar, tkhai
On Fri, 28 Feb 2014 14:50:43 +0400
Kirill Tkhai <ktkhai@parallels.com> wrote:
> Thomas, have you seen this?
>
> Nothing works at the moment:
>
Noticed the same once rebased on tip/master as of today.
> now
>
> 21 root 20 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/3
> 16 root 20 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/2
> 11 root 20 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/1
> 10 root 20 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/0
>
> 22 root 20 0 0 0 0 S 0.0 0.0 0:00.00 migration/3
> 17 root 20 0 0 0 0 S 0.0 0.0 0:00.00 migration/2
> 12 root 20 0 0 0 0 S 0.0 0.0 0:00.04 migration/1
> 9 root 20 0 0 0 0 S 0.0 0.0 0:00.20 migration/0
>
> with fix
>
> 21 root RT 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/3
> 16 root RT 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/2
> 11 root RT 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/1
> 10 root RT 0 0 0 0 S 0.0 0.0 0:00.00 watchdog/0
>
> 22 root RT 0 0 0 0 S 0.0 0.0 0:00.00 migration/3
> 17 root RT 0 0 0 0 S 0.0 0.0 0:00.03 migration/2
> 12 root RT 0 0 0 0 S 0.0 0.0 0:00.00 migration/1
> 9 root RT 0 0 0 0 S 0.0 0.0 0:00.24 migration/0
>
> В Чт, 27/02/2014 в 14:24 +0400, Kirill Tkhai пишет:
> > [PATCH]sched/core: Return possibility to set RT and DL classes back
> >
> > I found that it's impossible to set RT policy for tasks at the moment.
> >
> > This is regression after commit [sched: Consider pi boosting in setscheduler()]
> > [c365c292d05908c6ea6f32708f331e21033fe71d ]
> > Fix that.
> >
> > Signed-off-by: Kirill Tkhai <ktkhai@parallels.com>
> > CC: Thomas Gleixner <tglx@linutronix.de>
> > CC: Peter Zijlstra <peterz@infradead.org>
> > CC: Ingo Molnar <mingo@redhat.com>
> > ---
> > kernel/sched/core.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> > diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> > index 84b23ce..30cf9ad 100644
> > --- a/kernel/sched/core.c
> > +++ b/kernel/sched/core.c
> > @@ -3193,6 +3193,10 @@ static void __setscheduler_params(struct task_struct *p,
> > * getparam()/getattr() don't report silly values for !rt tasks.
> > */
> > p->rt_priority = attr->sched_priority;
> > +
> > + p->normal_prio = normal_prio(p);
> > + p->prio = rt_mutex_getprio(p);
> > +
> > set_load_weight(p);
> > }
> >
> >
I'd propose what follows, so that we can still use
__setscheduler_params() as it is.
Regards,
- Juri
>From 73bae0ad978db6e75f492eea9adff12ec9d6d2a3 Mon Sep 17 00:00:00 2001
From: Juri Lelli <juri.lelli@gmail.com>
Date: Sat, 1 Mar 2014 16:43:30 +0100
Subject: [PATCH] sched/core: restore __setscheduler() behavior
Commit c365c29 introduced __setscheduler_params(), that is now used
to only store a task's new scheduling parameters in the case it is
priority boosted.
Before this change, __setscheduler() was in charge of changing tasks
normal_prio and prio, and the latter is used to actually perform
sched_class change. Unfortunately, the commit above broke this
behavior, causing tasks to remain in fair_sched_class.
Restore the old behaviour setting normal_prio and prio to the right
values after the __setscheduler_params() call.
Signed-off-by: Juri Lelli <juri.lelli@gmail.com>
---
kernel/sched/core.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ee8004c..04ae20d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3206,6 +3206,13 @@ static void __setscheduler(struct rq *rq, struct task_struct *p,
{
__setscheduler_params(p, attr);
+ /*
+ * Since we checked before with rt_mutex_check_prio(),
+ * we don't have pi waiters or our top waiter has lower
+ * priority (user space view) than what we got.
+ */
+ p->prio = p->normal_prio = normal_prio(p);
+
if (dl_prio(p->prio))
p->sched_class = &dl_sched_class;
else if (rt_prio(p->prio))
--
1.7.9.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]sched/core: Return possibility to set RT and DL classes back
2014-03-01 18:18 ` Juri Lelli
@ 2014-03-03 9:35 ` Peter Zijlstra
0 siblings, 0 replies; 4+ messages in thread
From: Peter Zijlstra @ 2014-03-03 9:35 UTC (permalink / raw)
To: Juri Lelli
Cc: Kirill Tkhai, linux-kernel, Thomas Gleixner, Ingo Molnar, tkhai
On Sat, Mar 01, 2014 at 07:18:38PM +0100, Juri Lelli wrote:
> From 73bae0ad978db6e75f492eea9adff12ec9d6d2a3 Mon Sep 17 00:00:00 2001
> From: Juri Lelli <juri.lelli@gmail.com>
> Date: Sat, 1 Mar 2014 16:43:30 +0100
> Subject: [PATCH] sched/core: restore __setscheduler() behavior
>
> Commit c365c29 introduced __setscheduler_params(), that is now used
> to only store a task's new scheduling parameters in the case it is
> priority boosted.
>
> Before this change, __setscheduler() was in charge of changing tasks
> normal_prio and prio, and the latter is used to actually perform
> sched_class change. Unfortunately, the commit above broke this
> behavior, causing tasks to remain in fair_sched_class.
>
> Restore the old behaviour setting normal_prio and prio to the right
> values after the __setscheduler_params() call.
Please also add a Fixes: tag when appropriate, and add to Cc all those
two were involved with the original patch.
Fixes: c365c292d059 ("sched: Consider pi boosting in setscheduler()")
> Signed-off-by: Juri Lelli <juri.lelli@gmail.com>
> ---
> kernel/sched/core.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index ee8004c..04ae20d 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -3206,6 +3206,13 @@ static void __setscheduler(struct rq *rq, struct task_struct *p,
> {
> __setscheduler_params(p, attr);
>
> + /*
> + * Since we checked before with rt_mutex_check_prio(),
> + * we don't have pi waiters or our top waiter has lower
> + * priority (user space view) than what we got.
> + */
> + p->prio = p->normal_prio = normal_prio(p);
> +
> if (dl_prio(p->prio))
> p->sched_class = &dl_sched_class;
> else if (rt_prio(p->prio))
So there is one more caller of this: normalize_task() but since that is
only used to force set all tasks to SCHED_NORMAL ignoring the PI stuff
seems perfectly fine.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-03 9:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-27 10:24 [PATCH]sched/core: Return possibility to set RT and DL classes back Kirill Tkhai
2014-02-28 10:50 ` Kirill Tkhai
2014-03-01 18:18 ` Juri Lelli
2014-03-03 9:35 ` Peter Zijlstra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome