The patch titled
sched: implement staircase deadline cpu scheduler improvements fix
has been removed from the -mm tree. Its filename was
sched-implement-staircase-deadline-cpu-scheduler-improvements-fix.patch
This patch was dropped because I need to clear the decks
------------------------------------------------------
Subject: sched: implement staircase deadline cpu scheduler improvements fix
From: Con Kolivas <kernel@xxxxxxxxxxx>
Use of memset was bogus. Fix it.
Fix exiting recalc_task_prio without p->array being updated.
Microoptimisation courtesy of Dmitry Adamushko <dmitry.adamushko@xxxxxxxxx>
Signed-off-by: Con Kolivas <kernel@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/sched.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff -puN kernel/sched.c~sched-implement-staircase-deadline-cpu-scheduler-improvements-fix kernel/sched.c
--- a/kernel/sched.c~sched-implement-staircase-deadline-cpu-scheduler-improvements-fix
+++ a/kernel/sched.c
@@ -682,11 +682,13 @@ static void dequeue_task(struct task_str
* The task is being queued on a fresh array so it has its entitlement
* bitmap cleared.
*/
-static inline void task_new_array(struct task_struct *p, struct rq *rq)
+static void task_new_array(struct task_struct *p, struct rq *rq,
+ struct prio_array *array)
{
bitmap_zero(p->bitmap, PRIO_RANGE);
p->rotation = rq->prio_rotation;
p->time_slice = p->quota;
+ p->array = array;
}
/* Find the first slot from the relevant prio_matrix entry */
@@ -708,6 +710,8 @@ static inline int next_entitled_slot(str
DECLARE_BITMAP(tmp, PRIO_RANGE);
int search_prio, uprio = USER_PRIO(p->static_prio);
+ if (!rq->prio_level[uprio])
+ rq->prio_level[uprio] = MAX_RT_PRIO;
/*
* Only priorities equal to the prio_level and above for their
* static_prio are acceptable, and only if it's not better than
@@ -735,11 +739,8 @@ static inline int next_entitled_slot(str
static void queue_expired(struct task_struct *p, struct rq *rq)
{
- p->array = rq->expired;
- task_new_array(p, rq);
+ task_new_array(p, rq, rq->expired);
p->prio = p->normal_prio = first_prio_slot(p);
- p->time_slice = p->quota;
- p->rotation = rq->prio_rotation;
}
#ifdef CONFIG_SMP
@@ -799,9 +800,9 @@ static void recalc_task_prio(struct task
queue_expired(p, rq);
return;
} else
- task_new_array(p, rq);
+ task_new_array(p, rq, array);
} else
- task_new_array(p, rq);
+ task_new_array(p, rq, array);
queue_prio = next_entitled_slot(p, rq);
if (queue_prio >= MAX_PRIO) {
@@ -3444,7 +3445,7 @@ EXPORT_SYMBOL(sub_preempt_count);
static inline void reset_prio_levels(struct rq *rq)
{
- memset(rq->prio_level, MAX_RT_PRIO, ARRAY_SIZE(rq->prio_level));
+ memset(rq->prio_level, 0, sizeof(int) * PRIO_RANGE);
}
/*
_
Patches currently in -mm which might be from kernel@xxxxxxxxxxx are
sched-fix-idle-load-balancing-in-softirqd-context-fix.patch
sched-redundant-reschedule-when-set_user_nice-boosts-a-prio-of-a-task-from-the-expired-array.patch
sched-redundant-reschedule-when-set_user_nice-boosts-a-prio-of-a-task-from-the-expired-array-update.patch
sched-implement-staircase-deadline-cpu-scheduler-improvements-fix.patch
sched-implement-staircase-deadline-cpu-scheduler-avoid-redundant-reschedule-in-set_user_nice.patch
sched-implement-staircase-deadline-cpu-scheduler-tweak.patch
sched-implement-staircase-deadline-scheduler-rework-priomatrix.patch
sched-implement-staircase-deadline-scheduler-further-improvements-1.patch
sched-implement-staircase-deadline-scheduler-timeslice-fixes.patch
sched-implement-staircase-scheduler-yaf-fix.patch
sched-implement-staircase-deadline-scheduler-ymf-accounting-fixes.patch
sched-ymf-typo.patch
sched-implement-staircase-deadline-scheduler-load-weight-fix.patch
sched-increase-ksoftirqd-priority.patch
sched-remove-noninteractive-flag.patch
sched-document-sd-cpu-scheduler.patch
sched-implement-staircase-deadline-scheduler-rework-priomatrix-doc.patch
sched-consolidate-sched_clock-drift-adjustments.patch
sched-consolidate-sched_clock-drift-adjustments-fix.patch
sched-implement-staircase-deadline-scheduler-docupdate.patch
sched-add-above-background-load-function.patch
mm-implement-swap-prefetching.patch
swap-prefetch-avoid-repeating-entry.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
