Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eed3b9cf authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Thomas Gleixner
Browse files

nohz: Reuse ktime in sub-functions of tick_check_idle.



On a system with NOHZ=y tick_check_idle calls tick_nohz_stop_idle and
tick_nohz_update_jiffies. Given the right conditions (ts->idle_active
and/or ts->tick_stopped) both function get a time stamp with ktime_get.
The same time stamp can be reused if both function require one.

On s390 this change has the additional benefit that gcc inlines the
tick_nohz_stop_idle function into tick_check_idle. The number of
instructions to execute tick_check_idle drops from 225 to 144
(without the ktime_get optimization it is 367 vs 215 instructions).

before:

 0)               |  tick_check_idle() {
 0)               |    tick_nohz_stop_idle() {
 0)               |      ktime_get() {
 0)               |        read_tod_clock() {
 0)   0.601 us    |        }
 0)   1.765 us    |      }
 0)   3.047 us    |    }
 0)               |    ktime_get() {
 0)               |      read_tod_clock() {
 0)   0.570 us    |      }
 0)   1.727 us    |    }
 0)               |    tick_do_update_jiffies64() {
 0)   0.609 us    |    }
 0)   8.055 us    |  }

after:

 0)               |  tick_check_idle() {
 0)               |    ktime_get() {
 0)               |      read_tod_clock() {
 0)   0.617 us    |      }
 0)   1.773 us    |    }
 0)               |    tick_do_update_jiffies64() {
 0)   0.593 us    |    }
 0)   4.477 us    |  }

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Cc: john stultz <johnstul@us.ibm.com>
LKML-Reference: <20090929122533.206589318@de.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7bc7d637
Loading
Loading
Loading
Loading
+33 −29
Original line number Original line Diff line number Diff line
@@ -134,18 +134,13 @@ __setup("nohz=", setup_tick_nohz);
 * value. We do this unconditionally on any cpu, as we don't know whether the
 * value. We do this unconditionally on any cpu, as we don't know whether the
 * cpu, which has the update task assigned is in a long sleep.
 * cpu, which has the update task assigned is in a long sleep.
 */
 */
static void tick_nohz_update_jiffies(void)
static void tick_nohz_update_jiffies(ktime_t now)
{
{
	int cpu = smp_processor_id();
	int cpu = smp_processor_id();
	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
	unsigned long flags;
	unsigned long flags;
	ktime_t now;

	if (!ts->tick_stopped)
		return;


	cpumask_clear_cpu(cpu, nohz_cpu_mask);
	cpumask_clear_cpu(cpu, nohz_cpu_mask);
	now = ktime_get();
	ts->idle_waketime = now;
	ts->idle_waketime = now;


	local_irq_save(flags);
	local_irq_save(flags);
@@ -155,13 +150,11 @@ static void tick_nohz_update_jiffies(void)
	touch_softlockup_watchdog();
	touch_softlockup_watchdog();
}
}


static void tick_nohz_stop_idle(int cpu)
static void tick_nohz_stop_idle(int cpu, ktime_t now)
{
{
	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
	ktime_t delta;


	if (ts->idle_active) {
		ktime_t now, delta;
		now = ktime_get();
	delta = ktime_sub(now, ts->idle_entrytime);
	delta = ktime_sub(now, ts->idle_entrytime);
	ts->idle_lastupdate = now;
	ts->idle_lastupdate = now;
	ts->idle_sleeptime = ktime_add(ts->idle_sleeptime, delta);
	ts->idle_sleeptime = ktime_add(ts->idle_sleeptime, delta);
@@ -169,7 +162,6 @@ static void tick_nohz_stop_idle(int cpu)


	sched_clock_idle_wakeup_event(0);
	sched_clock_idle_wakeup_event(0);
}
}
}


static ktime_t tick_nohz_start_idle(struct tick_sched *ts)
static ktime_t tick_nohz_start_idle(struct tick_sched *ts)
{
{
@@ -431,7 +423,11 @@ void tick_nohz_restart_sched_tick(void)
	ktime_t now;
	ktime_t now;


	local_irq_disable();
	local_irq_disable();
	tick_nohz_stop_idle(cpu);
	if (ts->idle_active || (ts->inidle && ts->tick_stopped))
		now = ktime_get();

	if (ts->idle_active)
		tick_nohz_stop_idle(cpu, now);


	if (!ts->inidle || !ts->tick_stopped) {
	if (!ts->inidle || !ts->tick_stopped) {
		ts->inidle = 0;
		ts->inidle = 0;
@@ -445,7 +441,6 @@ void tick_nohz_restart_sched_tick(void)


	/* Update jiffies first */
	/* Update jiffies first */
	select_nohz_load_balancer(0);
	select_nohz_load_balancer(0);
	now = ktime_get();
	tick_do_update_jiffies64(now);
	tick_do_update_jiffies64(now);
	cpumask_clear_cpu(cpu, nohz_cpu_mask);
	cpumask_clear_cpu(cpu, nohz_cpu_mask);


@@ -579,22 +574,18 @@ static void tick_nohz_switch_to_nohz(void)
 * timer and do not touch the other magic bits which need to be done
 * timer and do not touch the other magic bits which need to be done
 * when idle is left.
 * when idle is left.
 */
 */
static void tick_nohz_kick_tick(int cpu)
static void tick_nohz_kick_tick(int cpu, ktime_t now)
{
{
#if 0
#if 0
	/* Switch back to 2.6.27 behaviour */
	/* Switch back to 2.6.27 behaviour */


	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
	ktime_t delta, now;
	ktime_t delta;

	if (!ts->tick_stopped)
		return;


	/*
	/*
	 * Do not touch the tick device, when the next expiry is either
	 * Do not touch the tick device, when the next expiry is either
	 * already reached or less/equal than the tick period.
	 * already reached or less/equal than the tick period.
	 */
	 */
	now = ktime_get();
	delta =	ktime_sub(hrtimer_get_expires(&ts->sched_timer), now);
	delta =	ktime_sub(hrtimer_get_expires(&ts->sched_timer), now);
	if (delta.tv64 <= tick_period.tv64)
	if (delta.tv64 <= tick_period.tv64)
		return;
		return;
@@ -603,9 +594,26 @@ static void tick_nohz_kick_tick(int cpu)
#endif
#endif
}
}


static inline void tick_check_nohz(int cpu)
{
	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
	ktime_t now;

	if (!ts->idle_active && !ts->tick_stopped)
		return;
	now = ktime_get();
	if (ts->idle_active)
		tick_nohz_stop_idle(cpu, now);
	if (ts->tick_stopped) {
		tick_nohz_update_jiffies(now);
		tick_nohz_kick_tick(cpu, now);
	}
}

#else
#else


static inline void tick_nohz_switch_to_nohz(void) { }
static inline void tick_nohz_switch_to_nohz(void) { }
static inline void tick_check_nohz(int cpu) { }


#endif /* NO_HZ */
#endif /* NO_HZ */


@@ -615,11 +623,7 @@ static inline void tick_nohz_switch_to_nohz(void) { }
void tick_check_idle(int cpu)
void tick_check_idle(int cpu)
{
{
	tick_check_oneshot_broadcast(cpu);
	tick_check_oneshot_broadcast(cpu);
#ifdef CONFIG_NO_HZ
	tick_check_nohz(cpu);
	tick_nohz_stop_idle(cpu);
	tick_nohz_update_jiffies();
	tick_nohz_kick_tick(cpu);
#endif
}
}


/*
/*