From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756862AbcGIR4M (ORCPT ); Sat, 9 Jul 2016 13:56:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57154 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752022AbcGIR4K (ORCPT ); Sat, 9 Jul 2016 13:56:10 -0400 Date: Sat, 9 Jul 2016 10:54:59 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: dave.hansen@linux.intel.com, tglx@linutronix.de, bp@alien8.de, luto@amacapital.net, jpoimboe@redhat.com, dvlasenk@redhat.com, peterz@infradead.org, mingo@kernel.org, brgerst@gmail.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, dave@sr71.net, luto@kernel.org, hpa@zytor.com Reply-To: dave.hansen@linux.intel.com, bp@alien8.de, tglx@linutronix.de, mingo@kernel.org, brgerst@gmail.com, dvlasenk@redhat.com, peterz@infradead.org, luto@amacapital.net, jpoimboe@redhat.com, hpa@zytor.com, luto@kernel.org, linux-kernel@vger.kernel.org, dave@sr71.net, torvalds@linux-foundation.org In-Reply-To: <20160618001503.CEE1B141@viggo.jf.intel.com> References: <20160618001503.CEE1B141@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/cpu: Fix duplicated X86_BUG(9) macro Git-Commit-ID: 8709ed4d4b0eab04561c1ec9e6ea50fd1e3897ff X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8709ed4d4b0eab04561c1ec9e6ea50fd1e3897ff Gitweb: http://git.kernel.org/tip/8709ed4d4b0eab04561c1ec9e6ea50fd1e3897ff Author: Dave Hansen AuthorDate: Fri, 17 Jun 2016 17:15:03 -0700 Committer: Ingo Molnar CommitDate: Sat, 9 Jul 2016 14:06:06 +0200 x86/cpu: Fix duplicated X86_BUG(9) macro cpufeatures.h currently defines X86_BUG(9) twice on 32-bit: #define X86_BUG_NULL_SEG X86_BUG(9) /* Nulling a selector preserves the base */ ... #ifdef CONFIG_X86_32 #define X86_BUG_ESPFIX X86_BUG(9) /* "" IRET to 16-bit SS corrupts ESP/RSP high bits */ #endif I think what happened was that this added the X86_BUG_ESPFIX, but in an #ifdef below most of the bugs: 58a5aac53313 x86/entry/32: Introduce and use X86_BUG_ESPFIX instead of paravirt_enabled Then this came along and added X86_BUG_NULL_SEG, but collided with the earlier one that did the bug below the main block defining all the X86_BUG()s. 7a5d67048745 x86/cpu: Probe the behavior of nulling out a segment at boot time Signed-off-by: Dave Hansen Acked-by: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20160618001503.CEE1B141@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/cpufeatures.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 4a41348..c64b1e9 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -301,10 +301,6 @@ #define X86_BUG_FXSAVE_LEAK X86_BUG(6) /* FXSAVE leaks FOP/FIP/FOP */ #define X86_BUG_CLFLUSH_MONITOR X86_BUG(7) /* AAI65, CLFLUSH required before MONITOR */ #define X86_BUG_SYSRET_SS_ATTRS X86_BUG(8) /* SYSRET doesn't fix up SS attrs */ -#define X86_BUG_NULL_SEG X86_BUG(9) /* Nulling a selector preserves the base */ -#define X86_BUG_SWAPGS_FENCE X86_BUG(10) /* SWAPGS without input dep on GS */ - - #ifdef CONFIG_X86_32 /* * 64-bit kernels don't use X86_BUG_ESPFIX. Make the define conditional @@ -312,5 +308,7 @@ */ #define X86_BUG_ESPFIX X86_BUG(9) /* "" IRET to 16-bit SS corrupts ESP/RSP high bits */ #endif +#define X86_BUG_NULL_SEG X86_BUG(10) /* Nulling a selector preserves the base */ +#define X86_BUG_SWAPGS_FENCE X86_BUG(11) /* SWAPGS without input dep on GS */ #endif /* _ASM_X86_CPUFEATURES_H */