Some code pathes, especially the low level entry code, must be protected against instrumentation for various reasons: - Low level entry code can be a fragile beast, especially on x86. - With NO_HZ_FULL RCU state needs to be established before using it. Having a dedicated section for such code allows to validate with tooling that no unsafe functions are invoked. Add the .noinstr.text section and the noinstr attribute to mark functions. noinstr implies notrace. Kprobes will gain a section check later. Provide also a set of markers: instrumentation_begin()/end() These are used to mark code inside a noinstr function which calls into regular instrumentable text section as safe. The instrumentation markers are only active when CONFIG_DEBUG_ENTRY is enabled as the end marker emits a NOP to prevent the compiler from merging the annotation points. This means the objtool verification requires a kernel compiled with this option.
Unified · Split
| @@ -90,6 +90,7 @@ SECTIONS · 89 unmodified lines | ||
| 90 | 90 | #ifdef CONFIG_PPC64 |
| 91 | 91 | *(.tramp.ftrace.text); |
| 92 | 92 | #endif |
| 93 | + NOINSTR_TEXT | |
| 93 | 94 | SCHED_TEXT |
| 94 | 95 | CPUIDLE_TEXT |
| 95 | 96 | LOCK_TEXT |
| @@ -53,6 +53,9 @@ extern char __ctors_start[], __ctors_end[]; · 52 unmodified lines | ||
| 53 | 53 | /* Start and end of .opd section - used for function descriptors. */ |
| 54 | 54 | extern char __start_opd[], __end_opd[]; |
| 55 | 55 | |
| 56 | +/* Start and end of instrumentation protected text section */ | |
| 57 | +extern char __noinstr_text_start[], __noinstr_text_end[]; | |
| 58 | + | |
| 56 | 59 | extern __visible const void __nosave_begin, __nosave_end; |
| 57 | 60 | |
| 58 | 61 | /* Function descriptor handling (if any). Override in asm/sections.h */ |
| @@ -540,6 +540,15 @@ · 539 unmodified lines | ||
| 540 | 540 | . = ALIGN((align)); \ |
| 541 | 541 | __end_rodata = .; |
| 542 | 542 | |
| 543 | +/* | |
| 544 | + * Non-instrumentable text section | |
| 545 | + */ | |
| 546 | +#define NOINSTR_TEXT \ | |
| 547 | + ALIGN_FUNCTION(); \ | |
| 548 | + __noinstr_text_start = .; \ | |
| 549 | + *(.noinstr.text) \ | |
| 550 | + __noinstr_text_end = .; | |
| 551 | + | |
| 543 | 552 | /* |
| 544 | 553 | * .text section. Map to function alignment to avoid address changes |
| 545 | 554 | * during second ld run in second ld pass when generating System.map |
| @@ -551,6 +560,7 @@ · 5 unmodified lines | ||
| 551 | 560 | #define TEXT_TEXT \ |
| 552 | 561 | ALIGN_FUNCTION(); \ |
| 553 | 562 | *(.text.hot TEXT_MAIN .text.fixup .text.unlikely) \ |
| 563 | + NOINSTR_TEXT \ | |
| 554 | 564 | *(.text..refcount) \ |
| 555 | 565 | *(.ref.text) \ |
| 556 | 566 | MEM_KEEP(init.text*) \ |
| @@ -120,12 +120,65 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, · 119 unmodified lines | ||
| 120 | 120 | /* Annotate a C jump table to allow objtool to follow the code flow */ |
| 121 | 121 | #define __annotate_jump_table __section(.rodata..c_jump_table) |
| 122 | 122 | |
| 123 | +#ifdef CONFIG_DEBUG_ENTRY | |
| 124 | +/* Begin/end of an instrumentation safe region */ | |
| 125 | +#define instrumentation_begin() ({ \ | |
| 126 | + asm volatile("%c0:\n\t" \ | |
| 127 | + ".pushsection .discard.instr_begin\n\t" \ | |
| 128 | + ".long %c0b - .\n\t" \ | |
| 129 | + ".popsection\n\t" : : "i" (__COUNTER__)); \ | |
| 130 | +}) | |
| 131 | + | |
| 132 | +/* | |
| 133 | + * Because instrumentation_{begin,end}() can nest, objtool validation considers | |
| 134 | + * _begin() a +1 and _end() a -1 and computes a sum over the instructions. | |
| 135 | + * When the value is greater than 0, we consider instrumentation allowed. | |
| 136 | + * | |
| 137 | + * There is a problem with code like: | |
| 138 | + * | |
| 139 | + * noinstr void foo() | |
| 140 | + * { | |
| 141 | + * instrumentation_begin(); | |
| 142 | + * ... | |
| 143 | + * if (cond) { | |
| 144 | + * instrumentation_begin(); | |
| 145 | + * ... | |
| 146 | + * instrumentation_end(); | |
| 147 | + * } | |
| 148 | + * bar(); | |
| 149 | + * instrumentation_end(); | |
| 150 | + * } | |
| 151 | + * | |
| 152 | + * If instrumentation_end() would be an empty label, like all the other | |
| 153 | + * annotations, the inner _end(), which is at the end of a conditional block, | |
| 154 | + * would land on the instruction after the block. | |
| 155 | + * | |
| 156 | + * If we then consider the sum of the !cond path, we'll see that the call to | |
| 157 | + * bar() is with a 0-value, even though, we meant it to happen with a positive | |
| 158 | + * value. | |
| 159 | + * | |
| 160 | + * To avoid this, have _end() be a NOP instruction, this ensures it will be | |
| 161 | + * part of the condition block and does not escape. | |
| 162 | + */ | |
| 163 | +#define instrumentation_end() ({ \ | |
| 164 | + asm volatile("%c0: nop\n\t" \ | |
| 165 | + ".pushsection .discard.instr_end\n\t" \ | |
| 166 | + ".long %c0b - .\n\t" \ | |
| 167 | + ".popsection\n\t" : : "i" (__COUNTER__)); \ | |
| 168 | +}) | |
| 169 | +#endif /* CONFIG_DEBUG_ENTRY */ | |
| 170 | + | |
| 123 | 171 | #else |
| 124 | 172 | #define annotate_reachable() |
| 125 | 173 | #define annotate_unreachable() |
| 126 | 174 | #define __annotate_jump_table |
| 127 | 175 | #endif |
| 128 | 176 | |
| 177 | +#ifndef instrumentation_begin | |
| 178 | +#define instrumentation_begin() do { } while(0) | |
| 179 | +#define instrumentation_end() do { } while(0) | |
| 180 | +#endif | |
| 181 | + | |
| 129 | 182 | #ifndef ASM_UNREACHABLE |
| 130 | 183 | # define ASM_UNREACHABLE |
| 131 | 184 | #endif |
| @@ -118,6 +118,10 @@ 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 | + | |
| 121 | 125 | /* |
| 122 | 126 | * it doesn't make sense on ARM (currently the only user of __naked) |
| 123 | 127 | * to trace naked functions because then mcount is called without |
| @@ -948,7 +948,7 @@ static void check_section(const char *modname, struct elf_info *elf, · 947 unmodified lines | ||
| 948 | 948 | |
| 949 | 949 | #define DATA_SECTIONS ".data", ".data.rel" |
| 950 | 950 | #define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \ |
| 951 | − ".kprobes.text", ".cpuidle.text" | |
| 951 | + ".kprobes.text", ".cpuidle.text", ".noinstr.text" | |
| 952 | 952 | #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ |
| 953 | 953 | ".fixup", ".entry.text", ".exception.text", ".text.*", \ |
| 954 | 954 | ".coldtext" |