This is a note to let you know that I've just added the patch titled
objtool/x86: add missing embedded_insn check
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
objtool-x86-add-missing-embedded_insn-check.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From jsperbeck@xxxxxxxxxx Tue Oct 31 15:13:57 2023
From: John Sperbeck <jsperbeck@xxxxxxxxxx>
Date: Sat, 28 Oct 2023 18:41:31 +0000
Subject: objtool/x86: add missing embedded_insn check
To: gregkh@xxxxxxxxxxxxxxxxxxx
Cc: bp@xxxxxxxxx, jpoimboe@xxxxxxxxxx, patches@xxxxxxxxxxxxxxx, peterz@xxxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx, jsperbeck@xxxxxxxxxx
Message-ID: <20231028184131.2103810-1-jsperbeck@xxxxxxxxxx>
From: John Sperbeck <jsperbeck@xxxxxxxxxx>
When dbf460087755 ("objtool/x86: Fixup frame-pointer vs rethunk")
was backported to some stable branches, the check for dest->embedded_insn
in is_special_call() was missed. The result is that the warning it
was intended to suppress still appears. For example on 6.1 (on kernels
before 6.1, the '-s' argument would instead be 'check'):
$ tools/objtool/objtool -s arch/x86/lib/retpoline.o
arch/x86/lib/retpoline.o: warning: objtool: srso_untrain_ret+0xd:
call without frame pointer save/setup
With this patch, the warning is correctly suppressed, and the
kernel still passes the normal Google kernel developer tests.
Signed-off-by: John Sperbeck <jsperbeck@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/objtool/check.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2107,7 +2107,7 @@ static bool is_special_call(struct instr
if (!dest)
return false;
- if (dest->fentry)
+ if (dest->fentry || dest->embedded_insn)
return true;
}
Patches currently in stable-queue which might be from jsperbeck@xxxxxxxxxx are
queue-5.10/objtool-x86-add-missing-embedded_insn-check.patch
