linux-kernel - Re: [tip:x86/pti] Revert "x86/speculation: Simplify indirect_branch_prediction

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180213132819.GJ25201@hirez.programming.kicks-ass.net>
Date:   Tue, 13 Feb 2018 14:28:19 +0100
From:   Peter Zijlstra <peterz@...radead.org>
To:     Ingo Molnar <mingo@...nel.org>
Cc:     torvalds@...ux-foundation.org, dave.hansen@...ux.intel.com,
        bp@...en8.de, tglx@...utronix.de, arjan@...ux.intel.com,
        linux-kernel@...r.kernel.org, dwmw2@...radead.org, hpa@...or.com,
        gregkh@...uxfoundation.org, dan.j.williams@...el.com,
        dwmw@...zon.co.uk, luto@...nel.org, jpoimboe@...hat.com,
        linux-tip-commits@...r.kernel.org,
        Joe Konno <joe.konno@...ux.intel.com>
Subject: Re: [tip:x86/pti] Revert "x86/speculation: Simplify
 indirect_branch_prediction_barrier()"

On Tue, Feb 13, 2018 at 12:28:38PM +0100, Ingo Molnar wrote:

> Separate would be better, it makes sense and is one problem less to worry about?

Something like so then? I'm not entirely sure which commit wants to fo
in Fixes, I picked the earlier one, but it could equally have been:

Fixes: f208820a321f ("Revert "x86/speculation: Simplify indirect_branch_prediction_barrier()"")

---
Subject: x86/speculation: Add msr-index.h
From: Peter Zijlstra <peterz@...radead.org>
Date: Tue, 13 Feb 2018 10:41:32 +0100

Joe Konno reported a compile failure resulting from using an MSR
without inclusion of msr-index.h, and while the current code builds
fine (by accident) this needs fixing for future patches.

Cc: mingo@...nel.org
Cc: dwmw2@...radead.org
Cc: torvalds@...ux-foundation.org
Cc: bp@...en8.de
Cc: tglx@...utronix.de
Cc: arjan@...ux.intel.com
Cc: dan.j.williams@...el.com
Cc: dave.hansen@...ux.intel.com
Cc: jpoimboe@...hat.com
Cc: hpa@...or.com
Cc: gregkh@...uxfoundation.org
Cc: dwmw@...zon.co.uk
Cc: luto@...nel.org
Fixes: 20ffa1caecca ("x86/speculation: Add basic IBPB (Indirect Branch Prediction Barrier) support")
Reported-by: Joe Konno <joe.konno@...ux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
---
 arch/x86/include/asm/nospec-branch.h |    1 +
 1 file changed, 1 insertion(+)

--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -6,6 +6,7 @@
 #include <asm/alternative.h>
 #include <asm/alternative-asm.h>
 #include <asm/cpufeatures.h>
+#include <asm/msr-index.h>
 
 #ifdef __ASSEMBLY__