From nobody Fri Apr 24 15:29:15 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 4g2H1m0CGZz6bSQY for ; Fri, 24 Apr 2026 15:29: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2H1l5HJnz3D5J for ; Fri, 24 Apr 2026 15:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044555; 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=avBGjF4WlJncIEo7PqAtzRQxkv1UoSAjKn56KB20aw8=; b=D/LgN8m3F+APXcK5RiePRmOnLgiSg7a1musEhbF3MsT4WGIUXqiP/5Vkj1sVCzQmnEhhPg KS/hRI7V1qjCaRrNaGtSTFVZMQlyO5gjbIj+CWRMZP2/vdo4M48nJUNT9+bvnECGlsG7Vh bGz5AY6+GS631614ZTiUWGJY0cRJ1t+bC3WkzUbJ+o/TQc3zMqn+uC1PaBC9LtXFU2+pLV CuAnYWLMtjYwY3ZrNs1wf81KKXOeM4+ld8kzik3f/oGTdqrPeVv9ABB4h1d8etLILNJnFd hGT/WenF/A0mv2kolt3eIOYVEeSGxveLFaBWwdhkEo5i+i2knPdMllEecgdGjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777044555; a=rsa-sha256; cv=none; b=hquTlFwCqs7kSCWu9ZnKhHwf6JND4sihNO+jDGPZd5AtDVefhV93Dtb65blx9+d0FvmRSj 7gzuHZ/WpYI7ywij0U5AIweizJu5Z1anIiC+L/RCSa0Zd1z16Th6mcf7O6sJXvEwujFBKE +hkpbyzP+MXlvYMvVGMOI8Qp6kMBLbQuznn1FlSmljjpt75JFFngNhnlUGa5CNyzzfHDpR 6AM7n0wEtXkTQEGJRBbdjvvxaPEke8PVBNYbMyIUtDqXzQdco0RmDuj1q86Xy4x4UxBvU7 wkhfOhUGg0IJ795V9rLaDwB3N7T3HWU1wb/6gLWfOHI8voXx0PCzofOFF9u9AA== 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=1777044555; 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=avBGjF4WlJncIEo7PqAtzRQxkv1UoSAjKn56KB20aw8=; b=rR/+NLmMeOTkxz7cN3fJPOwn1FGVLa/65V0NGd+K62Eondgd+ftEIg8v+aKCwmQ/0TmWNH U7LzrSHV8KIBSYUQNAcisjyMHp9AVq8ZboJt8wK/m3wBaZ08qSg/yQeA7FHODKtlGQMunh 5VdDZxkxd8l2yV/zDvjMRQ9YtU4PNuOj3nWzbZnJzXQx0NtEudQAZ3cCvbrSzYFzaCU1Nz MciqjrysjdSvvPE5mWDDnHKY74vTz5lEli8FNija/UTqbrQPi07bcYlqLs5aiudrtMVRII ipSfWtyrp1HhdGuGGzEbLfLVBoCMoJ3V8ya8+9BP71a6TApUTmSxQpHfpq0ojg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2H1l4SgCz17nY for ; Fri, 24 Apr 2026 15:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:29:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c9501b977642 - stable/15 - powerpc: Fix alignment of initial PCB on kstack 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: c9501b97764246c59dcc5d3fb4cbaa54aea7e41e Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:29:15 +0000 Message-Id: <69eb8c4b.35e01.f51230e@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c9501b97764246c59dcc5d3fb4cbaa54aea7e41e commit c9501b97764246c59dcc5d3fb4cbaa54aea7e41e Author: John Baldwin AuthorDate: 2026-01-27 18:30:46 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:26:39 +0000 powerpc: Fix alignment of initial PCB on kstack Commit cc81c44dd806737f98b4fd4094674dd71c8749f3 aimed to consolidate duplicated code between the Book-E and AIM backends. For cpu_thread_alloc cpu_thread_alloc and cpu_fork it used the AIM functions which used a bogus alignment mask (~0x2f). The Book-E functions used a proper alignment mask (~0x3f). The AIM functions appear to have been busted since they were first imported in commit 919cb3362fded33aca682a6ac57777f8fff86e36. To fix, use the Book-E mask which requests 64 byte alignment. Probably this was harmless in practice since td_kstack is page aligned and struct pcb is probably a multiple of 32 bytes in size, so the 0x10 bit should have been clear anyway. Reviewed by: fuz, jhibbits Fixes: cc81c44dd806 ("Unify ABI-related bits of the Book-E and AIM...") Effort: CHERI upstreaming Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54839 (cherry picked from commit 9272b780626640ce9b9ac378fbdd2783aaa33625) --- sys/powerpc/powerpc/exec_machdep.c | 2 +- sys/powerpc/powerpc/vm_machdep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index 8a33d0f589a7..fde24370842e 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -1095,7 +1095,7 @@ cpu_thread_alloc(struct thread *td) struct pcb *pcb; pcb = (struct pcb *)((td->td_kstack + td->td_kstack_pages * PAGE_SIZE - - sizeof(struct pcb)) & ~0x2fUL); + sizeof(struct pcb)) & ~0x3fUL); td->td_pcb = pcb; td->td_frame = (struct trapframe *)pcb - 1; } diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index d47beedb595e..1fd853783cc8 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -124,7 +124,7 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) cpu_update_pcb(td1); pcb = (struct pcb *)((td2->td_kstack + - td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x2fUL); + td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x3fUL); td2->td_pcb = pcb; /* Copy the pcb */