On Mon, 2018-07-09 at 06:25:21 UTC, Michael Ellerman wrote: > When I added the spectre_v2 information in sysfs, I included the > availability of the ori31 speculation barrier. > > Although the ori31 barrier can be used to mitigate v2, it's primarily > intended as a spectre v1 mitigation. Spectre v2 is mitigated by > hardware changes. > > So rework the sysfs files to show the ori31 information in the > spectre_v1 file, rather than v2. > > Currently we display eg: > > $ grep . spectre_v* > spectre_v1:Mitigation: __user pointer sanitization > spectre_v2:Mitigation: Indirect branch cache disabled, ori31 speculation > barrier enabled > > After: > > $ grep . spectre_v* > spectre_v1:Mitigation: __user pointer sanitization, ori31 speculation > barrier enabled > spectre_v2:Mitigation: Indirect branch cache disabled > > Fixes: d6fbe1c55c55 ("powerpc/64s: Wire up cpu_show_spectre_v2()") > Cc: sta...@vger.kernel.org # v4.17+ > Signed-off-by: Michael Ellerman <m...@ellerman.id.au>
Applied to powerpc next. https://git.kernel.org/powerpc/c/6d44acae1937b81cf8115ada8958e0 cheers