From patchwork Fri Sep 17 02:56:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12500839 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8351FC4332F for ; Fri, 17 Sep 2021 03:03:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4872B60F23 for ; Fri, 17 Sep 2021 03:03:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4872B60F23 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:60670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mR49z-0001lY-FJ for qemu-devel@archiver.kernel.org; Thu, 16 Sep 2021 23:03:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mR43W-0006fK-IY for qemu-devel@nongnu.org; Thu, 16 Sep 2021 22:56:50 -0400 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]:44939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mR43V-0005v7-1S for qemu-devel@nongnu.org; Thu, 16 Sep 2021 22:56:50 -0400 Received: by mail-il1-x12e.google.com with SMTP id x2so8734683ila.11 for ; Thu, 16 Sep 2021 19:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZO8JmiDexvxr2bkytagXw9QqKDBdH9/0PrYHGp52LZE=; b=RCCfAVHLJsJpXqgNwHIREwEQYb+npyd1Vn7JlBXpLe0o2VyffXVQ2CfH/jveEQfyzL foi0ApUr3ZDHwXlnJ6HemOueY/kIkzeido8KQluXdnFUEWmnAGEqiwM4Pgu8/if1scDw In0L7klP7Lqe9oAORfilQPd+iFvXxWavj6HUztmQh1ABJWKwBiAdwRolYjkjqeqDFYFI 0VII9l7EaJj4R2ucID4CzlNvwkYAoooGk4xdxcFLsJXEJAx7Fg7aILirdlkoQyOldJMq uENaYPqNKzKh9+yp2Gidz6SGFYa5LDNpnRZPOyLjTnHVhmz+sKWlcF9CK8kKZj4VnWsD 95Yw== 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=ZO8JmiDexvxr2bkytagXw9QqKDBdH9/0PrYHGp52LZE=; b=bu4apsnS48qw1yndWStSR7jEx70s0qGq2dHX/EuefgFbL7wEE9Qr6ttY4B3AVwWKq+ wnPY2HTY3CIQMm3MIpMk9QTMZ6GgYFRDt1Iu/O1wC2IZkAdFugDhcOt09JxkF0sjEPVp 1vMUrc5yvjpiOrC8+O1wAkIExK5EsZrIULiblQoEjehuTXqbuwV962zUfqWbaW5hI7tW EWJCWVRYHvczIobaPaq+23VYwMy634gZIZexDljkybWWCBmL4oU6v4ZsbKd/hi/5v8L5 pJY7jyuscnNjw6AxHz9eekeoiWov+Rye5uGqmtO9EqhAtK8yW/XCFBOGn4BoQi68Op5t scfA== X-Gm-Message-State: AOAM5313j8kbj7ts8lHMyT8woT4RKwphgK1FZVMqxdG59vCf1vT9IgGH x8s3WgYs+pThQ/ordq4o+XItJ/Dk3iRYq92uyhY= X-Google-Smtp-Source: ABdhPJyDiJx1JyIarVAH75qhEMyznNCpMD+jWkPsIPEwiSb9riNW+XACN72yDLTXA9NrikBbXx5Jow== X-Received: by 2002:a92:da85:: with SMTP id u5mr6471621iln.213.1631847406784; Thu, 16 Sep 2021 19:56:46 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id e10sm2603738ili.53.2021.09.16.19.56.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 19:56:46 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PATCH 8/9] bsd-user: Implement MAP_EXCL, required by jemalloc in head Date: Thu, 16 Sep 2021 20:56:34 -0600 Message-Id: <20210917025635.32011-9-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210917025635.32011-1-imp@bsdimp.com> References: <20210917025635.32011-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::12e; envelope-from=imp@bsdimp.com; helo=mail-il1-x12e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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: Kyle Evans , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Kyle Evans jemalloc requires a working MAP_EXCL. Emulate it by ensuring we don't double map anything. Signed-off-by: Kyle Evans Signed-off-by: Warner Losh --- bsd-user/mmap.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 347d314aa9..792ff00548 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -387,7 +387,7 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size) abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, int flags, int fd, off_t offset) { - abi_ulong ret, end, real_start, real_end, retaddr, host_offset, host_len; + abi_ulong addr, ret, end, real_start, real_end, retaddr, host_offset, host_len; mmap_lock(); #ifdef DEBUG_MMAP @@ -599,6 +599,14 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, goto the_end; } + /* Reject the mapping if any page within the range is mapped */ + if (flags & MAP_EXCL) { + for (addr = start; addr < end; addr++) { + if (page_get_flags(addr) != 0) + goto fail; + } + } + /* handle the start of the mapping */ if (start > real_start) { if (real_end == real_start + qemu_host_page_size) {