From nobody Thu May 14 00:57:10 2026 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 4gGBkG5pCQz6dKks for ; Thu, 14 May 2026 00:57: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkG3WyXz4B7t for ; Thu, 14 May 2026 00:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720230; 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=fFNIzHVd6Y1/R5j90RjPPEf613eeRzcKhG5vLAGuKNk=; b=lkX6gvVKSpeB5j4pslBhER4NGV7OoWPg5MEceinE4aB6PzpMrbHH9KKcZueuTlByT4Ozjv c8r3qoYeWZVEat0gz5gPauRRAIm7UFMV9xkJBU/Zk3RxuPxIMwezoZBien+5Hvucm1ksSz PLfkQYoVGTg+Jy0BC5cd0i2BNEiNclEePlgema0jINshmYHwkDl70SUUT7C8791wHg2Eod mbaw8KQLiOHY9zfR+R4+CXh2FbNa1Ays5hm+89E+me1+b03xq4U7ox/G7Pg9Skgy/iGts6 wSSsm6Sw62mjyIb/XJFElvJDKLGji7KaXcw1ryDAImH08Lpgpl5lp/uU+zXI2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720230; a=rsa-sha256; cv=none; b=g1E6zQ0QfgVlDc2CHoqtBc2utXEzx2XHDSdbSdcko35nzPOt8+1RhWZboVc1Awc/GIBn6q K1ez8U8+0oMnBEa4hkEc6GAwVSfB/ZQXNl7h4roy8cIXE7WQguoFoqZyq+u3RfBTq6BgAB sJk7+KiyYZ63LHVTazA6iDlBaLEyTu3Y46AjWqgT3NgAM2zNydSXn2ZaijStHsZYKANXVU +j9SrglJD061/f15QJiixUCrBioKve/V4P9ZB/aKy/R1RqhbVj0eWPGZyIW7v1UetB5c8I xG/1b7jk3SHdckUdTMKlJqiIJbaeAt/n5rioago8cSjIqLpBuydOpgpTCA+0gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720230; 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=fFNIzHVd6Y1/R5j90RjPPEf613eeRzcKhG5vLAGuKNk=; b=oazRc3wI7ZL/2236hjXTt6Qa7Lh5Y/1WRNyvwZ6Q25Wu2ShWt9xmKBHLDQKiQM0LtreqAj qp3DdkvUvX513B2yCWdAwWbQzOUHtCoqvilh3iyUbE7A/cO6rhdePTSzTjrV7VCE7Uyx4B Bz4192VYjCHrXKdhvSkiFmaIgySp99CcoTfOdNkhPeOOLoEMtbzzmLCoCEIomQJDeZ8vq8 JtKOW8Uvmi7RngooLMKKLxzGjQrW7MYOS620FYTs3JaWwu1syoh8DiZPiNEaes/JKGHzpM BXY6zwprc0PA/DKcFCTLujyzMsFQ1Qoq/GsKEnUsQFDHRC/+jiFT103StiPAAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkG1fzXzm7 for ; Thu, 14 May 2026 00:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21e4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e0e4d7b1f1c2 - stable/15 - vm_map_growstack(): consistently use local vars instead of curthread/proc 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: e0e4d7b1f1c256fb47a8eb8a7932b9e7769d1bf0 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:10 +0000 Message-Id: <6a051de6.21e4b.6165e525@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e0e4d7b1f1c256fb47a8eb8a7932b9e7769d1bf0 commit e0e4d7b1f1c256fb47a8eb8a7932b9e7769d1bf0 Author: Konstantin Belousov AuthorDate: 2026-05-07 16:00:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 vm_map_growstack(): consistently use local vars instead of curthread/proc (cherry picked from commit 642dd17ee94377c3d5533d05d0d9a58b88f60387) --- sys/vm/vm_map.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 63bdce9d60f8..0a81e62d2d63 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4731,6 +4731,7 @@ static int vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) { vm_map_entry_t stack_entry; + struct thread *td; struct proc *p; struct vmspace *vm; vm_offset_t gap_end, gap_start, grow_start; @@ -4746,7 +4747,8 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) int error __diagused; #endif - p = curproc; + td = curthread; + p = td->td_proc; vm = p->p_vmspace; /* @@ -4760,9 +4762,9 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) MPASS(!vm_map_is_system(map)); - lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK); - stacklim = lim_cur(curthread, RLIMIT_STACK); - vmemlim = lim_cur(curthread, RLIMIT_VMEM); + lmemlim = lim_cur(td, RLIMIT_MEMLOCK); + stacklim = lim_cur(td, RLIMIT_STACK); + vmemlim = lim_cur(td, RLIMIT_VMEM); retry: /* If addr is not in a hole for a stack grow area, no need to grow. */ if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry)) @@ -4778,8 +4780,8 @@ retry: } else { return (KERN_FAILURE); } - guard = ((curproc->p_flag2 & P2_STKGAP_DISABLE) != 0 || - (curproc->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : + guard = ((p->p_flag2 & P2_STKGAP_DISABLE) != 0 || + (p->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : gap_entry->next_read; max_grow = gap_entry->end - gap_entry->start; if (guard > max_grow)