From: Liu Song Date: Fri, 24 Jun 2022 01:20:48 +0000 (+0800) Subject: arm64: correct the effect of mitigations off on kpti X-Git-Tag: v6.0-rc1~203^2~11^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e92b25731ef6c21471a79404cebb0f6738096f77;p=thirdparty%2Flinux.git arm64: correct the effect of mitigations off on kpti 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 Link: https://lore.kernel.org/r/1656033648-84181-1-git-send-email-liusong@linux.alibaba.com Signed-off-by: Will Deacon --- diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 2522b11e593f2..1f5f9c1c96df0 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3161,7 +3161,7 @@ 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]