Skip to content

Commit 4b60ac3

Browse files
nickdesaulniersutkustnr
authored andcommitted
FROMLIST: ARM: kprobes: fix UNPREDICTABLE warnings
GNU as warns twice for this file: Warning: using r15 results in unpredictable behaviour via the Arm ARM: K1.1.1 Overview of the constraints on Armv7 UNPREDICTABLE behaviors The term UNPREDICTABLE describes a number of cases where the architecture has a feature that software must not use. Ard notes: These are selftests that aim to ensure that kprobe never attempts to replace the opcodes in question with a probe, but they are not actually executed, or expected to occur in real code. Reported-by: kernelci.org bot <bot@kernelci.org> Suggested-by: Peter Smith <peter.smith@arm.com> Suggested-by: Renato Golin <rengolin@systemcall.eu> Suggested-by: David Spickett <david.spickett@linaro.org> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Acked-by: Ard Biesheuvel <ardb@kernel.org> Link: ClangBuiltLinux/linux#1271 Link: https://reviews.llvm.org/D95586 Bug: 141693040 Link: https://lore.kernel.org/linux-arm-kernel/20210211025149.3544593-2-ndesaulniers@google.com/ Change-Id: I42333d7e64a98f739ab13916f61a587143fec7f8
1 parent 26ad7ad commit 4b60ac3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/probes/kprobes/test-arm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ void kprobe_arm_test_cases(void)
166166

167167
/* Data-processing with PC as a target and status registers updated */
168168
TEST_UNSUPPORTED("movs pc, r1")
169-
TEST_UNSUPPORTED("movs pc, r1, lsl r2")
169+
TEST_UNSUPPORTED(__inst_arm(0xe1b0f211) " @movs pc, r1, lsl r2")
170170
TEST_UNSUPPORTED("movs pc, #0x10000")
171171
TEST_UNSUPPORTED("adds pc, lr, r1")
172-
TEST_UNSUPPORTED("adds pc, lr, r1, lsl r2")
172+
TEST_UNSUPPORTED(__inst_arm(0xe09ef211) " @adds pc, lr, r1, lsl r2")
173173
TEST_UNSUPPORTED("adds pc, lr, #4")
174174

175175
/* Data-processing with SP as target */

0 commit comments

Comments
 (0)