[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-ce5f7f8200ca2504f6f290044393d73ca314965a@git.kernel.org>
Date: Thu, 22 May 2014 05:25:14 -0700
From: tip-bot for Peter Zijlstra <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
torvalds@...ux-foundation.org, peterz@...radead.org,
stable@...r.kernel.org, raistlin@...ux.it,
linux-man@...r.kernel.org, tglx@...utronix.de,
mtk.manpages@...il.com, juri.lelli@...il.com
Subject: [tip:sched/core] sched/deadline: Change sched_getparam()
behaviour vs SCHED_DEADLINE
Commit-ID: ce5f7f8200ca2504f6f290044393d73ca314965a
Gitweb: http://git.kernel.org/tip/ce5f7f8200ca2504f6f290044393d73ca314965a
Author: Peter Zijlstra <peterz@...radead.org>
AuthorDate: Mon, 12 May 2014 22:50:34 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Thu, 22 May 2014 10:21:26 +0200
sched/deadline: Change sched_getparam() behaviour vs SCHED_DEADLINE
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@...il.com>
Signed-off-by: Peter Zijlstra <peterz@...radead.org>
Acked-by: Michael Kerrisk <mtk.manpages@...il.com>
Cc: Dario Faggioli <raistlin@...ux.it>
Cc: linux-man <linux-man@...r.kernel.org>
Cc: "Michael Kerrisk (man-pages)" <mtk.manpages@...il.com>
Cc: Juri Lelli <juri.lelli@...il.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: <stable@...r.kernel.org>
Link: http://lkml.kernel.org/r/20140512205034.GH13467@laptop.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/sched/core.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index cdefcf7..f3f08bf 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3713,7 +3713,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;
@@ -3730,11 +3730,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();
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists