From nobody Fri Feb 27 02:30:16 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 4fMXNn03ngz6T7xw for ; Fri, 27 Feb 2026 02:30:17 +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 4fMXNm4xbmz422g for ; Fri, 27 Feb 2026 02:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159416; 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=KJzS/Kek9bKa+XAcLE5HBe0PAuw1K4c3mEgUzBTauLI=; b=jzXHaFlwXDlEn9fJssbggEjEFLqP1Mtf+YCLfBAsG8XNYXVTNcomERnHJFMZFPVkq2yM1R y04qRVXjvyKwIVBgot1OXPAAiEOiXR3pjUfnzZDC+Z+WvpZJum6wJ6fHd4SEHxV45803wQ p614Gty8hKj694BOZWsdgTsNJeEIyNiMUzEDqCRcjEbUX8ICaTXMKgjC+wYPnkKM5y4g0D esRyrF5nSoC7MxWPKM83qAKnz1G7P/Z7V7or2A8gMKpOKLIeEA1wlluTxm0Hf8zUidIkut fbDKzr1HR8ZF8smqIvTrgBxg17EXPMzxsgbJFUDmdO0svq/gwdoql5Dq2x7nuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159416; a=rsa-sha256; cv=none; b=snEx42x7GEMJJDI7TZfxotsHvC70BZdUZVetrlKwPjtmJfyivanj0LTK1ygvZrxX1Y+kL7 /c7pjOF37sPzSXa5nHbcowVKSpJUVMje70hm7mvySWuHTCTAdx+Vj6vg5UYnRtdb7MJP3I PIMarddDZmz8q3fyRvcoJ8hlRRbNHvGqb+ESbn0YhuoLnLKiA8bje7RnrkBrsHh+rwUGPO 4u/HsLfq0m0z8ykp+TRBtzqRJ0SCallU3uLwVlMlixD6EHRJ0HXmUcjnM2f330+TGvyOhz O183NvOkx4fzCbZ0Jp0Z57tXWAzaqu6D5z+0lA3NIEHAij3FTpCXoQ2VnDsRkQ== 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=1772159416; 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=KJzS/Kek9bKa+XAcLE5HBe0PAuw1K4c3mEgUzBTauLI=; b=J58/vKW++t7GHhqEGXvaPaEP2B9f/KfnGGW4kJCGInwsXYLbABD5gx+qaZL1YBCTlJW+nS lmrKSJm1GIY+cIYPx61mxcWAph0mUOYwauYSgfE64I3BoCvwpoXvXPJfNhwIvPpkoUyxFi U2mv5D0sOJeO6Pyf36QHZDoKb64OPtAhwTGtgFl6syT6I0JAwdWwV665kehQE2b3uz1RRP rzemDhtf+KK5HuMIMot99IErZmgMas0FX3l173VWAXnLwbI5MJNBTGSz6Z4oQXKiqeQ3Od O4LKtsWyU7cFfeXjgrj7yseGdIYWyhyNLmECC2Lw50Umsg/KGoyOOOi3js1vHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNm4N4yzygK for ; Fri, 27 Feb 2026 02:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21944 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:30:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ca1e0f9d60c9 - stable/15 - ofed: reduce usage of struct dma_attrs *dma_attrs 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ca1e0f9d60c9328164c7018592fa9de513e65b08 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:30:16 +0000 Message-Id: <69a101b8.21944.7f24b31@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ca1e0f9d60c9328164c7018592fa9de513e65b08 commit ca1e0f9d60c9328164c7018592fa9de513e65b08 Author: Bjoern A. Zeeb AuthorDate: 2026-02-19 23:12:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:09:17 +0000 ofed: reduce usage of struct dma_attrs *dma_attrs ib_verbs.h still uses struct dma_attrs *dma_attrs everywhere. It is beyond my knowledge when that struct got deprecated upstream but it is still supported by our LinuxKPI. The problem is that the functions called with that argument (dma_map_single_attrs, dma_unmap_single_attrs, dma_map_sg_attrs, dma_unmap_sg_attrs) so far are #defines in LinuxKPI and drop the last argument (attrs) so it was never a problem. In preparation to pass the attrs to the actual implementation in LinuxKPI, which has gained support for them, we now pass dma_sttrs->flags which is the expected unsigned long bit field. If anyone has serious interest in updating our ofed implementation they could look into this some more and remove the usage of struct dma_attrs entirely. Sponsored by: The FreeBSD Foundation Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55390 (cherry picked from commit 5edf24aac1d0978d37d62594f42d87c9f118622b) --- sys/ofed/include/rdma/ib_verbs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h index 78aa0af4fa2b..0c40a6f18f7c 100644 --- a/sys/ofed/include/rdma/ib_verbs.h +++ b/sys/ofed/include/rdma/ib_verbs.h @@ -3539,7 +3539,7 @@ static inline u64 ib_dma_map_single_attrs(struct ib_device *dev, struct dma_attrs *dma_attrs) { return dma_map_single_attrs(dev->dma_device, cpu_addr, size, - direction, dma_attrs); + direction, dma_attrs->flags); } static inline void ib_dma_unmap_single_attrs(struct ib_device *dev, @@ -3548,7 +3548,7 @@ static inline void ib_dma_unmap_single_attrs(struct ib_device *dev, struct dma_attrs *dma_attrs) { return dma_unmap_single_attrs(dev->dma_device, addr, size, - direction, dma_attrs); + direction, dma_attrs->flags); } /** @@ -3630,7 +3630,7 @@ static inline int ib_dma_map_sg_attrs(struct ib_device *dev, dma_attrs); else return dma_map_sg_attrs(dev->dma_device, sg, nents, direction, - dma_attrs); + dma_attrs->flags); } static inline void ib_dma_unmap_sg_attrs(struct ib_device *dev, @@ -3643,7 +3643,7 @@ static inline void ib_dma_unmap_sg_attrs(struct ib_device *dev, dma_attrs); else dma_unmap_sg_attrs(dev->dma_device, sg, nents, direction, - dma_attrs); + dma_attrs->flags); } /** * ib_sg_dma_address - Return the DMA address from a scatter/gather entry