From nobody Tue Jan 27 18:31:45 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 4f0vBT6zcsz6QDlW for ; Tue, 27 Jan 2026 18:31:45 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vBT589zz3l1B for ; Tue, 27 Jan 2026 18:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769538705; 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=0dMnD1BKVcOunxek+lEz7QbrbzM+o8w6972G7/caBrU=; b=XEQKX4/RxVp3z5d0XBLIX7jAOM3GWrymVe1FLJ1FFIZVswe2AGnrYHP53sAPBPTW3V7oDb 97WmPV9lsABt+8DUnawU41i9h05Uo8JyirG8fMrR5SvBWX4x71SsezRvLXVs8ES5poZRYs PNl42ZNJgc2kGc2ACRT9sYQfmLtynN9TGfmbgjb0zVNIvx23qbSTeW6WZ4U6y9chufAM/E HDVhl9+/5mDh/FqyQwgPbvWzZS/hnoDSJKz33dgg9KNtVmuU6TKBRGbXIA9aGBCkuBUc3x 660fDPcliOOhq9SFx+yJhqyHYlB9YEX6TXD8CMcxhAaUkbtkTOa6+z1kIqiIfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769538705; 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=0dMnD1BKVcOunxek+lEz7QbrbzM+o8w6972G7/caBrU=; b=jjjWszN3uRzMPc1OFDxfDtRe77yFcALJbXhmOqDaE5AL4U+f5MJorJeUuEj8OSC+KC66rp OeWSC4Ox1ovanD2WjR8lCJVr6OqbdpPp5Ol6HwgzleIm9Gyg3raTn4SiarZJtcOzBEPXWY yS+f5T2K5Sd1vfPPdEqvUp9uiyK+nJsGSEayf9cDNQKelWM9Hr7FaxgfzCMWsOTBjv40Og pBYlnsWpC0z75ODJXE63RY2cfeIHfp20+saYCgB6u39gWE38IUuikiW0Qd3wMISa7Rq5cY 3/gbIuoCUV+JCQ4qSCqG0pwaIhFJZSPpOAZr3yrNW5jQ5qGytuBK31WO7ZCzUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769538705; a=rsa-sha256; cv=none; b=FZZ6uD8Y1mNKxvaqE6r2vfQC3Hvgym/e+GAol0ED7hKFRo8C0ZAD/rRkyBVXgYINriULhm 1H73CLzZaSGgMCa60/wsJl9s4t7FD2ZP9Bh1WCSXTWZM0JkgxjGeEy4yHTOz3hYbruprjY CDAp087eFefuaDAKpU/gonZt22SPvulgF3RSSh10gkcPRfDQpU402jwObfljWHNFOCAPN7 MNY8wrYPNMC5D33y2U9bizcDr+o/XGQVp7xfaxep66INfl2JtFB+qq8b9ip+d8JczdlZPH 0p+y3k1RV4t+OAoGMXmOuEV9cBSIhgwxOL4i1wTQU/AvqlY8cI6JTMgKeF+lOw== 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 4f0vBT4lMDz3Nv for ; Tue, 27 Jan 2026 18:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f894 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:31:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9272b7806266 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9272b780626640ce9b9ac378fbdd2783aaa33625 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:31:45 +0000 Message-Id: <69790491.f894.6eac006@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9272b780626640ce9b9ac378fbdd2783aaa33625 commit 9272b780626640ce9b9ac378fbdd2783aaa33625 Author: John Baldwin AuthorDate: 2026-01-27 18:30:46 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:30:46 +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 --- 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 18c9bddb84c5..318927e01360 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -1083,7 +1083,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 */