diff mbox series

[for,6.2,25/49] bsd-user: define max args in terms of pages

Message ID	20210807214242.82385-26-imp@bsdimp.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: Warner Losh <imp@bsdimp.com> 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> In-Reply-To: <20210807214242.82385-1-imp@bsdimp.com> References: <20210807214242.82385-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Precedence: list Cc: kevans@freebsd.org, Warner Losh <imp@FreeBSD.org>, Warner Losh <imp@bsdimp.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	bsd-user updates to run hello world \| expand [for,6.2,00/49] bsd-user updates to run hello world [for,6.2,01/49] bsd-user: remove sparc and sparc64 [for,6.2,02/49] bsd-user: add copyright header to elfload.c [for,6.2,03/49] bsd-user: Add Stacey's copyright to main.c [for,6.2,04/49] bsd-user: Remove all non-x86 code from elfload.c [for,6.2,05/49] bsd-user: move arch specific defines out of elfload.c [for,6.2,06/49] bsd-user: merge comments and guards from bsd-user fork [for,6.2,07/49] bsd-user: style nits: apply qemu style to these files [for,6.2,08/49] bsd-user: style nits: fix whitespace issues to be qemu standard [for,6.2,09/49] bsd-user: add license [for,6.2,10/49] bsd-user: pass the bsd_param into loader_exec [for,6.2,11/49] bsd-user: Fix calculation of size to allocate [for,6.2,12/49] bsd-user: implement path searching [for,6.2,13/49] bsd-user: Eliminate elf personality [for,6.2,14/49] bsd-user: remove a.out support [for,6.2,15/49] bsd-user: TARGET_NGROUPS unused in this file, remove [for,6.2,16/49] bsd-user: elfload: simplify bswap a bit. [for,6.2,17/49] bsd-user: assume pthreads and support of __thread [for,6.2,18/49] bsd-user: add host-os.h [for,6.2,19/49] bsd-user: Include host-os.h from main [for,6.2,20/49] bsd-user: save the path the qemu emulator [for,6.2,21/49] bsd-user: start to move target CPU functions to target_arch* [for,6.2,22/49] bsd-user: Move per-cpu code into target_arch_cpu.h [for,6.2,23/49] bsd-user: pull in target_arch_thread.h update target_arch_elf.h [for,6.2,24/49] bsd-user: Include more things in qemu.h [for,6.2,25/49] bsd-user: define max args in terms of pages [for,6.2,26/49] bsd-user: Create target specific vmparam.h [for,6.2,27/49] bsd-user: Add architecture specific signal tramp code [for,6.2,28/49] bsd-user: Move stack initializtion into a per-os file. [for,6.2,29/49] bsd-user: Add system independent stack, data and text limiting [for,6.2,30/49] bsd-user: elf cleanup [for,6.2,31/49] bsd-user: Remove dead #ifdefs from elfload.c [for,6.2,32/49] bsd-user: *BSD specific siginfo defintions [for,6.2,33/49] bsd-user: Rewrite target system call definintion glue [for,6.2,34/49] bsd-user: Fix initializtion of task state [for,6.2,35/49] bsd-user: remove error_init [for,6.2,36/49] bsd-user: Make cpu_model and cpu_type visible to all of main.c [for,6.2,37/49] bsd-user: update debugging in mmap.c [for,6.2,38/49] bsd-user: Update mapping to handle reserved and starting conditions [for,6.2,39/49] bsd-user: Need to reset CPU after creation. [for,6.2,40/49] bsd-user: Add target_arch_reg to describe a target's register set [for,6.2,41/49] bsd-user: Add target_os_user.h to capture the user/kernel structures [for,6.2,42/49] bsd-user: add stubbed out core dump support [for,6.2,43/49] bsd-user: elfload.c style catch up patch [for,6.2,44/49] bsd-user: Refactor load_elf_sections and is_target_elf_binary [for,6.2,45/49] bsd-user: Make guest_base an unsigned long [for,6.2,46/49] bsd-user: move qemu_log to later in the file [for,6.2,47/49] bsd-user: Implement interlock for atomic operations [for,6.2,48/49] bsd-user: Implement cpu_copy() helper routine [for,6.2,49/49] bsd-user: Add '-0 argv0' option to bsd-user/main.c

Commit Message

Warner Losh Aug. 7, 2021, 9:42 p.m. UTC

From: Warner Losh <imp@FreeBSD.org>

For 32-bit platforms, pass in up to 256k of args. For 64-bit, bump that
to 512k.

Signed-off-by: Kyle Evans <kevans@freebsd.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
 bsd-user/qemu.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Comments

Richard Henderson Aug. 9, 2021, 8:33 p.m. UTC | #1

On 8/7/21 11:42 AM, Warner Losh wrote:
> From: Warner Losh <imp@FreeBSD.org>
> 
> For 32-bit platforms, pass in up to 256k of args. For 64-bit, bump that
> to 512k.
> 
> Signed-off-by: Kyle Evans <kevans@freebsd.org>
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> ---
>   bsd-user/qemu.h | 14 ++++++++++----
>   1 file changed, 10 insertions(+), 4 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

> +#define TARGET_ARG_MAX (512 * 1024)
> +#else
> +#define TARGET_ARG_MAX (256 * 1024)

For the to-do list: qemu/units.h has KiB for clarity.


r~

Warner Losh Aug. 10, 2021, 2:38 a.m. UTC | #2

On Mon, Aug 9, 2021 at 2:33 PM Richard Henderson <
richard.henderson@linaro.org> wrote:

> On 8/7/21 11:42 AM, Warner Losh wrote:
> > From: Warner Losh <imp@FreeBSD.org>
> >
> > For 32-bit platforms, pass in up to 256k of args. For 64-bit, bump that
> > to 512k.
> >
> > Signed-off-by: Kyle Evans <kevans@freebsd.org>
> > Signed-off-by: Warner Losh <imp@bsdimp.com>
> > ---
> >   bsd-user/qemu.h | 14 ++++++++++----
> >   1 file changed, 10 insertions(+), 4 deletions(-)
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>
> > +#define TARGET_ARG_MAX (512 * 1024)
> > +#else
> > +#define TARGET_ARG_MAX (256 * 1024)
>
> For the to-do list: qemu/units.h has KiB for clarity.
>

OK. Will change. Thanks!

Warner

diff mbox series

Patch

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