]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
arm64: correct the effect of mitigations off on kpti
authorLiu Song <liusong@linux.alibaba.com>
Fri, 24 Jun 2022 01:20:48 +0000 (09:20 +0800)
committerWill Deacon <will@kernel.org>
Tue, 28 Jun 2022 14:08:01 +0000 (15:08 +0100)
If KASLR is enabled, then kpti will be forced to be enabled even if
mitigations off, so we need to adjust the description of this parameter.

Signed-off-by: Liu Song <liusong@linux.alibaba.com>
Link: https://lore.kernel.org/r/1656033648-84181-1-git-send-email-liusong@linux.alibaba.com
Signed-off-by: Will Deacon <will@kernel.org>
Documentation/admin-guide/kernel-parameters.txt

index 2522b11e593f2397840d59541f9befcebed505b1..1f5f9c1c96df0797d5ab0bb494ac4197a63747c4 100644 (file)
                                improves system performance, but it may also
                                expose users to several CPU vulnerabilities.
                                Equivalent to: nopti [X86,PPC]
-                                              kpti=0 [ARM64]
+                                              if nokaslr then kpti=0 [ARM64]
                                               nospectre_v1 [X86,PPC]
                                               nobp=0 [S390]
                                               nospectre_v2 [X86,PPC,S390,ARM64]