From nobody Thu May 7 17:00:57 2026 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 4gBJRY6xJqz6cr9s for ; Thu, 07 May 2026 17:00:57 +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 4gBJRY6JCbz3g7x for ; Thu, 07 May 2026 17:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778173257; 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=KC8+/rvDxT7Vv7/FdRVlbQzG8lrEYqbAJOJuHjtHXyo=; b=q3IG96NEFsZ2RvWXOx1iKnbBd/AeZs/I+AMRF6eMBDrpquGHjR5JI3XC7TYALL8H2/pnwx e3O9RPi6uqMY1vEwvlDNfi89GIp2hk/mNBTbMnwo1FlhFnHXdzmCQYK4tOQyqkCQDsT1oV 2wq6yrU3TJzOeZLpCMTpAsk7RJWeJEVBUySk59t+kHi0ZfRyoMaOo95+w0dQZWyxZAUJdN adMCaqLEv8rdDFUsW7WovDnJPUiWtX0EMu8uTANzuxR+rAcUtUVAqlBYd0xXD20/dhJaYV iUwvBwIhcQQlyX47PuYxMZdlPFyI9Hn+lgHgRct5v1LR8ID3c63eTnxahUWZjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778173257; a=rsa-sha256; cv=none; b=bg32MYsjtmKGrDTk01kuScaxzZ1doCv9lbYG/R2jKOos/vIssblBXjh/PbxHktjQ8mbDeq YvoUhHCR3kvbUioiTLrCSQVIi/Syphj6XW+M9bmcRs47JpGZwUUGSau8dqggmjLVpJKQzM MV/RjS8U9J0b7DA7Q/Sw+KwKecaRcIaIQiDUB3ZQIVCIrBYKIfXSWW4+Ks3M64g6A7v+VE lKSivyPdfGbCbCIEg6j4k0pvbKpNmp3Q7AZ+tRsdGE8NonXfFJ+KnZXJ6fb+JW/sMY1eEM kx47zV1FlgJ1JOlf5R95qRoK/tuPQmKR5dhnnDJd+xEP8cQzJ0SaAPjZuirVdQ== 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=1778173257; 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=KC8+/rvDxT7Vv7/FdRVlbQzG8lrEYqbAJOJuHjtHXyo=; b=K5nDNj/KJdI0bgmiG1IW4helBzATzI0OcVTQoNPmQEyprNcfZ8nNT2603CIxUq2zsW9eis QqQ5pLDBFLW3ITTMgyqKN9hX4IgGI61Ufkbh3HSHA/pcYPvHLOGHqu8oUGlKV6ykj9a4Uv I24kPcogZQyu8uIQ4dxbVINhoOgfRhJxHKPKnw+ZKIGBbKg4nL4B7eB245Ytj6QL63wcnJ yNZfDCMoRPT2rV4RYkgu0mgwAUfq+0iEJzzwrk5l4CE5RlBK6KV+mLyGD8p2oxV7fVROUp N4tc+58Kp39OJ8QIfPJEze3BPQT4HNsQg/YfKx3SARnVvAIIZGYer5rH/EYQDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJRY5bSDzbXR for ; Thu, 07 May 2026 17:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39fd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:00:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 642dd17ee943 - main - vm_map_growstack(): consistently use local vars instead of curthread/proc 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 642dd17ee94377c3d5533d05d0d9a58b88f60387 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:00:57 +0000 Message-Id: <69fcc549.39fd6.602c9f25@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=642dd17ee94377c3d5533d05d0d9a58b88f60387 commit 642dd17ee94377c3d5533d05d0d9a58b88f60387 Author: Konstantin Belousov AuthorDate: 2026-05-07 16:00:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-07 17:00:14 +0000 vm_map_growstack(): consistently use local vars instead of curthread/proc Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56863 --- 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)