From nobody Mon Jun 22 18:37:54 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 4gkcQC1MRbz6hn2Q for ; Mon, 22 Jun 2026 18:37:55 +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 4gkcQB5KvVz3p6y for ; Mon, 22 Jun 2026 18:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782153474; 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=QDrzN0Av2chka6nV8AwEFTC3FuAzN86MQH/TErDZeNE=; b=G4JzJG7/MJQlleXV786Qk8Y5XyVz+IjwHrpUbpACoYkJQ1hxYMeaLHJMDQT1xeN1G4acEg Dq4ISQQ2I5g4XxPKu2iIGzFmOsoIIc0cxHYm5iwqd6h+rl6xDVxQD0TexFrX1hd3hVPMS0 6CDSpXZScX2Zb0rmWvwxjOxDta55AD6aRw4gaZMx2Lz3rfR0kOp/+1IklRuWACCbmS+O2p tPx5Lpcqv9hQryJpCbpAiu+lzDH2XRB26RZJENNJFVbOs1qMD7E7erLsMau3facnUi/e1w K5s8/tQqWspe5P3Tn8ZCKM1Zgt1qOauRW0M89DET2v7CvxZXkxmoD2C43uswIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782153474; a=rsa-sha256; cv=none; b=WiutdEziezveXkXoe5j6BFGLojesjiy1H0PkcYAT3bJyhrRrTU327rNhEysyabwjtzxtzV /vb/0nFZHupFhHC7ULUWP2VV5QAp/cU1v4+0dnY9dCvyujw8V+fuRzZoIEa9bRXoGyC7Ip co3dwddJecOOG5N2PGfueEWaCL1YcLeIM1+PrXZkx9cLH8j8G4SxFapgYUw082BqnDJ70z NaEbBmZTKvqvqTM95XCKbfI2EuywhZ3XcRhaFnmhC9lU+LJze6y8z8W7vbiafFAF3sdY7w lr9Y7sD3kyrfz4AwdWgHvkc/0OWDjg1JbCI9nR+WWknKVVG4m6nf6g8xdvQXCw== 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=1782153474; 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=QDrzN0Av2chka6nV8AwEFTC3FuAzN86MQH/TErDZeNE=; b=LWbY5AFWlo2ni0dhc9ogZXN6pKjuJB5IDdRRKRdayTGCil6fTWHM8HItVoBD8oUTee5pNw RIqNp4V3B+IUZhoboG22cnjabB7w5uncUdWcSeXv3Vt7rYqa7J/YMdqWHzWeD4+G3D5u2A CqE9QhlPPGZPJ5QuBPwx9U/sX2PJ3QtcbtMKuYYxlMCnWgCNpa1WqL3XQHtUN0YpiMIeI3 pkiItvUZT2CdpN9A/BIMci9hY2+6AFzc3htHHeBpXLHZoF6aV7PV2R+3/VKu8+6S6EPDx/ Hc9U6Cga7C/03SjU1p0+lcOM9ELvAo4DdYann2RzOL8mk+///PY+EI+hsZqCWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkcQB477pz10PG for ; Mon, 22 Jun 2026 18:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31f78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 18:37:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e4c4c6eeb2a2 - main - RDMA: dma-mapping: use unsigned long for 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 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4c4c6eeb2a29f7549d28e6ce51fc36125c08e68 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 18:37:54 +0000 Message-Id: <6a398102.31f78.6f989038@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e4c4c6eeb2a29f7549d28e6ce51fc36125c08e68 commit e4c4c6eeb2a29f7549d28e6ce51fc36125c08e68 Author: John Baldwin AuthorDate: 2026-05-28 15:51:30 +0000 Commit: John Baldwin CommitDate: 2026-06-22 18:36:53 +0000 RDMA: dma-mapping: use unsigned long for dma_attrs Tested by: Wafa Hamzah (mlx5_ib) Tested by: John Baldwin (iw_cxgbe) Obtained from: Linux commit 00085f1efa387a8ce100e3734920f7639c80caa3 Sponsored by: Chelsio Communications --- sys/ofed/drivers/infiniband/core/ib_umem.c | 6 +++--- sys/ofed/include/rdma/ib_verbs.h | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/ofed/drivers/infiniband/core/ib_umem.c b/sys/ofed/drivers/infiniband/core/ib_umem.c index ff92c4fa12a5..1f99d2560224 100644 --- a/sys/ofed/drivers/infiniband/core/ib_umem.c +++ b/sys/ofed/drivers/infiniband/core/ib_umem.c @@ -93,13 +93,13 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, unsigned long npages; int ret; int i; - struct dma_attrs dma_attrs = { 0 }; + unsigned long dma_attrs = 0; struct scatterlist *sg, *sg_list_start; int need_release = 0; unsigned int gup_flags = FOLL_WRITE; if (dmasync) - dma_attrs.flags |= DMA_ATTR_WRITE_BARRIER; + dma_attrs |= DMA_ATTR_WRITE_BARRIER; if (!size) return ERR_PTR(-EINVAL); @@ -202,7 +202,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, umem->sg_head.sgl, umem->npages, DMA_BIDIRECTIONAL, - &dma_attrs); + dma_attrs); if (umem->nmap <= 0) { ret = -ENOMEM; diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h index 8929cf2fe0b1..b495c1da6c57 100644 --- a/sys/ofed/include/rdma/ib_verbs.h +++ b/sys/ofed/include/rdma/ib_verbs.h @@ -2024,11 +2024,11 @@ struct ib_dma_mapping_ops { int (*map_sg_attrs)(struct ib_device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs); + unsigned long attrs); void (*unmap_sg_attrs)(struct ib_device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs); + unsigned long attrs); void (*sync_single_for_cpu)(struct ib_device *dev, u64 dma_handle, size_t size, @@ -3540,19 +3540,19 @@ static inline void ib_dma_unmap_single(struct ib_device *dev, static inline u64 ib_dma_map_single_attrs(struct ib_device *dev, void *cpu_addr, size_t size, enum dma_data_direction direction, - struct dma_attrs *dma_attrs) + unsigned long dma_attrs) { return dma_map_single_attrs(dev->dma_device, cpu_addr, size, - direction, dma_attrs->flags); + direction, dma_attrs); } static inline void ib_dma_unmap_single_attrs(struct ib_device *dev, u64 addr, size_t size, enum dma_data_direction direction, - struct dma_attrs *dma_attrs) + unsigned long dma_attrs) { return dma_unmap_single_attrs(dev->dma_device, addr, size, - direction, dma_attrs->flags); + direction, dma_attrs); } /** @@ -3627,27 +3627,27 @@ static inline void ib_dma_unmap_sg(struct ib_device *dev, static inline int ib_dma_map_sg_attrs(struct ib_device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction, - struct dma_attrs *dma_attrs) + unsigned long dma_attrs) { if (dev->dma_ops) return dev->dma_ops->map_sg_attrs(dev, sg, nents, direction, dma_attrs); else return dma_map_sg_attrs(dev->dma_device, sg, nents, direction, - dma_attrs->flags); + dma_attrs); } static inline void ib_dma_unmap_sg_attrs(struct ib_device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction, - struct dma_attrs *dma_attrs) + unsigned long dma_attrs) { if (dev->dma_ops) return dev->dma_ops->unmap_sg_attrs(dev, sg, nents, direction, dma_attrs); else dma_unmap_sg_attrs(dev->dma_device, sg, nents, direction, - dma_attrs->flags); + dma_attrs); } /** * ib_sg_dma_address - Return the DMA address from a scatter/gather entry