From nobody Wed Sep 30 08:06:17 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 4hvngG4l5Mz6v0Qv for ; Wed, 30 Sep 2026 08:06:18 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvngG077Zz4mHq for ; Wed, 30 Sep 2026 08:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790755578; 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=MzqykXGIfWHiVUL35ucO0+zirpoLPgfDVk7nKJ7P3F8=; b=Eh4BRaDAngZGdvluIUlVT9l2b+t69f4NbRjrfBY/JhaLhz/PtezhP9bVlt1Z9UT9eyyZf2 l4wia+MvL+KYUbbDVfF5rUFDSXiGU1+TWE/OMKDzLeEKaxVSVNBdquaQ8lpLrMjzg9q5Ku Z+hiM9GKLHsFISwju4kYGO+tGpvPPuwy8Mj8+gqnd/XR08HDMWSJyEs1tzpES69bGW0Tr2 t4X9Jl9zrZzavfcPjg+dUTFdl6qN3hzo4ar2EE0Xay0ett0MNv1Ds2ne+pRrwTZ2sURUOp rne2ju7PE6dnQmS7Up09qeCnZ0wjzHl2E9cgdAsmkpnK1HYuhIYaIe2oCK/nHQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790755578; b=BPj8eeAtM7Q/Fo6L1cEEE8zml74zGCpcvXjys7fBalLpWdV9WaWPCd8a8r1/wDXoIaKtLt wwJ2pFRWmNntXlrKrioQqWOp7QTxWzI1I+a010wWqKpE8gyNDgCOdG2wCCRW5xor0qR5M+ P4840pDYrxaY02+zbcVRqUgKx23Q7w3bTzjcsIQotIgwRTHPXKsLMiVDoa+6DK0F2kDZ3X JHeoRcC9ILLfe62ug7jVjVwFc8wfpKA/KjJJkDiy2T7Dse87mGVQ+gt2KbMt0Ml2xQXMGm HXGl5Ma5898hXjb+7Y4BboSBqBPlIwhqQtHlSSR3PdGW5S6bpo6cNEhi/KXL2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790755578; 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=MzqykXGIfWHiVUL35ucO0+zirpoLPgfDVk7nKJ7P3F8=; b=OoLQjZtKjYutpzW9WPohUeXuJf+mcXPqjyOHchPoZGrL3DmUYaONtemODCbyEhhTfVzezw A6cB2DKJnTgY6HxYCFe6PBaY+VFPR4LEnfKUaAtqpJMXh4kz3c+GbuzJSQiFSKSQg3GxQg v6KibygOGjK0Y/l2Y/BPZG9yO0xMvO6sSXUjmzOhhGWHrN+LpZr7wA/AQaKL4pXiLUBQqU RLTRqwt5A+y4rLzSw0O2ZlXyvPcjsaxVjAVMVo6q+xHhAGiCcKsj9Nq8/WnQjfCgj9VXUQ 2YtYJyej0Oo+2Ur4v0s0aGSpTIB1BUyW0k/vjUmv9S7DocwZt3gTOG+nuX7ugw== 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 4hvngF62f5zdMB for ; Wed, 30 Sep 2026 08:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fcf3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 08:06:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Kubaj Subject: git: 107212618921 - stable/15 - powerpc/radix: fix double page offset in mmu_radix_sync_icache() 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 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: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 107212618921492ffed84d6ea3c9a27c77aaf725 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 08:06:17 +0000 Message-Id: <6abcc2f9.1fcf3.529831d4@gitrepo.freebsd.org> The branch stable/15 has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=107212618921492ffed84d6ea3c9a27c77aaf725 commit 107212618921492ffed84d6ea3c9a27c77aaf725 Author: Piotr Kubaj AuthorDate: 2026-09-21 07:45:27 +0000 Commit: Piotr Kubaj CommitDate: 2026-09-30 08:05:40 +0000 powerpc/radix: fix double page offset in mmu_radix_sync_icache() mmu_radix_sync_icache() adds the offset of va within its page to the physical address it gets from mmu_radix_extract_locked(). That address already includes the offset - the extract routines return the physical address of the byte, not of the frame - so the offset is counted twice and __syncicache() is handed frame + 2 * offset. The hash MMU counterpart, moea64_sync_icache(), has to add the offset because PVO_PADDR() yields only the frame. Here the addition is wrong. Fixes: 6f0b2a235a13 ("powerpc/pmap: Add pmap_sync_icache() for radix pmap") Reviewed by: jhibbits MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D59870 (cherry picked from commit 9d0859637f99160e17b656df153effae3df31f8b) --- sys/powerpc/aim/mmu_radix.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index dce3103e087d..f146b1671956 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -6000,10 +6000,8 @@ mmu_radix_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz) pa = mmu_radix_extract_locked(pm, va); sync_sz = PAGE_SIZE - (va & PAGE_MASK); sync_sz = min(sync_sz, sz); - if (pa != 0) { - pa += (va & PAGE_MASK); - __syncicache((void *)PHYS_TO_DMAP(pa), sync_sz); - } + if (pa != 0) + __syncicache(PHYS_TO_DMAP(pa), sync_sz); va += sync_sz; sz -= sync_sz; }