]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
s390: correct nospec auto detection init order
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 11 Apr 2018 06:35:23 +0000 (08:35 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 11 Apr 2018 15:46:00 +0000 (17:46 +0200)
commit6a3d1e81a434fc311f224b8be77258bafc18ccc6
treebc800ab72949a9c1f9f2c3d43becfbd3fe4df12b
parentaf4a72276d49da117dbc99799afee740a26f8f10
s390: correct nospec auto detection init order

With CONFIG_EXPOLINE_AUTO=y the call of spectre_v2_auto_early() via
early_initcall is done *after* the early_param functions. This
overwrites any settings done with the nobp/no_spectre_v2/spectre_v2
parameters. The code patching for the kernel is done after the
evaluation of the early parameters but before the early_initcall
is done. The end result is a kernel image that is patched correctly
but the kernel modules are not.

Make sure that the nospec auto detection function is called before the
early parameters are evaluated and before the code patching is done.

Fixes: 6e179d64126b ("s390: add automatic detection of the spectre defense")
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/include/asm/nospec-branch.h
arch/s390/kernel/nospec-branch.c
arch/s390/kernel/setup.c