From nobody Tue Feb 10 21:40:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1600177881; cv=none; d=zohomail.com; s=zohoarc; b=lXtTljrsqDvvsG6JUFc4Y0DFvaJDuuVGKV/xhqeft+oKBYzQcz0iljRMd2sO9vyktPEfxgqTNaCqS7+6P1e/m0abYjTe7I/M7Qc1eyFmSH6iY/qzzmXwnBvWouhByTifHWO6L68RQt09wSSxze/t88bobUZVHumo2yb+sooRDGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600177881; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WnEEcW5T8TnW3Xg2cKGofSTt8rnGAByMYZea8oHCeVE=; b=n+5JdoViodXrx0C+mlIxj6tNSL66lj6MevGB9doFUx39+TGpQXxvW64mBgGeZPWWYPt8xIcZi2DOdZ1NnL/BmooQZZQ2fN97Dw0k/N1pErsBqsCvmTca7UuKdABrYCP46HQvHhUdjoCBh04aiOyA7+Lk2V0xEYGFhmOYISSGhFw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600177881571493.3043973489997; Tue, 15 Sep 2020 06:51:21 -0700 (PDT) Received: from localhost ([::1]:38152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIBMe-0001z3-Ct for importer@patchew.org; Tue, 15 Sep 2020 09:51:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIBEz-0000aD-Cj for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:43:25 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:55638) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIBEw-00047C-I1 for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:43:25 -0400 Received: by mail-wm1-x344.google.com with SMTP id d4so3417737wmd.5 for ; Tue, 15 Sep 2020 06:43:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f1sm26280408wrx.75.2020.09.15.06.43.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 06:43:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 406501FF87; Tue, 15 Sep 2020 14:43:17 +0100 (BST) 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=WnEEcW5T8TnW3Xg2cKGofSTt8rnGAByMYZea8oHCeVE=; b=lcPT8Nt8NDBiWax1mtggMu8WdBMIa5exaHhnN9E1LM4n6RThzzvWH0zY/SpsE8doIK TPk3C5YAvBu39S+nxRzC+hFOY/eGKBgKEgvqzXqOfQNJRaqwmseW1DS+72gPnaZzumG/ Fb1lmHfbYb0kcY1PLES+TWeh8hEXDrBSezYSf8qJ2HkGMUksy++CGX3xRJmVTD0QcGxF LSNMiL460xOCrfYLk45fOrVe2ImcsxypaRxHezFJVT0bmhTiRJ1atHmMf9mbBCwmBnMw D1jnpaIUNgXtpKHXAttJrql1JRqt8ebo2UPZBOOevFdsWsG1zC4qwc6aIsLoXgsLEdl+ yZaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WnEEcW5T8TnW3Xg2cKGofSTt8rnGAByMYZea8oHCeVE=; b=sP9VYIEm2lBw1xr3Q9UqDyrG4EtJN2JhNhDyRLjGejaMuKF6aEMQ5gCQBgfjElAY9/ 0IhcLRn9bJUInSw/yEwkvvazQQTNW0fhOVXxa03kkT1mDJkqFNtIq9xOXckKWA9EaRei Am+JTj+iznwzhRgB5VUQE4KkM7o66AtMFmRIpC8O9n+5qj8EqtPsfiiIDGRM7zAOQToR SqsimkdTBU1muspCqeL8Q1TjPmyhR/t6Sf97v2UEuBSdyoBnahuLu2WlSz3PeBL3mPfL 3huIM9OL83f1KlsEsv5YEmAI8VWBOVcdZqBmcf4MsAmgFZu60U40S61JJVhLhsGtxpup sppg== X-Gm-Message-State: AOAM530NbileDAMFdpWuBKSVZIrdzKKIDEfL1A2Z6dLnDGpNae8SYweL GYdNuAstY1Io2TEKIc+Sgoe3lQ== X-Google-Smtp-Source: ABdhPJxomF8lITxXQi/khxQxpuir52lK02fWHKRgWfYrFLmkYPsx/ouvQqMVLQb8r+nigqeuLffvxw== X-Received: by 2002:a1c:e919:: with SMTP id q25mr4736638wmc.123.1600177399761; Tue, 15 Sep 2020 06:43:19 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/8] linux-user: test, don't assert addr != test in pgb_reserved_va Date: Tue, 15 Sep 2020 14:43:10 +0100 Message-Id: <20200915134317.11110-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200915134317.11110-1-alex.bennee@linaro.org> References: <20200915134317.11110-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier , Bug 1895080 <1895080@bugs.launchpad.net> Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) On older kernels which don't implement MAP_FIXED_NOREPLACE the kernel may still fail to give us the address we asked for despite having already probed the map for a valid hole. Asserting isn't particularly useful to the user so let us move the check up and expand the error_report a little to give them a fighting chance of working around the problem. Ameliorates: ee94743034 Cc: Bug 1895080 <1895080@bugs.launchpad.net> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson --- linux-user/elfload.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 4961e6119e24..f6022fd70493 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2331,14 +2331,13 @@ static void pgb_reserved_va(const char *image_name,= abi_ulong guest_loaddr, assert(guest_base !=3D 0); test =3D g2h(0); addr =3D mmap(test, reserved_va, PROT_NONE, flags, -1, 0); - if (addr =3D=3D MAP_FAILED) { + if (addr =3D=3D MAP_FAILED || addr !=3D test) { error_report("Unable to reserve 0x%lx bytes of virtual address " - "space (%s) for use as guest address space (check you= r " - "virtual memory ulimit setting or reserve less " - "using -R option)", reserved_va, strerror(errno)); + "space at %p (%s) for use as guest address space (che= ck your" + "virtual memory ulimit setting, min_mmap_addr or rese= rve less " + "using -R option)", reserved_va, test, strerror(errno= )); exit(EXIT_FAILURE); } - assert(addr =3D=3D test); } =20 void probe_guest_base(const char *image_name, abi_ulong guest_loaddr, --=20 2.20.1