From patchwork Tue Jul 25 11:52:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 1812491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=gmx.de header.i=deller@gmx.de header.a=rsa-sha256 header.s=s31663417 header.b=TYd/Pp0N; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R9FmH45Xbz20Fn for ; Tue, 25 Jul 2023 21:53:35 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOGaf-0006wi-07; Tue, 25 Jul 2023 07:52:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOGad-0006wI-AN for qemu-devel@nongnu.org; Tue, 25 Jul 2023 07:52:31 -0400 Received: from mout.gmx.net ([212.227.17.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOGaa-0002Kv-Bp for qemu-devel@nongnu.org; Tue, 25 Jul 2023 07:52:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1690285941; x=1690890741; i=deller@gmx.de; bh=RQzwqRdzC4UMPSJzIBjSaM7WEto38+vaHaaILdjhDXs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=TYd/Pp0Nfo8Q5rVh0b1gAs1OSO1CM6ZrckhfTZSNbbX2MUDRu3IKXKOXrqzoWzJabAqx5yz Yb1O8JWsfOHG32ShmTd9r9JYA/X7lwZlQNFN2gwF6Af8YBdwNQcQyrus4QiGRV0faZCgJka6u BK2tX+Yg127pBz5HD+68iFWLdRxqE3eDlcReol6mezYaSSlaQ/6viGYgoDFGR6zwFFKOztUPs CqN96N9Ypimgfw3iBFdbvIIwovHtkXDj92kugHqPaSP/Ah2biRdL5jCLE10isj6LMkzUvc1Jd nxJQj7JnOuJ5QtucqMWcycSYc/Ag23m4jj2UwbQGU2jQpryKRoJw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([94.134.145.136]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M7sHy-1qJIVL1LRy-004xjV; Tue, 25 Jul 2023 13:52:21 +0200 From: Helge Deller To: Richard Henderson , Michael Tokarev , qemu-devel@nongnu.org, Andreas Schwab , Laurent Vivier Cc: Paolo Bonzini , Helge Deller Subject: [PATCH v3 2/3] linux-user: Optimize memory layout for static and dynamic executables Date: Tue, 25 Jul 2023 13:52:17 +0200 Message-ID: <20230725115218.52738-3-deller@gmx.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725115218.52738-1-deller@gmx.de> References: <20230725115218.52738-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Uz3o4L8wIR3yYHYfuex1d5SxZFQ2fbQZNx8kcNx9b0QxY69PwrY xWA/NvGvpiXRB/hYq3D6p4r1R03Zhr3MZgELDAiVXecMyqAT0lY/s2XCSyWceuzFEClOGgb aK///1ZMwWQoGpnbuXnKlZz9qEedbs0FwOVTjbklqMoKUOGUHBryHi4IwUDYAxVfAV8f1my ZuL97WyDTXU9nCUR+Dvhw== UI-OutboundReport: notjunk:1;M01:P0:g3U8MkO5QnY=;6H8ANrZjZ5o59+r9YwQFfNy5rcx y28YXNJagqFlRdTS4U9VRqhsgQIL3fqe4VSvfYv9fv0fmFqZInhosavSZA5BJp6NvkfY13lDu CO7V58sPpR62Auv69pHUHUUOHB2eqDDXxVFDsUb7yrVDvWX57bZsPkJbTUY7ECoYb96Jz8mDW 1wI+7PH2sKfoqVZ6FWUYaO2p+psJqLlcbBr4IXRJtN1HjH52gfjFg00oRHHl2X4g8GoGnvEVC BsvzeQH1GPpOmvT9eLp+O5u/O9eAEXcx9AllylzC6f2Ws3Fi0kaNsZmrXguedrMOsCOSEiKq2 jzsppGJad1hntHMfKgdvCcDNheuU22zRH2tkstUzcLY6vQXscKL25zU+iNuTyMUtyxOzxHgu+ 1Wh9B+HWGOJBYpz2SHM3kiienRcNQ+IQ07jhMFLUnrLjW/oiWmJnp/tQq4qDg4qbTxG0usTOq 7vQGYMY+VgUM2KMbHeYmevGTM3QB2BTk9xkrvqQ8drbTegbToGS5+MOpP2F52nT+kCdmI+e0J E1KH1HfwTxx/XbThwIeheHkhUpjTEc/U3iuX6qkHf3n8PgC83AE22y4W0k0hrCeTtJIdg0sWb sPTSfBpELDOB3LsRdrBrs5puVNrikJt1iowDNOmPa7qWm2y3K+/hGsBhqA2qim0/Fbfym1khm Mcc4LgXZ7i3NXRiy1Afm5WgfBA+a1pGxa+57YChbksgMr1isZ+2GTNR+07VX+qZg3RD9FOI54 GJArIjfoKAwzZrqedNOSOKQOg2px5oOIanc707iGslhPAMBRJyz6m+cqiaKjv+gtQp1Wuur6W tzBipwi8BnG3WnIC/6hiNnL9ChF9dQOhvZj5zzP8q3m6DT6uHhpHVIGacD/MxDGFKCPUN0+W/ Tge2pXoDapKnjPs2gLLdjRC1z5x3Dh401yqtuI5iUiT8CHw64M0xd7dJwK1/c20ZoxTuzJYru zOzFb2hBiTWdg4uyyYqMHsboMbo= Received-SPF: pass client-ip=212.227.17.20; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Organize the emulated memory layout in a way which leaves as much memory as possible for heap for the application. This patch tries to optize the memory layout by loading pie executables into lower memory and shared libs into higher memory (at TASK_UNMAPPED_BASE). This leaves a bigger memory area usable for heap space which will be located directly after the executable. Up to now, pie executable and shared libs were loaded directly behind each other in the area at TASK_UNMAPPED_BASE, which leaves very little space for heap. I tested this change on arm64, armhf and hppa (all in chroot on x86-64), and with a static armhf binary (which is broken without this patch). This patch temporarily breaks the Thread Sanitizer (TSan) application which expects specific boundary definitions for memory mappings on different platforms [1], see commit aab613fb9597 ("linux-user: Update TASK_UNMAPPED_BASE for aarch64") for aarch64. The follow-up patch fixes it again. [1] https://github.com/llvm/llvm-project/blob/master/compiler-rt/lib/tsan/rtl/tsan_platform.h Signed-off-by: Helge Deller --- linux-user/elfload.c | 55 +++++++++++++------------------------------- linux-user/mmap.c | 8 ++++--- 2 files changed, 21 insertions(+), 42 deletions(-) -- 2.41.0 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 861ec07abc..47a118e430 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3023,6 +3023,7 @@ static void load_elf_image(const char *image_name, int image_fd, abi_ulong load_addr, load_bias, loaddr, hiaddr, error; int i, retval, prot_exec; Error *err = NULL; + bool is_main_executable; /* First of all, some simple consistency checks */ if (!elf_check_ident(ehdr)) { @@ -3106,28 +3107,8 @@ static void load_elf_image(const char *image_name, int image_fd, } } - if (pinterp_name != NULL) { - /* - * This is the main executable. - * - * Reserve extra space for brk. - * We hold on to this space while placing the interpreter - * and the stack, lest they be placed immediately after - * the data segment and block allocation from the brk. - * - * 16MB is chosen as "large enough" without being so large as - * to allow the result to not fit with a 32-bit guest on a - * 32-bit host. However some 64 bit guests (e.g. s390x) - * attempt to place their heap further ahead and currently - * nothing stops them smashing into QEMUs address space. - */ -#if TARGET_LONG_BITS == 64 - info->reserve_brk = 32 * MiB; -#else - info->reserve_brk = 16 * MiB; -#endif - hiaddr += info->reserve_brk; - + is_main_executable = (pinterp_name != NULL); + if (is_main_executable) { if (ehdr->e_type == ET_EXEC) { /* * Make sure that the low address does not conflict with @@ -3136,7 +3117,7 @@ static void load_elf_image(const char *image_name, int image_fd, probe_guest_base(image_name, loaddr, hiaddr); } else { /* - * The binary is dynamic, but we still need to + * The binary is dynamic (pie-executabe), but we still need to * select guest_base. In this case we pass a size. */ probe_guest_base(image_name, 0, hiaddr - loaddr); @@ -3159,7 +3140,7 @@ static void load_elf_image(const char *image_name, int image_fd, */ load_addr = target_mmap(loaddr, (size_t)hiaddr - loaddr + 1, PROT_NONE, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | - (ehdr->e_type == ET_EXEC ? MAP_FIXED : 0), + (is_main_executable ? MAP_FIXED : 0), -1, 0); if (load_addr == -1) { goto exit_mmap; @@ -3194,7 +3175,8 @@ static void load_elf_image(const char *image_name, int image_fd, info->end_code = 0; info->start_data = -1; info->end_data = 0; - info->brk = 0; + /* possible start for brk is behind all sections of this ELF file. */ + info->brk = TARGET_PAGE_ALIGN(hiaddr); info->elf_flags = ehdr->e_flags; prot_exec = PROT_EXEC; @@ -3288,9 +3270,6 @@ static void load_elf_image(const char *image_name, int image_fd, info->end_data = vaddr_ef; } } - if (vaddr_em > info->brk) { - info->brk = vaddr_em; - } #ifdef TARGET_MIPS } else if (eppnt->p_type == PT_MIPS_ABIFLAGS) { Mips_elf_abiflags_v0 abiflags; @@ -3618,6 +3597,15 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) if (elf_interpreter) { load_elf_interp(elf_interpreter, &interp_info, bprm->buf); + /* + * Use brk address of interpreter if it was loaded above the + * executable and leaves less than 16 MB for heap. + * This happens e.g. with static binaries on armhf. + */ + if (interp_info.brk > info->brk && + interp_info.load_bias - info->brk < 16 * MiB) { + info->brk = interp_info.brk; + } /* If the program interpreter is one of these two, then assume an iBCS2 image. Otherwise assume a native linux image. */ @@ -3672,17 +3660,6 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) bprm->core_dump = &elf_core_dump; #endif - /* - * If we reserved extra space for brk, release it now. - * The implementation of do_brk in syscalls.c expects to be able - * to mmap pages in this space. - */ - if (info->reserve_brk) { - abi_ulong start_brk = HOST_PAGE_ALIGN(info->brk); - abi_ulong end_brk = HOST_PAGE_ALIGN(info->brk + info->reserve_brk); - target_munmap(start_brk, end_brk - start_brk); - } - return 0; } diff --git a/linux-user/mmap.c b/linux-user/mmap.c index a5dfb56545..848d2fd4bb 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -299,14 +299,16 @@ static bool mmap_frag(abi_ulong real_start, abi_ulong start, abi_ulong last, #ifdef TARGET_AARCH64 # define TASK_UNMAPPED_BASE 0x5500000000 #else -# define TASK_UNMAPPED_BASE (1ul << 38) +# define TASK_UNMAPPED_BASE 0x4000000000 #endif -#else +#elif HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 32 #ifdef TARGET_HPPA # define TASK_UNMAPPED_BASE 0xfa000000 #else -# define TASK_UNMAPPED_BASE 0x40000000 +# define TASK_UNMAPPED_BASE 0xe0000000 #endif +#else /* HOST_LONG_BITS == 32 && TARGET_ABI_BITS == 32 */ +# define TASK_UNMAPPED_BASE 0x40000000 #endif abi_ulong mmap_next_start = TASK_UNMAPPED_BASE;