Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: fix nr_uninterruptible accounting of frozen tasks really
sched: fix load average accounting vs. cpu hotplug
sched: Account for vruntime wrapping
+19
-5
+2
-1
include/linux/sched.h
+2
-1
include/linux/sched.h
···
209
209
((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
210
210
#define task_contributes_to_load(task) \
211
211
((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
212
-
(task->flags & PF_FROZEN) == 0)
212
+
(task->flags & PF_FREEZING) == 0)
213
213
214
214
#define __set_task_state(tsk, state_value) \
215
215
do { (tsk)->state = (state_value); } while (0)
···
1680
1680
#define PF_MEMALLOC 0x00000800 /* Allocating memory */
1681
1681
#define PF_FLUSHER 0x00001000 /* responsible for disk writeback */
1682
1682
#define PF_USED_MATH 0x00002000 /* if unset the fpu must be initialized before use */
1683
+
#define PF_FREEZING 0x00004000 /* freeze in progress. do not account to load */
1683
1684
#define PF_NOFREEZE 0x00008000 /* this thread should not be frozen */
1684
1685
#define PF_FROZEN 0x00010000 /* frozen for system suspend */
1685
1686
#define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */
+7
kernel/freezer.c
+7
kernel/freezer.c
···
44
44
recalc_sigpending(); /* We sent fake signal, clean it up */
45
45
spin_unlock_irq(¤t->sighand->siglock);
46
46
47
+
/* prevent accounting of that task to load */
48
+
current->flags |= PF_FREEZING;
49
+
47
50
for (;;) {
48
51
set_current_state(TASK_UNINTERRUPTIBLE);
49
52
if (!frozen(current))
50
53
break;
51
54
schedule();
52
55
}
56
+
57
+
/* Remove the accounting blocker */
58
+
current->flags &= ~PF_FREEZING;
59
+
53
60
pr_debug("%s left refrigerator\n", current->comm);
54
61
__set_current_state(save);
55
62
}
+2
-2
kernel/sched.c
+2
-2
kernel/sched.c
···
7289
7289
static void calc_global_load_remove(struct rq *rq)
7290
7290
{
7291
7291
atomic_long_sub(rq->calc_load_active, &calc_load_tasks);
7292
+
rq->calc_load_active = 0;
7292
7293
}
7293
7294
#endif /* CONFIG_HOTPLUG_CPU */
7294
7295
···
7516
7515
task_rq_unlock(rq, &flags);
7517
7516
get_task_struct(p);
7518
7517
cpu_rq(cpu)->migration_thread = p;
7518
+
rq->calc_load_update = calc_load_update;
7519
7519
break;
7520
7520
7521
7521
case CPU_ONLINE:
···
7527
7525
/* Update our root-domain */
7528
7526
rq = cpu_rq(cpu);
7529
7527
spin_lock_irqsave(&rq->lock, flags);
7530
-
rq->calc_load_update = calc_load_update;
7531
-
rq->calc_load_active = 0;
7532
7528
if (rq->rd) {
7533
7529
BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
7534
7530
+8
-2
kernel/sched_fair.c
+8
-2
kernel/sched_fair.c
···
266
266
return min_vruntime;
267
267
}
268
268
269
+
static inline int entity_before(struct sched_entity *a,
270
+
struct sched_entity *b)
271
+
{
272
+
return (s64)(a->vruntime - b->vruntime) < 0;
273
+
}
274
+
269
275
static inline s64 entity_key(struct cfs_rq *cfs_rq, struct sched_entity *se)
270
276
{
271
277
return se->vruntime - cfs_rq->min_vruntime;
···
1023
1017
/*
1024
1018
* Already in the rightmost position?
1025
1019
*/
1026
-
if (unlikely(!rightmost || rightmost->vruntime < se->vruntime))
1020
+
if (unlikely(!rightmost || entity_before(rightmost, se)))
1027
1021
return;
1028
1022
1029
1023
/*
···
1719
1713
1720
1714
/* 'curr' will be NULL if the child belongs to a different group */
1721
1715
if (sysctl_sched_child_runs_first && this_cpu == task_cpu(p) &&
1722
-
curr && curr->vruntime < se->vruntime) {
1716
+
curr && entity_before(curr, se)) {
1723
1717
/*
1724
1718
* Upon rescheduling, sched_class::put_prev_task() will place
1725
1719
* 'current' within the tree based on its new key value.