From: Peter Zijlstra peterz@infradead.org
[ Upstream commit 951ddecf435659553ed15a9214e153a3af43a9a1 ]
Needed because zen_untrain_ret() will be called from noinstr code.
Also makes sense since the thunks MUST NOT contain instrumentation nor be poked with dynamic instrumentation.
Signed-off-by: Peter Zijlstra (Intel) peterz@infradead.org Signed-off-by: Borislav Petkov bp@suse.de Reviewed-by: Josh Poimboeuf jpoimboe@kernel.org Signed-off-by: Borislav Petkov bp@suse.de Signed-off-by: Sasha Levin sashal@kernel.org --- tools/objtool/check.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 8b3435af989a..d87b493544e1 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -291,7 +291,8 @@ static int decode_instructions(struct objtool_file *file) sec->text = true;
if (!strcmp(sec->name, ".noinstr.text") || - !strcmp(sec->name, ".entry.text")) + !strcmp(sec->name, ".entry.text") || + !strncmp(sec->name, ".text.__x86.", 12)) sec->noinstr = true;
for (offset = 0; offset < sec->sh.sh_size; offset += insn->len) {