x86/build: Disable CET instrumentation in the kernel
authorJosh Poimboeuf <jpoimboe@redhat.com>
Thu, 28 Jan 2021 21:52:19 +0000 (15:52 -0600)
committerBorislav Petkov <bp@suse.de>
Fri, 29 Jan 2021 17:41:06 +0000 (18:41 +0100)
commit20bf2b378729c4a0366a53e2018a0b70ace94bcd
tree3d87eb862bfeccbf6172bdb04ca701b11857df25
parent6ee1d745b7c9fd573fba142a2efdad76a9f1cb04
x86/build: Disable CET instrumentation in the kernel

With retpolines disabled, some configurations of GCC, and specifically
the GCC versions 9 and 10 in Ubuntu will add Intel CET instrumentation
to the kernel by default. That breaks certain tracing scenarios by
adding a superfluous ENDBR64 instruction before the fentry call, for
functions which can be called indirectly.

CET instrumentation isn't currently necessary in the kernel, as CET is
only supported in user space. Disable it unconditionally and move it
into the x86's Makefile as CET/CFI... enablement should be a per-arch
decision anyway.

 [ bp: Massage and extend commit message. ]

Fixes: 29be86d7f9cb ("kbuild: add -fcf-protection=none when using retpoline flags")
Reported-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Tested-by: Nikolay Borisov <nborisov@suse.com>
Cc: <stable@vger.kernel.org>
Cc: Seth Forshee <seth.forshee@canonical.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Link: https://lkml.kernel.org/r/20210128215219.6kct3h2eiustncws@treble
Makefile
arch/x86/Makefile