[patch 3/3] sched: move sched_avg_update() to update_cpu_load()
in [Kernel]
|
Prev: [PATCH] time: Workaround gcc loop optimization that causes 64bit div errors
Next: [patch 2/3] sched: fix minimum power returned by update_cpu_power()
From: Suresh Siddha on 13 Aug 2010 15:50 Currently sched_avg_update() (which updates rt_avg stats in the rq) is getting called from scale_rt_power() (in the load balance context) which doesn't take rq->lock. Fix it by moving the sched_avg_update() to more appropriate update_cpu_load() where the CFS load gets updated aswell. Signed-off-by: Suresh Siddha <suresh.b.siddha(a)intel.com> --- kernel/sched.c | 3 ++- kernel/sched_fair.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) Index: tree/kernel/sched_fair.c =================================================================== --- tree.orig/kernel/sched_fair.c +++ tree/kernel/sched_fair.c @@ -2268,8 +2268,6 @@ unsigned long scale_rt_power(int cpu) struct rq *rq = cpu_rq(cpu); u64 total, available; - sched_avg_update(rq); - total = sched_avg_period() + (rq->clock - rq->age_stamp); available = total - rq->rt_avg; Index: tree/kernel/sched.c =================================================================== --- tree.orig/kernel/sched.c +++ tree/kernel/sched.c @@ -1281,7 +1281,6 @@ static void sched_avg_update(struct rq * static void sched_rt_avg_update(struct rq *rq, u64 rt_delta) { rq->rt_avg += rt_delta; - sched_avg_update(rq); } #else /* !CONFIG_SMP */ @@ -3182,6 +3181,8 @@ static void update_cpu_load(struct rq *t this_rq->cpu_load[i] = (old_load * (scale - 1) + new_load) >> i; } + + sched_avg_update(this_rq); } static void update_cpu_load_active(struct rq *this_rq) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |