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 1/9] x86: make is_64bit_mm() widely available
Date: Mon, 02 Feb 2015 13:31:28 -0800 [thread overview]
Message-ID: <20150202213128.B1102A08@viggo.jf.intel.com> (raw)
In-Reply-To: <20150202213127.0171DBC1@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) beacuse
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-01-30 10:16:12.187416024 -0800
+++ b/arch/x86/include/asm/mmu_context.h 2015-01-30 10:16:12.192416249 -0800
@@ -121,6 +121,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-01-30 10:16:12.189416114 -0800
+++ b/arch/x86/kernel/uprobes.c 2015-01-30 10:16:12.193416294 -0800
@@ -29,6 +29,7 @@
#include <linux/kdebug.h>
#include <asm/processor.h>
#include <asm/insn.h>
+#include <asm/mmu_context.h>
/* Post-execution fixups. */
@@ -245,11 +246,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
@@ -430,10 +426,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
*/
_
next prev parent reply other threads:[~2015-02-02 21:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-02 21:31 [PATCH 0/9] x86, mpx: Support 32-bit binaries on 64-bit kernels Dave Hansen
2015-02-02 21:31 ` Dave Hansen [this message]
2015-02-02 21:31 ` [PATCH 2/9] x86: make __VIRTUAL_MASK safe to use on 32 bit Dave Hansen
2015-02-02 21:31 ` [PATCH 3/9] x86, mpx: we do not allocate the bounds directory Dave Hansen
2015-02-02 21:31 ` [PATCH 4/9] x86, mpx: remove redundant MPX_BNDCFG_ADDR_MASK Dave Hansen
2015-02-02 21:31 ` [PATCH 5/9] x86, mpx: Add temporary variable to reduce masking Dave Hansen
2015-02-02 21:31 ` [PATCH 6/9] x86, mpx: new directory entry to addr helper Dave Hansen
2015-02-02 21:31 ` [PATCH 7/9] x86, mpx: do 32-bit-only cmpxchg for 32-bit apps Dave Hansen
2015-02-02 21:31 ` [PATCH 8/9] x86, mpx: support 32bit binaries on 64bit kernel Dave Hansen
2015-02-02 21:31 ` [PATCH 9/9] x86, mpx: allow mixed binaries again 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=20150202213128.B1102A08@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
all inboxes | Powered by JetHome®