diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2014-05-12 22:50:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-11 11:54:10 -0700 |
| commit | ccb9d3e85cf380ada0695bb07d39cda88099d6a2 (patch) | |
| tree | 1ffb5a4717f7c7260167dc89009ece317f63db7d /kernel | |
| parent | 49123dda5f51ebb79ec4359b5244a21cf122844b (diff) | |
| download | linux-stable-ccb9d3e85cf380ada0695bb07d39cda88099d6a2.tar.gz linux-stable-ccb9d3e85cf380ada0695bb07d39cda88099d6a2.tar.bz2 linux-stable-ccb9d3e85cf380ada0695bb07d39cda88099d6a2.zip | |
sched/deadline: Change sched_getparam() behaviour vs SCHED_DEADLINE
commit ce5f7f8200ca2504f6f290044393d73ca314965a upstream.
The way we read POSIX one should only call sched_getparam() when
sched_getscheduler() returns either SCHED_FIFO or SCHED_RR.
Given that we currently return sched_param::sched_priority=0 for all
others, extend the same behaviour to SCHED_DEADLINE.
Requested-by: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Dario Faggioli <raistlin@linux.it>
Cc: linux-man <linux-man@vger.kernel.org>
Cc: "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>
Cc: Juri Lelli <juri.lelli@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20140512205034.GH13467@laptop.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/core.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 55dc8036ea78..9fd076a4f832 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3735,7 +3735,7 @@ SYSCALL_DEFINE1(sched_getscheduler, pid_t, pid) */ SYSCALL_DEFINE2(sched_getparam, pid_t, pid, struct sched_param __user *, param) { - struct sched_param lp; + struct sched_param lp = { .sched_priority = 0 }; struct task_struct *p; int retval; @@ -3752,11 +3752,8 @@ SYSCALL_DEFINE2(sched_getparam, pid_t, pid, struct sched_param __user *, param) if (retval) goto out_unlock; - if (task_has_dl_policy(p)) { - retval = -EINVAL; - goto out_unlock; - } - lp.sched_priority = p->rt_priority; + if (task_has_rt_policy(p)) + lp.sched_priority = p->rt_priority; rcu_read_unlock(); /* |