[PATCH 2/9] x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE
authorPeter Zijlstra (Intel) <peterz@infradead.org>
Wed, 16 Feb 2022 19:57:00 +0000 (20:57 +0100)
committerSalvatore Bonaccorso <carnil@debian.org>
Mon, 7 Mar 2022 21:06:21 +0000 (21:06 +0000)
commit95cfed11a2cefda11763e1eeaa5bb0f9da1d6688
treebdd015e4975c4c5272bd9a574bc8cb1d9486c854
parent2928625d8c260438e20387c446e8d5da6d6012a6
[PATCH 2/9] x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE

commit d45476d9832409371537013ebdd8dc1a7781f97a upstream.

The RETPOLINE_AMD name is unfortunate since it isn't necessarily
AMD only, in fact Hygon also uses it. Furthermore it will likely be
sufficient for some Intel processors. Therefore rename the thing to
RETPOLINE_LFENCE to better describe what it is.

Add the spectre_v2=retpoline,lfence option as an alias to
spectre_v2=retpoline,amd to preserve existing setups. However, the output
of /sys/devices/system/cpu/vulnerabilities/spectre_v2 will be changed.

  [ bp: Fix typos, massage. ]

Co-developed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
[fllinden@amazon.com: backported to 5.10]
Signed-off-by: Frank van der Linden <fllinden@amazon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Gbp-Pq: Topic bugfix/x86/bhb
Gbp-Pq: Name 0002-x86-speculation-Rename-RETPOLINE_AMD-to-RETPOLINE_LF.patch
arch/x86/include/asm/cpufeatures.h
arch/x86/include/asm/nospec-branch.h
arch/x86/kernel/cpu/bugs.c
tools/arch/x86/include/asm/cpufeatures.h