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 B2AF52374A for ; Mon, 6 Nov 2023 13:32:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xXGxm5GO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A047C433C9; Mon, 6 Nov 2023 13:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1699277533; bh=Q6quCzg0GUrGe+CUYVlCe4XqJUYcYsKc8fU7iD3Hf6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xXGxm5GOOAaY/tbFMGEI4G+awjwTT6AsW0Jvm6ja9vYYh9dCfdyLcDqWaFp8ARON7 ugbnQXPiMp30NHxDEi8WgjlXqSYh7TjBYOJnU/rQViCiRK+DaH3d6FahTO807cliOz 9RFkz6dzBsfELegZ15u/yCmWtGYcgf2KakzeAjNk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, John Sperbeck Subject: [PATCH 5.10 53/95] objtool/x86: add missing embedded_insn check Date: Mon, 6 Nov 2023 14:04:21 +0100 Message-ID: <20231106130306.637911460@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106130304.678610325@linuxfoundation.org> References: <20231106130304.678610325@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ 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 @@ -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; }