Skip to content

Commit

Permalink
sched: Revert nohz_ratelimit() for now
Browse files Browse the repository at this point in the history
Norbert reported that nohz_ratelimit() causes his laptop to burn about
4W (40%) extra. For now back out the change and see if we can adjust
the power management code to make better decisions.

Reported-by: Norbert Preining <preining@logic.at>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Mike Galbraith <efault@gmx.de>
Cc: Arjan van de Ven <arjan@infradead.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Jul 17, 2010
1 parent f469461 commit 396e894
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 17 deletions.
6 changes: 0 additions & 6 deletions include/linux/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -273,17 +273,11 @@ extern cpumask_var_t nohz_cpu_mask;
#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)
extern int select_nohz_load_balancer(int cpu);
extern int get_nohz_load_balancer(void);
extern int nohz_ratelimit(int cpu);
#else
static inline int select_nohz_load_balancer(int cpu)
{
return 0;
}

static inline int nohz_ratelimit(int cpu)
{
return 0;
}
#endif

/*
Expand Down
10 changes: 0 additions & 10 deletions kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -1232,16 +1232,6 @@ void wake_up_idle_cpu(int cpu)
smp_send_reschedule(cpu);
}

int nohz_ratelimit(int cpu)
{
struct rq *rq = cpu_rq(cpu);
u64 diff = rq->clock - rq->nohz_stamp;

rq->nohz_stamp = rq->clock;

return diff < (NSEC_PER_SEC / HZ) >> 1;
}

#endif /* CONFIG_NO_HZ */

static u64 sched_avg_period(void)
Expand Down
2 changes: 1 addition & 1 deletion kernel/time/tick-sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ void tick_nohz_stop_sched_tick(int inidle)
} while (read_seqretry(&xtime_lock, seq));

if (rcu_needs_cpu(cpu) || printk_needs_cpu(cpu) ||
arch_needs_cpu(cpu) || nohz_ratelimit(cpu)) {
arch_needs_cpu(cpu)) {
next_jiffies = last_jiffies + 1;
delta_jiffies = 1;
} else {
Expand Down

0 comments on commit 396e894

Please sign in to comment.