public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Hansen <dave@sr71.net>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, x86@kernel.org, Dave Hansen <dave@sr71.net>,
	dave.hansen@linux.intel.com
Subject: [RFC][PATCH 2/8] x86: make __VIRTUAL_MASK safe to use on 32 bit
Date: Fri, 12 Dec 2014 11:12:16 -0800	[thread overview]
Message-ID: <20141212191216.6676010C@viggo.jf.intel.com> (raw)
In-Reply-To: <20141212191213.579887D2@viggo.jf.intel.com>


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

We are going to do some calculations in a moment that are based on the
size of the virtual address space.  __VIRTUAL_MASK is currently unsafe
to use on 32-bit since it overflows an unsigned long with its shift.

The current version will emit a warning if used at all on 32-bit
kernels.

Add a version which is safe on 32-bit and consequently does not spit
out a warning.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
---

 b/arch/x86/include/asm/page_types.h |    8 ++++++++
 1 file changed, 8 insertions(+)

diff -puN arch/x86/include/asm/page_types.h~x86-make-__VIRTUAL_MASK-safe-to-use-on-32-bit arch/x86/include/asm/page_types.h
--- a/arch/x86/include/asm/page_types.h~x86-make-__VIRTUAL_MASK-safe-to-use-on-32-bit	2014-12-12 11:11:39.484965499 -0800
+++ b/arch/x86/include/asm/page_types.h	2014-12-12 11:11:39.487965634 -0800
@@ -10,7 +10,15 @@
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
 #define __PHYSICAL_MASK		((phys_addr_t)((1ULL << __PHYSICAL_MASK_SHIFT) - 1))
+#ifdef CONFIG_X86_64
+/*
+ * This version doesn't work on 32-bit because __VIRTUAL_MASK_SHIFT=32
+ * overflows the unsigned long we're trying to shift.
+ */
 #define __VIRTUAL_MASK		((1UL << __VIRTUAL_MASK_SHIFT) - 1)
+#else
+#define __VIRTUAL_MASK		(~0UL)
+#endif
 
 /* Cast PAGE_MASK to a signed type so that it is sign-extended if
    virtual addresses are 32-bits but physical addresses are larger
_

  parent reply	other threads:[~2014-12-12 19:13 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-12 19:12 [RFC][PATCH 0/8] x86, mpx: Support 32-bit binaries on 64-bit kernels Dave Hansen
2014-12-12 19:12 ` [RFC][PATCH 1/8] x86: make is_64bit_mm() widely available Dave Hansen
2014-12-12 19:12 ` Dave Hansen [this message]
2014-12-12 19:12 ` [RFC][PATCH 3/8] x86, mpx: we do not allocate the bounds directory Dave Hansen
2014-12-12 19:12 ` [RFC][PATCH 4/8] x86, mpx: remove redundant MPX_BNDCFG_ADDR_MASK Dave Hansen
2014-12-12 19:12 ` [RFC][PATCH 5/8] x86, mpx: Add temporary variable to reduce masking Dave Hansen
2014-12-12 19:12 ` [RFC][PATCH 6/8] x86, mpx: new directory entry to addr helper Dave Hansen
2014-12-12 19:12 ` [RFC][PATCH 7/8] x86, mpx: do 32-bit-only cmpxchg for 32-bit apps Dave Hansen
2014-12-12 19:12 ` [RFC][PATCH 8/8] x86, mpx: support 32bit binaries on 64bit kernel Dave Hansen
2014-12-12 20:22 ` [RFC][PATCH 0/8] x86, mpx: Support 32-bit binaries on 64-bit kernels Andy Lutomirski
2014-12-12 20:27   ` Dave Hansen
2014-12-12 20:48     ` Andy Lutomirski
2014-12-12 21:41       ` Dave Hansen
2014-12-12 23:04         ` Andy Lutomirski
2014-12-12 23:16           ` Dave Hansen
2014-12-13  0:11             ` Andy Lutomirski
2014-12-13  0:23               ` Dave Hansen
2014-12-13  1:45                 ` Andy Lutomirski
2014-12-13 15:50                   ` Dave Hansen
2014-12-12 20:27 ` Andy Lutomirski
2014-12-12 20:35   ` 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=20141212191216.6676010C@viggo.jf.intel.com \
    --to=dave@sr71.net \
    --cc=dave.hansen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --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