From nobody Fri Dec 19 18:05:56 2025 X-Original-To: dev-commits-src-branches@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 4dXwSj0vjmz6M8wF for ; Fri, 19 Dec 2025 18:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXwSj00fQz447v for ; Fri, 19 Dec 2025 18:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167557; 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=b+YKbAkcnCp1JJ3VAxmp25PWiqXlLXh4JnsH9yAQulM=; b=BkfBCirPPDAenjhF0lKHRyYe33LPfFojBS4piFKctweZAebSH4Mf+y1byHOcEWqswa4vEU IdDqJT0thLXzj2dY/lhtOqi2hoLwUkt+Hlq6os5D0qaQZhOEwYPeMD7upIknhme4YXQwnS br9dWnnmJLp+Qwqkm9gywKPcRROP70RM7cnADWsz3Mehr5+7idnFVANIWj3kGgwl/dO4XD EBpdeuymEav9g9rvDpQApw4f47pqrsRoo/dFKJhGPRP0BRt7+ep85vKXpEiZFXrHdRQK5u G9s/+gjQ1lZUc5PVf7O7EqoXQkV7FGFATPssxEUY+y8Oazhx5I2SwNH1M+YY8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167557; 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=b+YKbAkcnCp1JJ3VAxmp25PWiqXlLXh4JnsH9yAQulM=; b=W7Yj9DUP714sOBaKxUhSEDxwXmMuaX1h4AIMNFlH3i8shaQI1MyBFnxABayHikFXJCGRUl lEG1Pwvi6FaBOGaqOOxMF501LY62P6CfkFoxNGxmCF3GTz90UdE04TfnKN673zaC9QLfvT V564MMlg2aZzGS5D3cL7K2atSAIdvmboE+0+susFitH6mk4LCePmHDa8qWf7ieVaZ3l9mk S+FXYZike83XWx5zgFv8YZW2Xo8DDrYISgYVPQ+Uz8+AKAUYeKA4MkQSquV+4Xk+JQdX3U I3s4MDTrexUba2wYEbFF8gkXFmCsHjk4XVfZ5b4PtRM0FlP0x8Zxow/8H7LEkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766167557; a=rsa-sha256; cv=none; b=ATlgB6mg1NSrknSStkP2i82e+j6An/l3jLbgSZeLVYicXNe+uVzawc8V5RnXe9MCJNv18T TswaYv0GOg20boEissLosP6grMpwGIBKybLbu2L5CInVBnGY8kgF9eNjZVSRJ8it/DgDD5 /jKHQCSx+I88QapsHiDAaA0o656gBzkze24HRbw51klo8m4ZHGRjLeur6gM/mw2X6qjZ1d bKlzmWRyuUPZvmixBG09+OmSl775Hh9+f5wnC2sB8kco407hzm+IliHZu3Na6OOQ7VOnWa NLWpU3vS1SzuOLWp/k1jOuUYx9u7gDrIytSnVOHMcWiIQb3hbu2DHCKedDHTZQ== 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 4dXwSh69G7z4Cx for ; Fri, 19 Dec 2025 18:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 18:05:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3ed0824b743a - stable/15 - vm: Fix kstack alignment assertion List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 3ed0824b743af50a60402070c94f23591c75162f Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 18:05:56 +0000 Message-Id: <69459404.235bc.7cee7ea5@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3ed0824b743af50a60402070c94f23591c75162f commit 3ed0824b743af50a60402070c94f23591c75162f Author: Dag-Erling Smørgrav AuthorDate: 2025-12-11 09:01:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-19 18:05:43 +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 (cherry picked from commit a35545ee02680cee04c354b50182dd94d4489666) --- 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