sched-range.patch
PATCH 6/29 sched-range.patch
Add SCHED_RANGE and SCHED_RT wrappers for easy policy management.
Signed-off-by Con Kolivas <[email protected]>
include/linux/sched.h | 7 +++++++ kernel/sched.c | 13 +++++-------- 2 files changed, 12 insertions(+), 8 deletions(-)
include/linux/sched.h +7 -0
@@ -165,6 +165,13 @@ extern unsigned long weighted_cpuload(co#define SCHED_RR 2#define SCHED_BATCH 3 +#define SCHED_MIN 0 +#define SCHED_MAX 3 + +#define SCHED_RANGE (policy) ((policy) <= SCHED_MAX) +#define SCHED_RT (policy) ((policy) == SCHED_FIFO || \ + (policy) == SCHED_RR) +struct sched_param {int sched_priority; };
kernel/sched.c +5 -8
@@ -3548,7 +3548,7 @@ static void __setscheduler(struct task_sBUG_ON (task_queued (p)); p->policy = policy; p->rt_priority = prio; -if (policy !=SCHED_NORMAL && policy !=SCHED_BATCH ) { +if (SCHED_RT (policy)) { p->prio =MAX_RT_PRIO -1 - p->rt_priority; }else p->prio = p->static_prio;
@@ -3574,8 +3574,7 @@ recheck:/* double check policy once rq lock held */ if (policy <0 ) policy = oldpolicy = p->policy; -else if (policy !=SCHED_FIFO && policy !=SCHED_RR && - policy !=SCHED_NORMAL && policy !=SCHED_BATCH ) +else if (!SCHED_RANGE (policy))return -EINVAL ;/* * Valid priorities for SCHED_FIFO and SCHED_RR are
@@ -3586,8 +3585,7 @@ recheck: (p->mm && param->sched_priority >MAX_USER_RT_PRIO -1 ) || (!p->mm && param->sched_priority > MAX_RT_PRIO-1)) return -EINVAL; -if ((policy ==SCHED_NORMAL || policy ==SCHED_BATCH ) - != (param->sched_priority ==0 )) +if ((!SCHED_RT (policy)) != (param->sched_priority ==0 ))return -EINVAL ;/*
@@ -3598,12 +3596,11 @@ recheck:* can't change policy, except between SCHED_NORMAL * and SCHED_BATCH: */ -if (((policy !=SCHED_NORMAL && p->policy !=SCHED_BATCH ) && - (policy !=SCHED_BATCH && p->policy !=SCHED_NORMAL )) && +if (SCHED_RT (policy) && policy != p->policy && !p->signal->rlim[RLIMIT_RTPRIO ].rlim_cur)return -EPERM ;/* can't increase priority */ -if ((policy !=SCHED_NORMAL && policy !=SCHED_BATCH ) && +if (SCHED_RT (policy) && param->sched_priority > p->rt_priority && param->sched_priority > p->signal->rlim[RLIMIT_RTPRIO ].rlim_cur)
Signature · 1 line
-ck