From nobody Thu Dec 11 09:02:10 2025 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 4dRmn4118pz6Kc5S for ; Thu, 11 Dec 2025 09:02:16 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dRmn370S5z3cSb for ; Thu, 11 Dec 2025 09:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765443736; 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=GVFrvtZaBYQaSJQd0L8EFdXQ+DpuFKeuD0+pMIcADYU=; b=jn9kmc+uUOQ8xMKv1s4uonp/qk3zOkW6qQY6VFivn4gmMNfp4sB0JVcYHNpqGE4hL5D9Rd fgl1zZjc5beY1S28ZFOyfxNvnF113Tg23QbJFutyoXL1LQiM5zAO6LygagMZpJpn6FC6sJ HLNqDzmM8Knp7sdIyEqnnBF/9ips3NbLFH2nykjd2OUkFl3kYOaCWXyOXPC6PUcpHuU+Bm +xJ0sUZ/S4RRyLq1r9JfHYAxlxuAoxx1uNaW8JldMboNLpKy+b72tR/1ERzaQBfZV6URZ/ aa+KwHjkgJAulwJWRU84XfPZyIxGoQ84rY76vknJAOt9HpieOefwM0r2/jEPpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765443736; 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=GVFrvtZaBYQaSJQd0L8EFdXQ+DpuFKeuD0+pMIcADYU=; b=ldBATRxUGosted9U58u8nT5iiHY42xuiOA4YEoOiZLDITeSPEqOrxGv8iWRfCs+y85YyVC hLaNXKPerBPIoeQhu80/dmqUOtcRyD1l1qCOziBpKl791mmrQW49WAfcYGfZXNu2B/IN0U TbhRQfe13/xvURXSiW3ZaygLohfwWGl+uUm4Dix0nViVDrY5IxSZ0H2niJe93J12PWmjyx UTV2v++owDiwtS3scoCPlMWA4g7x99ycCtLIJOipjwSOzYnxtBS0BjV0t2WZPk29LGOo4k fJeHXngWa8IBdupREGhTERw/MrwEH9dD0f2OIRGtAcOZN9lVZO+eTIxQ3UqZBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765443736; a=rsa-sha256; cv=none; b=QU2QlIKxJebC7+ugnRPzHrsZnHy8igX/1evyF7zMtInTB3L0vOqhXANDA/VfRLpRKCSHzH 52ecB1ZbeVcaBhDrf9jQpi28fJKK0bHQ64UndDj2emM236SJm2j1c55yC2Zj6UZZnE10Wd zCGIyA8n76lZ4pLwkgr6jrnRMIZwdN+fd6YUdGACxdJtSIVdg7pqgyYIPStNt7mRqXV8+6 oNUpzOIfuwdOJnJAYk3r6q4mt8rMzz0v1tRxA9XI/e1mwgQuCyImg77qRyjBCoFDNpO5tA TthQel615q5CppIWHdG/d8OV4BleS9sflDtg7f1m5cfbtWIZmeHUoz7YrxFcZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dRmn36T5yz8kx for ; Thu, 11 Dec 2025 09:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31030 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Dec 2025 09:02:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a35545ee0268 - main - vm: Fix kstack alignment assertion 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a35545ee02680cee04c354b50182dd94d4489666 Auto-Submitted: auto-generated Date: Thu, 11 Dec 2025 09:02:10 +0000 Message-Id: <693a8892.31030.200d994c@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a35545ee02680cee04c354b50182dd94d4489666 commit a35545ee02680cee04c354b50182dd94d4489666 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-11 09:01:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-11 09:02:07 +0000 vm: Fix kstack alignment assertion The expectation that the allocation will be aligned to the kstack size only applies when allocating from a kstack arena, not when allocating a non-standard size from the kernel arena. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Fixes: 7a79d0669761 ("vm: improve kstack_object pindex calculation to avoid pindex holes") Reviewed by: bnovkov, siderop1_netapp.com Differential Revision: https://reviews.freebsd.org/D54171 --- sys/vm/vm_glue.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 18d789c59281..925bb92cdd75 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -321,10 +321,12 @@ vm_thread_alloc_kstack_kva(vm_size_t size, int domain) rv = vmem_alloc(arena, size, M_BESTFIT | M_NOWAIT, &addr); if (rv == ENOMEM) return (0); - KASSERT(atop(addr - VM_MIN_KERNEL_ADDRESS) % - (kstack_pages + KSTACK_GUARD_PAGES) == 0, - ("%s: allocated kstack KVA not aligned to multiple of kstack size", - __func__)); + if (size == ptoa(kstack_pages + KSTACK_GUARD_PAGES)) { + /* This expectation only applies to kstack arenas */ + KASSERT((addr - VM_MIN_KERNEL_ADDRESS) % size == 0, + ("%s: allocated kstack KVA not aligned to multiple of kstack size", + __func__)); + } return (addr); #else