From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933407AbdKAVEc (ORCPT ); Wed, 1 Nov 2017 17:04:32 -0400 Received: from terminus.zytor.com ([65.50.211.136]:51079 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933164AbdKAVE1 (ORCPT ); Wed, 1 Nov 2017 17:04:27 -0400 Date: Wed, 1 Nov 2017 13:55:28 -0700 From: tip-bot for Ricardo Neri Message-ID: Cc: paul.gortmaker@windriver.com, ravi.v.shankar@intel.com, peterz@infradead.org, torvalds@linux-foundation.org, mingo@kernel.org, hpa@zytor.com, akpm@linux-foundation.org, mhiramat@kernel.org, tglx@linutronix.de, bp@suse.de, dvlasenk@redhat.com, luto@kernel.org, cmetcalf@mellanox.com, brgerst@gmail.com, ray.huang@amd.com, corbet@lwn.net, luto@amacapital.net, jpoimboe@redhat.com, jslaby@suse.cz, mst@redhat.com, slaoub@gmail.com, pbonzini@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, shuah@kernel.org, vbabka@suse.cz, dave.hansen@intel.com, ricardo.neri-calderon@linux.intel.com, linux-kernel@vger.kernel.org Reply-To: dave.hansen@intel.com, vbabka@suse.cz, shuah@kernel.org, linux-kernel@vger.kernel.org, ricardo.neri-calderon@linux.intel.com, pbonzini@redhat.com, slaoub@gmail.com, dave.hansen@linux.intel.com, bp@alien8.de, mst@redhat.com, jpoimboe@redhat.com, jslaby@suse.cz, corbet@lwn.net, luto@amacapital.net, ray.huang@amd.com, luto@kernel.org, brgerst@gmail.com, cmetcalf@mellanox.com, akpm@linux-foundation.org, bp@suse.de, dvlasenk@redhat.com, mhiramat@kernel.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, torvalds@linux-foundation.org, ravi.v.shankar@intel.com, peterz@infradead.org, paul.gortmaker@windriver.com In-Reply-To: <1509135945-13762-3-git-send-email-ricardo.neri-calderon@linux.intel.com> References: <1509135945-13762-3-git-send-email-ricardo.neri-calderon@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mpx] x86/boot: Relocate definition of the initial state of CR0 Git-Commit-ID: b0ce5b8c95c83a7b98c679b117e3d6ae6f97154b 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: b0ce5b8c95c83a7b98c679b117e3d6ae6f97154b Gitweb: https://git.kernel.org/tip/b0ce5b8c95c83a7b98c679b117e3d6ae6f97154b Author: Ricardo Neri AuthorDate: Fri, 27 Oct 2017 13:25:29 -0700 Committer: Thomas Gleixner CommitDate: Wed, 1 Nov 2017 21:50:07 +0100 x86/boot: Relocate definition of the initial state of CR0 Both head_32.S and head_64.S utilize the same value to initialize the control register CR0. Also, other parts of the kernel might want to access this initial definition (e.g., emulation code for User-Mode Instruction Prevention uses this state to provide a sane dummy value for CR0 when emulating the smsw instruction). Thus, relocate this definition to a header file from which it can be conveniently accessed. Suggested-by: Borislav Petkov Signed-off-by: Ricardo Neri Signed-off-by: Thomas Gleixner Reviewed-by: Borislav Petkov Reviewed-by: Andy Lutomirski Cc: "Michael S. Tsirkin" Cc: Peter Zijlstra Cc: Dave Hansen Cc: ricardo.neri@intel.com Cc: linux-mm@kvack.org Cc: Paul Gortmaker Cc: Huang Rui Cc: Shuah Khan Cc: linux-arch@vger.kernel.org Cc: Jonathan Corbet Cc: Jiri Slaby Cc: "Ravi V. Shankar" Cc: Denys Vlasenko Cc: Chris Metcalf Cc: Brian Gerst Cc: Josh Poimboeuf Cc: Chen Yucong Cc: Vlastimil Babka Cc: Dave Hansen Cc: Andy Lutomirski Cc: Masami Hiramatsu Cc: Paolo Bonzini Cc: Andrew Morton Cc: Linus Torvalds Link: https://lkml.kernel.org/r/1509135945-13762-3-git-send-email-ricardo.neri-calderon@linux.intel.com --- arch/x86/include/uapi/asm/processor-flags.h | 3 +++ arch/x86/kernel/head_32.S | 3 --- arch/x86/kernel/head_64.S | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/uapi/asm/processor-flags.h b/arch/x86/include/uapi/asm/processor-flags.h index 185f3d1..39946d0 100644 --- a/arch/x86/include/uapi/asm/processor-flags.h +++ b/arch/x86/include/uapi/asm/processor-flags.h @@ -151,5 +151,8 @@ #define CX86_ARR_BASE 0xc4 #define CX86_RCR_BASE 0xdc +#define CR0_STATE (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \ + X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \ + X86_CR0_PG) #endif /* _UAPI_ASM_X86_PROCESSOR_FLAGS_H */ diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 9ed3074..c3cfc65 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -211,9 +211,6 @@ ENTRY(startup_32_smp) #endif .Ldefault_entry: -#define CR0_STATE (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \ - X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \ - X86_CR0_PG) movl $(CR0_STATE & ~X86_CR0_PG),%eax movl %eax,%cr0 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 513cbb0..5e1bfdd 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -149,9 +149,6 @@ ENTRY(secondary_startup_64) 1: wrmsr /* Make changes effective */ /* Setup cr0 */ -#define CR0_STATE (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \ - X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \ - X86_CR0_PG) movl $CR0_STATE, %eax /* Make changes effective */ movq %rax, %cr0