From patchwork Fri Sep 11 14:56:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 249728 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ecf:0:0:0:0 with SMTP id i15csp1728994ilk; Fri, 11 Sep 2020 07:57:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwls4PT7UWj/SzN7xHyPfPAuJSySY0zWS9X9BtUA0rEZWWUP7cF+A7rlTko1wuEhsANLR6w X-Received: by 2002:a5b:741:: with SMTP id s1mr3132311ybq.477.1599836230917; Fri, 11 Sep 2020 07:57:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599836230; cv=none; d=google.com; s=arc-20160816; b=F5VcWgkOwyedD9aKbEi4tsHi8yiMtsxj+Z8ceCN1AUbUHECrxKMOCGlSB2p8F+AH2i DvmwnHqRwgRlx4YKawJOBj2mX2DKm+2zxEU9V4XLA/MWqCreXYx9WZhah3MsCuzye+eJ dXvqfGk2ykNBWiSNi4NMVJYdj4c+vC3Z82tR1T8KU4Qhhk6y624Y1z4WW2gmv4vtKejo 2uRySeBKDRzyCzw4MSqHaCHPypYem3ezBIUu4rjAJqj75o0P5CtRNa7xfX9DAU1kPPyE a/AdDGdRN+fEAz6J/8jq88v3DPyqopNEVKARtLKdKH64NoTbWbr2UjYTSEelip7lLSAT Uxzw== 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:message-id:date:subject:to:from:dkim-signature; bh=19qgvsEOvtswh8P/1dIqVPRRk97gM4HoI/2ZL6WyXNM=; b=gaY8a8FrwpR6vR4j86SFh/e5X6dK4lOugKdAue1sQw1e5kEG96Xs1FggN6CAdVsg1R ufPfB2alCY4fuPzZ6NjI4KDUGSsKmuf+wZFUY6ZAglzX1eDY7m2YTfGaGLOXw/cEIaa8 ZFs8Y+5oF1v64cGsV2gB0dw+iyE5+T2x+c3SXpWv7IRlshuEnaCxu+nj4uI6QK8/tgrJ DOleY1ICSoDZh0seDOo1FZyj7oPPnwouaRMD3EaKXtIsXHqpzczJashOrOFKUvgMCPf0 buvsQd2MyhdyrLvUz3J7P4TnCX/qPkCH/7+GFOlpTfNdTqffbrpA+bkhIXLs8pQa9ZIa YHUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Kw/nI0EH"; 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 t45si2486183ybi.236.2020.09.11.07.57.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Sep 2020 07:57:10 -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=fail header.i=@linaro.org header.s=google header.b="Kw/nI0EH"; 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]:39308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGkUA-0007Dr-EI for patch@linaro.org; Fri, 11 Sep 2020 10:57:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGkTk-0007Bp-QQ for qemu-devel@nongnu.org; Fri, 11 Sep 2020 10:56:44 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:35958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kGkTi-00008E-Tm for qemu-devel@nongnu.org; Fri, 11 Sep 2020 10:56:44 -0400 Received: by mail-wr1-x444.google.com with SMTP id z1so11794880wrt.3 for ; Fri, 11 Sep 2020 07:56:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=19qgvsEOvtswh8P/1dIqVPRRk97gM4HoI/2ZL6WyXNM=; b=Kw/nI0EHB4IeP+i1ReNpOy+QSuyzY72a5JdRzhNLg5cJW9eBlzvjY6YbzW/oKX6TP0 zrJpIdWoN1M/X4cARWMhUFqKcvSxtfnFqgDLPJNC/8+PSMVcmQBOVUliahoMgv8fLrvp z5Z6Kj9KaY6yZ3joGCsxueMm7+kgTAe7sAUtBDfZUpD/lr1fhtYCvqIzjZfoPp9Zza6H tzpyp4Mkxipx3kJlTJ4Fv8xzlLdKTShLy34OVQWG3moia6wzygXMlhwQJZv4h1NfRP0d 9qkKv+RaRm7FTCeZ2Mmu5cAPZDpf4nRApMpXV1cncRQheGymGhWAmFNQRHVLlMhQMZ36 9/Sw== 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:mime-version :content-transfer-encoding; bh=19qgvsEOvtswh8P/1dIqVPRRk97gM4HoI/2ZL6WyXNM=; b=hiY68fKuNtM+fEYo4wr+K6usaEYfJsy/aUpf2x9GeKdlbCkRr/K8Lkj9896KAo8BVl 5Xt0p4tFWDeFE7d6rX6larlXVh3HNPinTKPAL9ojLZ/DGicaoZfjC5O4ZXlUij8LiVXq 3eU5cB5Cdi7eUf5gl+WaZ6IatzivWbXGw0etDkLTNCGKziXuLLsorhh9fa+mZ6gR0OHI TFEWdJCpACfIxz05wYLs9KzWLEpONnyJirRqCEwIzid+hKpbLux8iRx5G1YbqP725Lwa Wo1rWg5zLJmu4Ko5xIgYqXqZ3eP45SYAHOc+J/n8vcAby0OvV5btvaKeEbEt0P/VEjjy Ll8w== X-Gm-Message-State: AOAM533wu1Cpvd12WGlvC/dGMiLqjM+FX34/f2I9jPwbINcsBRxnPYvg xE4ab0KVsEaZ3PTFHsnY3kMPNg== X-Received: by 2002:adf:f290:: with SMTP id k16mr2653199wro.124.1599836201198; Fri, 11 Sep 2020 07:56:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a15sm5710093wrn.3.2020.09.11.07.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 07:56:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7A5271FF7E; Fri, 11 Sep 2020 15:56:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [RFC PATCH] linux-user: test, don't assert addr != test in pgb_reserved_va Date: Fri, 11 Sep 2020 15:56:30 +0100 Message-Id: <20200911145630.6560-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x444.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_Benn=C3=A9e?= , Laurent Vivier , Bug 1895080 <1895080@bugs.launchpad.net> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée --- linux-user/elfload.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 4961e6119e2..f6022fd7049 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 != 0); test = g2h(0); addr = mmap(test, reserved_va, PROT_NONE, flags, -1, 0); - if (addr == MAP_FAILED) { + if (addr == MAP_FAILED || addr != test) { error_report("Unable to reserve 0x%lx bytes of virtual address " - "space (%s) for use as guest address space (check your " - "virtual memory ulimit setting or reserve less " - "using -R option)", reserved_va, 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)", reserved_va, test, strerror(errno)); exit(EXIT_FAILURE); } - assert(addr == test); } void probe_guest_base(const char *image_name, abi_ulong guest_loaddr,