The following commit has been merged into the x86/misc branch of tip: Commit-ID: 86e39b94cd71a4987f9b98dd2a7d6c826e1c5c98 Gitweb: https://git.kernel.org/tip/86e39b94cd71a4987f9b98dd2a7d6c826e1c5c98 Author: Breno Leitao <leitao@xxxxxxxxxx> AuthorDate: Fri, 13 Sep 2024 05:27:53 -07:00 Committer: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> CommitterDate: Mon, 30 Sep 2024 10:30:54 -07:00 x86/bugs: Correct RSB terminology in Kconfig RSB stands for "Return Stack Buffer" in industry literature[1]. Update the kernel Kconfig to use this standard term instead of the current "Return-Speculation-Buffer". This change aligns kernel documentation with widely accepted terminology. The line length reduction triggers text reformatting, but no functional text is altered. [1] https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/return-stack-buffer-underflow.html Signed-off-by: Breno Leitao <leitao@xxxxxxxxxx> Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Acked-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Link: https://lore.kernel.org/all/20240913122754.249306-1-leitao%40debian.org --- arch/x86/Kconfig | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 2852fcd..2cea5f2 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2551,15 +2551,14 @@ config MITIGATION_CALL_DEPTH_TRACKING default y help Compile the kernel with call depth tracking to mitigate the Intel - SKL Return-Speculation-Buffer (RSB) underflow issue. The - mitigation is off by default and needs to be enabled on the - kernel command line via the retbleed=stuff option. For - non-affected systems the overhead of this option is marginal as - the call depth tracking is using run-time generated call thunks - in a compiler generated padding area and call patching. This - increases text size by ~5%. For non affected systems this space - is unused. On affected SKL systems this results in a significant - performance gain over the IBRS mitigation. + SKL Return-Stack-Buffer (RSB) underflow issue. The mitigation is off + by default and needs to be enabled on the kernel command line via the + retbleed=stuff option. For non-affected systems the overhead of this + option is marginal as the call depth tracking is using run-time + generated call thunks in a compiler generated padding area and call + patching. This increases text size by ~5%. For non affected systems + this space is unused. On affected SKL systems this results in a + significant performance gain over the IBRS mitigation. config CALL_THUNKS_DEBUG bool "Enable call thunks and call depth tracking debugging"