This is a note to let you know that I've just added the patch titled
Revert "x86/speculation: Change FILL_RETURN_BUFFER to work with objtool"
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-x86-speculation-change-fill_return_buffer-to-work-with-objtool.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ben@xxxxxxxxxxxxxxx Tue Dec 6 13:25:30 2022
From: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date: Mon, 5 Dec 2022 22:31:24 +0100
Subject: Revert "x86/speculation: Change FILL_RETURN_BUFFER to work with objtool"
To: stable@xxxxxxxxxxxxxxx
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>, Alexandre Chartre <alexandre.chartre@xxxxxxxxxx>, Josh Poimboeuf <jpoimboe@xxxxxxxxxx>, Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxx>, Suleiman Souhlal <suleiman@xxxxxxxxxx>
Message-ID: <Y45jLPqv/0fJ+rmk@xxxxxxxxxxxxxxx>
Content-Disposition: inline
From: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
This reverts commit 9f3330d4930e034d84ee6561fbfb098433ff0ab9, which
was commit 089dd8e53126ebaf506e2dc0bf89d652c36bfc12 upstream.
The necessary changes to objtool have not been backported to 4.19.
Backporting this commit alone only added build warnings.
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/nospec-branch.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -4,13 +4,11 @@
#define _ASM_X86_NOSPEC_BRANCH_H_
#include <linux/static_key.h>
-#include <linux/frame.h>
#include <asm/alternative.h>
#include <asm/alternative-asm.h>
#include <asm/cpufeatures.h>
#include <asm/msr-index.h>
-#include <asm/unwind_hints.h>
#include <asm/percpu.h>
/*
@@ -54,9 +52,9 @@
lfence; \
jmp 775b; \
774: \
- add $(BITS_PER_LONG/8) * 2, sp; \
dec reg; \
jnz 771b; \
+ add $(BITS_PER_LONG/8) * nr, sp; \
/* barrier for jnz misprediction */ \
lfence;
#else
@@ -167,8 +165,10 @@
* monstrosity above, manually.
*/
.macro FILL_RETURN_BUFFER reg:req nr:req ftr:req
- ALTERNATIVE "jmp .Lskip_rsb_\@", "", \ftr
- __FILL_RETURN_BUFFER(\reg,\nr,%_ASM_SP)
+ ANNOTATE_NOSPEC_ALTERNATIVE
+ ALTERNATIVE "jmp .Lskip_rsb_\@", \
+ __stringify(__FILL_RETURN_BUFFER(\reg,\nr,%_ASM_SP)) \
+ \ftr
.Lskip_rsb_\@:
.endm
Patches currently in stable-queue which might be from ben@xxxxxxxxxxxxxxx are
queue-4.19/revert-x86-speculation-change-fill_return_buffer-to-work-with-objtool.patch
