]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/bugs: Allow ITS stuffing in eIBRS+retpoline mode also
authorPawan Gupta <pawan.kumar.gupta@linux.intel.com>
Wed, 11 Jun 2025 17:30:33 +0000 (10:30 -0700)
committerBorislav Petkov (AMD) <bp@alien8.de>
Tue, 24 Jun 2025 12:12:41 +0000 (14:12 +0200)
commitab9f2388e0b99cd164ddbd74a6133d3070e2788d
tree6124b08b4c1cd34d08746b5e2e9bd78ee0e48f30
parente2a9c03192f54bb53a5422bf5106bdc4d04a7426
x86/bugs: Allow ITS stuffing in eIBRS+retpoline mode also

After a recent restructuring of the ITS mitigation, RSB stuffing can no longer
be enabled in eIBRS+Retpoline mode. Before ITS, retbleed mitigation only
allowed stuffing when eIBRS was not enabled. This was perfectly fine since
eIBRS mitigates retbleed.

However, RSB stuffing mitigation for ITS is still needed with eIBRS. The
restructuring solely relies on retbleed to deploy stuffing, and does not allow
it when eIBRS is enabled. This behavior is different from what was before the
restructuring. Fix it by allowing stuffing in eIBRS+retpoline mode also.

Fixes: 61ab72c2c6bf ("x86/bugs: Restructure ITS mitigation")
Closes: https://lore.kernel.org/lkml/20250519235101.2vm6sc5txyoykb2r@desk/
Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20250611-eibrs-fix-v4-7-5ff86cac6c61@linux.intel.com
arch/x86/kernel/cpu/bugs.c