From nobody Fri Jul 24 19:34:59 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 4h6J9J23vrz6mcXb for ; Fri, 24 Jul 2026 19:35:00 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6J9H5YvGz3PhQ for ; Fri, 24 Jul 2026 19:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784921699; 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=lV01m5Bz4OGLC3sGBbG5YZ1ad7QEnJO+oWciIMRGQfM=; b=dc7YUPH30MpxeRLRnfz8GzSNXcvFPyOCpBOoji0Rqw9iyJgCXBTeYNG4/6vJvLgeGYr/Po zSUs9xCO3FfDvnV/kvxWsnajsluuYNx9uGMWytR1ncf6rp0iDdQySjoXtK99MbB6X7YBsu jCx3TPMSRntA6M8Eb0C5bk7evVJcRH25NAJFx1f6O/qYueTZz5/mRM0kLFWOQE6bmlJ5Vt Kn3bfvm+iqESg/l/Pi9BiuYCrTXEuQFEtmR/0QTihPMEb6/sDTvdh+AMv1cqSVCzkbcu1q oVOyGri+ToC+5hchYA/tGWbZ4AjAmV/eyFkgsa64eOPgyPVLQqzfPKWVhej3iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784921699; a=rsa-sha256; cv=none; b=Ajp1L29vexH0rxUXjrk6HcAnJ2hB7cw/lo9J3zQpdkaGPGbH/nt+ZDYlEws3Qju46XcIvT r6BQaVzan668b42p6EfwLRxBa3hMsw46b8RZykJ3GtxmojqvQUWVAXGc0Gy3OjgFP6FXsm sonO/PbJU1ilZOpv8sNXO2+u5nUdxJyHg5yEuHLtwPZmA+dsC3xBAmfqxRWo/Ut96JaR/8 aNz4PingD0nH/yd93MBWxZ6tdKytbquGFmyykt8e6Z+7JX5TosiCZYwuCBFpUxtX6KLatf cfAG44B/5szEwA8UWwZcwVALnewnkO3ChSIQhYVqvkQFVScgTNScEu7tYN2AFw== 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=1784921699; 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=lV01m5Bz4OGLC3sGBbG5YZ1ad7QEnJO+oWciIMRGQfM=; b=iI/mU8MH7feI5KHWCUs3Xbepntgn00Sr1D/RaftoZJj8d05CCAZjFqRUNG5n92O4Jj3rr4 rN2chdNASDxRIqrBXURlKDqNd1e0fC6IXaNBXl/fi0pGvmqNZPMK7SX//2YbX/UBqN1N80 zg0QomYgNRc40RIKqY3GwhHyORkwznjcjqDtA77FGuG3esFJISAfFo71y9M/mV6EQMEdiv QI3D5R8Nx5FPlhW+OuAVSuk1AR4qSQc/s+lqTBW2IvkbFCK2qJ4tzl3Mn4SxdIM0rpJoo9 QE5cV+0soSxsPQgKt3uaI3i8JaWTfcVHbAvyJxWobMOnML0NVa847UeElMQjYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6J9H3pXJz14p7 for ; Fri, 24 Jul 2026 19:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2649a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 19:34:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 2099bf27126f - main - LinuxKPI: pci: fix dma handle type in match function 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2099bf27126f6fef10128c3cd0ea8476c88b28c5 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 19:34:59 +0000 Message-Id: <6a63be63.2649a.61558504@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2099bf27126f6fef10128c3cd0ea8476c88b28c5 commit 2099bf27126f6fef10128c3cd0ea8476c88b28c5 Author: Bjoern A. Zeeb AuthorDate: 2026-05-27 01:26:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-24 19:33:55 +0000 LinuxKPI: pci: fix dma handle type in match function dma_addr_t is a vm_paddr_t which is a uint of some width. Rather than passing pointers of it around pass the value. Comparing the addresses of different storage for the same dma handle (the actual bug here) will not work when passed to the devres match function. Sponsored by: The FreeBSD Foundation Fixes: 0a575891211ef ("implement dmam_free_coherent()") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D58285 --- sys/compat/linuxkpi/common/src/linux_pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 1622ecb8b8ff..a49254425b5d 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1916,7 +1916,7 @@ linux_dma_alloc_coherent(struct device *dev, size_t size, struct lkpi_devres_dmam_coherent { size_t size; - dma_addr_t *handle; + dma_addr_t handle; void *mem; }; @@ -1926,7 +1926,7 @@ lkpi_dmam_free_coherent(struct device *dev, void *p) struct lkpi_devres_dmam_coherent *dr; dr = p; - dma_free_coherent(dev, dr->size, dr->mem, *dr->handle); + dma_free_coherent(dev, dr->size, dr->mem, dr->handle); } static int @@ -1952,7 +1952,7 @@ linuxkpi_dmam_free_coherent(struct device *dev, size_t size, { struct lkpi_devres_dmam_coherent match = { .size = size, - .handle = &dma_handle, + .handle = dma_handle, .mem = addr }; int error; @@ -1979,7 +1979,7 @@ linuxkpi_dmam_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_ha dr->size = size; dr->mem = linux_dma_alloc_coherent(dev, size, dma_handle, flag); - dr->handle = dma_handle; + dr->handle = *dma_handle; if (dr->mem == NULL) { lkpi_devres_free(dr); return (NULL);