From nobody Fri Sep 30 02:04:09 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mdtnk1BYHz4df3V; Fri, 30 Sep 2022 02:04:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mdtnk0jHHz3f1t; Fri, 30 Sep 2022 02:04:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664503450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xt+L5w2YNrflmR/6JGECMaSOiSKiTIFnG14u1pibjDI=; b=RWl/uco3Eu6tD156qZWazPsO3ltuPVpTGuHUuYQzipSZ8XcIR1tcQl8EmHGz/Pzkn0Ngu7 MC2kgSDEC1QUJ7TYUQsNc5964NwkKSoykKNbITvjh6EDm+YwZyFdgtTMuj3Nv+D10FNY3G 0XUMbd2n3p8ZlX8KwwuxQDaorJ/4d1Cnh/raARe1mn9xgs/XlJoadnRlSQkKKM7YhD8UvI OpGkMtkf2Xp5CFjrYNa28k90eq1pNbpCFafCTS2QivyZG9vK+4XnhAhiUeu/XMVu8pdqhE UDFgQNBRX/xnlvrwZXL2HSCMWj3A1izYhqyFwmqnuFEe9a5FFJJ7/wilPuROJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mdtnj6sNhz11RD; Fri, 30 Sep 2022 02:04:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28U249xQ099111; Fri, 30 Sep 2022 02:04:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28U249VA099110; Fri, 30 Sep 2022 02:04:09 GMT (envelope-from git) Date: Fri, 30 Sep 2022 02:04:09 GMT Message-Id: <202209300204.28U249VA099110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 05c462f16a61 - stable/13 - Add AT_USRSTACK{BASE, LIM} AT vectors, and ELF_BSDF_VMNOOVERCOMMIT flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 05c462f16a61ee46730d9d979ea958ff49f67af3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664503450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xt+L5w2YNrflmR/6JGECMaSOiSKiTIFnG14u1pibjDI=; b=RRpP5GPwItkpdTTow2yxQeeiK4GuVrHRFzQ6GyHACqL/TmBzp8oeKFHCn2hq8vSFL10gGG jD/9kPPM9b8GEmzAaIQKyCgKrjOqyW1L5HifAcnmKJbOQyzI7WaC3npJY09lzclnEa/1nU LMut04aFUNHkNUG7SIjnXVzMB174revYz2FxE4R2ZNKNcm1vn98+3anD39OxweeNmp0aeq EfZUXCneUroxVeyHYPhwkpHS71q2N/QLkc7LGiLxP+OAUVlVuuiSl37Fgg9vTvr38nW5KA GhhW3y7Y8HEra6p+wmXZhIQpsE2jr15xJBS4d6JtbHLQm/NG5UczwkL1/64Csw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664503450; a=rsa-sha256; cv=none; b=JzSIKvH6FnwnrH1XcPjJoYx6LWAakWND1V46dE5oh0e/ExxuYn/03lhIeFN/s0jE6PVeAf ch2+03EUXY65Hj9u2rLUsK5sCHh0SHrm3Y7j0prgIpFYzY4UUZt4WHAdnNHOeSsuHnQkZd myy3oQ7MxK9cLH3Wg/3Fgubjsm0lnX+fPKvUqAznM/JoIt7ScrV6XO6nWb1y7f+XIOEPP/ t6+iBKLx+SJfNB/dwqHNjrjXro123CBpFexwHdPtML1x3PHoLeqm4GKwxKLqgrgCYE8sA9 C414i+7CljI0M8a70hdMdMjXJzuiX32Um5yhk68bd96w9rMcPK2JwoMfsb1LOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=05c462f16a61ee46730d9d979ea958ff49f67af3 commit 05c462f16a61ee46730d9d979ea958ff49f67af3 Author: Konstantin Belousov AuthorDate: 2022-09-12 19:32:02 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-30 00:29:09 +0000 Add AT_USRSTACK{BASE, LIM} AT vectors, and ELF_BSDF_VMNOOVERCOMMIT flag (cherry picked from commit ff41239f587f2c2850c10639bd0ab8b5422b33fa) --- sys/kern/imgact_elf.c | 17 ++++++++++++++--- sys/sys/elf_common.h | 5 ++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 34cfef0d7cd9..3308a27953a8 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1439,11 +1439,15 @@ __elfN(freebsd_copyout_auxargs)(struct image_params *imgp, uintptr_t base) { Elf_Auxargs *args = (Elf_Auxargs *)imgp->auxargs; Elf_Auxinfo *argarray, *pos; - int error; + struct vmspace *vmspace; + rlim_t stacksz; + int error, bsdflags, oc; argarray = pos = malloc(AT_COUNT * sizeof(*pos), M_TEMP, M_WAITOK | M_ZERO); + vmspace = imgp->proc->p_vmspace; + if (args->execfd != -1) AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd); AUXARGS_ENTRY(pos, AT_PHDR, args->phdr); @@ -1478,8 +1482,12 @@ __elfN(freebsd_copyout_auxargs)(struct image_params *imgp, uintptr_t base) AUXARGS_ENTRY(pos, AT_HWCAP, *imgp->sysent->sv_hwcap); if (imgp->sysent->sv_hwcap2 != NULL) AUXARGS_ENTRY(pos, AT_HWCAP2, *imgp->sysent->sv_hwcap2); - AUXARGS_ENTRY(pos, AT_BSDFLAGS, __elfN(sigfastblock) ? - ELF_BSDF_SIGFASTBLK : 0); + bsdflags = 0; + bsdflags |= __elfN(sigfastblock) ? ELF_BSDF_SIGFASTBLK : 0; + oc = atomic_load_int(&vm_overcommit); + bsdflags |= (oc & (SWAP_RESERVE_FORCE_ON | SWAP_RESERVE_RLIMIT_ON)) != + 0 ? ELF_BSDF_VMNOOVERCOMMIT : 0; + AUXARGS_ENTRY(pos, AT_BSDFLAGS, bsdflags); AUXARGS_ENTRY(pos, AT_ARGC, imgp->args->argc); AUXARGS_ENTRY_PTR(pos, AT_ARGV, imgp->argv); AUXARGS_ENTRY(pos, AT_ENVC, imgp->args->envc); @@ -1489,6 +1497,9 @@ __elfN(freebsd_copyout_auxargs)(struct image_params *imgp, uintptr_t base) AUXARGS_ENTRY(pos, AT_FXRNG, imgp->sysent->sv_fxrng_gen_base); if (imgp->sysent->sv_vdso_base != 0 && __elfN(vdso) != 0) AUXARGS_ENTRY(pos, AT_KPRELOAD, imgp->sysent->sv_vdso_base); + AUXARGS_ENTRY(pos, AT_USRSTACKBASE, round_page(vmspace->vm_stacktop)); + stacksz = imgp->proc->p_limit->pl_rlimit[RLIMIT_STACK].rlim_cur; + AUXARGS_ENTRY(pos, AT_USRSTACKLIM, stacksz); AUXARGS_ENTRY(pos, AT_NULL, 0); free(imgp->auxargs, M_TEMP); diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 5b7a290fd761..884b8bb18d4f 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -985,8 +985,10 @@ typedef struct { #define AT_PS_STRINGS 32 /* struct ps_strings */ #define AT_FXRNG 33 /* Pointer to root RNG seed version. */ #define AT_KPRELOAD 34 /* Base of vdso, preloaded by rtld */ +#define AT_USRSTACKBASE 35 /* Top of user stack */ +#define AT_USRSTACKLIM 36 /* Grow limit of user stack */ -#define AT_COUNT 35 /* Count of defined aux entry types. */ +#define AT_COUNT 37 /* Count of defined aux entry types. */ /* * Relocation types. @@ -1504,5 +1506,6 @@ typedef struct { #define R_X86_64_REX_GOTPCRELX 42 #define ELF_BSDF_SIGFASTBLK 0x0001 /* Kernel supports fast sigblock */ +#define ELF_BSDF_VMNOOVERCOMMIT 0x0002 #endif /* !_SYS_ELF_COMMON_H_ */