mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-14 06:35:12 +00:00
c199f64ff9
The expansion of instrumentation_begin/instrumentation_end on s390 will
result in a compiler error if the __COUNTER__ value is high enough.
For example with "i" (154) the "%c0" operand of annotate_reachable
will be expanded to -102:
-102:
.pushsection .discard.instr_begin
.long -102b - .
.popsection
This is a quirk of the gcc backend for s390, it interprets the %c0
as a signed byte value. Avoid using operand modifiers in this case
by simply converting __COUNTER__ to string, with the same result,
but in an arch assembler independent way.
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/patch-2.thread-1a26be.git-1a26be80cb18.your-ad-here.call-01621428935-ext-2104@work.hours
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Miroslav Benes <mbenes@suse.cz>
Cc: Borislav Petkov <bp@suse.de>
Cc: linux-kernel@vger.kernel.org
61 lines
1.9 KiB
C
61 lines
1.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __LINUX_INSTRUMENTATION_H
|
|
#define __LINUX_INSTRUMENTATION_H
|
|
|
|
#if defined(CONFIG_DEBUG_ENTRY) && defined(CONFIG_STACK_VALIDATION)
|
|
|
|
#include <linux/stringify.h>
|
|
|
|
/* Begin/end of an instrumentation safe region */
|
|
#define __instrumentation_begin(c) ({ \
|
|
asm volatile(__stringify(c) ": nop\n\t" \
|
|
".pushsection .discard.instr_begin\n\t" \
|
|
".long " __stringify(c) "b - .\n\t" \
|
|
".popsection\n\t"); \
|
|
})
|
|
#define instrumentation_begin() __instrumentation_begin(__COUNTER__)
|
|
|
|
/*
|
|
* Because instrumentation_{begin,end}() can nest, objtool validation considers
|
|
* _begin() a +1 and _end() a -1 and computes a sum over the instructions.
|
|
* When the value is greater than 0, we consider instrumentation allowed.
|
|
*
|
|
* There is a problem with code like:
|
|
*
|
|
* noinstr void foo()
|
|
* {
|
|
* instrumentation_begin();
|
|
* ...
|
|
* if (cond) {
|
|
* instrumentation_begin();
|
|
* ...
|
|
* instrumentation_end();
|
|
* }
|
|
* bar();
|
|
* instrumentation_end();
|
|
* }
|
|
*
|
|
* If instrumentation_end() would be an empty label, like all the other
|
|
* annotations, the inner _end(), which is at the end of a conditional block,
|
|
* would land on the instruction after the block.
|
|
*
|
|
* If we then consider the sum of the !cond path, we'll see that the call to
|
|
* bar() is with a 0-value, even though, we meant it to happen with a positive
|
|
* value.
|
|
*
|
|
* To avoid this, have _end() be a NOP instruction, this ensures it will be
|
|
* part of the condition block and does not escape.
|
|
*/
|
|
#define __instrumentation_end(c) ({ \
|
|
asm volatile(__stringify(c) ": nop\n\t" \
|
|
".pushsection .discard.instr_end\n\t" \
|
|
".long " __stringify(c) "b - .\n\t" \
|
|
".popsection\n\t"); \
|
|
})
|
|
#define instrumentation_end() __instrumentation_end(__COUNTER__)
|
|
#else
|
|
# define instrumentation_begin() do { } while(0)
|
|
# define instrumentation_end() do { } while(0)
|
|
#endif
|
|
|
|
#endif /* __LINUX_INSTRUMENTATION_H */
|