From nobody Tue Feb 10 00:46:42 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 4f92v664lwz6R4YV for ; Tue, 10 Feb 2026 00:46: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92v641zvz4Fvw for ; Tue, 10 Feb 2026 00:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684402; 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=IqAhOLRdmw2CwucRzoVy256heXfx+AFM8LpkeqfdgCQ=; b=j4k48CyN72K4X3D6ZLhqlOcYuIRqR1jNfbTNzvIzEKtGpizqzV0lbpcWvaVGYsetdQ7lHF gpMrHIWQRNoNiduc+67STb2RQbC83AIwZ9v4uLm1kxQUTddS0w/ggvfdcmgY4z13CJk0kN wZZaD9NJbyXWR1nKEKfdpKjhi7TVXBBUNNxd1aIDQQ3MI75uEwNxDJW2x8BfKTjelZqx23 2WYila+gibkIhB16/MzTA19utgEY82T9/FpWhylvc/eNQdGGHY7ENwwObIDI3QV88j3hmc +dHgkfEqsvwnx0O8pMxJHy2zCy5Vd//6BhBcT5A6G4zW9KcCp/nI3MiNvyVRtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684402; a=rsa-sha256; cv=none; b=yHihne5rIAC0tnJdnIz1jgEDKxl0cIe4hx2fmeSme6+zlq+POrtkjibYzxwiGHJ65izd77 C4bBmXURGAXFuwhFnLRbyOB2bmK5WVZgKOSB6myiBwhwLlU/qcKFhnIYe7b7UuoXl1Md3e +MVytX1gDb32fnTSZMu2Q8eYzOG62pUJcgABFLb2hmN0mYq979U5+qPy93IaQD1TLE80QL lvut2PomVIvtQyocmG8lI76WSBuvKNBNLYnDaomC2Y6LgH1SQasdq3qPblJA25n+Dup5lG xgpS/c1BM4mxnZ385EF00x0Keve4gesgRCLXczcqcLBk6tLprtQHIqH6XkUgtw== 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=1770684402; 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=IqAhOLRdmw2CwucRzoVy256heXfx+AFM8LpkeqfdgCQ=; b=qxoYsvqda2PJSaKCsOOm2UqR0wSI8cmYEMCM524Xmg3MvvOUyowIAZUjr61fKVQi8SyW3n 8Sq+M4RxrZ7iOhh8jQJplwtxfWeAfx3JIJt/nzNW7OLbjTyP00QYx/McnkMf5uqDguZSpW et1NZpTHpAlulvATsFagUxhmystFi5JR3KTB7BpJwdMTHo0j8CUzaiNQcC0vRM0LbpvsQR BVzVRIUQSY/zGZh3GNVFcmAQsgO3SUic1paAyRm0ioPfVOhARVNLPQ6d58jdKDhaX0TZMv 9XjOymQYBn059gEDudW8OlO5hiaBZL9h0OWjejlO23N1Pp99xaDlFQ+m/kchDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92v63bRTzwk9 for ; Tue, 10 Feb 2026 00:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b615b4805a9c - main - LinuxKPI: expand dma_sync_single_for_cpu() in lkpi_dma_unmap() 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 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: b615b4805a9ce83b9b86dd66d46a9f220f9f89c6 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:42 +0000 Message-Id: <698a7ff2.31b05.13e51dcf@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b615b4805a9ce83b9b86dd66d46a9f220f9f89c6 commit b615b4805a9ce83b9b86dd66d46a9f220f9f89c6 Author: Bjoern A. Zeeb AuthorDate: 2026-01-23 19:14:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:40:47 +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 MFC after: 3 days Observed with: iwlwifi mld Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D54841 --- 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 9e4fad45433a..612a2cb5f46b 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);