From nobody Thu Sep 10 09:48:42 2026 X-Original-To: dev-commits-src-branches@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 4hgXtf4CrCz6rm66 for ; Thu, 10 Sep 2026 09:48:42 +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 4hgXtf1twPz4ZpJ for ; Thu, 10 Sep 2026 09:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789033722; 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=LEUAiLDfQcCKtGXIXv/nHmr2/PlkHuO4kKJzlecatdk=; b=bANxRBS9PHeF4eIATWTRRNuSB91Jvfyr/+YX1ElE9eQYX0SY/+u0i9AavflY+uHi67c3bv pB7+0XFaZ7OHXd19wXUkD1L7IQzjPGhVW1Y/yCKhquyd8sMZJ6UuzjdN908e7QDXGWpiqT UFvCEOoawhOhJb4pLakcRqzCmM946YWo3zuP286ZqHEWl1l4EALtrmmHTzxC6YEPqUKKRH niU+5gr0+aXK0gQYy9kxV/1iEINAWkNiNRWWIUhDK2MHB6gZEL+2/st+lCVEfnVmZ5LJzK QEjM9AKO1vmGpoJUlJV8RAGTnP1qxbB43AOI5KSsrYlK+Z30oOvdR8/AJGq79Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789033722; b=xhyFhHeBZ9URQSb36k7BMz/tT4ECD1l7EuZn+Y3cLFLmdZkApleEpIdYZ4C91pHgzhw/Dc /K+f9Gge+qJqb3Gx1npGz0wF1hVD/N30Rejd5IelzFrQcinQR6eOYlqeNUgcfC5PWGsJwe ngcLK+TZaGBiY1Ds/l6GlLK90DG3Stm3CHG6yLsAEzdoOYuGNsJnMPAQ1P2X1zKBDN5K/6 kmLUpyOn5YVtu2zNFlGfQhsHLm5IXTOSq+m+/PLHoTb3ePhwKw6QITvMJp31xzubjIolDq VQDyblRtkxNKqMXSnJc6gmhEWU94nOaz3FzNuUd+C8L9M/F9xyMR0suhasos1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789033722; 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=LEUAiLDfQcCKtGXIXv/nHmr2/PlkHuO4kKJzlecatdk=; b=NMvcwPoa+61UMwWdraC3iqzDLX+eF+xPs/KQ6qlYsvjgr3zGJ7gB1AIZQM19DmJOYJUK2u bbamcwnNR7kkfoMsEIjbMP3sCi9QCG31bNwikNh93gjnlZMC9hozrdRRdbbOdd0LlYDdWp HCWUflTT14weZ5msCJCdpIZS3LUaAkbcYIVae8PyMChjQCgH6PYV5hj/GhFnVKcSfRNOrR 43w8dO2RvSfUFsmFbiicgWZ5AWak6gaaW4au79q71pgnA/YLpWFwAKY/E/8phfy5fYx20m GLQUQu2SFRucO3BEmvZNHp3T67K6tTMD90Eli8xyaLvmZRRjKTB7G1Dbk5tYBg== 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 4hgXtf0WzQzM0c for ; Thu, 10 Sep 2026 09:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25b92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 09:48:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Zishun Yi From: Bjoern A. Zeeb Subject: git: 361c6a6b93fd - stable/15 - LinuxKPI: Fix DMA_BIDIRECTIONAL and other mappings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 361c6a6b93fde0c112158b74611c9712ec8683b7 Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 09:48:42 +0000 Message-Id: <6aa27cfa.25b92.4c4cc216@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=361c6a6b93fde0c112158b74611c9712ec8683b7 commit 361c6a6b93fde0c112158b74611c9712ec8683b7 Author: Zishun Yi AuthorDate: 2026-09-04 19:11:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-10 09:46:54 +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 (cherry picked from commit 6e1436d748273be52fb155914db3efae075a8619) --- 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 5e5d40ef8339..d32518a4d6ae 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -245,9 +245,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; @@ -277,13 +275,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 940926c6297c..9d4d7bba8265 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);