From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932601AbbEHTDJ (ORCPT ); Fri, 8 May 2015 15:03:09 -0400 Received: from mga09.intel.com ([134.134.136.24]:24992 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932072AbbEHS7k (ORCPT ); Fri, 8 May 2015 14:59:40 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,391,1427785200"; d="scan'208";a="707424934" Subject: [PATCH 12/19] x86: make is_64bit_mm() widely available To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, tglx@linutronix.de, Dave Hansen , dave.hansen@linux.intel.com, oleg@redhat.com From: Dave Hansen Date: Fri, 08 May 2015 11:59:53 -0700 References: <20150508185948.4C19F4B0@viggo.jf.intel.com> In-Reply-To: <20150508185948.4C19F4B0@viggo.jf.intel.com> Message-Id: <20150508185953.490E9116@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen The uprobes code has a nice helper, is_64bit_mm(), that consults both the runtime and compile-time flags for 32-bit support. Instead of reinventing the wheel, pull it in to an x86 header so we can use it for MPX. I prefer passing the mm around to test_thread_flag(TIF_IA32) because it makes it explicit where the context is coming from. It will also make it easier if we ever need to access the MPX structures from another process. Signed-off-by: Dave Hansen Cc: Oleg Nesterov --- b/arch/x86/include/asm/mmu_context.h | 13 +++++++++++++ b/arch/x86/kernel/uprobes.c | 10 +--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff -puN arch/x86/include/asm/mmu_context.h~x86-make-is_64bit_mm-available arch/x86/include/asm/mmu_context.h --- a/arch/x86/include/asm/mmu_context.h~x86-make-is_64bit_mm-available 2015-05-08 11:46:15.799798535 -0700 +++ b/arch/x86/include/asm/mmu_context.h 2015-05-08 11:46:15.804798760 -0700 @@ -142,6 +142,19 @@ static inline void arch_exit_mmap(struct paravirt_arch_exit_mmap(mm); } +#ifdef CONFIG_X86_64 +static inline bool is_64bit_mm(struct mm_struct *mm) +{ + return !config_enabled(CONFIG_IA32_EMULATION) || + !(mm->context.ia32_compat == TIF_IA32); +} +#else +static inline bool is_64bit_mm(struct mm_struct *mm) +{ + return false; +} +#endif + static inline void arch_bprm_mm_init(struct mm_struct *mm, struct vm_area_struct *vma) { diff -puN arch/x86/kernel/uprobes.c~x86-make-is_64bit_mm-available arch/x86/kernel/uprobes.c --- a/arch/x86/kernel/uprobes.c~x86-make-is_64bit_mm-available 2015-05-08 11:46:15.800798580 -0700 +++ b/arch/x86/kernel/uprobes.c 2015-05-08 11:46:15.804798760 -0700 @@ -29,6 +29,7 @@ #include #include #include +#include /* Post-execution fixups. */ @@ -312,11 +313,6 @@ static int uprobe_init_insn(struct arch_ } #ifdef CONFIG_X86_64 -static inline bool is_64bit_mm(struct mm_struct *mm) -{ - return !config_enabled(CONFIG_IA32_EMULATION) || - !(mm->context.ia32_compat == TIF_IA32); -} /* * If arch_uprobe->insn doesn't use rip-relative addressing, return * immediately. Otherwise, rewrite the instruction so that it accesses @@ -497,10 +493,6 @@ static void riprel_post_xol(struct arch_ } } #else /* 32-bit: */ -static inline bool is_64bit_mm(struct mm_struct *mm) -{ - return false; -} /* * No RIP-relative addressing on 32-bit */ _