From nobody Mon Feb 14 18:58:14 2022 X-Original-To: dev-commits-src-main@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 26FB219C18B0; Mon, 14 Feb 2022 18:58:15 +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 4JyD530WvZz4Spw; Mon, 14 Feb 2022 18:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644865095; 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=PRJAP6RM9B1j0xAl2LoSF2tQZjtLgtaA+OaugkA3F8o=; b=EQ2mGXvU1ibQzXD+qR4mizMeiTVY5JuN1EbZt3/udgtcmdUXja9AgHDRJFKYgdlJQq3wPz UwuUq1+YSm42ypkmD8trVonczwsx1TThL1BjrDfSRbm91z+339H53XkaxIbi4g24MJUGDy T9baIdaallOAqHzXN18zfWCU88vv15HVbP8reY52dDbYcNAGWA6qeu3K0NRgko76knxQn2 hs/7mIYXpyFCfEp8Lznv7o5/PxL0r4wL+weK0NFsFDbKRUkUuZ5c44ANQKxFKZZatOCINJ OD2bhIEM4z/X+veISaJhSZJyI2yiLFg6FJ9V9c2rNRZuXJ7RBMGdUvstU2NzPw== 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 E59C714304; Mon, 14 Feb 2022 18:58:14 +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 21EIwE7T067919; Mon, 14 Feb 2022 18:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EIwEQ9067918; Mon, 14 Feb 2022 18:58:14 GMT (envelope-from git) Date: Mon, 14 Feb 2022 18:58:14 GMT Message-Id: <202202141858.21EIwEQ9067918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: becaf6433be4 - main - Use vmspace->vm_stacktop in place of sv_usrstack in more places. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: becaf6433be4a7c86e8053d42f399176c24d76b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644865095; 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=PRJAP6RM9B1j0xAl2LoSF2tQZjtLgtaA+OaugkA3F8o=; b=ChXLKyK8In80EbkhtjI/bB+IaZmc8CZ6gKbcnwnSCwvQCnQ0B7vFHOkVnN9drDzZIXSzN0 W3Jo37WkoVGpvEdjqE6pwlcQCr+J274RxoNjd7d5llqMlRcX2z1bFnk21h3uuWL7rGTKkD X6oocaNdnPkFQEL5inqONmUgKyIWHnnTPRU9H0Ko4TF6V0Rh6zGysVQC7s7/BnhGw3O+Dd ugCs88j8p9AGD5bDnUneRv0uJJQqA+eyJ9yqKW/drtZl+glzig3L3y36FQvAEQVq0AofR9 HTDd6gy3j27OxzjdWSIZlZx6bLzTfU33fgfUjrg2h7fOPyTQICxtRboKKIXy6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644865095; a=rsa-sha256; cv=none; b=QHLYJLr2C5ZS0aDAh1Xe9PDmZQS8Ck6TZquLDJBaYBrHdaqWbJ2MwX8bZGx7eT7vTktXZ9 Pz4QYGiwtZyEb2vM2vigicAgtE8a2Bvg8DZlUp19UZxWFDp3zE4MEyk/ETd6K3prDVjMru HliVh00c8qZwgwDKPX5ei13BBGOhCaZS9FY3U5sRqcQ9A6tODiHGF3vRbZCUJE+qZSrNfP HlQz12e8H4wp4p5UbmreWJ04w9lUSCqVObYLb02EYdN8acu5q/7KMo7kySax7UaV0moYsZ BQB9jD/52Gocilm/SiKXBV2J9DbDgcyQWwhMnJLICjJMG1xFll2YRnErfjdUlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=becaf6433be4a7c86e8053d42f399176c24d76b6 commit becaf6433be4a7c86e8053d42f399176c24d76b6 Author: John Baldwin AuthorDate: 2022-02-14 18:57:30 +0000 Commit: John Baldwin CommitDate: 2022-02-14 18:57:30 +0000 Use vmspace->vm_stacktop in place of sv_usrstack in more places. Reviewed by: markj Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D34174 --- sys/compat/linux/linux_mmap.c | 2 +- sys/kern/kern_resource.c | 4 ++-- sys/vm/vm_map.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c index af2ccc74ba12..4e53f3255b07 100644 --- a/sys/compat/linux/linux_mmap.c +++ b/sys/compat/linux/linux_mmap.c @@ -176,7 +176,7 @@ linux_mmap_common(struct thread *td, uintptr_t addr, size_t len, int prot, * mmap's return value. */ PROC_LOCK(p); - vms->vm_maxsaddr = (char *)p->p_sysent->sv_usrstack - + vms->vm_maxsaddr = (char *)round_page(vms->vm_stacktop) - lim_cur_proc(p, RLIMIT_STACK); PROC_UNLOCK(p); } diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 0c1fd4303d3d..6ffd1bb379b2 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -770,12 +770,12 @@ kern_proc_setrlimit(struct thread *td, struct proc *p, u_int which, if (limp->rlim_cur > oldssiz.rlim_cur) { prot = p->p_sysent->sv_stackprot; size = limp->rlim_cur - oldssiz.rlim_cur; - addr = p->p_sysent->sv_usrstack - + addr = round_page(p->p_vmspace->vm_stacktop) - limp->rlim_cur; } else { prot = VM_PROT_NONE; size = oldssiz.rlim_cur - limp->rlim_cur; - addr = p->p_sysent->sv_usrstack - + addr = round_page(p->p_vmspace->vm_stacktop) - oldssiz.rlim_cur; } addr = trunc_page(addr); diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 8d654f5ac612..2efefd16defb 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4664,7 +4664,7 @@ retry: * limit. */ is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr && - addr < (vm_offset_t)p->p_sysent->sv_usrstack; + addr < (vm_offset_t)vm->vm_stacktop; if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) return (KERN_NO_SPACE);