From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933248AbdKAVCw (ORCPT ); Wed, 1 Nov 2017 17:02:52 -0400 Received: from terminus.zytor.com ([65.50.211.136]:58677 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755283AbdKAVCu (ORCPT ); Wed, 1 Nov 2017 17:02:50 -0400 Date: Wed, 1 Nov 2017 13:55:53 -0700 From: tip-bot for Ricardo Neri Message-ID: Cc: bp@suse.de, lstoakes@gmail.com, vbabka@suse.cz, hpa@zytor.com, tglx@linutronix.de, dvyukov@google.com, akpm@linux-foundation.org, mingo@kernel.org, dave.hansen@linux.intel.com, ray.huang@amd.com, jslaby@suse.cz, ricardo.neri-calderon@linux.intel.com, mhiramat@kernel.org, luto@kernel.org, corbet@lwn.net, acme@redhat.com, adam.buchbinder@gmail.com, ravi.v.shankar@intel.com, paul.gortmaker@windriver.com, keescook@chromium.org, pbonzini@redhat.com, slaoub@gmail.com, shuah@kernel.org, linux-kernel@vger.kernel.org, cmetcalf@mellanox.com, mst@redhat.com, qiaowei.ren@intel.com, colin.king@canonical.com, brgerst@gmail.com, peterz@infradead.org, thgarnie@google.com, adrian.hunter@intel.com Reply-To: tglx@linutronix.de, dvyukov@google.com, akpm@linux-foundation.org, bp@suse.de, lstoakes@gmail.com, vbabka@suse.cz, hpa@zytor.com, mhiramat@kernel.org, corbet@lwn.net, luto@kernel.org, mingo@kernel.org, dave.hansen@linux.intel.com, jslaby@suse.cz, ray.huang@amd.com, ricardo.neri-calderon@linux.intel.com, keescook@chromium.org, paul.gortmaker@windriver.com, pbonzini@redhat.com, slaoub@gmail.com, shuah@kernel.org, linux-kernel@vger.kernel.org, cmetcalf@mellanox.com, mst@redhat.com, acme@redhat.com, adam.buchbinder@gmail.com, ravi.v.shankar@intel.com, brgerst@gmail.com, peterz@infradead.org, thgarnie@google.com, adrian.hunter@intel.com, qiaowei.ren@intel.com, colin.king@canonical.com In-Reply-To: <1509135945-13762-4-git-send-email-ricardo.neri-calderon@linux.intel.com> References: <1509135945-13762-4-git-send-email-ricardo.neri-calderon@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mpx] ptrace,x86: Make user_64bit_mode() available to 32-bit builds Git-Commit-ID: e27c310af5c05cf876d9cad006928076c27f54d4 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: e27c310af5c05cf876d9cad006928076c27f54d4 Gitweb: https://git.kernel.org/tip/e27c310af5c05cf876d9cad006928076c27f54d4 Author: Ricardo Neri AuthorDate: Fri, 27 Oct 2017 13:25:30 -0700 Committer: Thomas Gleixner CommitDate: Wed, 1 Nov 2017 21:50:08 +0100 ptrace,x86: Make user_64bit_mode() available to 32-bit builds In its current form, user_64bit_mode() can only be used when CONFIG_X86_64 is selected. This implies that code built with CONFIG_X86_64=n cannot use it. If a piece of code needs to be built for both CONFIG_X86_64=y and CONFIG_X86_64=n and wants to use this function, it needs to wrap it in an #ifdef/#endif; potentially, in multiple places. This can be easily avoided with a single #ifdef/#endif pair within user_64bit_mode() itself. Suggested-by: Borislav Petkov Signed-off-by: Ricardo Neri Signed-off-by: Thomas Gleixner Reviewed-by: Borislav Petkov Cc: "Michael S. Tsirkin" Cc: Peter Zijlstra Cc: Dave Hansen Cc: ricardo.neri@intel.com Cc: Adrian Hunter Cc: Paul Gortmaker Cc: Huang Rui Cc: Qiaowei Ren Cc: Shuah Khan Cc: Kees Cook Cc: Jonathan Corbet Cc: Jiri Slaby Cc: Dmitry Vyukov Cc: "Ravi V. Shankar" Cc: Chris Metcalf Cc: Brian Gerst Cc: Arnaldo Carvalho de Melo Cc: Andy Lutomirski Cc: Colin Ian King Cc: Chen Yucong Cc: Adam Buchbinder Cc: Vlastimil Babka Cc: Lorenzo Stoakes Cc: Masami Hiramatsu Cc: Paolo Bonzini Cc: Andrew Morton Cc: Thomas Garnier Link: https://lkml.kernel.org/r/1509135945-13762-4-git-send-email-ricardo.neri-calderon@linux.intel.com --- arch/x86/include/asm/ptrace.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index 91c04c8..e2afbf6 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h @@ -135,9 +135,9 @@ static inline int v8086_mode(struct pt_regs *regs) #endif } -#ifdef CONFIG_X86_64 static inline bool user_64bit_mode(struct pt_regs *regs) { +#ifdef CONFIG_X86_64 #ifndef CONFIG_PARAVIRT /* * On non-paravirt systems, this is the only long mode CPL 3 @@ -148,8 +148,12 @@ static inline bool user_64bit_mode(struct pt_regs *regs) /* Headers are too twisted for this to go in paravirt.h. */ return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs; #endif +#else /* !CONFIG_X86_64 */ + return false; +#endif } +#ifdef CONFIG_X86_64 #define current_user_stack_pointer() current_pt_regs()->sp #define compat_user_stack_pointer() current_pt_regs()->sp #endif