From patchwork Thu Mar 3 19:15:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 547801 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:3c7:0:0:0:0 with SMTP id b7csp1182250wrg; Thu, 3 Mar 2022 11:26:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxgRs7rx2NBPjhwJZt7E/L/B/tPPMqAiCfrK0wUS8o8HWe/3l5v2xva7MfU/ofoNXuDl/tb X-Received: by 2002:a81:1d51:0:b0:2ca:73e5:9bd6 with SMTP id d78-20020a811d51000000b002ca73e59bd6mr37579575ywd.490.1646335617688; Thu, 03 Mar 2022 11:26:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646335617; cv=none; d=google.com; s=arc-20160816; b=pB3N5ah2e3daBH4FbtVp5RGYz7Ljru1t1P3E0pu42c767RACj+ff8k1qSFS1QBNPtn wZfzAZBj4r6diFL/lxyr9Z+cdyVaVbabbjq/XBxGdlLQrM/gCo9/+2cz3u2PlGz+hzyW N8gFcOZzWmQq5LUfNgJ8QvqbJ4wGZsS9PTGG7WtbyXbPLnXleN1y1SUA87NjhLnBm1Oq sHB1pUHeAgYuhjNXpRai0cFphtwPZ6ObA7PFpQDvxLIDUH28BhUpuVthYGlxkMeF1zwk 5TQONZlJJoAH64Yb1rMMpuwglUVXauxZfpBFdY4QQDiaobkrca21wybd3E1zhWobzzdY y1fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=F2bsGcziKKgWIATQyKoWzWtQMllrUtNMWOT4PiIDWxo=; b=Arun3s1q8lBTXHCFKUOOWmQEfsBnmr4zxyqryEalvPo01s4yzMthAtYtpH2/hokk/f nLcvphASpQGVMflCa1QMYgWn7cvai0u43vz3lg/2I4akjAZFI0EGwTcd8ZUMATgAXYgO lOCxHPAIAcrnH7TMdlVqn73atYt7Ucm8KOwwN4XDGjCFJpmURSDl92rVrD5b6lYp4B1q SwaCyV/hkP5DARoAehGJA6R6Yu6BNTWrbYcztj+IO1XQWbqJaOzrlRn/irYTQ2dslsqA yz4zY+p7AUCXmgX6OASSxyXkdp6Wq1aMBKI+V9FgIUYbsj/xCQP3O5t0CwN+dxEo2aU+ aAXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=La+UZkFG; 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=fail (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 y129-20020a0dd687000000b002d6b99fb19asi2354165ywd.87.2022.03.03.11.26.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Mar 2022 11:26:57 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=La+UZkFG; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPr6H-0005p2-3R for patch@linaro.org; Thu, 03 Mar 2022 14:26:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPqvp-0001wV-Ro for qemu-devel@nongnu.org; Thu, 03 Mar 2022 14:16:09 -0500 Received: from [2607:f8b0:4864:20::62b] (port=46911 helo=mail-pl1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPqvk-0007Sn-3U for qemu-devel@nongnu.org; Thu, 03 Mar 2022 14:16:09 -0500 Received: by mail-pl1-x62b.google.com with SMTP id bd1so5545557plb.13 for ; Thu, 03 Mar 2022 11:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F2bsGcziKKgWIATQyKoWzWtQMllrUtNMWOT4PiIDWxo=; b=La+UZkFGsKvGG3mpg7hSMQ4FthcocZ8kLEh2JGTOpFGcCbVk9Q0pOUFDYGsuMvM52/ t6uDWcCCZ42L9Io//OpzuiA+eE9qRyt13w0mmfaPnrnigk/tEbPqfLGls0rdrOrSNnfi 5XkIj/Fm3/FJfa3Y5T5W2NatvI9tMKAWudI9rX9gNdiE1yq9Re7+ol5fMXxKOGQvRUJ2 TraUNs8AVkqvAC8S2SqkrnI27f5+SIzd/Di2HQdF6sYlUvqWIPGuN4YfVbKril9tkr0z ldgBIjWYw0VqBDRXYkfmG/LJ+6DOg9ORmEYQP1uJOG84KrNaz+GBr/3F8qMJ8c+J1YZs HXww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F2bsGcziKKgWIATQyKoWzWtQMllrUtNMWOT4PiIDWxo=; b=hrkjPM2Lj/wvH3odxrrecv5A0VS6EK44ZPL6lSAqa75d6Prpf/dvqx34jlg3qZ5fk/ +l3UhdA2LUH9h0GZEcs27F+i4vYjJifwcArUW96gOtfR+brIaoBwwJcAi0JOXlDT8BTO MBMq6ZXeysJgO7QXr7NMLh3bSHMX9YO4TOurHyKs+XuS0PstSy77Fr2cfkSc0OslY2xQ yOZeh4J8vMZoj0dO0siERr/4yGzf8DIy5ijoxtXq5UjeRYMQToOiQPGZ1oPs5x1GPpBd 8iYbLl+R6fxGd6LZeY56ZuJtz6xsYynVzYvOyiuUTmdxL5vnzYc53npicLP3kgFLyHj6 vDHg== X-Gm-Message-State: AOAM532JAapDFmI0aGVv9VlpBgT1oLzN+BXvEhSn7zR6W9VW5gKd5tkV xYcCLTE0Vbt7V/NIbeW/95PHNUTmWRn1sw== X-Received: by 2002:a17:90b:1a81:b0:1bc:c3e5:27b2 with SMTP id ng1-20020a17090b1a8100b001bcc3e527b2mr6997483pjb.20.1646334961675; Thu, 03 Mar 2022 11:16:01 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-119c-490c-a4ee-08e8.res6.spectrum.com. [2603:800c:1201:c600:119c:490c:a4ee:8e8]) by smtp.gmail.com with ESMTPSA id u25-20020a62ed19000000b004f140515d56sm3318043pfh.46.2022.03.03.11.16.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 11:16:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 5/9] linux-user: Support TCG_TARGET_SIGNED_ADDR32 Date: Thu, 3 Mar 2022 09:15:47 -1000 Message-Id: <20220303191551.466631-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303191551.466631-1-richard.henderson@linaro.org> References: <20220303191551.466631-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62b (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When using reserved_va, which is the default for a 64-bit host and a 32-bit guest, set guest_base_signed_addr32 if requested by TCG_TARGET_SIGNED_ADDR32, and the executable layout allows. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- include/exec/cpu-all.h | 4 --- linux-user/elfload.c | 62 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 26ecd3c886..8bea0e069e 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -269,11 +269,7 @@ extern const TargetPageBits target_page; #define PAGE_RESET 0x0040 /* For linux-user, indicates that the page is MAP_ANON. */ #define PAGE_ANON 0x0080 - -#if defined(CONFIG_BSD) && defined(CONFIG_USER_ONLY) -/* FIXME: Code that sets/uses this is broken and needs to go away. */ #define PAGE_RESERVED 0x0100 -#endif /* Target-specific bits that will be used via page_get_flags(). */ #define PAGE_TARGET_1 0x0200 #define PAGE_TARGET_2 0x0400 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 9628a38361..5522f9e721 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2482,34 +2482,72 @@ static void pgb_dynamic(const char *image_name, long align) static void pgb_reserved_va(const char *image_name, abi_ulong guest_loaddr, abi_ulong guest_hiaddr, long align) { - int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE; + int flags = (MAP_ANONYMOUS | MAP_PRIVATE | + MAP_NORESERVE | MAP_FIXED_NOREPLACE); + unsigned long local_rva = reserved_va; + bool protect_wrap = false; void *addr, *test; - if (guest_hiaddr > reserved_va) { + if (guest_hiaddr > local_rva) { error_report("%s: requires more than reserved virtual " "address space (0x%" PRIx64 " > 0x%lx)", - image_name, (uint64_t)guest_hiaddr, reserved_va); + image_name, (uint64_t)guest_hiaddr, local_rva); exit(EXIT_FAILURE); } - /* Widen the "image" to the entire reserved address space. */ - pgb_static(image_name, 0, reserved_va, align); + if (TCG_TARGET_SIGNED_ADDR32 && TARGET_LONG_BITS == 32) { + if (guest_loaddr < 0x80000000u && guest_hiaddr > 0x80000000u) { + /* + * The executable itself wraps on signed addresses. + * Without per-page translation, we must keep the + * guest address 0x7fff_ffff adjacent to 0x8000_0000 + * consecutive in host memory: unsigned addresses. + */ + } else { + set_guest_base_signed_addr32(); + if (local_rva <= 0x80000000u) { + /* No guest addresses are "negative": win! */ + } else { + /* Begin by allocating the entire address space. */ + local_rva = 0xfffffffful + 1; + protect_wrap = true; + } + } + } - /* osdep.h defines this as 0 if it's missing */ - flags |= MAP_FIXED_NOREPLACE; + /* Widen the "image" to the entire reserved address space. */ + pgb_static(image_name, 0, local_rva, align); + assert(guest_base != 0); /* Reserve the memory on the host. */ - assert(guest_base != 0); test = g2h_untagged(0); - addr = mmap(test, reserved_va, PROT_NONE, flags, -1, 0); + addr = mmap(test, local_rva, PROT_NONE, flags, -1, 0); if (addr == MAP_FAILED || addr != test) { + /* + * If protect_wrap, we could try again with the original reserved_va + * setting, but the edge case of low ulimit vm setting on a 64-bit + * host is probably useless. + */ error_report("Unable to reserve 0x%lx bytes of virtual address " - "space at %p (%s) for use as guest address space (check your" - "virtual memory ulimit setting, min_mmap_addr or reserve less " - "using -R option)", reserved_va, test, strerror(errno)); + "space at %p (%s) for use as guest address space " + "(check your virtual memory ulimit setting, " + "min_mmap_addr or reserve less using -R option)", + local_rva, test, strerror(errno)); exit(EXIT_FAILURE); } + if (protect_wrap) { + /* + * Prevent the page just before 0x80000000 from being allocated. + * This prevents a single guest object/allocation from crossing + * the signed wrap, and thus being discontiguous in host memory. + */ + page_set_flags(0x7fffffff & TARGET_PAGE_MASK, 0x80000000u, + PAGE_RESERVED); + /* Adjust guest_base so that 0 is in the middle of the reservation. */ + guest_base += 0x80000000ul; + } + qemu_log_mask(CPU_LOG_PAGE, "%s: base @ %p for %lu bytes\n", __func__, addr, reserved_va); }