Received: by 2002:ab2:31c4:0:b0:1ef:b27b:cc29 with SMTP id d4csp966322lqf; Fri, 5 Apr 2024 07:46:46 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUXLC8PhhWGMhs2hXhhzNDK5lziag6fkhdOvjLEDFO0y304M4xasyEYPdYHdkDr/glqPj45Gttch8n5Z0JIe8sJw8fsI8vP8hzjvjTJWA== X-Google-Smtp-Source: AGHT+IGPZG/94j5ZJj0wHG1ogX877FupPaySgCtwQLestD2kxkCEMoYlxa5gIHdgJkWPvUy5nA54 X-Received: by 2002:a17:902:e811:b0:1e2:a5ee:c0a2 with SMTP id u17-20020a170902e81100b001e2a5eec0a2mr1778483plg.31.1712328406247; Fri, 05 Apr 2024 07:46:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712328406; cv=pass; d=google.com; s=arc-20160816; b=MAqn5A8mFYuArh1XkpqQBcauG8+zH8X6UhbCeu64fXPZx8ZT96z2KDYFDiVmEWzy8M NGIR/Q/yLW/ICunBhbxUdmA0GB0fYTAncGqgMAGouqvc+dxqvs6uzKRPIgmVwIS3nlWI yhgMxa3ADsvjr8P0GmAXM7xml+LsHYMUgdyDkU4AzGQVPlxO6W/dPyyV0XX2lbfqdxky aBGmDDFsfi7sh4NvW93lFuMQg5qrpFMi7q+gCT769X2w78OteSG3SqJFKDIwUvh6tUtt Eojm6cLYfSwpCbkf2Rwz3zJUw5kvVo7zMPycEZE65qYUJyQxKZ6WbSdBtFY6zNEv6ooG 7DBg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=4XIGm26ErMO1aMglqCBHSJTaAL+oyggS4vx1WITW/4Y=; fh=b+GcvI4Pcayc3mqYGvUYD/O2AEP50jeeZwnwIXNAGVQ=; b=NAwpH7P9kznrzc4oKX7D5LTYMujZcGrDwfwEh3LbY9v9Jk7GjuC/JJL84HaRzi9R05 Tevp7rFdKFCD4hZy8vJrg63CBoBFn4xgP2mwjWw1ApC1l96O6yd+FM8BNf3tY9gfABZA GiYhDXUAaV8bqgsSVHxf5bF3YaOXTJBnk0l5CtQEQJIONk8j6oYMvmrZAFvqhAuky1qh +SgP9iTJiIQWs9dKS4qTmIt9Qh5p+7ZUWT1bvcNieDOa3PtMTHzlVNVKw4IFSD4ekI1H SVgKCw4f2Q7JQtdAJStGrre0Dd5GegSkp9/HvBHPJ/YuCJl36mPtJ466o+E8BdCW73V9 YEng==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BR6dLFfK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-133186-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-133186-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id b3-20020a170902650300b001e25659fffcsi1400496plk.647.2024.04.05.07.46.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 07:46:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-133186-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BR6dLFfK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-133186-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-133186-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id EB4F12875C2 for ; Fri, 5 Apr 2024 14:46:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2A99A16F297; Fri, 5 Apr 2024 14:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BR6dLFfK" 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 575068BEF for ; Fri, 5 Apr 2024 14:46:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712328401; cv=none; b=UdJD1aoY1QPeTMqqG7aMYLO/p0Uc+zzEm6m2Zu3euKEHvBGqiph7tyoUDl1OC9rlIb1fgB8OpHLutspV7hdXXMLFkxFUrBlRg0pv6IKx8L7XUr1M3vDB/7wxBlh3sUBHxoeD0EllPLCMi9SsJF2KDmVsvDsuEEuirnDnzqgr8zI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712328401; c=relaxed/simple; bh=tu81MxJCl8lzqOKsL9mIE+wBbym3zJHuT56JK0pU1oo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NP6AI9nPhe98CUBlmxKd0fAy6WEQWEmPDk/AThiRHqCJEhV3Bq+L37oSC/mC/lq2NzpcusowAat1PLX2AogTpsNqWe1oymcvvWUcS57FkFNzR4gR/7N+UVmjgl+/WwCCATt8xNj9surHrKzZCgKG2tiLAe47T1vfsQqYKJtMls0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BR6dLFfK; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13A79C433F1; Fri, 5 Apr 2024 14:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712328400; bh=tu81MxJCl8lzqOKsL9mIE+wBbym3zJHuT56JK0pU1oo=; h=From:To:Cc:Subject:Date:From; b=BR6dLFfKiYMIXCPkDUKJAc2sBznOgm8RL0oWVlmK/kTwGjb8Y2a52Ub9JbkZn5wDL XfurJ7kC2gnoitG1E6DmOh0amdjfXeQizyNzZYqtwjNqP9Bpgovym7Za0nKckUudTR FBeOU3GKWEsVm8OgfXPClhyT7tv0ckWcrvd2U97ReRyLS5vppoZCGiQWGRGLTrHef6 0DosKPnmWQ+NJLNEriBdWN0r4RDGZ9HylJUwrbStUmrDDv0Pxsi6pl10zQM4CcRNLw bq/t7JzjrJuFeqhvBr6k/Uw8hEuhtAguGPPgf6w9CYI1d5dc+XkE22ZpnP3a7fbXyk tXZzvcVbGLSDQ== From: bp@kernel.org To: X86 ML Cc: LKML , "Borislav Petkov (AMD)" Subject: [PATCH] x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk Date: Fri, 5 Apr 2024 16:46:37 +0200 Message-ID: <20240405144637.17908-1-bp@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Borislav Petkov (AMD)" It is special code even if it is a dummy which is called in the !SRSO case so annotate it like its real counterpart to address: vmlinux.o: warning: objtool: .export_symbol+0x2b290: data relocation to !ENDBR: srso_alias_untrain_ret+0x0 Signed-off-by: Borislav Petkov (AMD) --- arch/x86/lib/retpoline.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index 0795b3464058..e674ccf720b9 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -229,6 +229,7 @@ SYM_CODE_END(srso_return_thunk) /* Dummy for the alternative in CALL_UNTRAIN_RET. */ SYM_CODE_START(srso_alias_untrain_ret) ANNOTATE_UNRET_SAFE + ANNOTATE_NOENDBR ret int3 SYM_FUNC_END(srso_alias_untrain_ret) -- 2.43.0