Commit aafd9d6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer/dynticks updates from Ingo Molnar:
 "This tree contains misc dynticks updates: a fix and three cleanups"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/nohz: Fix overflow error in scheduler_tick_max_deferment()
  nohz_full: fix code style issue of tick_nohz_full_stop_tick
  nohz: Get timekeeping max deferment outside jiffies_lock
  tick: Rename tick_check_idle() to tick_irq_enter()
parents 595bf999 a2b4c607

include/linux/jiffies.h

+6 −0
Original line number Diff line number Diff line
@@ -294,6 +294,12 @@ extern unsigned long preset_lpj; 
 */

extern unsigned int jiffies_to_msecs(const unsigned long j);

extern unsigned int jiffies_to_usecs(const unsigned long j);



static inline u64 jiffies_to_nsecs(const unsigned long j)

{

	return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;

}



extern unsigned long msecs_to_jiffies(const unsigned int m);

extern unsigned long usecs_to_jiffies(const unsigned int u);

extern unsigned long timespec_to_jiffies(const struct timespec *value);

include/linux/tick.h

+3 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ extern struct cpumask *tick_get_broadcast_oneshot_mask(void); 
extern void tick_clock_notify(void);

extern int tick_check_oneshot_change(int allow_nohz);

extern struct tick_sched *tick_get_tick_sched(int cpu);

extern void tick_check_idle(void);

extern void tick_irq_enter(void);

extern int tick_oneshot_mode_active(void);

#  ifndef arch_needs_cpu

#   define arch_needs_cpu(cpu) (0)
@@ -112,7 +112,7 @@ extern int tick_oneshot_mode_active(void); 
# else

static inline void tick_clock_notify(void) { }

static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }

static inline void tick_check_idle(void) { }

static inline void tick_irq_enter(void) { }

static inline int tick_oneshot_mode_active(void) { return 0; }

# endif
@@ -121,7 +121,7 @@ static inline void tick_init(void) { } 
static inline void tick_cancel_sched_timer(int cpu) { }

static inline void tick_clock_notify(void) { }

static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }

static inline void tick_check_idle(void) { }

static inline void tick_irq_enter(void) { }

static inline int tick_oneshot_mode_active(void) { return 0; }

#endif /* !CONFIG_GENERIC_CLOCKEVENTS */

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2476,7 +2476,7 @@ u64 scheduler_tick_max_deferment(void) 
	if (time_before_eq(next, now))

		return 0;



	return jiffies_to_usecs(next - now) * NSEC_PER_USEC;

	return jiffies_to_nsecs(next - now);

}

#endif

kernel/softirq.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ void irq_enter(void) 
		 * here, as softirq will be serviced on return from interrupt.

		 */

		local_bh_disable();

		tick_check_idle();

		tick_irq_enter();

		_local_bh_enable();

	}

kernel/time/tick-sched.c

+14 −13
Original line number Diff line number Diff line
@@ -533,12 +533,13 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts, 
	struct clock_event_device *dev = __get_cpu_var(tick_cpu_device).evtdev;

	u64 time_delta;



	time_delta = timekeeping_max_deferment();



	/* Read jiffies and the time when jiffies were updated last */

	do {

		seq = read_seqbegin(&jiffies_lock);

		last_update = last_jiffies_update;

		last_jiffies = jiffies;

		time_delta = timekeeping_max_deferment();

	} while (read_seqretry(&jiffies_lock, seq));



	if (rcu_needs_cpu(cpu, &rcu_delta_jiffies) ||
@@ -1023,7 +1024,7 @@ static void tick_nohz_kick_tick(struct tick_sched *ts, ktime_t now) 
#endif

}



static inline void tick_check_nohz_this_cpu(void)

static inline void tick_nohz_irq_enter(void)

{

	struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched);

	ktime_t now;
@@ -1042,17 +1043,17 @@ static inline void tick_check_nohz_this_cpu(void) 
#else



static inline void tick_nohz_switch_to_nohz(void) { }

static inline void tick_check_nohz_this_cpu(void) { }

static inline void tick_nohz_irq_enter(void) { }



#endif /* CONFIG_NO_HZ_COMMON */



/*

 * Called from irq_enter to notify about the possible interruption of idle()

 */

void tick_check_idle(void)

void tick_irq_enter(void)

{

	tick_check_oneshot_broadcast_this_cpu();

	tick_check_nohz_this_cpu();

	tick_nohz_irq_enter();

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE