Skip to content

Commit 8ab40fc

Browse files
melverPeter Zijlstra
authored andcommitted
time/sched_clock: Broaden sched_clock()'s instrumentation coverage
Most of sched_clock()'s implementation is ineligible for instrumentation due to relying on sched_clock_noinstr(). Split the implementation off into an __always_inline function __sched_clock(), which is then used by the noinstr and instrumentable version, to allow more of sched_clock() to be covered by various instrumentation. This will allow instrumentation with the various sanitizers (KASAN, KCSAN, KMSAN, UBSAN). For KCSAN, we know that raw seqcount_latch usage without annotations will result in false positive reports: tell it that all of __sched_clock() is "atomic" for the latch reader; later changes in this series will take care of the writers. Co-developed-by: "Peter Zijlstra (Intel)" <[email protected]> Signed-off-by: "Peter Zijlstra (Intel)" <[email protected]> Signed-off-by: Marco Elver <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1139c71 commit 8ab40fc

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

kernel/time/sched_clock.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ notrace int sched_clock_read_retry(unsigned int seq)
8080
return raw_read_seqcount_latch_retry(&cd.seq, seq);
8181
}
8282

83-
unsigned long long noinstr sched_clock_noinstr(void)
83+
static __always_inline unsigned long long __sched_clock(void)
8484
{
8585
struct clock_read_data *rd;
8686
unsigned int seq;
@@ -98,11 +98,23 @@ unsigned long long noinstr sched_clock_noinstr(void)
9898
return res;
9999
}
100100

101+
unsigned long long noinstr sched_clock_noinstr(void)
102+
{
103+
return __sched_clock();
104+
}
105+
101106
unsigned long long notrace sched_clock(void)
102107
{
103108
unsigned long long ns;
104109
preempt_disable_notrace();
105-
ns = sched_clock_noinstr();
110+
/*
111+
* All of __sched_clock() is a seqcount_latch reader critical section,
112+
* but relies on the raw helpers which are uninstrumented. For KCSAN,
113+
* mark all accesses in __sched_clock() as atomic.
114+
*/
115+
kcsan_nestable_atomic_begin();
116+
ns = __sched_clock();
117+
kcsan_nestable_atomic_end();
106118
preempt_enable_notrace();
107119
return ns;
108120
}

0 commit comments

Comments
 (0)