From nobody Fri Apr 24 15:29:16 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 4g2H1n2LXPz6bSXP for ; Fri, 24 Apr 2026 15:29:17 +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 4g2H1m5n41z3DTX for ; Fri, 24 Apr 2026 15:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044556; 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=b3m4A6n/8auVl3TT3OJ503BVq1RVlK/hd5VZ86+0ySY=; b=HT9Zw1YH6TfFf3OOA+Ec3I0i20/QaeZv8j2CiJawfm5+5+eBolkdyWS3tm4Nnv+IeBlkmw SxFpkrJHKnGam+OjaODyvyGpGAxX/2iD2rEegdHon42CIKNhwWSGfYtWjRTbOAeQoKVQ05 psXTdB95Q8iTKbnrQ8jEv/O+CU3bNJN9k5/3SDlV87RYgW9SAYoWDQFIHt1Im+Izh/lJZa JG4XA2vA1jblpBS7V/LHvZbUWqkOlD4bYES57LbXSRHuJdz4zE0g3QkLd4NgpRY1si/hv2 QrRc9R3o82bsfl6TEox6RMLBqf6TcvnFF9uMqROMJooYCIsH11txK/eYCHmjiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777044556; a=rsa-sha256; cv=none; b=SGG5eVHO5kFlAvQmxU4W7Ijq7rLolcX66drPaxEC/mp2w2zFwivpfeJYiRUe7/wHn1HbSM NTQqDDS15bCyNGPHyZD0OS2HhXCC318nc50rmMoNKkYGyxiGKQESB7IIMCir+HaVDTVrrH tW8IbhH6O5B7mFK1/8Uo9jUBVRjE8adWqgXaqCdzya+wW2qNI9YvPJmEm0CbAw5yF03wWW /srZwBfQxA6OSCSIpUSWLYrKXuF0OH4sguNk/8dDC1UaFRxpPA4Ytc6Ma0cjPJwhl8sEkv aQz17SKQOYd3EXn41llIA+4dRyNDraZrNkBtrmmrTNUb09NHCaQqDugvNg+7fg== 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=1777044556; 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=b3m4A6n/8auVl3TT3OJ503BVq1RVlK/hd5VZ86+0ySY=; b=cTv45NN/I3hf+OukdRUG+bnnO3VZwMTcU/4vgeZ9t/zKmQZuUtgn+kgKfVuSpJrnocOhql MXV3PTpRbSvMyg8fKl8TvB7jc/mWc5PmBVdf6J+K4DArAgqOiGe+bbsFA0TmyrzhhjM88a Vp3GfCyTR0Awz/4b99EL8I2GvU4WFuiE57m0OT40ZLVBQa0RzbV/aD0masqb+ck4is0xm5 f27VLrv91DSMipBSsmRPvLyriHRMS5r3eWMETAiFED7uJ2Gcu6w0NGrzAHsoJiEPeXeu/+ HocC5mW2W4ehziGC0HXI1oNdkzEOnmnuAgJ4KxG4qOjY75rBCh/RdCwVm8UEsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2H1m5Ldqz173M for ; Fri, 24 Apr 2026 15:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 363b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:29:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f5b85cc09186 - stable/15 - sys: Use __is_aligned and __align_down for some kstack alignment operations 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f5b85cc091868d48bbea60c82d511e5f2309666c Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:29:16 +0000 Message-Id: <69eb8c4c.363b2.5badf330@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f5b85cc091868d48bbea60c82d511e5f2309666c commit f5b85cc091868d48bbea60c82d511e5f2309666c Author: John Baldwin AuthorDate: 2026-01-27 18:31:23 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:26:39 +0000 sys: Use __is_aligned and __align_down for some kstack alignment operations Reviewed by: kib, jhibbits Effort: CHERI upstreaming Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54840 (cherry picked from commit 093fffa296d009de8cebf713a58ddbf876f05c5c) --- sys/amd64/amd64/vm_machdep.c | 3 +-- sys/i386/i386/vm_machdep.c | 3 ++- sys/powerpc/powerpc/exec_machdep.c | 4 ++-- sys/powerpc/powerpc/machdep.c | 5 ++--- sys/powerpc/powerpc/vm_machdep.c | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index c763ff58680e..2e180003e93d 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -93,8 +93,7 @@ set_top_of_stack_td(struct thread *td) struct savefpu * get_pcb_user_save_td(struct thread *td) { - KASSERT(((vm_offset_t)td->td_md.md_usr_fpu_save % - XSAVE_AREA_ALIGN) == 0, + KASSERT(__is_aligned(td->td_md.md_usr_fpu_save, XSAVE_AREA_ALIGN), ("Unaligned pcb_user_save area ptr %p td %p", td->td_md.md_usr_fpu_save, td)); return (td->td_md.md_usr_fpu_save); diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 80b45070d896..698d3b26813c 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -91,7 +91,8 @@ get_pcb_user_save_td(struct thread *td) p = td->td_kstack + td->td_kstack_pages * PAGE_SIZE - roundup2(cpu_max_ext_state_size, XSAVE_AREA_ALIGN); - KASSERT((p % XSAVE_AREA_ALIGN) == 0, ("Unaligned pcb_user_save area")); + KASSERT(__is_aligned(p, XSAVE_AREA_ALIGN), + ("Unaligned pcb_user_save area")); return ((union savefpu *)p); } diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index fde24370842e..4df70feb31bc 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -1094,8 +1094,8 @@ cpu_thread_alloc(struct thread *td) { struct pcb *pcb; - pcb = (struct pcb *)((td->td_kstack + td->td_kstack_pages * PAGE_SIZE - - sizeof(struct pcb)) & ~0x3fUL); + pcb = (struct pcb *)__align_down(td->td_kstack + td->td_kstack_pages * + PAGE_SIZE - sizeof(struct pcb), 0x40); td->td_pcb = pcb; td->td_frame = (struct trapframe *)pcb - 1; } diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c index 1bbe165e5fe5..04b3967ee110 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -490,9 +490,8 @@ powerpc_init(vm_offset_t fdt, vm_offset_t toc, vm_offset_t ofentry, void *mdp, /* * Finish setting up thread0. */ - thread0.td_pcb = (struct pcb *) - ((thread0.td_kstack + thread0.td_kstack_pages * PAGE_SIZE - - sizeof(struct pcb)) & ~15UL); + thread0.td_pcb = (struct pcb *)__align_down(thread0.td_kstack + + thread0.td_kstack_pages * PAGE_SIZE - sizeof(struct pcb), 16); bzero((void *)thread0.td_pcb, sizeof(struct pcb)); pc->pc_curpcb = thread0.td_pcb; diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index 1fd853783cc8..00fdc301a7e7 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -123,8 +123,8 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) if (td1 == curthread) cpu_update_pcb(td1); - pcb = (struct pcb *)((td2->td_kstack + - td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x3fUL); + pcb = (struct pcb *)__align_down(td2->td_kstack + + td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb), 0x40); td2->td_pcb = pcb; /* Copy the pcb */