From nobody Fri Feb 27 02:29:46 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 4fMXNC3QgLz6T7d4 for ; Fri, 27 Feb 2026 02:29: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMXNB4914z41JF for ; Fri, 27 Feb 2026 02:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159386; 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=1BumuuwSTixL0nt+qJtEiTvYNRtyaMg6invukKt6Eso=; b=RJZ1EWP9se30K9wOGavllh/YRw5jzVF2ZY0YzgNcxwp5Pwt9SO6N+92dx08tu+1l3XBeav RDu2d7zzhxnukL4pkqhs/K+2Jo0zsSNJ1YpdM2Xz0b0m05JanQvFyKy+Oj7yuRk5UUPkQc jV3jiRbbz3iVZsyTwZ/5inkbdrQdn5T5AdSZaxlBvkYw2Wa+yMi1rbRPMW5eaFCIXrRh/d aJ+tARuvG54MSPqABlvk/73fqW5tDkV/9RXOjpwGK/BbuH3nLsBtIOTxriUeM4W2iMTx38 /FY5uTgcMW0Jk71nZTzNAkflQIfsx3/atYZUAc/5Bmf1+SRpSySawiNNBDc0gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159386; a=rsa-sha256; cv=none; b=Osy3zRvonKjgebVPBUPy1Hm/zMUKJYP/JpxCUPw8K5H70fndUCmb+8dnb0zvcoPyTvNDdd a0f0nIJDZWw9f2IokxaFJVpyMU183vLs37IQ+Xle0OICTL7l3fY+0bp+eeeWmETkSHOAdS 9xoDh0HQGlwjk2Pp7xyixikLo3m9SS3iwRe+8IJfoPBiw8zf9LheZoBUAWhTAAUrov4Yw3 79JITF5u56pMY63byhPcL6Un9RTXr44Q1CMhTBAAgEyHY9by8HqH8zgmxL8sHwsfUqoAa/ ifALmHUdzsmT8saCimcBSlWPa5X8cOC9J1nRHDOAsQXg/MbYa4WzadG09SvxFQ== 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=1772159386; 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=1BumuuwSTixL0nt+qJtEiTvYNRtyaMg6invukKt6Eso=; b=Fyv3+EIuG7UPpen4sM01A4V8I6ijLnzLmL+WyeL1rrQ2nCa9inYu2cgPMl7kEgtkSVoTep OFrUnPyo+aBTdjntoFRu440gJL5or8hkuYRD1OhDUh00hn0RBi3qcAluWPGMpoFL7vTu0x NimmKhsOX7sXMb8BBZh1jSmovQ+sOUJavY0qLfySu82V25/G1YioQj8HZxpmKN4FrTFTZQ W6tj+Ly1GZ+UehAerPvJBSGtSBH/ThSa+51uefoUvodt0CZg3Kz+u4atn5Fpg6BWbo71bE iLpxaZCTmmHKcaNcdP8bAgONTaIBLd8Miq5zqlLH9eBgxdQE34UGiTGt4ElViA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNB3gLhzycZ for ; Fri, 27 Feb 2026 02:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ece4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9c0f88c33ce0 - stable/15 - LinuxKPI: expand dma_sync_single_for_cpu() in lkpi_dma_unmap() 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 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: 9c0f88c33ce02d8b842e7e75ba7b0beb7edebcbc Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:46 +0000 Message-Id: <69a1019a.1ece4.7564fa9@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9c0f88c33ce02d8b842e7e75ba7b0beb7edebcbc commit 9c0f88c33ce02d8b842e7e75ba7b0beb7edebcbc Author: Bjoern A. Zeeb AuthorDate: 2026-01-23 19:14:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:02:27 +0000 LinuxKPI: expand dma_sync_single_for_cpu() in lkpi_dma_unmap() In case lkpi_dma_unmap() would call dma_sync_single_for_cpu() we get into a lock recursion which will trigger a panic with debug kernels. It would be hard to provide an internal "locked" version for dma_sync_single_for_cpu(). In the old days this would not have been a problem but (long before we added the missing sync calls) some locks got folded into one in a6619e8d9c1a3. Sponsored by: The FreeBSD Foundation Observed with: iwlwifi mld Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D54841 (cherry picked from commit b615b4805a9ce83b9b86dd66d46a9f220f9f89c6) --- sys/compat/linuxkpi/common/src/linux_pci.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index cf8a6ffeb46c..c8d1989f669b 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1720,9 +1720,26 @@ lkpi_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len, } LINUX_DMA_PCTRIE_REMOVE(&priv->ptree, dma_addr); - if ((attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0) - dma_sync_single_for_cpu(dev, dma_addr, len, direction); + if ((attrs & DMA_ATTR_SKIP_CPU_SYNC) != 0) + goto skip_sync; + /* 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); + break; + case DMA_TO_DEVICE: + bus_dmamap_sync(obj->dmat, obj->dmamap, BUS_DMASYNC_POSTWRITE); + break; + case DMA_FROM_DEVICE: + bus_dmamap_sync(obj->dmat, obj->dmamap, BUS_DMASYNC_POSTREAD); + break; + default: + break; + } + +skip_sync: bus_dmamap_unload(obj->dmat, obj->dmamap); bus_dmamap_destroy(obj->dmat, obj->dmamap); DMA_PRIV_UNLOCK(priv);