From nobody Sat May 18 12:47:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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 ARC-Seal: i=1; a=rsa-sha256; t=1690563811; cv=none; d=zohomail.com; s=zohoarc; b=ewyqD/CmjS4WkGCsV+VEr+RzQGadimzrOngz2nMea4JhZn5r8ke8Ro9A14/4f0TSj5fWbPnTBl4Z9qe5bxw0q8GJPkx1Er9v5sKerAgfgdHd97iR6HCPsI8J6mEDKyk8jW57NmxR3ec1cEVpnXMVjbjd4wD5gowPRkvXzUriXiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690563811; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=sHvFvgWaKoBsMB0EX+juv/wbA79eq/aNJemQawAvSgc=; b=H1iNux7lSx3GTSCVeNL9EqWnWbmhONNaGNPZ8E/Mbdlgz7T5VgLkx7H6f3t9qfr83w2ngIhvClBU+b5z1NQKnqo5ybKxK1UMSM5pkMVzanxoTHKAiOvIfVnozP3RBl4lBcYpGB8CQW8peT3p98GhmoxpQjCtWdBB5hLxI7UqEVI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1690563811516737.5792812756938; Fri, 28 Jul 2023 10:03:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPQLX-0007UM-VT; Fri, 28 Jul 2023 12:29:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPQLV-0007SD-F9 for qemu-devel@nongnu.org; Fri, 28 Jul 2023 12:29:41 -0400 Received: from mail-io1-xd31.google.com ([2607:f8b0:4864:20::d31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPQLT-0007gD-S6 for qemu-devel@nongnu.org; Fri, 28 Jul 2023 12:29:41 -0400 Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-785cbc5bfd2so92115239f.2 for ; Fri, 28 Jul 2023 09:29:39 -0700 (PDT) Received: from dune.bsdimp.com.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id h16-20020a0566380f9000b0041a9022c3dasm1152875jal.118.2023.07.28.09.29.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 09:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1690561778; x=1691166578; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sHvFvgWaKoBsMB0EX+juv/wbA79eq/aNJemQawAvSgc=; b=WX49/z4oeK173vRH3rebN0Lm7rO8FgfJKYGHFsfg7n7o9SoOE2Dr1r4/GdiQgWkUTu pnrl4xp7fU95pG/DDleTP8B/RFGXm70O/SLLfGGN0q+vm4VAPEY0AdX1903+1ba4gfqZ KZGxia8NJAY3uzUVCixs9MYp9ALrbPbosQA6ujwrYhJOEttXJL2WqN3qJ5rl1tL3pExY p7ZU/B6tKiK+MWpn/GRofADOR8VWVywRWceAWkvwjMqKs6+gh4KK/dRPto0/8pEyz8rm oIDDbBW2CwAt6FY6eQvyGKAFQqpGDJRb8dqH1BGGFu54GNH/+wsFd1Ne3r/Fm5tVhA8n ojBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690561778; x=1691166578; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sHvFvgWaKoBsMB0EX+juv/wbA79eq/aNJemQawAvSgc=; b=FKyf1MERsnHzOJpdKD6+u3XxqickGB7/D4K8+iKdXlbqtZJKhoYNowjzWZwM+SNk2b XzwCqzsLM9gCSPHCVDe37Pr6nnB9P8hSIJvoJk0fTvAtPplAfrC7sxKpWj/al1MRsjxP x5KNWZbsrjrbXBm1lekYMp1L1Uw+4ChmcgZE/PlY1OyjV2dMQr5P8oeE3hbC1y4eFo/C QC5taMsa7iDHYIWZsmHNFHUfxRgtJsU9tVuzZPC77eNVvHmrxDXA1NdMevo6Bl96Ji5S H3ScRHChA9U1PWESyUm9XSKYqMhv91M3Zy5RTuL8g39karzz7Jj/odetyOmU3p4BvP0x yFNA== X-Gm-Message-State: ABy/qLY3++hPOpVq8Ni8EF6cAkdMOg1SXiiyvfEq+c/CeQoLmT1SFoAd gRHnkrsygsl0PYttGU/fJ2Owpl6eLisuyKadmwl2Iw== X-Google-Smtp-Source: APBJJlHEhRJUWWGte6TAd79VU5gc9+XLPhi3b0EtuVVF21R6UL0LuiPGBqLLotAD/xI9F8V+0JalkA== X-Received: by 2002:a6b:db01:0:b0:780:c787:637d with SMTP id t1-20020a6bdb01000000b00780c787637dmr34884ioc.17.1690561777860; Fri, 28 Jul 2023 09:29:37 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, kevans@freebsd.org, Warner Losh Subject: [PATCH v2] bsd-user: Specify host page alignment if none specified Date: Fri, 28 Jul 2023 10:29:27 -0600 Message-Id: <20230728162927.5009-1-imp@bsdimp.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 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: none client-ip=2607:f8b0:4864:20::d31; envelope-from=imp@bsdimp.com; helo=mail-io1-xd31.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @bsdimp-com.20221208.gappssmtp.com) X-ZM-MESSAGEID: 1690563811892100001 Content-Type: text/plain; charset="utf-8" We're hitting an assert when we pass in alignment =3D=3D 0 since that's not a power of two. so pass in the ideal page size. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson --- bsd-user/mmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 74ed00b9fe3..b62a69bd075 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -260,7 +260,8 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start,= abi_ulong size, =20 if (reserved_va) { return mmap_find_vma_reserved(start, size, - (alignment !=3D 0 ? 1 << alignment : 0)); + (alignment !=3D 0 ? 1 << alignment : + MAX(qemu_host_page_size, TARGET_PAGE_SIZE))); } =20 addr =3D start; --=20 2.40.0