* [PATCH] sched: Simplify sys_sched_rr_get_interval() system call
@ 2009-09-21 1:31 Peter Williams
2009-09-21 7:11 ` Peter Zijlstra
2009-09-21 9:06 ` [tip:sched/urgent] " tip-bot for Peter Williams
0 siblings, 2 replies; 3+ messages in thread
From: Peter Williams @ 2009-09-21 1:31 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Peter Zijlstra, Mike Galbraith, Linux Kernel Mailing
# HG changeset patch
# User Peter Williams <pwil3058@bigpond.net.au>
# Date 1253495380 -36000
# Node ID 06d1b89ee15a0eef82d7b9e8ed1ac20e6cf43661
# Parent 067982df9f80206a7b49780f2235bde3b3249631
sched: Simplify sys_sched_rr_get_interval() system call
by removing the need for it to know details of scheduling classes.
Signed-off-by: Peter Williams <pwil3058@bigpond.net.au>
diff -r 067982df9f80 -r 06d1b89ee15a include/linux/sched.h
--- a/include/linux/sched.h Wed Sep 09 15:13:59 2009 -0700
+++ b/include/linux/sched.h Mon Sep 21 11:09:40 2009 +1000
@@ -1067,6 +1067,8 @@ struct sched_class {
void (*prio_changed) (struct rq *this_rq, struct task_struct *task,
int oldprio, int running);
+ unsigned int (*get_rr_interval) (struct task_struct *task);
+
#ifdef CONFIG_FAIR_GROUP_SCHED
void (*moved_group) (struct task_struct *p);
#endif
diff -r 067982df9f80 -r 06d1b89ee15a kernel/sched.c
--- a/kernel/sched.c Wed Sep 09 15:13:59 2009 -0700
+++ b/kernel/sched.c Mon Sep 21 11:09:40 2009 +1000
@@ -6759,23 +6759,8 @@ SYSCALL_DEFINE2(sched_rr_get_interval, p
if (retval)
goto out_unlock;
- /*
- * Time slice is 0 for SCHED_FIFO tasks and for SCHED_OTHER
- * tasks that are on an otherwise idle runqueue:
- */
- time_slice = 0;
- if (p->policy == SCHED_RR) {
- time_slice = DEF_TIMESLICE;
- } else if (p->policy != SCHED_FIFO) {
- struct sched_entity *se = &p->se;
- unsigned long flags;
- struct rq *rq;
-
- rq = task_rq_lock(p, &flags);
- if (rq->cfs.load.weight)
- time_slice = NS_TO_JIFFIES(sched_slice(&rq->cfs, se));
- task_rq_unlock(rq, &flags);
- }
+ time_slice = p->sched_class->get_rr_interval(p);
+
read_unlock(&tasklist_lock);
jiffies_to_timespec(time_slice, &t);
retval = copy_to_user(interval, &t, sizeof(t)) ? -EFAULT : 0;
diff -r 067982df9f80 -r 06d1b89ee15a kernel/sched_fair.c
--- a/kernel/sched_fair.c Wed Sep 09 15:13:59 2009 -0700
+++ b/kernel/sched_fair.c Mon Sep 21 11:09:40 2009 +1000
@@ -1796,6 +1796,25 @@ static void moved_group_fair(struct task
}
#endif
+unsigned int get_rr_interval_fair(struct task_struct *task)
+{
+ struct sched_entity *se = &task->se;
+ unsigned long flags;
+ struct rq *rq;
+ unsigned int rr_interval = 0;
+
+ /*
+ * Time slice is 0 for SCHED_OTHER tasks that are on an otherwise
+ * idle runqueue:
+ */
+ rq = task_rq_lock(task, &flags);
+ if (rq->cfs.load.weight)
+ rr_interval = NS_TO_JIFFIES(sched_slice(&rq->cfs, se));
+ task_rq_unlock(rq, &flags);
+
+ return rr_interval;
+}
+
/*
* All the scheduling class methods:
*/
@@ -1824,6 +1843,8 @@ static const struct sched_class fair_sch
.prio_changed = prio_changed_fair,
.switched_to = switched_to_fair,
+ .get_rr_interval = get_rr_interval_fair,
+
#ifdef CONFIG_FAIR_GROUP_SCHED
.moved_group = moved_group_fair,
#endif
diff -r 067982df9f80 -r 06d1b89ee15a kernel/sched_idletask.c
--- a/kernel/sched_idletask.c Wed Sep 09 15:13:59 2009 -0700
+++ b/kernel/sched_idletask.c Mon Sep 21 11:09:40 2009 +1000
@@ -97,6 +97,11 @@ static void prio_changed_idle(struct rq
check_preempt_curr(rq, p, 0);
}
+unsigned int get_rr_interval_idle(struct task_struct *task)
+{
+ return 0;
+}
+
/*
* Simple, special scheduling class for the per-CPU idle tasks:
*/
@@ -122,6 +127,8 @@ static const struct sched_class idle_sch
.set_curr_task = set_curr_task_idle,
.task_tick = task_tick_idle,
+ .get_rr_interval = get_rr_interval_idle,
+
.prio_changed = prio_changed_idle,
.switched_to = switched_to_idle,
diff -r 067982df9f80 -r 06d1b89ee15a kernel/sched_rt.c
--- a/kernel/sched_rt.c Wed Sep 09 15:13:59 2009 -0700
+++ b/kernel/sched_rt.c Mon Sep 21 11:09:40 2009 +1000
@@ -1738,6 +1738,17 @@ static void set_curr_task_rt(struct rq *
dequeue_pushable_task(rq, p);
}
+unsigned int get_rr_interval_rt(struct task_struct *task)
+{
+ /*
+ * Time slice is 0 for SCHED_FIFO tasks
+ */
+ if (task->policy == SCHED_RR)
+ return DEF_TIMESLICE;
+ else
+ return 0;
+}
+
static const struct sched_class rt_sched_class = {
.next = &fair_sched_class,
.enqueue_task = enqueue_task_rt,
@@ -1767,6 +1778,8 @@ static const struct sched_class rt_sched
.set_curr_task = set_curr_task_rt,
.task_tick = task_tick_rt,
+ .get_rr_interval = get_rr_interval_rt,
+
.prio_changed = prio_changed_rt,
.switched_to = switched_to_rt,
};
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] sched: Simplify sys_sched_rr_get_interval() system call
2009-09-21 1:31 [PATCH] sched: Simplify sys_sched_rr_get_interval() system call Peter Williams
@ 2009-09-21 7:11 ` Peter Zijlstra
2009-09-21 9:06 ` [tip:sched/urgent] " tip-bot for Peter Williams
1 sibling, 0 replies; 3+ messages in thread
From: Peter Zijlstra @ 2009-09-21 7:11 UTC (permalink / raw)
To: Peter Williams; +Cc: Ingo Molnar, Mike Galbraith, Linux Kernel Mailing
On Mon, 2009-09-21 at 01:31 +0000, Peter Williams wrote:
> # HG changeset patch
> # User Peter Williams <pwil3058@bigpond.net.au>
> # Date 1253495380 -36000
> # Node ID 06d1b89ee15a0eef82d7b9e8ed1ac20e6cf43661
> # Parent 067982df9f80206a7b49780f2235bde3b3249631
> sched: Simplify sys_sched_rr_get_interval() system call
> by removing the need for it to know details of scheduling classes.
>
> Signed-off-by: Peter Williams <pwil3058@bigpond.net.au>
Looks good to me,
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:sched/urgent] sched: Simplify sys_sched_rr_get_interval() system call
2009-09-21 1:31 [PATCH] sched: Simplify sys_sched_rr_get_interval() system call Peter Williams
2009-09-21 7:11 ` Peter Zijlstra
@ 2009-09-21 9:06 ` tip-bot for Peter Williams
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Peter Williams @ 2009-09-21 9:06 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, a.p.zijlstra, efault, pwil3058, tglx, mingo
Commit-ID: 0d721ceadbeaa24d7f9dd41b3e5e29912327a7e1
Gitweb: http://git.kernel.org/tip/0d721ceadbeaa24d7f9dd41b3e5e29912327a7e1
Author: Peter Williams <pwil3058@bigpond.net.au>
AuthorDate: Mon, 21 Sep 2009 01:31:53 +0000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 21 Sep 2009 09:53:55 +0200
sched: Simplify sys_sched_rr_get_interval() system call
By removing the need for it to know details of scheduling classes.
This allows PlugSched to define orthogonal scheduling classes.
Signed-off-by: Peter Williams <pwil3058@bigpond.net.au>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <06d1b89ee15a0eef82d7.1253496713@mudlark.pw.nest>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
include/linux/sched.h | 2 ++
kernel/sched.c | 17 +----------------
kernel/sched_fair.c | 21 +++++++++++++++++++++
kernel/sched_idletask.c | 7 +++++++
kernel/sched_rt.c | 13 +++++++++++++
5 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index cc37a3f..239c8e0 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1075,6 +1075,8 @@ struct sched_class {
void (*prio_changed) (struct rq *this_rq, struct task_struct *task,
int oldprio, int running);
+ unsigned int (*get_rr_interval) (struct task_struct *task);
+
#ifdef CONFIG_FAIR_GROUP_SCHED
void (*moved_group) (struct task_struct *p);
#endif
diff --git a/kernel/sched.c b/kernel/sched.c
index 1b900fb..830967e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6819,23 +6819,8 @@ SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid,
if (retval)
goto out_unlock;
- /*
- * Time slice is 0 for SCHED_FIFO tasks and for SCHED_OTHER
- * tasks that are on an otherwise idle runqueue:
- */
- time_slice = 0;
- if (p->policy == SCHED_RR) {
- time_slice = DEF_TIMESLICE;
- } else if (p->policy != SCHED_FIFO) {
- struct sched_entity *se = &p->se;
- unsigned long flags;
- struct rq *rq;
+ time_slice = p->sched_class->get_rr_interval(p);
- rq = task_rq_lock(p, &flags);
- if (rq->cfs.load.weight)
- time_slice = NS_TO_JIFFIES(sched_slice(&rq->cfs, se));
- task_rq_unlock(rq, &flags);
- }
read_unlock(&tasklist_lock);
jiffies_to_timespec(time_slice, &t);
retval = copy_to_user(interval, &t, sizeof(t)) ? -EFAULT : 0;
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 566e3bb..cd73738 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1938,6 +1938,25 @@ static void moved_group_fair(struct task_struct *p)
}
#endif
+unsigned int get_rr_interval_fair(struct task_struct *task)
+{
+ struct sched_entity *se = &task->se;
+ unsigned long flags;
+ struct rq *rq;
+ unsigned int rr_interval = 0;
+
+ /*
+ * Time slice is 0 for SCHED_OTHER tasks that are on an otherwise
+ * idle runqueue:
+ */
+ rq = task_rq_lock(task, &flags);
+ if (rq->cfs.load.weight)
+ rr_interval = NS_TO_JIFFIES(sched_slice(&rq->cfs, se));
+ task_rq_unlock(rq, &flags);
+
+ return rr_interval;
+}
+
/*
* All the scheduling class methods:
*/
@@ -1966,6 +1985,8 @@ static const struct sched_class fair_sched_class = {
.prio_changed = prio_changed_fair,
.switched_to = switched_to_fair,
+ .get_rr_interval = get_rr_interval_fair,
+
#ifdef CONFIG_FAIR_GROUP_SCHED
.moved_group = moved_group_fair,
#endif
diff --git a/kernel/sched_idletask.c b/kernel/sched_idletask.c
index a8b448a..b133a28 100644
--- a/kernel/sched_idletask.c
+++ b/kernel/sched_idletask.c
@@ -97,6 +97,11 @@ static void prio_changed_idle(struct rq *rq, struct task_struct *p,
check_preempt_curr(rq, p, 0);
}
+unsigned int get_rr_interval_idle(struct task_struct *task)
+{
+ return 0;
+}
+
/*
* Simple, special scheduling class for the per-CPU idle tasks:
*/
@@ -122,6 +127,8 @@ static const struct sched_class idle_sched_class = {
.set_curr_task = set_curr_task_idle,
.task_tick = task_tick_idle,
+ .get_rr_interval = get_rr_interval_idle,
+
.prio_changed = prio_changed_idle,
.switched_to = switched_to_idle,
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index 13de712..a4d790c 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -1734,6 +1734,17 @@ static void set_curr_task_rt(struct rq *rq)
dequeue_pushable_task(rq, p);
}
+unsigned int get_rr_interval_rt(struct task_struct *task)
+{
+ /*
+ * Time slice is 0 for SCHED_FIFO tasks
+ */
+ if (task->policy == SCHED_RR)
+ return DEF_TIMESLICE;
+ else
+ return 0;
+}
+
static const struct sched_class rt_sched_class = {
.next = &fair_sched_class,
.enqueue_task = enqueue_task_rt,
@@ -1762,6 +1773,8 @@ static const struct sched_class rt_sched_class = {
.set_curr_task = set_curr_task_rt,
.task_tick = task_tick_rt,
+ .get_rr_interval = get_rr_interval_rt,
+
.prio_changed = prio_changed_rt,
.switched_to = switched_to_rt,
};
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-09-21 9:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-09-21 1:31 [PATCH] sched: Simplify sys_sched_rr_get_interval() system call Peter Williams
2009-09-21 7:11 ` Peter Zijlstra
2009-09-21 9:06 ` [tip:sched/urgent] " tip-bot for Peter Williams
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