From: Steve Capper <steve.capper@arm.com>
To: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org
Cc: catalin.marinas@arm.com, will.deacon@arm.com,
ard.biesheuvel@linaro.org, jcm@redhat.com,
Steve Capper <steve.capper@arm.com>
Subject: [PATCH V3 5/5] arm64: mm: Allow forcing all userspace addresses to 52-bit
Date: Wed, 14 Nov 2018 13:39:20 +0000 [thread overview]
Message-ID: <20181114133920.7134-6-steve.capper@arm.com> (raw)
In-Reply-To: <20181114133920.7134-1-steve.capper@arm.com>
On arm64 52-bit VAs are provided to userspace when a hint is supplied to
mmap. This helps maintain compatibility with software that expects at
most 48-bit VAs to be returned.
In order to help identify software that has 48-bit VA assumptions, this
patch allows one to compile a kernel where 52-bit VAs are returned by
default on HW that supports it.
This feature is intended to be for development systems only.
Signed-off-by: Steve Capper <steve.capper@arm.com>
---
Patch added in V3 to allow for testing/preparation for 52-bit support.
---
arch/arm64/Kconfig | 14 ++++++++++++++
arch/arm64/include/asm/elf.h | 4 ++++
arch/arm64/include/asm/processor.h | 9 ++++++++-
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index eab02d24f5d1..17d363e40c4d 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1165,6 +1165,20 @@ config ARM64_CNP
at runtime, and does not affect PEs that do not implement
this feature.
+config ARM64_FORCE_52BIT
+ bool "Force 52-bit virtual addresses for userspace"
+ default n
+ depends on ARM64_52BIT_VA && EXPERT
+ help
+ For systems with 52-bit userspace VAs enabled, the kernel will attempt
+ to maintain compatibility with older software by providing 48-bit VAs
+ unless a hint is supplied to mmap.
+
+ This configuration option disables the 48-bit compatibility logic, and
+ forces all userspace addresses to be 52-bit on HW that supports it. One
+ should only enable this configuration option for stress testing userspace
+ memory management code. If unsure say N here.
+
endmenu
config ARM64_SVE
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index bc9bd9e77d9d..6adc1a90e7e6 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -117,7 +117,11 @@
* 64-bit, this is above 4GB to leave the entire 32-bit address
* space open for things that want to use the area for 32-bit pointers.
*/
+#ifdef CONFIG_ARM64_FORCE_52BIT
+#define ELF_ET_DYN_BASE (2 * TASK_SIZE_64 / 3)
+#else
#define ELF_ET_DYN_BASE (2 * DEFAULT_MAP_WINDOW_64 / 3)
+#endif /* CONFIG_ARM64_FORCE_52BIT */
#ifndef __ASSEMBLY__
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
index 403c3c106d24..1415de41d836 100644
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@ -64,8 +64,13 @@ extern u64 vabits_user;
#define DEFAULT_MAP_WINDOW DEFAULT_MAP_WINDOW_64
#endif /* CONFIG_COMPAT */
-#define TASK_UNMAPPED_BASE (PAGE_ALIGN(DEFAULT_MAP_WINDOW / 4))
+#ifdef CONFIG_ARM64_FORCE_52BIT
+#define STACK_TOP_MAX TASK_SIZE_64
+#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 4))
+#else
#define STACK_TOP_MAX DEFAULT_MAP_WINDOW_64
+#define TASK_UNMAPPED_BASE (PAGE_ALIGN(DEFAULT_MAP_WINDOW / 4))
+#endif /* CONFIG_ARM64_FORCE_52BIT */
#ifdef CONFIG_COMPAT
#define AARCH32_VECTORS_BASE 0xffff0000
@@ -75,12 +80,14 @@ extern u64 vabits_user;
#define STACK_TOP STACK_TOP_MAX
#endif /* CONFIG_COMPAT */
+#ifndef CONFIG_ARM64_FORCE_52BIT
#define arch_get_mmap_end(addr) ((addr > DEFAULT_MAP_WINDOW) ? TASK_SIZE :\
DEFAULT_MAP_WINDOW)
#define arch_get_mmap_base(addr, base) ((addr > DEFAULT_MAP_WINDOW) ? \
base + TASK_SIZE - DEFAULT_MAP_WINDOW :\
base)
+#endif /* CONFIG_ARM64_FORCE_52BIT */
extern phys_addr_t arm64_dma_phys_limit;
#define ARCH_LOW_ADDRESS_LIMIT (arm64_dma_phys_limit - 1)
--
2.11.0
next prev parent reply other threads:[~2018-11-14 13:39 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-14 13:39 [PATCH V3 0/5] 52-bit userspace VAs Steve Capper
2018-11-14 13:39 ` [PATCH V3 1/5] mm: mmap: Allow for "high" userspace addresses Steve Capper
2018-11-23 18:17 ` Catalin Marinas
2018-11-26 12:11 ` Steve Capper
2018-11-14 13:39 ` [PATCH V3 2/5] arm64: mm: Introduce DEFAULT_MAP_WINDOW Steve Capper
2018-11-27 17:09 ` Catalin Marinas
2018-11-27 17:15 ` Ard Biesheuvel
2018-11-28 16:31 ` Steve Capper
2018-11-14 13:39 ` [PATCH V3 3/5] arm64: mm: Define arch_get_mmap_end, arch_get_mmap_base Steve Capper
2018-11-27 17:10 ` Catalin Marinas
2018-11-28 16:31 ` Steve Capper
2018-11-14 13:39 ` [PATCH V3 4/5] arm64: mm: introduce 52-bit userspace support Steve Capper
2018-11-23 18:35 ` Catalin Marinas
2018-11-26 12:13 ` Steve Capper
2018-11-30 17:59 ` Catalin Marinas
2018-12-04 17:41 ` Steve Capper
2018-11-14 13:39 ` Steve Capper [this message]
2018-11-23 18:22 ` [PATCH V3 5/5] arm64: mm: Allow forcing all userspace addresses to 52-bit Catalin Marinas
2018-11-26 12:11 ` Steve Capper
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=20181114133920.7134-6-steve.capper@arm.com \
--to=steve.capper@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=jcm@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mm@kvack.org \
--cc=will.deacon@arm.com \
/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).