From patchwork Sat Aug 7 21:42:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12424553 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 4AA57C4338F for ; Sat, 7 Aug 2021 21:53:43 +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 AB9FD60F38 for ; Sat, 7 Aug 2021 21:53:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AB9FD60F38 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]:55088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCUGD-0006XV-JJ for qemu-devel@archiver.kernel.org; Sat, 07 Aug 2021 17:53:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCU6C-0007ce-DO for qemu-devel@nongnu.org; Sat, 07 Aug 2021 17:43:20 -0400 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]:36830) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCU6A-00050C-8E for qemu-devel@nongnu.org; Sat, 07 Aug 2021 17:43:20 -0400 Received: by mail-io1-xd32.google.com with SMTP id f11so19876520ioj.3 for ; Sat, 07 Aug 2021 14:43:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zZ2V1vsBzx1QDxkiUAUegs9PmelXvmX9ctk5L5IAdd8=; b=jP5dvwGi3qdfRNweydk9U1o2FUZy2yHfyB/xTmTkxPQGUM/AU+mQqJpHyH2/7onpQQ Ad6QiCSndpLxTFeb7+bNBCfzN5XKsfm5PgA4ihsn3z8je/QnsuqaEys24JuBjthJlc0l U2x6nEY77vCAoQAIWpRUVRtN7CY7m+9aalDqIN4TSaJRD1XVvO96xL6p3upibHiSyvkp xAiuvJtkKFE8HQvz4a3G2e6xoYvJGwORX4hqEMioVCLx9WdLINGh7108vqBg8opObb8Q LR5K9CY7WKrkpxnKHWNiW5lx5xjNJZtC9iW2AbwOy2a04/S648YgV+ZfpyKjUHey6zZx CIlw== 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=zZ2V1vsBzx1QDxkiUAUegs9PmelXvmX9ctk5L5IAdd8=; b=YXzz3uTorc5y9JzMghH4e4WNfeybBRr6RwldlQYnm9byYZxmKz3SSIjfNBW7VDOBlQ udgiSxajoZAYb7IEPOz9GpQi0q1+hwelK3yktqLgowDUe+j+6661kfwN8Ff7mqBE1oR8 +/LClXRUQJVcvaFHbW/OqFf4moY4YaPhgod0Ivft2fR4O0Nl2/CfShwZOVaIPhAmdCe8 UfYgdjmnvIisKJF94jLpJYbdninM4QXOQe6Ikfmyvi4f7uYpNGxJlGFc6+RlrvEXdrq4 kX4hEH6iOEs6ig9rSuZu74efww1BVKdRJbuspDok3Yk1DtmTzK16eMCzzp3khlLGqs4I UGQQ== X-Gm-Message-State: AOAM533yXXedf7D2XU6DHVlymWnZ1I1HEdq5W45DV5xPrOFKbN928+9z PuZVua689r2IycnkPaVvxn3zWhEc+El7v6CO X-Google-Smtp-Source: ABdhPJxQDs1K/uhxEsKw/8S3JC3L1YdfNJvVuZTFO6DDPcIPdQDCFygeYST31eex06jqizXoJra5Rg== X-Received: by 2002:a92:ae03:: with SMTP id s3mr63395ilh.248.1628372597041; Sat, 07 Aug 2021 14:43:17 -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 a17sm8062827ios.36.2021.08.07.14.43.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Aug 2021 14:43:16 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PATCH for 6.2 25/49] bsd-user: define max args in terms of pages Date: Sat, 7 Aug 2021 15:42:18 -0600 Message-Id: <20210807214242.82385-26-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210807214242.82385-1-imp@bsdimp.com> References: <20210807214242.82385-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::d32; envelope-from=imp@bsdimp.com; helo=mail-io1-xd32.google.com X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) 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: kevans@freebsd.org, Warner Losh , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Warner Losh For 32-bit platforms, pass in up to 256k of args. For 64-bit, bump that to 512k. Signed-off-by: Kyle Evans Signed-off-by: Warner Losh Reviewed-by: Richard Henderson --- bsd-user/qemu.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 02e6e8327a..9322187891 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -107,11 +107,17 @@ extern const char *qemu_uname_release; extern unsigned long mmap_min_addr; /* - * MAX_ARG_PAGES defines the number of pages allocated for arguments - * and envelope for the new program. 32 should suffice, this gives - * a maximum env+arg of 128kB w/4KB pages! + * TARGET_ARG_MAX defines the number of bytes allocated for arguments + * and envelope for the new program. 256k should suffice for a reasonable + * maxiumum env+arg in 32-bit environments, bump it up to 512k for !ILP32 + * platforms. */ -#define MAX_ARG_PAGES 32 +#if TARGET_ABI_BITS > 32 +#define TARGET_ARG_MAX (512 * 1024) +#else +#define TARGET_ARG_MAX (256 * 1024) +#endif +#define MAX_ARG_PAGES (TARGET_ARG_MAX / TARGET_PAGE_SIZE) /* * This structure is used to hold the arguments that are