From patchwork Fri Aug 4 22:00:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 710252 Delivered-To: patch@linaro.org Received: by 2002:a05:6359:d30:b0:129:c516:61db with SMTP id gp48csp229772rwb; Fri, 4 Aug 2023 15:03:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrLZG8m8zpodWt5XcvprSkvGZhJBVNkVelRArieWRQTZ7RtiDN0a+unPaYWOqUTpb1lf2e X-Received: by 2002:a67:ce05:0:b0:447:48ab:cfeb with SMTP id s5-20020a67ce05000000b0044748abcfebmr2610303vsl.11.1691186588810; Fri, 04 Aug 2023 15:03:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691186588; cv=none; d=google.com; s=arc-20160816; b=oF15vIH+j8Q11PfeGddI/zTIXpmiJVvwPlcp9fWMSF3P4o31j6pKCY/xVNAKzLIOQ2 hBxwlOzCJ36pCqDlaFgx6uj1GInI6VY3T/B/oKAwWQJW5xrSt4m5k078wl7JvLFuf2yu HAoEQgGsAlxCoBDGI0wJP7UkoC3+j0R9mFxbMT6dQ/B42zYeCKfF6xzPXWUhNJvDz8Gf /LvDcOW3Gd++GqOLWb5ZntFaDKVe/lm19B/BaCyW/kpkw+Lo2cF2M/a24/xePxF4g0HX l+A3vUIYR/n3JRnlJGz6B/CDmO0QR5qYomKeoilqt91l3z8PGnpSb0uTR5KHZtxWEUO4 19Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LEtd4K5hRnVc6hrl39zIoY3R0ensohNvKsrzBxsSkfw=; fh=e1NRMjxVMtV0F5wYJj2s+gr60lsrqkDmE/ulJ4pjdtQ=; b=opef5oSzmDgaEjxVJZk8xkJN4MRkJGz73b0U0cvRSUqCkgCw8gd3iwbgN7aXahThdp 7Qq0UiH+BB9j6yepURHHhFkbOX83bYHny2HskIMvknfXGAPW46Ut8pKKoNUA0FVzOAPC 93MFMRlr176FEhUijybkzZMsRiLW4k9HzLQtWZDJb9LchwzxliQrE7ihxV024jPCsIei qwCXEArj1EuIO5Gw1ewD5CtIrIh55XDIof/evcEApW2hVrJ1I96lCvePVuT8jagdt8vS /ZgG6DiNaQXHy5o7Dk/LaMyOnYGHjOZ7sNNIPTPesPNVjN8L5rS7ewHAQrBJnexyvrP5 n5ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V2odV32C; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g19-20020a05620a40d300b00767d4aad122si2013245qko.301.2023.08.04.15.03.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Aug 2023 15:03:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V2odV32C; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qS2rO-00053t-5I; Fri, 04 Aug 2023 18:01:26 -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 1qS2qq-0004jI-FL for qemu-devel@nongnu.org; Fri, 04 Aug 2023 18:00:52 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qS2qo-0001ut-Nv for qemu-devel@nongnu.org; Fri, 04 Aug 2023 18:00:52 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1b8b4748fe4so18865885ad.1 for ; Fri, 04 Aug 2023 15:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691186449; x=1691791249; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LEtd4K5hRnVc6hrl39zIoY3R0ensohNvKsrzBxsSkfw=; b=V2odV32CCUGvjYsqvFcVwvYXnDB71UZs6vy9o1S4G11aaFP4nF5h3rl35xZJ/qnMpU RXrrsFeyewEj2AUT1aE0ew0U4cg0CaZQ87xttli1sX+LK1GMkU2fNm6hJYsG2fezChky /MVDeGqKHMCS8PQ6+Idb4D/ycH4z8wni9Fdx4ap4N4P145EDSMsBPYOX30c4DyOa9RzF uHuByzIE+2eAkKkjc5T+4NAikFxSRpjJHVRET9Z4zkAsfuoWI0ruztg8TUZpiHUk4dwP q411fqjLkViMvcGT65bOb7gmHuNgGgJnZpiHSGmuTOc9kH1JCtF9BUER89wmjkpSMwp1 szww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691186449; x=1691791249; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LEtd4K5hRnVc6hrl39zIoY3R0ensohNvKsrzBxsSkfw=; b=imok3u/lt9G0zzSkWVhspwhJ57pzy2yja2uW8X6NHPkPeeRUc2UlVERUSq8MU14PGk S7yituQhxd+5bBcQkjdnkACeFBZ0A8qVaq8IzQ3ygXB/6lVan61NTmPrvhofonXAjzbm SnODaDrKr8w15zbkh+tUz/qSlkbjBDLVMCTq2WPW+TavP1V8jzljb3phzKz6Tb5zqA+i oLvCLhm/8GwghY86iu+5fB5bM6DVxlz0tZ09jzQpWFyGRnLo8hdMgWSVgnTYhkwEQfZl t4xpCTnMkKE7kpDwVQ8O3tsn73gm6K3EvpSSTxCphtpy4yN28roYUW6RKuqU8ozgbQw4 jp8Q== X-Gm-Message-State: AOJu0YyAOancidT5+4M0dM2wF/7LT4WMRckg2k+PI+vesYHFkLwqsBVD W+Nsbfgmpyu6XcwceJEFSGrhkTVTUg0TN62Fw2E= X-Received: by 2002:a17:902:ecc5:b0:1b0:307c:e6fe with SMTP id a5-20020a170902ecc500b001b0307ce6femr3110738plh.10.1691186449265; Fri, 04 Aug 2023 15:00:49 -0700 (PDT) Received: from stoup.. ([2602:47:d490:6901:1eed:f77f:f320:8b14]) by smtp.gmail.com with ESMTPSA id u1-20020a17090282c100b001bbf7fd354csm2185568plz.213.2023.08.04.15.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Aug 2023 15:00:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller , Akihiko Odaki Subject: [PATCH v9 18/24] linux-user: Adjust initial brk when interpreter is close to executable Date: Fri, 4 Aug 2023 15:00:26 -0700 Message-Id: <20230804220032.295411-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230804220032.295411-1-richard.henderson@linaro.org> References: <20230804220032.295411-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Helge Deller While we attempt to load a ET_DYN executable far away from TASK_UNMAPPED_BASE, we are not completely in control of the address space layout. If the interpreter lands close to the executable, leaving insufficient heap space, move brk. Tested-by: Helge Deller Signed-off-by: Helge Deller [rth: Re-order after ELF_ET_DYN_BASE patch so that we do not "temporarily break" tsan, and also to minimize the changes required. Remove image_info.reserve_brk as unused.] Reviewed-by: Akihiko Odaki Signed-off-by: Richard Henderson --- linux-user/qemu.h | 1 - linux-user/elfload.c | 51 +++++++++++++------------------------------- 2 files changed, 15 insertions(+), 37 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 802794db63..4b0c9da0dc 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -31,7 +31,6 @@ struct image_info { abi_ulong end_data; abi_ulong start_brk; abi_ulong brk; - abi_ulong reserve_brk; abi_ulong start_mmap; abi_ulong start_stack; abi_ulong stack_limit; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index a3aa08a13e..fa0c9ace8e 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3109,27 +3109,6 @@ static void load_elf_image(const char *image_name, int image_fd, load_addr = loaddr; 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; - if (ehdr->e_type == ET_EXEC) { /* * Make sure that the low address does not conflict with @@ -3220,7 +3199,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; + /* Usual start for brk is after all sections of the main executable. */ + info->brk = TARGET_PAGE_ALIGN(hiaddr); info->elf_flags = ehdr->e_flags; prot_exec = PROT_EXEC; @@ -3314,9 +3294,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; @@ -3645,6 +3622,19 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) if (elf_interpreter) { load_elf_interp(elf_interpreter, &interp_info, bprm->buf); + /* + * While unusual because of ELF_ET_DYN_BASE, if we are unlucky + * with the mappings the interpreter can be loaded above but + * near the main executable, which can leave very little room + * for the heap. + * If the current brk has less than 16MB, use the end of the + * interpreter. + */ + 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. */ @@ -3698,17 +3688,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 = TARGET_PAGE_ALIGN(info->brk); - abi_ulong end_brk = TARGET_PAGE_ALIGN(info->brk + info->reserve_brk); - target_munmap(start_brk, end_brk - start_brk); - } - return 0; }