Skip to content

Commit 58faf20

Browse files
a-darwishPeter Zijlstra
authored andcommitted
time/sched_clock: Use raw_read_seqcount_latch() during suspend
sched_clock uses seqcount_t latching to switch between two storage places protected by the sequence counter. This allows it to have interruptible, NMI-safe, seqcount_t write side critical sections. Since 7fc2632 ("seqlock: Introduce raw_read_seqcount_latch()"), raw_read_seqcount_latch() became the standardized way for seqcount_t latch read paths. Due to the dependent load, it has one read memory barrier less than the currently used raw_read_seqcount() API. Use raw_read_seqcount_latch() for the suspend path. Commit aadd6e5 ("time/sched_clock: Use raw_read_seqcount_latch()") missed changing that instance of raw_read_seqcount(). References: 1809bfa ("timers, sched/clock: Avoid deadlock during read from NMI") Signed-off-by: Ahmed S. Darwish <a.darwish@linutronix.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20200715092345.GA231464@debian-buster-darwi.lab.linutronix.de
1 parent 96a16f4 commit 58faf20

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

kernel/time/sched_clock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ void __init generic_sched_clock_init(void)
258258
*/
259259
static u64 notrace suspended_sched_clock_read(void)
260260
{
261-
unsigned int seq = raw_read_seqcount(&cd.seq);
261+
unsigned int seq = raw_read_seqcount_latch(&cd.seq);
262262

263263
return cd.read_data[seq & 1].epoch_cyc;
264264
}

0 commit comments

Comments
 (0)