[PATCH 2/2] x86/bugs: Don't WARN() when overwriting retbleed_return_thunk with srso_return_thunk

[Suraj Jitindar Singh <surajjs@amazon.com>]

There is a special case when the return thunk is overwritten from
retbleed_return_thunk to srso_return_thunk since srso_return_thunk provides
a superset of the functionality of retbleed_return_thunk, and this is
handled correctly in entry_untrain_ret(). Avoid emitting the warning in
this scenario to clarify that this is not an issue.

This situation occurs on certain AMD processors (e.g. Zen2) which are
affected by both retbleed and srso.

Fixes: f4818881c47fd ("x86/its: Enable Indirect Target Selection mitigation")
Cc: stable@vger.kernel.org # 5.15.x-
Signed-off-by: Suraj Jitindar Singh <surajjs@amazon.com>
---
 arch/x86/kernel/cpu/bugs.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 9679fa30563c..840902cee670 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -73,9 +73,14 @@ static void __init set_return_thunk(void *thunk)
 	 * There can only be one return thunk enabled at a time, so issue a
 	 * warning when overwriting it as this is likely a bug which will
 	 * result in a mitigation getting disabled and a vulnerability being
-	 * incorrectly reported in sysfs.
+	 * incorrectly reported in sysfs. retbleed_return_thunk is a special
+	 * case which is safe to be overwritten with srso_return_thunk since it
+	 * provides a superset of the functionality and is handled correctly in
+	 * entry_untrain_ret().
 	 */
-	WARN(x86_return_thunk != __x86_return_thunk,
+	WARN((x86_return_thunk != __x86_return_thunk) &&
+	     (thunk != srso_return_thunk ||
+	      x86_return_thunk != retbleed_return_thunk),
 	     "x86/bugs: return thunk changed from %ps to %ps\n",
 	     x86_return_thunk, thunk);
 
-- 
2.34.1