diff options
| author | Will Deacon <will@kernel.org> | 2020-09-18 12:54:33 +0200 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-09-29 17:08:16 +0200 |
| commit | c28762070ca651fe7a981b8f31d972c9b7d2c386 (patch) | |
| tree | 907e7cdfc0461b55880ac1ecccc54e460797f219 /arch/arm64/kernel/suspend.c | |
| parent | arm64: Move SSBD prctl() handler alongside other spectre mitigation code (diff) | |
| download | linux-c28762070ca651fe7a981b8f31d972c9b7d2c386.tar.xz linux-c28762070ca651fe7a981b8f31d972c9b7d2c386.zip | |
arm64: Rewrite Spectre-v4 mitigation code
Rewrite the Spectre-v4 mitigation handling code to follow the same
approach as that taken by Spectre-v2.
For now, report to KVM that the system is vulnerable (by forcing
'ssbd_state' to ARM64_SSBD_UNKNOWN), as this will be cleared up in
subsequent steps.
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/kernel/suspend.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/suspend.c b/arch/arm64/kernel/suspend.c index c1dee9066ff9..584c14ce3c86 100644 --- a/arch/arm64/kernel/suspend.c +++ b/arch/arm64/kernel/suspend.c @@ -72,8 +72,7 @@ void notrace __cpu_suspend_exit(void) * have turned the mitigation on. If the user has forcefully * disabled it, make sure their wishes are obeyed. */ - if (arm64_get_ssbd_state() == ARM64_SSBD_FORCE_DISABLE) - arm64_set_ssbd_mitigation(false); + spectre_v4_enable_mitigation(NULL); } /* |