From patchwork Wed Jan 17 20:39:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10171293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46B8A603B5 for ; Wed, 17 Jan 2018 20:45:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3900020243 for ; Wed, 17 Jan 2018 20:45:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D636223B2; Wed, 17 Jan 2018 20:45:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0C8C520243 for ; Wed, 17 Jan 2018 20:45:18 +0000 (UTC) Received: from localhost ([::1]:60983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebuaD-0004tf-TH for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Jan 2018 15:45:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebuZG-00047n-Pn for qemu-devel@nongnu.org; Wed, 17 Jan 2018 15:44:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebuZE-00082K-8t for qemu-devel@nongnu.org; Wed, 17 Jan 2018 15:44:18 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:39413) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebuZE-000824-2T for qemu-devel@nongnu.org; Wed, 17 Jan 2018 15:44:16 -0500 Received: by mail-pf0-x244.google.com with SMTP id e11so12351079pff.6 for ; Wed, 17 Jan 2018 12:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=mj2IANlcr+x0463skV6Fm8L/aOmGymfhaUy6drMRqf4=; b=Vyuwp5hEWDlReh8fSS6IV7Zq4Vh9dkhBWJpY+3Ly9n9ZSq5BrQNZo9S5H7Uudp+cBs ExNmKkE1Lvlpa0V/8ra3xLC00/e/NBMmsKX0/6Iqdyo/0WLDZgr6gnOH9eH7rydp6PKv Ys63oBSA+qeBuTY9rP2+futsZJKIj+B78O4ASarOvOTohTxsMVrapAng1gPwmUIS7wck G104nO0xuOu13GBQ8yqxs/J6+tAt7+wtf85BVSC/avjld4g4QfEyjhmRPRcxpmsUCzTa WkXWLUOWj3gPEFFIhozUdLNBUF23lY/xLi5jr0BlKe+cLlJW2NOqtS/SqAW/SKhTzZe6 vP0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=mj2IANlcr+x0463skV6Fm8L/aOmGymfhaUy6drMRqf4=; b=tCrxmfuSvnGk0bQpARsU6Of5D0wGYehZjp/dT2BcqB1dGMjJfKMrvIF15a+N5QyyLV JWr32A/7dbs19LRBr4D0fyMFqjKLKNLlWMVushFmzwPPuglAycVwA36mvpjSe4Q2BF1P gdwrrwaIpcdRM1O3KO+29OsEmAjHpST8wowYogxOTFmw8Fh1RNzeFMDwptSwyskPUovM 23wNAN//iVLxSwqdajEAR7KJ8kpI4D+gWedzecmphfqWY/3lV5xQQu1Wo81EFIZqSd0Y K6Gqw+TreIfvaGCn/J7ifV8nctGIVtgT6Bqcyh8NvOzDsOKvEtJ0OOvkkopsNXv6DfC4 absw== X-Gm-Message-State: AKGB3mKuExYeqRJcPm2fvJopOLjJ7dGHXztVGq7cTmc8gPkjwIcdQA/U qTRJyDO6r6rlsGBnH7e+AoVoJbN/R2k= X-Google-Smtp-Source: ACJfBosWpRmDJwB8B3UncqZrdE12RxXGZe8snqO16sdDY/u7beSrEgGo0Ik6oMMeAbgS7+COwnVvCw== X-Received: by 10.84.150.129 with SMTP id h1mr42747711plh.369.1516221854726; Wed, 17 Jan 2018 12:44:14 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id t80sm8253935pgb.88.2018.01.17.12.44.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jan 2018 12:44:13 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, rth@twiddle.net, richard.henderson@linaro.org Date: Wed, 17 Jan 2018 12:39:50 -0800 Message-Id: X-Mailer: git-send-email 2.14.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH v1 1/1] linux-user: Fix webkitgtk hangs on 32-bit x86 target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, alistair23@gmail.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since commit "linux-user: Tidy and enforce reserved_va initialization" (18e80c55bb6ec17c05ec0ba717ec83933c2bfc07) the Yocto webkitgtk build hangs when cross compiling for 32-bit x86 on a 64-bit x86 machine using musl. To fix the issue reduce the MAX_RESERVED_VA macro to be a closer match to what it was before the problematic commit. Signed-off-by: Alistair Francis --- linux-user/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c index 450eb3ce65..c7cc0a184e 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -77,7 +77,7 @@ do { \ (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 (0x7ffffffful & TARGET_PAGE_MASK) # else # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif