linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Hansen <dave@sr71.net>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, tglx@linutronix.de, Dave Hansen <dave@sr71.net>,
	dave.hansen@linux.intel.com, oleg@redhat.com
Subject: [PATCH 08/17] x86: make is_64bit_mm() widely available
Date: Wed, 22 Apr 2015 11:27:40 -0700	[thread overview]
Message-ID: <20150422182740.AF02E31D@viggo.jf.intel.com> (raw)
In-Reply-To: <20150422182729.0512E57D@viggo.jf.intel.com>


From: Dave Hansen <dave.hansen@linux.intel.com>

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 <dave.hansen@linux.intel.com>
Cc: Oleg Nesterov <oleg@redhat.com>
---

 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-04-22 11:16:20.693931944 -0700
+++ b/arch/x86/include/asm/mmu_context.h	2015-04-22 11:16:20.698932170 -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-04-22 11:16:20.695932034 -0700
+++ b/arch/x86/kernel/uprobes.c	2015-04-22 11:16:20.699932215 -0700
@@ -29,6 +29,7 @@
 #include <linux/kdebug.h>
 #include <asm/processor.h>
 #include <asm/insn.h>
+#include <asm/mmu_context.h>
 
 /* 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
  */
_

  parent reply	other threads:[~2015-04-22 18:30 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-22 18:27 [PATCH 00/17] x86, mpx updates for 4.2 (take 5) Dave Hansen
2015-04-22 18:27 ` [PATCH 01/17] x86, fpu: wrap get_xsave_addr() to make it safer Dave Hansen
2015-04-25  9:31   ` Borislav Petkov
2015-05-05 17:27     ` Borislav Petkov
2015-05-08 17:42       ` Dave Hansen
2015-04-22 18:27 ` [PATCH 02/17] x86, mpx: use new tsk_get_xsave_addr() Dave Hansen
2015-04-22 19:18   ` Yu, Fenghua
2015-04-22 19:32     ` Dave Hansen
2015-04-22 21:21       ` Yu, Fenghua
2015-04-22 18:27 ` [PATCH 03/17] x86, mpx: trace #BR exceptions Dave Hansen
2015-04-22 18:27 ` [PATCH 04/17] x86, mpx: trace entry to bounds exception paths Dave Hansen
2015-04-22 18:27 ` [PATCH 05/17] x86, mpx: trace ranged MPX operations Dave Hansen
2015-04-22 18:27 ` [PATCH 06/17] x86, mpx: trace allocation of new bounds tables Dave Hansen
2015-04-22 18:27 ` [PATCH 07/17] x86, mpx: boot-time disable Dave Hansen
2015-04-22 18:27 ` Dave Hansen [this message]
2015-04-22 18:27 ` [PATCH 09/17] x86: make __VIRTUAL_MASK safe to use on 32 bit Dave Hansen
2015-04-22 18:27 ` [PATCH 10/17] x86, mpx: we do not allocate the bounds directory Dave Hansen
2015-04-22 18:27 ` [PATCH 11/17] x86, mpx: remove redundant MPX_BNDCFG_ADDR_MASK Dave Hansen
2015-04-22 18:27 ` [PATCH 12/17] x86, mpx: Add temporary variable to reduce masking Dave Hansen
2015-04-22 18:27 ` [PATCH 13/17] x86, mpx: new directory entry to addr helper Dave Hansen
2015-04-22 18:27 ` [PATCH 14/17] x86, mpx: do 32-bit-only cmpxchg for 32-bit apps Dave Hansen
2015-04-22 18:27 ` [PATCH 15/17] x86, mpx: support 32-bit binaries on 64-bit kernel Dave Hansen
2015-04-22 18:27 ` [PATCH 16/17] x86, mpx: allow mixed binaries again Dave Hansen
2015-04-22 18:27 ` [PATCH 17/17] x86, mpx: cleanup: do not pass task around when unnecessary Dave Hansen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150422182740.AF02E31D@viggo.jf.intel.com \
    --to=dave@sr71.net \
    --cc=dave.hansen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oleg@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).