From nobody Fri Sep 04 22:54:19 2026 X-Original-To: dev-commits-src-main@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 4hcBbv5cmqz6qQhZ for ; Fri, 04 Sep 2026 22:54:19 +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 4hcBbv37bBz3jVF for ; Fri, 04 Sep 2026 22:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788562459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UerXJadAKixOTRRT9+ycEr4ZcZoBjcANWGXMehXa4IM=; b=HhO8tEhMZ4r67K+BrvVTFS0vUnz4stJCSo8Ph0/mX6QER6UXCqEx0dZmicRqi5C9/rafoA wiihcrBYKAKjgSBb67pQEUlL3/A/okktEfGXvKcNJ9RMZ1/NmAlMXsDaFJtsfcbWqhbTCY Eioe9SScivK6ihAbC5Ql7h84nFiFzz/ExdUYIzHVbC44jwVPZ1mIU9yoqOzwARggd/n/Jn 9wPndhPCZYwvv7q4i5iMIjSK0Aw0iotGkiq1IOSEe2q5abKXv9vSvlu28CTFcFExuQSBtt u++YqPZbiyKmJsWufNg2BG89+5Iyj1KH9+sBbHnn+Hs1pdQBKA+qIC/WpXEs1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788562459; a=rsa-sha256; cv=none; b=ksJHMzriFLivfN0unoW1nZbx5pCMjxoxm7GuvHJ5/vrXDtGgZ/NY4ISMH/Ua0Fy5levdSL tA97usV0UbLMdZ0Ks0q6Q0i0n7QdM5QUaFW5LEmLf0ePTS2ItVtvqrD0Fe8KIOE3bnxbEF 0djpL0KP2Dw3v2cQDZY34Q2YhDyAbkfzWBi10k4iCg7sJ/SvcChE3qPV5EO/NXG52rlxm5 i/UOmVv3KwvhOy/DTYdQ5iVUIEnbEc4CBAp0D+54e3SYvSrc1yIvuUqnA957wvwu7PKoWv sJzHSAv12oEH0OXcjXTqEpUNKT0EInEPEq38rEic+OQ5HpsXSF4m1r5l5lVEJw== 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=1788562459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UerXJadAKixOTRRT9+ycEr4ZcZoBjcANWGXMehXa4IM=; b=vOEt5Da/xOFHf7Hg4n3gHFhBJ1uavVmSU62I7eHNTI+7S138oP+U4SehUqHD+VFhrNdO/9 2iiO2PBhHFPm7tGOLYRHk5lM2oUh+gpnvxBC1N/vbna1wU7LO8NEc0kRbHUDvnzCJNtM4B XMy1+2tuGWQOpiUCnpOlQrcY8wrGmKndujeWIXzJC+bnDUTZu/GQ0pK8auvD25J7oSc032 j/8AULTJaPog+0Nyvrk/Fj5PxSxPzS0KeI8GIh63TEnnl9aFYs0sB8o2jtUoTvjCspMrow wAk7Dr4JdzUooHuOW5SsXc3u+sbASelCx+Mof/UzSpz5L68gRXUi/TAth4rXFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcBbv1xLlz4Y2 for ; Fri, 04 Sep 2026 22:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 431cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 22:54:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Zishun Yi From: Bjoern A. Zeeb Subject: git: 6e1436d74827 - main - LinuxKPI: Fix DMA_BIDIRECTIONAL and other mappings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e1436d748273be52fb155914db3efae075a8619 Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 22:54:19 +0000 Message-Id: <6a9b4c1b.431cd.251c0da2@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6e1436d748273be52fb155914db3efae075a8619 commit 6e1436d748273be52fb155914db3efae075a8619 Author: Zishun Yi AuthorDate: 2026-09-04 19:11:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-04 22:52:24 +0000 LinuxKPI: Fix DMA_BIDIRECTIONAL and other mappings In dma_sync_single_for_cpu(), the DMA_BIDIRECTIONAL direction currently performs BUS_DMASYNC_POSTREAD followed by BUS_DMASYNC_PREREAD. This patch corrects the mapping to use BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE. When ownership of the DMA area is transferred to the CPU, we must assume the previous device access was bidirectional. Both POST operations are necessary to ensure the CPU sees a consistent view of memory after potential device reads and writes. A PREREAD is unnecessary here because the device will no longer access the memory since ownership has been transferred to the CPU. Conversely, for dma_sync_single_for_device(), ownership is being transferred back to the hardware. The buffer must be prepared for potential bidirectional access by the device, requiring BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE. PR: 293381, 297155 Reported by: Zishun Yi Reported by: Kim Shrier (fbsdbugs westryn.net) Fixes: 95edb10b47fc ("LinuxKPI: implement dma_sync_single_for_*, apply to (un)map single/sg") Signed-off-by: Zishun Yi Reviewed by: aokblast, bz Differential Revision: https://reviews.freebsd.org/D55497 --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 10 ++++------ sys/compat/linuxkpi/common/src/linux_pci.c | 15 ++++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index d29006cb52d3..ce0703bd7999 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -262,9 +262,7 @@ dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma, size_t size, switch (direction) { case DMA_BIDIRECTIONAL: - op = BUS_DMASYNC_POSTREAD; - linuxkpi_dma_sync(dev, dma, size, op); - op = BUS_DMASYNC_PREREAD; + op = BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE; break; case DMA_TO_DEVICE: op = BUS_DMASYNC_POSTWRITE; @@ -294,13 +292,13 @@ dma_sync_single_for_device(struct device *dev, dma_addr_t dma, switch (direction) { case DMA_BIDIRECTIONAL: - op = BUS_DMASYNC_PREWRITE; + op = BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD; break; case DMA_TO_DEVICE: - op = BUS_DMASYNC_PREREAD; + op = BUS_DMASYNC_PREWRITE; break; case DMA_FROM_DEVICE: - op = BUS_DMASYNC_PREWRITE; + op = BUS_DMASYNC_PREREAD; break; default: return; diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index a49254425b5d..9e11f53cb299 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1842,8 +1842,8 @@ lkpi_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len, /* dma_sync_single_for_cpu() unrolled to avoid lock recursicn. */ switch (direction) { case DMA_BIDIRECTIONAL: - bus_dmamap_sync(obj->dmat, obj->dmamap, BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(obj->dmat, obj->dmamap, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(obj->dmat, obj->dmamap, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); break; case DMA_TO_DEVICE: bus_dmamap_sync(obj->dmat, obj->dmamap, BUS_DMASYNC_POSTWRITE); @@ -2053,13 +2053,14 @@ linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents, switch (direction) { case DMA_BIDIRECTIONAL: - bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(priv->dmat, sgl->dma_map, + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); break; case DMA_TO_DEVICE: - bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREWRITE); break; case DMA_FROM_DEVICE: - bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREREAD); break; default: break; @@ -2087,8 +2088,8 @@ linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl, switch (direction) { case DMA_BIDIRECTIONAL: - bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(priv->dmat, sgl->dma_map, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); break; case DMA_TO_DEVICE: bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_POSTWRITE);