From nobody Wed Sep 30 08:07:47 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 4hvnhz70q5z6v0ct for ; Wed, 30 Sep 2026 08:07:47 +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 4hvnhz3gxXz4n6C for ; Wed, 30 Sep 2026 08:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790755667; 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=YR6AAy/h3xXGB1CLWKNcR3w48wn2SoXca4pWbH0bMKU=; b=wX+uxkRm6qqJiUuOGfMeZ1MLtX40EqbltFkzolCKPEtntaz94+B2lFLIj5OsluVVlYNLSx H36lcqZCPG9NlONkppINSQTx7RmaS+Z7rRE1xFkdqb4AvUUTXZVPPdr0Qnni42rd9X5vg0 3hvlen+U/M1ncp/lMOhsBENXcVU3nld28iYrh9srX0zzpo0d2MCP9PTTUMwoU6qRGAE7tA cW1WoCujTIKcKj3cbmgFj9anXYO2lATsQStGhG0xhM3HfehPp9O+ZHAhjGGK76P0Vsteql LP1H9RwOKW0R30w1NkiQ43jq6dlqcjcw+88eupIN3RDI5Q4U9LJ+ioUjsn9VhA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790755667; b=EaZKRBPd+EMQ8U5Vpuenn7q48os55bDq472aboLC+uzihSXjLYv02xwIll/1pwJf2pV6aP DkL+KwPLWOz7RmRGVYxn1LxLEph0p4hLU720OCOafBpx1dLIhU7jub0DTrrMp2TsrE0SRc aezroO+q4ssN91Bfzk5COuYsb6EFhD1ISfgzVGjflolxZi/WsLiZviTta329K7uB4Ts10Y UJKC7QOS8WOmV3CfCTDA2fJJNaECbNFobKXLEHuuciGowUl4bZ0Osfptizuq+pSfvAzaWk P/TZ5sKuqF+nh/GiqCGArGYPZoqoPXMrzfdlIZsgRKyb4GBXRbrmlSSI9uB2ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790755667; 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=YR6AAy/h3xXGB1CLWKNcR3w48wn2SoXca4pWbH0bMKU=; b=nywDToOM1l6NA69Dz99nGmmbdTXm84olIMuHbwdzqLPvMhPuJKsBa54J+6W4pa0/CUqiJe fLWSHOZvXT2jSMcRzDtxuecdcjWwx9jluKqSq9HB92mxlw8FVBoeGZ/ZUnBlKpfRR0oCTu i95W0kX2azzAPj7f1MQnxtwx8bLeeCpN4wVu0UULwuGUJvf/j8dWQUXzqZ32c5A3bDNryn NetQ+bDZd7v/UPOHg+Xq51lZ1FNUfaOfjN+cRbaxFOY98fhIj6/6QH8guJz3l4sjeKyGtT HVnU/BfaVS159glToNem7ihDNKXkHITwL/hMYWCB4kLhVD7JQniP5XTIyCVBEg== 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 4hvnhz2hvCzdKL for ; Wed, 30 Sep 2026 08:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 212ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 08:07:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Kubaj Subject: git: 304088ed1222 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 304088ed12223e585409aba30ca62931e32f74ed Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 08:07:47 +0000 Message-Id: <6abcc353.212ae.8e6d93c@gitrepo.freebsd.org> The branch stable/14 has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=304088ed12223e585409aba30ca62931e32f74ed commit 304088ed12223e585409aba30ca62931e32f74ed Author: Piotr Kubaj AuthorDate: 2026-09-21 07:45:27 +0000 Commit: Piotr Kubaj CommitDate: 2026-09-30 08:07:39 +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) (cherry picked from commit 107212618921492ffed84d6ea3c9a27c77aaf725) --- 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 f762e8db0afc..f6011fe09d09 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -5951,10 +5951,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; }