The 'noinstr' function attribute means no-instrumentation, this should very much include *SAN. Because lots of that is broken at present, only include KCSAN for now, as that is limited to clang11, which has sane function attribute behaviour.
Unified · Split
| @@ -118,10 +118,6 @@ struct ftrace_likely_data { · 117 unmodified lines | ||
| 118 | 118 | #define notrace __attribute__((__no_instrument_function__)) |
| 119 | 119 | #endif |
| 120 | 120 | |
| 121 | −/* Section for code which can't be instrumented at all */ | |
| 122 | −#define noinstr \ | |
| 123 | − noinline notrace __attribute((__section__(".noinstr.text"))) | |
| 124 | − | |
| 125 | 121 | /* |
| 126 | 122 | * it doesn't make sense on ARM (currently the only user of __naked) |
| 127 | 123 | * to trace naked functions because then mcount is called without |
| @@ -200,6 +196,10 @@ struct ftrace_likely_data { · 72 unmodified lines | ||
| 200 | 196 | #define __no_sanitize_or_inline __always_inline |
| 201 | 197 | #endif |
| 202 | 198 | |
| 199 | +/* Section for code which can't be instrumented at all */ | |
| 200 | +#define noinstr \ | |
| 201 | + noinline notrace __attribute((__section__(".noinstr.text"))) __no_kcsan | |
| 202 | + | |
| 203 | 203 | #endif /* __KERNEL__ */ |
| 204 | 204 | |
| 205 | 205 | #endif /* __ASSEMBLY__ */ |