Skip to content

Commit 35de589

Browse files
npigginmpe
authored andcommitted
powerpc/time: improve decrementer clockevent processing
The stop/shutdown op should not use decrementer_set_next_event because that sets decrementers_next_tb to now + decrementer_max, which means a decrementer interrupt that occurs after that time will call the clockevent event handler unexpectedly. Set next_tb to ~0 here to prevent any clock event call. Init all clockevents to stopped. Then the decrementer clockevent device always has event_handler set and applicable because we know the clock event device was not stopped. So make this call unconditional to show that it is always called. next_tb need not be set to ~0 before the event handler is called because it will stop the clockevent device if there is no other timer. Finally, the timer broadcast interrupt should not modify next_tb because it is not involved with the local decrementer clockevent on this CPU. This doesn't fix a known bug, just tidies the code. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20220124143930.3923442-3-npiggin@gmail.com
1 parent cf74ff5 commit 35de589

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

arch/powerpc/kernel/time.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,12 @@ struct clock_event_device decrementer_clockevent = {
107107
};
108108
EXPORT_SYMBOL(decrementer_clockevent);
109109

110-
DEFINE_PER_CPU(u64, decrementers_next_tb);
110+
/*
111+
* This always puts next_tb beyond now, so the clock event will never fire
112+
* with the usual comparison, no need for a separate test for stopped.
113+
*/
114+
#define DEC_CLOCKEVENT_STOPPED ~0ULL
115+
DEFINE_PER_CPU(u64, decrementers_next_tb) = DEC_CLOCKEVENT_STOPPED;
111116
EXPORT_SYMBOL_GPL(decrementers_next_tb);
112117
static DEFINE_PER_CPU(struct clock_event_device, decrementers);
113118

@@ -645,9 +650,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt)
645650

646651
now = get_tb();
647652
if (now >= *next_tb) {
648-
*next_tb = ~(u64)0;
649-
if (evt->event_handler)
650-
evt->event_handler(evt);
653+
evt->event_handler(evt);
651654
__this_cpu_inc(irq_stat.timer_irqs_event);
652655
} else {
653656
now = *next_tb - now;
@@ -666,9 +669,6 @@ EXPORT_SYMBOL(timer_interrupt);
666669
#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
667670
void timer_broadcast_interrupt(void)
668671
{
669-
u64 *next_tb = this_cpu_ptr(&decrementers_next_tb);
670-
671-
*next_tb = ~(u64)0;
672672
tick_receive_broadcast();
673673
__this_cpu_inc(irq_stat.broadcast_irqs_event);
674674
}
@@ -894,7 +894,9 @@ static int decrementer_set_next_event(unsigned long evt,
894894

895895
static int decrementer_shutdown(struct clock_event_device *dev)
896896
{
897-
decrementer_set_next_event(decrementer_max, dev);
897+
__this_cpu_write(decrementers_next_tb, DEC_CLOCKEVENT_STOPPED);
898+
set_dec_or_work(decrementer_max);
899+
898900
return 0;
899901
}
900902

0 commit comments

Comments
 (0)