Module Name: src Committed By: maxv Date: Tue May 22 08:15:26 UTC 2018
Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: GENERIC src/sys/arch/x86/x86: spectre.c x86_machdep.c Log Message: Clarify the parameters for the SpectreV2 mitigation. Add: machdep.spectre_v2.swmitigated Rename: machdep.spectre_v2.mitigated -> machdep.spectre_v2.hwmitigated Change the method string, to combine both the hardware and software mitigations. swmitigated is set at compile time, hwmitigated can be set by the user. Examples: spectre_v2.swmitigated = 1 spectre_v2.hwmitigated = 0 spectre_v2.method = [GCC retpoline] spectre_v2.swmitigated = 0 spectre_v2.hwmitigated = 0 spectre_v2.method = (none) spectre_v2.swmitigated = 1 spectre_v2.hwmitigated = 1 spectre_v2.method = [GCC retpoline] + [Intel IBRS] To generate a diff of this commit: cvs rdiff -u -r1.491 -r1.492 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1178 -r1.1179 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/x86/spectre.c cvs rdiff -u -r1.113 -r1.114 src/sys/arch/x86/x86/x86_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.