2022-03-17 05:49:40

by James Morse

[permalink] [raw]
Subject: [stable:PATCH v5.10.105] arm64: kvm: Fix copy-and-paste error in bhb templates for v5.10 stable

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 <[email protected]>
Link: https://lore.kernel.org/all/20220310234858.GB16308@amd/
Signed-off-by: James Morse <[email protected]>
---
arch/arm64/kvm/hyp/smccc_wa.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kvm/hyp/smccc_wa.S b/arch/arm64/kvm/hyp/smccc_wa.S
index 24b281912463..533b0aa73256 100644
--- a/arch/arm64/kvm/hyp/smccc_wa.S
+++ b/arch/arm64/kvm/hyp/smccc_wa.S
@@ -68,7 +68,7 @@ SYM_DATA_START(__spectre_bhb_loop_k24)
esb
sub sp, sp, #(8 * 2)
stp x0, x1, [sp, #(8 * 0)]
- mov x0, #8
+ mov x0, #24
2: b . + 4
subs x0, x0, #1
b.ne 2b
@@ -85,7 +85,7 @@ SYM_DATA_START(__spectre_bhb_loop_k32)
esb
sub sp, sp, #(8 * 2)
stp x0, x1, [sp, #(8 * 0)]
- mov x0, #8
+ mov x0, #32
2: b . + 4
subs x0, x0, #1
b.ne 2b
--
2.30.2


2022-03-17 12:49:04

by Pavel Machek

[permalink] [raw]
Subject: Re: [stable:PATCH v5.10.105] arm64: kvm: Fix copy-and-paste error in bhb templates for v5.10 stable

Hi!

> > 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.

> > @@ -68,7 +68,7 @@ SYM_DATA_START(__spectre_bhb_loop_k24)
> > esb
> > sub sp, sp, #(8 * 2)
> > stp x0, x1, [sp, #(8 * 0)]
> > - mov x0, #8
> > + mov x0, #24
> > 2: b . + 4
> > subs x0, x0, #1
> > b.ne 2b
>
> Thanks, now queued up!

Thank you.

Reviewed-by: Pavel Machek <[email protected]>
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Attachments:
(No filename) (835.00 B)
 signature.asc (188.00 B)
Digital signature Download all attachments

2022-03-17 14:03:03

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [stable:PATCH v5.10.105] arm64: kvm: Fix copy-and-paste error in bhb templates for v5.10 stable

On Tue, Mar 15, 2022 at 01:57:20PM +0000, James Morse wrote:
> 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 <[email protected]>
> Link: https://lore.kernel.org/all/20220310234858.GB16308@amd/
> Signed-off-by: James Morse <[email protected]>
> ---
> arch/arm64/kvm/hyp/smccc_wa.S | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/kvm/hyp/smccc_wa.S b/arch/arm64/kvm/hyp/smccc_wa.S
> index 24b281912463..533b0aa73256 100644
> --- a/arch/arm64/kvm/hyp/smccc_wa.S
> +++ b/arch/arm64/kvm/hyp/smccc_wa.S
> @@ -68,7 +68,7 @@ SYM_DATA_START(__spectre_bhb_loop_k24)
> esb
> sub sp, sp, #(8 * 2)
> stp x0, x1, [sp, #(8 * 0)]
> - mov x0, #8
> + mov x0, #24
> 2: b . + 4
> subs x0, x0, #1
> b.ne 2b
> @@ -85,7 +85,7 @@ SYM_DATA_START(__spectre_bhb_loop_k32)
> esb
> sub sp, sp, #(8 * 2)
> stp x0, x1, [sp, #(8 * 0)]
> - mov x0, #8
> + mov x0, #32
> 2: b . + 4
> subs x0, x0, #1
> b.ne 2b
> --
> 2.30.2
>

Thanks, now queued up!

greg k-h