[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 06/15] linux-user: Pass CPUState to MAX_RESERVED_V
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL v2 06/15] linux-user: Pass CPUState to MAX_RESERVED_VA |
Date: |
Wed, 11 Sep 2019 08:49:11 +0200 |
From: Richard Henderson <address@hidden>
Turn the scalar macro into a functional macro. Move the creation
of the cpu up a bit within main() so that we can pass it to the
invocation of MAX_RESERVED_VA. Delay the validation of the -R
parameter until MAX_RESERVED_VA is computed.
So far no changes to any of the MAX_RESERVED_VA macros to actually
use the cpu in any way, but ARM will need it.
Signed-off-by: Richard Henderson <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/arm/target_cpu.h | 2 +-
linux-user/main.c | 43 +++++++++++++++++++++----------------
2 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/linux-user/arm/target_cpu.h b/linux-user/arm/target_cpu.h
index 8a3764919ad9..279ea532d5b7 100644
--- a/linux-user/arm/target_cpu.h
+++ b/linux-user/arm/target_cpu.h
@@ -21,7 +21,7 @@
/* We need to be able to map the commpage.
See validate_guest_space in linux-user/elfload.c. */
-#define MAX_RESERVED_VA 0xffff0000ul
+#define MAX_RESERVED_VA(CPU) 0xffff0000ul
static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp)
{
diff --git a/linux-user/main.c b/linux-user/main.c
index c257b063dbc1..24cb24f0bf8f 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -77,12 +77,12 @@ int have_guest_base;
(TARGET_LONG_BITS == 32 || defined(TARGET_ABI32))
/* There are a number of places where we assign reserved_va to a variable
of type abi_ulong and expect it to fit. Avoid the last page. */
-# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK)
+# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK)
# else
-# define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS)
+# define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS)
# endif
# else
-# define MAX_RESERVED_VA 0
+# define MAX_RESERVED_VA(CPU) 0
# endif
#endif
@@ -356,8 +356,7 @@ static void handle_arg_reserved_va(const char *arg)
unsigned long unshifted = reserved_va;
p++;
reserved_va <<= shift;
- if (reserved_va >> shift != unshifted
- || (MAX_RESERVED_VA && reserved_va > MAX_RESERVED_VA)) {
+ if (reserved_va >> shift != unshifted) {
fprintf(stderr, "Reserved virtual address too big\n");
exit(EXIT_FAILURE);
}
@@ -605,6 +604,7 @@ int main(int argc, char **argv, char **envp)
int i;
int ret;
int execfd;
+ unsigned long max_reserved_va;
error_init(argv[0]);
module_call_init(MODULE_INIT_TRACE);
@@ -670,24 +670,31 @@ int main(int argc, char **argv, char **envp)
/* init tcg before creating CPUs and to get qemu_host_page_size */
tcg_exec_init(0);
- /* Reserving *too* much vm space via mmap can run into problems
- with rlimits, oom due to page table creation, etc. We will still try
it,
- if directed by the command-line option, but not by default. */
- if (HOST_LONG_BITS == 64 &&
- TARGET_VIRT_ADDR_SPACE_BITS <= 32 &&
- reserved_va == 0) {
- /* reserved_va must be aligned with the host page size
- * as it is used with mmap()
- */
- reserved_va = MAX_RESERVED_VA & qemu_host_page_mask;
- }
-
cpu = cpu_create(cpu_type);
env = cpu->env_ptr;
cpu_reset(cpu);
-
thread_cpu = cpu;
+ /*
+ * Reserving too much vm space via mmap can run into problems
+ * with rlimits, oom due to page table creation, etc. We will
+ * still try it, if directed by the command-line option, but
+ * not by default.
+ */
+ max_reserved_va = MAX_RESERVED_VA(cpu);
+ if (reserved_va != 0) {
+ if (max_reserved_va && reserved_va > max_reserved_va) {
+ fprintf(stderr, "Reserved virtual address too big\n");
+ exit(EXIT_FAILURE);
+ }
+ } else if (HOST_LONG_BITS == 64 && TARGET_VIRT_ADDR_SPACE_BITS <= 32) {
+ /*
+ * reserved_va must be aligned with the host page size
+ * as it is used with mmap()
+ */
+ reserved_va = max_reserved_va & qemu_host_page_mask;
+ }
+
if (getenv("QEMU_STRACE")) {
do_strace = 1;
}
--
2.21.0
- [Qemu-devel] [PULL v2 00/15] Linux user for 4.2 patches, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 02/15] linux-user: Add AT_HWCAP2 for aarch64-linux-user, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 03/15] linux-user: erroneous fd_trans_unregister call, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 04/15] linux-user: fail and report on bad dfilter specs, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 07/15] linux-user/arm: Adjust MAX_RESERVED_VA for M-profile, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 13/15] linux-user: Add support for FDFLUSH ioctl, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 05/15] linux-user: add memfd_create, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 06/15] linux-user: Pass CPUState to MAX_RESERVED_VA,
Laurent Vivier <=
- [Qemu-devel] [PULL v2 08/15] linux-user: Support gdb 'qOffsets' query for ELF, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 09/15] target/xtensa: linux-user: add call0 ABI support, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 11/15] linux-user: Add support for RNDRESEEDCRNG ioctl, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 01/15] linux-user: remove useless variable, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 10/15] linux-user: drop redundant handling of environment variables, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 12/15] linux-user: Add support for FIOGETOWN and FIOSETOWN ioctls, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 15/15] linux-user: Add support for FDRESET, FDRAWCMD, FDTWADDLE, and FDEJECT ioctls, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 14/15] linux-user: Add support for FDMSGON and FDMSGOFF ioctls, Laurent Vivier, 2019/09/11
- Re: [Qemu-devel] [PULL v2 00/15] Linux user for 4.2 patches, Peter Maydell, 2019/09/12