From: Peter Zijlstra <peterz@infradead.org>
Date: Tue, 14 Jun 2022 21:15:47 +0000 (+0200)
Subject: objtool: Treat .text.__x86.* as noinstr
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=07f5c5e36236368ca761868ed82c8b654f58968a;p=linux.git

objtool: Treat .text.__x86.* as noinstr

commit 951ddecf435659553ed15a9214e153a3af43a9a1 upstream.

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: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index d80c54809a91d..a955cf4cf9328 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -367,7 +367,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) {