xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: kvm: Fix copy-and-paste error in bhb templates for v5.10 stable

Browse Source 
KVM's infrastructure for spectre mitigations in the vectors in v5.10 and
earlier is different, it uses templates which are used to build a set of
vectors at runtime.

There are two copy-and-paste errors in the templates: __spectre_bhb_loop_k24
should loop 24 times and __spectre_bhb_loop_k32 32.

Fix these.

Reported-by: Pavel Machek <pavel@denx.de>
Link: https://lore.kernel.org/all/20220310234858.GB16308@amd/
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Morse
2022-03-15 13:57:20 +00:00
committed by Greg Kroah-Hartman
parent dc1163203a
commit 7a0d13ef67
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/kvm/hyp/smccc_wa.S
View File

@@ -68,7 +68,7 @@ SYM_DATA_START(__spectre_bhb_loop_k24)
esb esb
sub sp, sp, #(8 * 2) sub sp, sp, #(8 * 2)
stp x0, x1, [sp, #(8 * 0)] stp x0, x1, [sp, #(8 * 0)]
mov x0, #8 mov x0, #24
2: b . + 4 2: b . + 4
subs x0, x0, #1 subs x0, x0, #1
b.ne 2b b.ne 2b
@@ -85,7 +85,7 @@ SYM_DATA_START(__spectre_bhb_loop_k32)
esb esb
sub sp, sp, #(8 * 2) sub sp, sp, #(8 * 2)
stp x0, x1, [sp, #(8 * 0)] stp x0, x1, [sp, #(8 * 0)]
mov x0, #8 mov x0, #32
2: b . + 4 2: b . + 4
subs x0, x0, #1 subs x0, x0, #1
b.ne 2b b.ne 2b