FAILED: patch "[PATCH] s390: correct module section names for expoline code revert" failed to apply to 4.16-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.16-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
6cf09958f32b9667bb3ebadf74367c791112771bMon Sep 17 00:00:00 2001
From: Martin Schwidefsky <[email protected]>
Date: Fri, 20 Apr 2018 12:48:52 +0200
Subject: [PATCH] s390: correct module section names for expoline code revert
The main linker script vmlinux.lds.S for the kernel image merges the expoline code patch tables into two section ".nospec_call_table" and ".nospec_return_table". This is *not* done for the modules, there the sections retain their original names as generated by gcc:
".s390_indirect_call", ".s390_return_mem" and ".s390_return_reg".
The module_finalize code has to check for the compiler generated section names, otherwise no code patching is done. This slows down the module code in case of "spectre_v2=off".
arch/s390/kernel/module.c +2 -2
@@ -465,11 +465,11 @@ int module_finalize(const Elf_Ehdr *hdr,apply_alternatives (aseg, aseg + s->sh_size);if (IS_ENABLED (CONFIG_EXPOLINE ) && - (!strcmp (".nospec_call_table" , secname))) + (!strncmp (".s390_indirect" , secname,14 )))nospec_revert (aseg, aseg + s->sh_size);if (IS_ENABLED (CONFIG_EXPOLINE ) && - (!strcmp (".nospec_return_table" , secname))) + (!strncmp (".s390_return" , secname,12 )))nospec_revert (aseg, aseg + s->sh_size); }