Commit 17a1b882 authored by Thomas Gleixner's avatar Thomas Gleixner

hrtimer: Add bases argument to clock_was_set()

clock_was_set() unconditionaly invokes retrigger_next_event() on all online
CPUs. This was necessary because that mechanism was also used for resume
from suspend to idle which is not longer the case.

The bases arguments allows the callers of clock_was_set() to hand in a mask
which tells clock_was_set() which of the hrtimer clock bases are affected
by the clock setting. This mask will be used in the next step to check
whether a CPU base has timers queued on a clock base affected by the event
and avoid the SMP function call if there are none.

Add a @bases argument, provide defines for the active bases masking and
fixup all callsites.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210713135158.691083465@linutronix.de
parent 1b267793
...@@ -880,7 +880,7 @@ static void hrtimer_reprogram(struct hrtimer *timer, bool reprogram) ...@@ -880,7 +880,7 @@ static void hrtimer_reprogram(struct hrtimer *timer, bool reprogram)
* in the tick, which obviously might be stopped, so this has to bring out * in the tick, which obviously might be stopped, so this has to bring out
* the remote CPU which might sleep in idle to get this sorted. * the remote CPU which might sleep in idle to get this sorted.
*/ */
void clock_was_set(void) void clock_was_set(unsigned int bases)
{ {
if (!hrtimer_hres_active() && !tick_nohz_active) if (!hrtimer_hres_active() && !tick_nohz_active)
goto out_timerfd; goto out_timerfd;
...@@ -894,7 +894,7 @@ void clock_was_set(void) ...@@ -894,7 +894,7 @@ void clock_was_set(void)
static void clock_was_set_work(struct work_struct *work) static void clock_was_set_work(struct work_struct *work)
{ {
clock_was_set(); clock_was_set(CLOCK_SET_WALL);
} }
static DECLARE_WORK(hrtimer_work, clock_was_set_work); static DECLARE_WORK(hrtimer_work, clock_was_set_work);
......
...@@ -166,7 +166,14 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases); ...@@ -166,7 +166,14 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
extern u64 get_next_timer_interrupt(unsigned long basej, u64 basem); extern u64 get_next_timer_interrupt(unsigned long basej, u64 basem);
void timer_clear_idle(void); void timer_clear_idle(void);
void clock_was_set(void); #define CLOCK_SET_WALL \
(BIT(HRTIMER_BASE_REALTIME) | BIT(HRTIMER_BASE_REALTIME_SOFT) | \
BIT(HRTIMER_BASE_TAI) | BIT(HRTIMER_BASE_TAI_SOFT))
#define CLOCK_SET_BOOT \
(BIT(HRTIMER_BASE_BOOTTIME) | BIT(HRTIMER_BASE_BOOTTIME_SOFT))
void clock_was_set(unsigned int bases);
void clock_was_set_delayed(void); void clock_was_set_delayed(void);
void hrtimers_resume_local(void); void hrtimers_resume_local(void);
...@@ -1323,8 +1323,8 @@ int do_settimeofday64(const struct timespec64 *ts) ...@@ -1323,8 +1323,8 @@ int do_settimeofday64(const struct timespec64 *ts)
write_seqcount_end(&tk_core.seq); write_seqcount_end(&tk_core.seq);
raw_spin_unlock_irqrestore(&timekeeper_lock, flags); raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
/* signal hrtimers about time change */ /* Signal hrtimers about time change */
clock_was_set(); clock_was_set(CLOCK_SET_WALL);
if (!ret) if (!ret)
audit_tk_injoffset(ts_delta); audit_tk_injoffset(ts_delta);
...@@ -1371,8 +1371,8 @@ static int timekeeping_inject_offset(const struct timespec64 *ts) ...@@ -1371,8 +1371,8 @@ static int timekeeping_inject_offset(const struct timespec64 *ts)
write_seqcount_end(&tk_core.seq); write_seqcount_end(&tk_core.seq);
raw_spin_unlock_irqrestore(&timekeeper_lock, flags); raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
/* signal hrtimers about time change */ /* Signal hrtimers about time change */
clock_was_set(); clock_was_set(CLOCK_SET_WALL);
return ret; return ret;
} }
...@@ -1746,8 +1746,8 @@ void timekeeping_inject_sleeptime64(const struct timespec64 *delta) ...@@ -1746,8 +1746,8 @@ void timekeeping_inject_sleeptime64(const struct timespec64 *delta)
write_seqcount_end(&tk_core.seq); write_seqcount_end(&tk_core.seq);
raw_spin_unlock_irqrestore(&timekeeper_lock, flags); raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
/* signal hrtimers about time change */ /* Signal hrtimers about time change */
clock_was_set(); clock_was_set(CLOCK_SET_WALL | CLOCK_SET_BOOT);
} }
#endif #endif
...@@ -2440,7 +2440,7 @@ int do_adjtimex(struct __kernel_timex *txc) ...@@ -2440,7 +2440,7 @@ int do_adjtimex(struct __kernel_timex *txc)
clock_set |= timekeeping_advance(TK_ADV_FREQ); clock_set |= timekeeping_advance(TK_ADV_FREQ);
if (clock_set) if (clock_set)
clock_was_set(); clock_was_set(CLOCK_REALTIME);
ntp_notify_cmos_timer(); ntp_notify_cmos_timer();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment