From nobody Wed May 27 14:59:28 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 4gQXp91QTJz6f8rd for ; Wed, 27 May 2026 14:59:29 +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 4gQXp85Jjcz3HXp for ; Wed, 27 May 2026 14:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779893968; 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=TpkKZgG85rbESN8DodtmD38JchDtUhqqdxV+eOgE/w4=; b=PJqcfaqb8vGi1a496WuTqIBIa2YNnbQiBSU5hL91+dlv9JN3kV+ywUkUblFMmnFONN+XRm 8HoUClJ6VUp3AlpSI1JfBD6pWo/+VMNVkPprS/4ZZX2OmEVEgk3n9HVgEtK94TMkzCO1RP QQwYI9RzOhGPRMMow33ri09HEKIPmbhW3jhi6GzdvOfXmHLel309NuuoR/MJC8MzyvA7uI Xk8B010OKaAI56vE/TFmsWX3KOaWLj997mtrGLAyXnTEnOcqY/ShMo6KJboaNZbf+dpt4u jLB5kHayXq7miKdCl49QyQ04Yc9Ma+jd5kC3b3gF/H/mIbAX9CRvcCW8GZ+GLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779893968; a=rsa-sha256; cv=none; b=cfMJW2+5no2023cDf7WNof65tDENGdsNpoZqmm8h9umtEWP9Kd187TrBHD4iecwn6aMrqQ HNpcAeabhBRxoIXVlEJ1LW4Pu2MgRVxuCZBuEg39nZPr/K126iPpT3OHmFM2JO4ZbzRlTG AFgLo1PiVZtta+T6ve/BlcJ/0YU7V8kB91Qudub+KNozvltfy6p+S3wgC7Y3zDj/g4ZvdU L2jQ5GHwPv2o5GWyWOU8bx4o/khyy/ydStzcYbdTVsGuA9yDKogokc6iaOhQlLIKbgMEjA ypH2XPlGz5WD8KhIoW3X2C8aPdOymKDkXksGuF1Pi/p506zcmWnAoZFD34Taqw== 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=1779893968; 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=TpkKZgG85rbESN8DodtmD38JchDtUhqqdxV+eOgE/w4=; b=g6SIyfhHnQBymfJWc/Q54dX3yagwJcHUUmAQ8V/B1II4wh7aH4UJ9m+ZKzLugMhBqVhVmT NlnII3D/e+mQWAy1RarI/FIz0jTscIsMlS/VXwo6pSP5f7WEnfiWqLLIet2V/xAzQGfGZg XFwEbsigttZx2Gv18F0H8+rdMNrwN7jKZaVYH+TJcgJy6bR4ACq56aQ8+bT7u1iDWUwXEV VT02PL1zjsp0ynd1QwKvJB6wFOtFB2TwHeh8fwmtov32xgRGJHHC2Y1D6xjTFILMKmin6r gs0XCBOIsqQa5TiH4BgNMvtcrCi+kL5nQnTp5+mjerFmgksjXtBgzrMQKvTV8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQXp84R63z13gh for ; Wed, 27 May 2026 14:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 14:59:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: dcae0f7d7aa6 - main - sys: Consistently use ptoa() with td_kstack_pages 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcae0f7d7aa67ed6ec6b8da5e1b444a828898595 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 14:59:28 +0000 Message-Id: <6a1706d0.23e92.788bff0a@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dcae0f7d7aa67ed6ec6b8da5e1b444a828898595 commit dcae0f7d7aa67ed6ec6b8da5e1b444a828898595 Author: John Baldwin AuthorDate: 2026-04-27 19:05:54 +0000 Commit: John Baldwin CommitDate: 2026-05-27 13:45:26 +0000 sys: Consistently use ptoa() with td_kstack_pages Suggested by: kib Reviewed by: kib, andrew (arm changes) Sponsored by: AFRL, DARPA Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/23 --- sys/amd64/amd64/machdep.c | 2 +- sys/amd64/include/stack.h | 2 +- sys/arm/include/stack.h | 2 +- sys/arm64/include/stack.h | 2 +- sys/powerpc/include/stack.h | 2 +- sys/riscv/include/stack.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 510c6d375a2d..dbad85096a1d 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1367,7 +1367,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) thread0.td_kstack = (char *)physfree - kernphys + KERNSTART; thread0.td_kstack_pages = kstack_pages; - kstack0_sz = thread0.td_kstack_pages * PAGE_SIZE; + kstack0_sz = ptoa(kstack_pages); bzero(thread0.td_kstack, kstack0_sz); cpu_thread_new_kstack(&thread0); physfree += kstack0_sz; diff --git a/sys/amd64/include/stack.h b/sys/amd64/include/stack.h index 765a8e78daed..7d821348be0e 100644 --- a/sys/amd64/include/stack.h +++ b/sys/amd64/include/stack.h @@ -12,7 +12,7 @@ /* Get the current kernel thread stack usage. */ #define GET_STACK_USAGE(total, used) do { \ struct thread *td = curthread; \ - (total) = td->td_kstack_pages * PAGE_SIZE; \ + (total) = ptoa(td->td_kstack_pages); \ (used) = td_kstack_top(td) - (char *)&td; \ } while (0) diff --git a/sys/arm/include/stack.h b/sys/arm/include/stack.h index 6af9418aba42..f6bc67dbe771 100644 --- a/sys/arm/include/stack.h +++ b/sys/arm/include/stack.h @@ -68,7 +68,7 @@ void unwind_module_unloaded(struct linker_file *); /* Get the current kernel thread stack usage. */ #define GET_STACK_USAGE(total, used) do { \ struct thread *td = curthread; \ - (total) = td->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb); \ + (total) = ptoa(td->td_kstack_pages) - sizeof(struct pcb); \ (used) = td->td_kstack + (total) - (char *)&td; \ } while (0) diff --git a/sys/arm64/include/stack.h b/sys/arm64/include/stack.h index b89019fbbec6..0aa483e15e64 100644 --- a/sys/arm64/include/stack.h +++ b/sys/arm64/include/stack.h @@ -43,7 +43,7 @@ bool unwind_frame(struct thread *, struct unwind_state *); #define GET_STACK_USAGE(total, used) do { \ struct thread *td = curthread; \ - (total) = td->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb); \ + (total) = ptoa(td->td_kstack_pages) - sizeof(struct pcb); \ (used) = td->td_kstack + (total) - (char *)&td; \ } while (0) diff --git a/sys/powerpc/include/stack.h b/sys/powerpc/include/stack.h index 0fb9a929128b..533ff0fa2056 100644 --- a/sys/powerpc/include/stack.h +++ b/sys/powerpc/include/stack.h @@ -38,7 +38,7 @@ extern int end[]; /* Get the current kernel thread stack usage. */ #define GET_STACK_USAGE(total, used) do { \ struct thread *td = curthread; \ - (total) = td->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb); \ + (total) = ptoa(td->td_kstack_pages) - sizeof(struct pcb); \ (used) = td->td_kstack + (total) - (char *)&td; \ } while (0) diff --git a/sys/riscv/include/stack.h b/sys/riscv/include/stack.h index 7de9f05b567b..5669dcda6c67 100644 --- a/sys/riscv/include/stack.h +++ b/sys/riscv/include/stack.h @@ -53,7 +53,7 @@ bool unwind_frame(struct thread *, struct unwind_state *); /* Get the current kernel thread stack usage. */ #define GET_STACK_USAGE(total, used) do { \ struct thread *td = curthread; \ - (total) = td->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb); \ + (total) = ptoa(td->td_kstack_pages) - sizeof(struct pcb); \ (used) = td->td_kstack + (total) - (char *)&td; \ } while (0)