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

Commit cc608af3 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

hrtimer: Ensure timerfd notification for HIGHRES=n 



[ Upstream commit 8c3b5e6ec0fee18bc2ce38d1dfe913413205f908 ]

If high resolution timers are disabled the timerfd notification about a
clock was set event is not happening for all cases which use
clock_was_set_delayed() because that's a NOP for HIGHRES=n, which is wrong.

Make clock_was_set_delayed() unconditially available to fix that.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210713135158.196661266@linutronix.de


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a8457878

include/linux/hrtimer.h

+0 −5
Original line number Diff line number Diff line
@@ -317,16 +317,12 @@ struct clock_event_device; 


extern void hrtimer_interrupt(struct clock_event_device *dev);



extern void clock_was_set_delayed(void);



extern unsigned int hrtimer_resolution;



#else



#define hrtimer_resolution	(unsigned int)LOW_RES_NSEC



static inline void clock_was_set_delayed(void) { }



#endif



static inline ktime_t
@@ -350,7 +346,6 @@ hrtimer_expires_remaining_adjusted(const struct hrtimer *timer) 
						    timer->base->get_time());

}



extern void clock_was_set(void);

#ifdef CONFIG_TIMERFD

extern void timerfd_clock_was_set(void);

#else

kernel/time/hrtimer.c

+16 −16
Original line number Diff line number Diff line
@@ -759,22 +759,6 @@ static void hrtimer_switch_to_hres(void) 
	retrigger_next_event(NULL);

}



static void clock_was_set_work(struct work_struct *work)

{

	clock_was_set();

}



static DECLARE_WORK(hrtimer_work, clock_was_set_work);



/*

 * Called from timekeeping and resume code to reprogram the hrtimer

 * interrupt device on all cpus.

 */

void clock_was_set_delayed(void)

{

	schedule_work(&hrtimer_work);

}



#else



static inline int hrtimer_is_hres_enabled(void) { return 0; }
@@ -892,6 +876,22 @@ void clock_was_set(void) 
	timerfd_clock_was_set();

}



static void clock_was_set_work(struct work_struct *work)

{

	clock_was_set();

}



static DECLARE_WORK(hrtimer_work, clock_was_set_work);



/*

 * Called from timekeeping and resume code to reprogram the hrtimer

 * interrupt device on all cpus and to notify timerfd.

 */

void clock_was_set_delayed(void)

{

	schedule_work(&hrtimer_work);

}



/*

 * During resume we might have to reprogram the high resolution timer

 * interrupt on all online CPUs.  However, all other CPUs will be

kernel/time/tick-internal.h

+3 −0
Original line number Diff line number Diff line
@@ -165,3 +165,6 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases); 


extern u64 get_next_timer_interrupt(unsigned long basej, u64 basem);

void timer_clear_idle(void);



void clock_was_set(void);

void clock_was_set_delayed(void);