From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C7E0F1DFC2 for ; Tue, 31 Oct 2023 14:15:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vvCp+Kgd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3ABC9C433C7; Tue, 31 Oct 2023 14:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1698761730; bh=DBGGIP7bK5f4pPfTaKH7FWJHbB5uP+jEexZ8oARL7HY=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=vvCp+KgduQ1ZPR/lBawA4OdxzZ3l6sUKd+4sMoPoLNFgf84t6y0/7vR7w04bawrRo 12wwrZuOSBA/t2apJ80Kmi1gIHlh0r4Cue1hp3u0ySU3j21oehc3XJUrHahfV7PJ8a 8soCcXcxuhY+XV7G3a/WrkR55ooRT6mh/SSy++a8= Subject: Patch "objtool/x86: add missing embedded_insn check" has been added to the 6.1-stable tree To: bp@alien8.de,gregkh@linuxfoundation.org,jpoimboe@kernel.org,jsperbeck@google.com,patches@lists.linux.dev,peterz@infradead.org Cc: From: Date: Tue, 31 Oct 2023 15:15:27 +0100 In-Reply-To: <20231028184131.2103810-1-jsperbeck@google.com> Message-ID: <2023103126-unplanted-say-deaa@gregkh> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore 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 6.1-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-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From jsperbeck@google.com Tue Oct 31 15:13:57 2023 From: John Sperbeck Date: Sat, 28 Oct 2023 18:41:31 +0000 Subject: objtool/x86: add missing embedded_insn check To: gregkh@linuxfoundation.org Cc: bp@alien8.de, jpoimboe@kernel.org, patches@lists.linux.dev, peterz@infradead.org, stable@vger.kernel.org, jsperbeck@google.com Message-ID: <20231028184131.2103810-1-jsperbeck@google.com> From: John Sperbeck 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 Signed-off-by: Greg Kroah-Hartman --- tools/objtool/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2478,7 +2478,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@google.com are queue-6.1/objtool-x86-add-missing-embedded_insn-check.patch