aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Collapse)AuthorAge
...
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-schedLinus Torvalds2007-08-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: (61 commits) sched: refine negative nice level granularity sched: fix update_stats_enqueue() reniced codepath sched: round a bit better sched: make the multiplication table more accurate sched: optimize update_rq_clock() calls in the load-balancer sched: optimize activate_task() sched: clean up set_curr_task_fair() sched: remove __update_rq_clock() call from entity_tick() sched: move the __update_rq_clock() call to scheduler_tick() sched debug: remove the 'u64 now' parameter from print_task()/_rq() sched: remove the 'u64 now' local variables sched: remove the 'u64 now' parameter from deactivate_task() sched: remove the 'u64 now' parameter from dequeue_task() sched: remove the 'u64 now' parameter from enqueue_task() sched: remove the 'u64 now' parameter from dec_nr_running() sched: remove the 'u64 now' parameter from inc_nr_running() sched: remove the 'u64 now' parameter from dec_load() sched: remove the 'u64 now' parameter from inc_load() sched: remove the 'u64 now' parameter from update_curr_load() sched: remove the 'u64 now' parameter from ->task_new() ...
| * sched: refine negative nice level granularityIngo Molnar2007-08-09
| | | | | | | | | | | | | | | | | | | | refine the granularity of negative nice level tasks: let them reschedule more often to offset the effect of them consuming their wait_runtime proportionately slower. (This makes nice-0 task scheduling smoother in the presence of negatively reniced tasks.) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: fix update_stats_enqueue() reniced codepathIngo Molnar2007-08-09
| | | | | | | | | | | | | | | | the key has to be rescaled to /weight even if it has a positive value. (this change only affects the scheduling of reniced tasks) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: round a bit betterIngo Molnar2007-08-09
| | | | | | | | | | | | | | | | | | round a tiny bit better in high-frequency rescheduling scenarios, by rounding around zero instead of rounding down. (this is pretty theoretical though) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: make the multiplication table more accurateIngo Molnar2007-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do small deltas in the weight and multiplication constant table so that the worst-case numeric error is better than 1:100000000. (8 digits) the current error table is: nice mult * inv_mult error ------------------------------------------ -20: 88761 * 48388 -0.0000000065 -19: 71755 * 59856 -0.0000000037 -18: 56483 * 76040 0.0000000056 -17: 46273 * 92818 0.0000000042 -16: 36291 * 118348 -0.0000000065 -15: 29154 * 147320 -0.0000000037 -14: 23254 * 184698 -0.0000000009 -13: 18705 * 229616 -0.0000000037 -12: 14949 * 287308 -0.0000000009 -11: 11916 * 360437 -0.0000000009 -10: 9548 * 449829 -0.0000000009 -9: 7620 * 563644 -0.0000000037 -8: 6100 * 704093 0.0000000009 -7: 4904 * 875809 0.0000000093 -6: 3906 * 1099582 -0.0000000009 -5: 3121 * 1376151 -0.0000000058 -4: 2501 * 1717300 0.0000000009 -3: 1991 * 2157191 -0.0000000035 -2: 1586 * 2708050 0.0000000009 -1: 1277 * 3363326 0.0000000014 0: 1024 * 4194304 0.0000000000 1: 820 * 5237765 0.0000000009 2: 655 * 6557202 0.0000000033 3: 526 * 8165337 -0.0000000079 4: 423 * 10153587 0.0000000012 5: 335 * 12820798 0.0000000079 6: 272 * 15790321 0.0000000037 7: 215 * 19976592 -0.0000000037 8: 172 * 24970740 -0.0000000037 9: 137 * 31350126 -0.0000000079 10: 110 * 39045157 -0.0000000061 11: 87 * 49367440 -0.0000000037 12: 70 * 61356676 0.0000000056 13: 56 * 76695844 -0.0000000075 14: 45 * 95443717 -0.0000000072 15: 36 * 119304647 -0.0000000009 16: 29 * 148102320 -0.0000000037 17: 23 * 186737708 -0.0000000028 18: 18 * 238609294 -0.0000000009 19: 15 * 286331153 -0.0000000002 Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: optimize update_rq_clock() calls in the load-balancerIngo Molnar2007-08-09
| | | | | | | | | | | | | | | | optimize update_rq_clock() calls in the load-balancer: update them right after locking the runqueue(s) so that the pull functions do not have to call it. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: optimize activate_task()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | optimize activate_task() by removing update_rq_clock() from it. (and add update_rq_clock() to all callsites of activate_task() that did not have it before.) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: clean up set_curr_task_fair()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | | | | | | | | | clean up set_curr_task_fair(). ( identity transformation that causes no change in functionality. ) text data bss dec hex filename 39170 3750 36 42956 a7cc sched.o.before 39170 3750 36 42956 a7cc sched.o.after Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove __update_rq_clock() call from entity_tick()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | | | remove __update_rq_clock() call from entity_tick(). no change in functionality because scheduler_tick() already calls __update_rq_clock(). Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: move the __update_rq_clock() call to scheduler_tick()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | | | | | | | move the __update_rq_clock() call from update_cpu_load() to scheduler_tick(). ( identity transformation that causes no change in functionality. ) this allows the direct use of rq->clock in ->task_tick() functions. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched debug: remove the 'u64 now' parameter from print_task()/_rq()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from sched_debug.c:print_task()/_rq(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' local variablesIngo Molnar2007-08-09
| | | | | | | | | | | | | | | | final step: remove all (now superfluous) 'u64 now' variables. ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from deactivate_task()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from deactivate_task(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from dequeue_task()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from dequeue_task(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from enqueue_task()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from enqueue_task(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from dec_nr_running()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from dec_nr_running(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from inc_nr_running()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from inc_nr_running(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from dec_load()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from dec_load(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from inc_load()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from inc_load(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from update_curr_load()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from update_curr_load(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from ->task_new()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from ->task_new(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from ->put_prev_task()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from ->put_prev_task(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from pick_next_task()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from pick_next_task(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from ->pick_next_task()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from ->pick_next_task(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from ->dequeue_task()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from ->dequeue_task(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from ->enqueue_task()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from ->enqueue_task(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from update_curr_rt()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from update_curr_rt(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from put_prev_entity()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from put_prev_entity(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from pick_next_entity()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from pick_next_entity(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from set_next_entity()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from set_next_entity(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from dequeue_entity()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from dequeue_entity(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from enqueue_entity()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from enqueue_entity(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from enqueue_sleeper()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from enqueue_sleeper(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from __enqueue_sleeper()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from __enqueue_sleeper(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from update_stats_curr_end()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from update_stats_curr_end(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from update_stats_dequeue()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from update_stats_dequeue(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from update_stats_curr_start()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from update_stats_curr_start(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from update_stats_wait_end()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from update_stats_wait_end(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from __update_stats_wait_end()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from __update_stats_wait_end(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from update_stats_enqueue()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from update_stats_enqueue(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from update_stats_wait_start()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from update_stats_wait_start(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from update_curr()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from update_curr(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove the 'u64 now' parameter from print_cfs_rq()Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | remove the 'u64 now' parameter from print_cfs_rq(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove 'now' use from assignmentsIngo Molnar2007-08-09
| | | | | | | | | | | | | | | | | | | | change all 'now' timestamp uses in assignments to rq->clock. ( this is an identity transformation that causes no functionality change: all such new rq->clock is necessarily preceded by an update_rq_clock() call. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove __rq_clock()Ingo Molnar2007-08-09
| | | | | | | | | | | | remove the (now unused) __rq_clock() function. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: eliminate __rq_clock() useIngo Molnar2007-08-09
| | | | | | | | | | | | | | | | | | | | | | eliminate __rq_clock() use by changing it to: __update_rq_clock(rq) now = rq->clock; identity transformation - no change in behavior. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: remove rq_clock()Ingo Molnar2007-08-09
| | | | | | | | | | | | remove the now unused rq_clock() function. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: eliminate rq_clock() useIngo Molnar2007-08-09
| | | | | | | | | | | | | | | | | | | | | | eliminate rq_clock() use by changing it to: update_rq_clock(rq) now = rq->clock; identity transformation - no change in behavior. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: add [__]update_rq_clock(rq)Ingo Molnar2007-08-09
| | | | | | | | | | | | | | | | add the [__]update_rq_clock(rq) functions. (No change in functionality, just reorganization to prepare for elimination of the heavy 64-bit timestamp-passing in the scheduler.) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * sched: fix bug in balance_tasks()Peter Williams2007-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two problems with balance_tasks() and how it used: 1. The variables best_prio and best_prio_seen (inherited from the old move_tasks()) were only required to handle problems caused by the active/expired arrays, the order in which they were processed and the possibility that the task with the highest priority could be on either. These issues are no longer present and the extra overhead associated with their use is unnecessary (and possibly wrong). 2. In the absence of CONFIG_FAIR_GROUP_SCHED being set, the same this_best_prio variable needs to be used by all scheduling classes or there is a risk of moving too much load. E.g. if the highest priority task on this at the beginning is a fairly low priority task and the rt class migrates a task (during its turn) then that moved task becomes the new highest priority task on this_rq but when the sched_fair class initializes its copy of this_best_prio it will get the priority of the original highest priority task as, due to the run queue locks being held, the reschedule triggered by pull_task() will not have taken place. This could result in inappropriate overriding of skip_for_load and excessive load being moved. The attached patch addresses these problems by deleting all reference to best_prio and best_prio_seen and making this_best_prio a reference parameter to the various functions involved. load_balance_fair() has also been modified so that this_best_prio is only reset (in the loop) if CONFIG_FAIR_GROUP_SCHED is set. This should preserve the effect of helping spread groups' higher priority tasks around the available CPUs while improving system performance when CONFIG_FAIR_GROUP_SCHED isn't set. Signed-off-by: Peter Williams <pwil3058@bigpond.net.au> Signed-off-by: Ingo Molnar <mingo@elte.hu>