src/sys/dev/mlx4/mlx4_ib, branch main FreeBSD source tree OFED: A few channges from Linux 5.0 2026-06-24T19:30:56+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:56+00:00 45c0d87c57298599397204179c2c4fa0f580a5d9 The main point of these changes is the last commit adding a couple of helper functions used in ROCE drivers. This contains changes from the following Linux commits: a70c07397fd8 RDMA: Introduce and use GID attr helper to read RoCE L2 fields 8f9748602491 IB/cm: Reduce dependency on gid attribute ndev check adb4a57a7a1d RDMA/cma: Use rdma_read_gid_attr_ndev_rcu to access netdev b4fb4cc5ba83 RDMA/cma: Fix unbalanced cm_id reference count during address resolve d5665a21250e RDMA/core: Add hash functions to calculate RoCEv2 flowlabel and UDP source port Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
The main point of these changes is the last commit adding a couple of
helper functions used in ROCE drivers.

This contains changes from the following Linux commits:

a70c07397fd8 RDMA: Introduce and use GID attr helper to read RoCE L2 fields
8f9748602491 IB/cm: Reduce dependency on gid attribute ndev check
adb4a57a7a1d RDMA/cma: Use rdma_read_gid_attr_ndev_rcu to access netdev
b4fb4cc5ba83 RDMA/cma: Fix unbalanced cm_id reference count during address resolve
d5665a21250e RDMA/core: Add hash functions to calculate RoCEv2 flowlabel and UDP source port

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications
OFED: Various changes from Linux 4.19 2026-06-24T19:30:56+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:56+00:00 6a75471dbcf0fb187cf7918ee1a918fd7c9d002d Many of these changes deal with shifting from fetcing SGID attributes via an index in drivers to including references to SGID attributes in other structures passed to driver callbacks which can be used directly avoiding the need for fetching attributes via lookup functions. I had to fixup the ROCE GID management code directly as the version in FreeBSD is very different from Linux. I also tweaked the change from commit 475c8de7bf2dc86d9806709a04e9c8f524d4ec32 to use a goto to reduce diffs with upstream to minimize conflicts when merging upstream changes. This contains changes from the following Linux commits: a1a4caeebac9 IB/core: Do not set the gid type when reserving default entries 1c36cf912ad1 IB/core: Store default GID property per-table instead of per-entry 1dfce2945771 IB: Replace ib_query_gid/ib_get_cached_gid with rdma_query_gid 83f6f8d29dd3 IB/core: Make rdma_find_gid_by_filter support all protocols c3d71b69a75c IB/core: Provide rdma_ versions of the gid cache API 77e786fcbe2e IB/core: Replace ib_query_gid with rdma_get_gid_attr bf399c2cadfa IB/core: Introduce GID attribute get, put and hold APIs f4df9a7c34d8 RDMA: Use GID from the ib_gid_attr during the add_gid() callback b150c3862d21 IB/core: Introduce GID entry reference counts 47ec38666210 RDMA: Convert drivers to use sgid_attr instead of sgid_index d97099fe53ed IB{cm, core}: Introduce and use ah_attr copy, move, replace APIs 947c99ecfcb4 IB/core: Tidy ib_resolve_eth_dmac 8d9ec9addd6c IB/core: Add a sgid_attr pointer to struct rdma_ah_attr 89af969a6653 RDMA: Convert drivers to use the AH's sgid_attr in post_wr paths 1a1f460ff151 RDMA: Hold the sgid_attr inside the struct ib_ah/qp 7492052a186b IB/mlx4: Use GID attribute from ah attribute 59d40813328f IB/core: Free GID table entry during GID deletion 881456789248 RDMA/cma: Consider net namespace while leaving multicast group 4ed13a5f2d60 IB/cm: Keep track of the sgid_attr that created the cm id aa74f4878d61 IB: Make init_ah_attr_grh_fields set sgid_attr f685c19529f0 IB: Make ib_init_ah_from_mcmember set sgid_attr b7403217656d IB: Make ib_init_ah_attr_from_wc set sgid_attr ea8c2d8f6014 RDMA/core: Remove unused ib cache functions a8872d53e9b7 IB/cm: Use sgid_attr from the AV 398391071f25 IB/cm: Replace members of sa_path_rec with 'struct sgid_attr *' 815d456ef21a IB/cm: Pass the sgid_attr through various events 4eefd62c17a9 include/rdma/opa_addr.h: Fix an endianness issue f8c2d2280cf6 RDMA/core: Remove set-but-not-used variables 28e39894ed4f RDMA/core: Remove ib_find_cached_gid() and ib_find_cached_gid_by_port() 07e7056aff6c IB/core: Simplify check for RoCE route resolve 40ddacf2dda9 RDMA/umem: Don't hold mmap_sem for too long 1215cb7c88ec RDMA/umem: Refactor exit paths in ib_umem_get c012691508f5 IB/cm: Remove cma_multicast->igmp_joined 4b4671a0f269 IB/IPoIB: Simplify ib_post_(send|recv|srq_recv)() calls 1fec77bf8fcd RDMA/core: Simplify ib_post_(send|recv|srq_recv)() calls bb039a870c05 IB/core: Allow ULPs to specify NULL as the third ib_post_(send|recv|srq_recv)() argument 643d213a9a03 RDMA/cma: Do not ignore net namespace for unbound cm_id d274e45ce1ed RDMA/cma: Consider netdevice for RoCE ports cee104334c98 IB/core: Introduce and use sgid_attr in CM requests 7150c3d5544b RDMA/core: Remove {create,destroy}_ah from mandatory verbs 854633165164 RDMA/core: Prefix _ib to IB/RoCE specific functions 7582df826734 RDMA/core: Avoid holding lock while initializing fields on stack 79d684f02647 RDMA/core: Simplify gid type check in cma_acquire_dev() ca3a8ace2b12 RDMA/core: Return bool instead of int 05e0b86c413d RDMA/cma: Get rid of 1 bit boolean e7ff98aefc9e RDMA/cma: Constify path record, ib_cm_event, listen_id pointers 2df7dba855e1 RDMA/core: Constify dst_addr argument 219d2e9dfda9 RDMA/cma: Simplify rdma_resolve_addr() error flow 26e551c5aec5 RDMA: Fix return code check in rdma_set_cq_moderation 58796e67d5d5 IB/ucm: Initialize sgid request GID attribute pointer dd81b2c8a333 IB/core: Change filter function return type from int to bool 93065ac753e4 mm, oom: distinguish blockable mode for mmu notifiers 0d23ba6034b9 RDMA/ucma: check fd type in ucma_migrate_id() Part of cee104334c98 was previously merged into FreeBSD. Namely, SGID index fields had been added to the two param structures instead and roce_get_net_dev_by_cm_event was implemented using SGID indices. Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
Many of these changes deal with shifting from fetcing SGID attributes
via an index in drivers to including references to SGID attributes in
other structures passed to driver callbacks which can be used directly
avoiding the need for fetching attributes via lookup functions.  I had
to fixup the ROCE GID management code directly as the version in
FreeBSD is very different from Linux.

I also tweaked the change from commit
475c8de7bf2dc86d9806709a04e9c8f524d4ec32 to use a goto to reduce diffs
with upstream to minimize conflicts when merging upstream changes.

This contains changes from the following Linux commits:

a1a4caeebac9 IB/core: Do not set the gid type when reserving default entries
1c36cf912ad1 IB/core: Store default GID property per-table instead of per-entry
1dfce2945771 IB: Replace ib_query_gid/ib_get_cached_gid with rdma_query_gid
83f6f8d29dd3 IB/core: Make rdma_find_gid_by_filter support all protocols
c3d71b69a75c IB/core: Provide rdma_ versions of the gid cache API
77e786fcbe2e IB/core: Replace ib_query_gid with rdma_get_gid_attr
bf399c2cadfa IB/core: Introduce GID attribute get, put and hold APIs
f4df9a7c34d8 RDMA: Use GID from the ib_gid_attr during the add_gid() callback
b150c3862d21 IB/core: Introduce GID entry reference counts
47ec38666210 RDMA: Convert drivers to use sgid_attr instead of sgid_index
d97099fe53ed IB{cm, core}: Introduce and use ah_attr copy, move, replace APIs
947c99ecfcb4 IB/core: Tidy ib_resolve_eth_dmac
8d9ec9addd6c IB/core: Add a sgid_attr pointer to struct rdma_ah_attr
89af969a6653 RDMA: Convert drivers to use the AH's sgid_attr in post_wr paths
1a1f460ff151 RDMA: Hold the sgid_attr inside the struct ib_ah/qp
7492052a186b IB/mlx4: Use GID attribute from ah attribute
59d40813328f IB/core: Free GID table entry during GID deletion
881456789248 RDMA/cma: Consider net namespace while leaving multicast group
4ed13a5f2d60 IB/cm: Keep track of the sgid_attr that created the cm id
aa74f4878d61 IB: Make init_ah_attr_grh_fields set sgid_attr
f685c19529f0 IB: Make ib_init_ah_from_mcmember set sgid_attr
b7403217656d IB: Make ib_init_ah_attr_from_wc set sgid_attr
ea8c2d8f6014 RDMA/core: Remove unused ib cache functions
a8872d53e9b7 IB/cm: Use sgid_attr from the AV
398391071f25 IB/cm: Replace members of sa_path_rec with 'struct sgid_attr *'
815d456ef21a IB/cm: Pass the sgid_attr through various events
4eefd62c17a9 include/rdma/opa_addr.h: Fix an endianness issue
f8c2d2280cf6 RDMA/core: Remove set-but-not-used variables
28e39894ed4f RDMA/core: Remove ib_find_cached_gid() and ib_find_cached_gid_by_port()
07e7056aff6c IB/core: Simplify check for RoCE route resolve
40ddacf2dda9 RDMA/umem: Don't hold mmap_sem for too long
1215cb7c88ec RDMA/umem: Refactor exit paths in ib_umem_get
c012691508f5 IB/cm: Remove cma_multicast->igmp_joined
4b4671a0f269 IB/IPoIB: Simplify ib_post_(send|recv|srq_recv)() calls
1fec77bf8fcd RDMA/core: Simplify ib_post_(send|recv|srq_recv)() calls
bb039a870c05 IB/core: Allow ULPs to specify NULL as the third ib_post_(send|recv|srq_recv)() argument
643d213a9a03 RDMA/cma: Do not ignore net namespace for unbound cm_id
d274e45ce1ed RDMA/cma: Consider netdevice for RoCE ports
cee104334c98 IB/core: Introduce and use sgid_attr in CM requests
7150c3d5544b RDMA/core: Remove {create,destroy}_ah from mandatory verbs
854633165164 RDMA/core: Prefix _ib to IB/RoCE specific functions
7582df826734 RDMA/core: Avoid holding lock while initializing fields on stack
79d684f02647 RDMA/core: Simplify gid type check in cma_acquire_dev()
ca3a8ace2b12 RDMA/core: Return bool instead of int
05e0b86c413d RDMA/cma: Get rid of 1 bit boolean
e7ff98aefc9e RDMA/cma: Constify path record, ib_cm_event, listen_id pointers
2df7dba855e1 RDMA/core: Constify dst_addr argument
219d2e9dfda9 RDMA/cma: Simplify rdma_resolve_addr() error flow
26e551c5aec5 RDMA: Fix return code check in rdma_set_cq_moderation
58796e67d5d5 IB/ucm: Initialize sgid request GID attribute pointer
dd81b2c8a333 IB/core: Change filter function return type from int to bool
93065ac753e4 mm, oom: distinguish blockable mode for mmu notifiers
0d23ba6034b9 RDMA/ucma: check fd type in ucma_migrate_id()

Part of cee104334c98 was previously merged into FreeBSD.  Namely, SGID
index fields had been added to the two param structures instead and
roce_get_net_dev_by_cm_event was implemented using SGID indices.

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications
OFED: Malloc API cleanups from Linux 4.18 2026-06-24T19:30:56+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:56+00:00 f08a98090229a7d13a8ff2e320696458f6b7c126 This contains changes from the following Linux commits: acafe7e30216 treewide: Use struct_size() for kmalloc()-family fad953ce0b22 treewide: Use array_size() in vzalloc() 6396bb221514 treewide: kzalloc() -> kcalloc() 6da2ec56059c treewide: kmalloc() -> kmalloc_array() Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
This contains changes from the following Linux commits:

acafe7e30216 treewide: Use struct_size() for kmalloc()-family
fad953ce0b22 treewide: Use array_size() in vzalloc()
6396bb221514 treewide: kzalloc() -> kcalloc()
6da2ec56059c treewide: kmalloc() -> kmalloc_array()

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications
OFED: Various changes from Linux 4.18 2026-06-24T19:30:56+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:56+00:00 cd567a22e28a68aebf12cc320d83648b5b68c274 This contains changes from the following Linux commits: e822ff213fe6 IB/cm: Store and restore ah_attr during CM message processing 0e225dcb7681 IB/cm: Store and restore ah_attr during LAP msg processing a5c57d327272 IB/cm: Avoid AV ah_attr overwriting during LAP message handling 724631a9c6e9 IB/core: Introduce and use rdma_gid_table() 25e62655c793 IB/core: Reduce the places that use zgid 08bb558ac11a IB/core: Make testing MR flags for writability a static inline function Commit 0e225dcb7681 was partially merged previously as cm_init_av_for_lap() already existed in FreeBSD matching the version from the Linux commit. Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
This contains changes from the following Linux commits:

e822ff213fe6 IB/cm: Store and restore ah_attr during CM message processing
0e225dcb7681 IB/cm: Store and restore ah_attr during LAP msg processing
a5c57d327272 IB/cm: Avoid AV ah_attr overwriting during LAP message handling
724631a9c6e9 IB/core: Introduce and use rdma_gid_table()
25e62655c793 IB/core: Reduce the places that use zgid
08bb558ac11a IB/core: Make testing MR flags for writability a static inline function

Commit 0e225dcb7681 was partially merged previously as
cm_init_av_for_lap() already existed in FreeBSD matching the version
from the Linux commit.

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications
OFED: Various changes from Linux 4.17 2026-06-24T19:30:56+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:56+00:00 75cde38e949345c9d63e400bd4707d6eec817941 This contains changes from the following Linux commits: a3b641af72ba RDMA/CM: move rdma_id_private to cma_priv.h 6612b4983f7e IB/core: Fix comments of GID query functions b26c4a1138df IB/{core, ipoib}: Simplify ib_find_gid() for unused ndev 5ac08a341303 IB/cma: Use rdma_protocol_roce() and remove cma_protocol_roce_dev_port() a9c06aeba997 IB/core: Remove rdma_resolve_ip_route() as exported symbol a22af59ea9a5 IB/cm: Add and use a helper function to add cm_id's to the port list cb12a8e2fa5f IB/cm: Introduce and use helper function to get cm_port from path 0a5141593567 IB/core: Refactor ib_init_ah_attr_from_path() for RoCE e41a7c41947d IB/core: Move rdma_addr_find_l2_eth_by_grh to core_priv.h 98f1f4e0ed26 IB/core: Refer to RoCE port property instead of GID table property 114cc9c4b182 IB/cma: Resolve route only while receiving CM requests 9137108cc3d6 RDMA/rdma_cm: Fix use after free race with process_one_req 190fb9c4d130 IB/core: Refer to RoCE port property to decide building cache 22d24f75a193 IB/core: Search GID only for IB link layer 4ab7cb4bf362 IB/core: Refer to RoCE port property instead of GID table property 3401857ea347 IB/core: Generate GID change event regardless of RoCE GID table property 218b9e3eb8b5 RDMA/cma: Move rdma_cm_state to cma_priv.h 8435168d50e6 RDMA/ucma: Don't allow setting RDMA_OPTION_IB_PATH without an RDMA device 72e1ff0fb7e0 RDMA/core: Update query_gid documentation for HCA drivers 0e1f9b924471 RDMA/providers: Simplify query_gid callback of RoCE providers 598ff6bae689 IB/core: Refactor GID modify code for RoCE f35faa4ba956 IB/core: Simplify ib_query_gid to always refer to cache 14169e333e71 IB/providers: Avoid zero GID check for RoCE 414448d249d8 RDMA: Use ib_gid_attr during GID modification ee6548d1d98d RDMA/rdma_cm: Delete rdma_addr_client 44e75052bc2a RDMA/rdma_cm: Make rdma_addr_cancel into a fence e19c0d237873 RDMA/rdma_cm: Remove process_req and timer sorting a66ed149b0da IB/core: Don't allow default GID addition at non reseved slots dc5640f294e4 IB/core: Fix deleting default GIDs when changing mac adddress 22c01ee4b8a8 IB/core: Fix to avoid deleting IPv6 look alike default GIDs 9aa169213d11 RDMA/cma: Do not query GID during QP state transition to RTR aec05afe641b IB/core: Remove redundant return Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
This contains changes from the following Linux commits:

a3b641af72ba RDMA/CM: move rdma_id_private to cma_priv.h
6612b4983f7e IB/core: Fix comments of GID query functions
b26c4a1138df IB/{core, ipoib}: Simplify ib_find_gid() for unused ndev
5ac08a341303 IB/cma: Use rdma_protocol_roce() and remove cma_protocol_roce_dev_port()
a9c06aeba997 IB/core: Remove rdma_resolve_ip_route() as exported symbol
a22af59ea9a5 IB/cm: Add and use a helper function to add cm_id's to the port list
cb12a8e2fa5f IB/cm: Introduce and use helper function to get cm_port from path
0a5141593567 IB/core: Refactor ib_init_ah_attr_from_path() for RoCE
e41a7c41947d IB/core: Move rdma_addr_find_l2_eth_by_grh to core_priv.h
98f1f4e0ed26 IB/core: Refer to RoCE port property instead of GID table property
114cc9c4b182 IB/cma: Resolve route only while receiving CM requests
9137108cc3d6 RDMA/rdma_cm: Fix use after free race with process_one_req
190fb9c4d130 IB/core: Refer to RoCE port property to decide building cache
22d24f75a193 IB/core: Search GID only for IB link layer
4ab7cb4bf362 IB/core: Refer to RoCE port property instead of GID table property
3401857ea347 IB/core: Generate GID change event regardless of RoCE GID table property
218b9e3eb8b5 RDMA/cma: Move rdma_cm_state to cma_priv.h
8435168d50e6 RDMA/ucma: Don't allow setting RDMA_OPTION_IB_PATH without an RDMA device
72e1ff0fb7e0 RDMA/core: Update query_gid documentation for HCA drivers
0e1f9b924471 RDMA/providers: Simplify query_gid callback of RoCE providers
598ff6bae689 IB/core: Refactor GID modify code for RoCE
f35faa4ba956 IB/core: Simplify ib_query_gid to always refer to cache
14169e333e71 IB/providers: Avoid zero GID check for RoCE
414448d249d8 RDMA: Use ib_gid_attr during GID modification
ee6548d1d98d RDMA/rdma_cm: Delete rdma_addr_client
44e75052bc2a RDMA/rdma_cm: Make rdma_addr_cancel into a fence
e19c0d237873 RDMA/rdma_cm: Remove process_req and timer sorting
a66ed149b0da IB/core: Don't allow default GID addition at non reseved slots
dc5640f294e4 IB/core: Fix deleting default GIDs when changing mac adddress
22c01ee4b8a8 IB/core: Fix to avoid deleting IPv6 look alike default GIDs
9aa169213d11 RDMA/cma: Do not query GID during QP state transition to RTR
aec05afe641b IB/core: Remove redundant return

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications
OFED: Various changes from Linux 4.16 2026-06-24T19:30:56+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:56+00:00 1d99feddd681da05dfa9091870403bc9ceb94550 This contains changes from the following Linux commits: c5c4e40e90b5 IB/CM: Change sgid to IB GID when handling CM request 54a6d63f14bd IB/mlx4: Potential buffer overflow in _mlx4_set_path() 56d0a7d9a0f0 IB/core: Depend on IPv6 stack to resolve link local address for RoCEv2 1060f8653414 IB/{core/cm}: Fix generating a return AH for RoCEE 981b5a2384b7 RDMA/cma: Introduce and use helper functions to init work c42388053758 RDMA/cma: Avoid setting path record type twice 4367ec7fe2dd RDMA/cma: Simplify netdev check 151ed9d70097 IB/core: Refactor to avoid unnecessary check on GID lookup miss b0dd0d335364 IB/core: Avoid unnecessary type cast 86937fcd6ed2 RDMA/core: Avoid redundant memcpy in rdma_addr_find_l2_eth_by_grh 1c43d5d308f0 IB/core: Avoid exporting module internal ib_find_gid_by_filter() dbb12562f7c2 IB/{core, ipoib}: Simplify ib_find_gid to search only for IB link layer f6bdb14267ba IB/{core, umad, cm}: Rename ib_init_ah_from_wc to ib_init_ah_attr_from_wc 4ad6a0245ec8 IB/{core, cm, cma, ipoib}: Rename ib_init_ah_from_path to ib_init_ah_attr_from_path 33f93e1ebcf5 IB/cm: Fix sleeping while spin lock is held 16c72e402867 IB/cm: Refactor to avoid setting path record software only fields af808ece5ce9 IB/SA: Check dlid before SA agent queries for ClassPortInfo 8d20a1f0ecd5 RDMA/cma: Fix rdma_cm raw IB path setting for RoCE fe75889f2794 RDMA/{cma, ucma}: Simplify and rename rdma_set_ib_paths 9327c7afdce3 RDMA/cma: Provide a function to set RoCE path record L2 parameters 89838118a515 RDMA/cma: Fix rdma_cm path querying for RoCE cd2a6e7d384b IB/core: Fix ib_wc structure size to remain in 64 bytes boundary f2290d6d522d IB/core: Attempt DMAC resolution for only RoCE a6532e713966 RDMA/core: Clarify rdma_ah_find_type 246d8b184c10 IB/cq: Don't force IB_POLL_DIRECT poll context for ib_process_cq_direct aaebd377c0e9 IB/core: postpone WR initialization during queue drain 15cbc5197693 RDMA/core: Simplify rdma_addr_get_sgid() to not support RoCE 7a2f64ee4a95 RDMA/ucma: Use rdma cm API to query GID 411460ac50b0 RDMA/cma: Introduce API to read GIDs for multiple transports 2493a57bc10f RDMA/cma: Refactor to access multiple fields of rdma_dev_addr 00db63c128dd RDMA/cma: Check existence of netdevice during port validation 925f7ea7a6ba RDMA/cm: Fix access to uninitialized variable 87daac68f77a IB/core: Map iWarp AH type to undefined in rdma_ah_find_type 87915bf82eea RDMA/verbs: Return proper error code for not supported system call d3b9e8ad425c RDMA/core: Reduce poll batch for direct cq polling Parts of 1060f8653414 were already merged into FreeBSD. Cosmetic changes made in rdma_addr_find_l2_eth_by_grh while merging this change were just to reduce the diff with Linux to ease merging future changes. The merge of 56d0a7d9a0f0 differs slightly from the Linux commit as FreeBSD was missing the original changes to check for link-local addresses in ib_resolve_eth_dmac. The merge of 2493a57bc10f is mostly a cosmetic change to reduce diffs with upstream as local changes in FreeBSD passed the dev_addr as the last argument instead of the dev_type and if_index already. Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
This contains changes from the following Linux commits:

c5c4e40e90b5 IB/CM: Change sgid to IB GID when handling CM request
54a6d63f14bd IB/mlx4: Potential buffer overflow in _mlx4_set_path()
56d0a7d9a0f0 IB/core: Depend on IPv6 stack to resolve link local address for RoCEv2
1060f8653414 IB/{core/cm}: Fix generating a return AH for RoCEE
981b5a2384b7 RDMA/cma: Introduce and use helper functions to init work
c42388053758 RDMA/cma: Avoid setting path record type twice
4367ec7fe2dd RDMA/cma: Simplify netdev check
151ed9d70097 IB/core: Refactor to avoid unnecessary check on GID lookup miss
b0dd0d335364 IB/core: Avoid unnecessary type cast
86937fcd6ed2 RDMA/core: Avoid redundant memcpy in rdma_addr_find_l2_eth_by_grh
1c43d5d308f0 IB/core: Avoid exporting module internal ib_find_gid_by_filter()
dbb12562f7c2 IB/{core, ipoib}: Simplify ib_find_gid to search only for IB link layer
f6bdb14267ba IB/{core, umad, cm}: Rename ib_init_ah_from_wc to ib_init_ah_attr_from_wc
4ad6a0245ec8 IB/{core, cm, cma, ipoib}: Rename ib_init_ah_from_path to ib_init_ah_attr_from_path
33f93e1ebcf5 IB/cm: Fix sleeping while spin lock is held
16c72e402867 IB/cm: Refactor to avoid setting path record software only fields
af808ece5ce9 IB/SA: Check dlid before SA agent queries for ClassPortInfo
8d20a1f0ecd5 RDMA/cma: Fix rdma_cm raw IB path setting for RoCE
fe75889f2794 RDMA/{cma, ucma}: Simplify and rename rdma_set_ib_paths
9327c7afdce3 RDMA/cma: Provide a function to set RoCE path record L2 parameters
89838118a515 RDMA/cma: Fix rdma_cm path querying for RoCE
cd2a6e7d384b IB/core: Fix ib_wc structure size to remain in 64 bytes boundary
f2290d6d522d IB/core: Attempt DMAC resolution for only RoCE
a6532e713966 RDMA/core: Clarify rdma_ah_find_type
246d8b184c10 IB/cq: Don't force IB_POLL_DIRECT poll context for ib_process_cq_direct
aaebd377c0e9 IB/core: postpone WR initialization during queue drain
15cbc5197693 RDMA/core: Simplify rdma_addr_get_sgid() to not support RoCE
7a2f64ee4a95 RDMA/ucma: Use rdma cm API to query GID
411460ac50b0 RDMA/cma: Introduce API to read GIDs for multiple transports
2493a57bc10f RDMA/cma: Refactor to access multiple fields of rdma_dev_addr
00db63c128dd RDMA/cma: Check existence of netdevice during port validation
925f7ea7a6ba RDMA/cm: Fix access to uninitialized variable
87daac68f77a IB/core: Map iWarp AH type to undefined in rdma_ah_find_type
87915bf82eea RDMA/verbs: Return proper error code for not supported system call
d3b9e8ad425c RDMA/core: Reduce poll batch for direct cq polling

Parts of 1060f8653414 were already merged into FreeBSD.  Cosmetic
changes made in rdma_addr_find_l2_eth_by_grh while merging this change
were just to reduce the diff with Linux to ease merging future
changes.

The merge of 56d0a7d9a0f0 differs slightly from the Linux commit as
FreeBSD was missing the original changes to check for link-local
addresses in ib_resolve_eth_dmac.

The merge of 2493a57bc10f is mostly a cosmetic change to reduce diffs
with upstream as local changes in FreeBSD passed the dev_addr as the
last argument instead of the dev_type and if_index already.

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications
OFED: Various changes from Linux 4.15 2026-06-24T19:30:55+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:55+00:00 85893a8399bce2dd66e8693037395e1979277967 This contains changes from the following Linux commits: c0b64f58e8d4 RDMA/cma: Avoid triggering undefined behavior c0348eb06968 IB: Let ib_core resolve destination mac address 5a3dc3237243 IB/cm: Fix memory corruption in handling CM request fec99ededf6b RDMA/umem: Avoid partial declaration of non-static function 19b57c6c4499 IB/core: Convert OPA AH to IB for Extended LIDs only e08ce2e82b2f RDMA/core: Make function rdma_copy_addr return void 4190b4e96954 RDMA/core: Rename kernel modify_cq to better describe its usage Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
This contains changes from the following Linux commits:

c0b64f58e8d4 RDMA/cma: Avoid triggering undefined behavior
c0348eb06968 IB: Let ib_core resolve destination mac address
5a3dc3237243 IB/cm: Fix memory corruption in handling CM request
fec99ededf6b RDMA/umem: Avoid partial declaration of non-static function
19b57c6c4499 IB/core: Convert OPA AH to IB for Extended LIDs only
e08ce2e82b2f RDMA/core: Make function rdma_copy_addr return void
4190b4e96954 RDMA/core: Rename kernel modify_cq to better describe its usage

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications
OFED: Various changes from Linux 4.14 2026-06-24T19:30:55+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:55+00:00 687057e712edbbc31e33613d99d9f8cc436cfa1f This contains changes from the following Linux commits: 1cb2fc0db764 IB/mad: Change slid in RMPP recv from 16 to 32 bits 7e93e2cb835c IB/IPoIB: Increase local_lid to 32 bits d541e45500bd IB/core: Convert ah_attr from OPA to IB when copying to user 6b3c0e6e6d5a IB/CM: Create appropriate path records when handling CM request e92aa00a5189 IB/CM: Add OPA Path record support to CM 7db20ecd1d97 IB/core: Change wc.slid from 16 to 32 bits db58540b021a IB/core: Change port_attr.sm_lid from 16 to 32 bits 582faf3150f5 IB/core: Change port_attr.lid size from 16 to 32 bits ac3a949fb2ff IB/CM: Set appropriate slid and dlid when handling CM request 06f8174a9782 IB/core: Protect sysfs entry on ib_unregister_device 62ede7779904 Add OPA extended LID support 13c19222889d IB/rdmavt, hfi1, qib: Modify check_ah() to account for extended LIDs d98bb7f7e6fa IB/hfi1: Determine 9B/16B L2 header type based on Address handle dcc9881e6767 RDMA/(core, ulp): Convert register/unregister event handler to be void f808c13fd373 lib/interval_tree: fast overlap detection Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
This contains changes from the following Linux commits:

1cb2fc0db764 IB/mad: Change slid in RMPP recv from 16 to 32 bits
7e93e2cb835c IB/IPoIB: Increase local_lid to 32 bits
d541e45500bd IB/core: Convert ah_attr from OPA to IB when copying to user
6b3c0e6e6d5a IB/CM: Create appropriate path records when handling CM request
e92aa00a5189 IB/CM: Add OPA Path record support to CM
7db20ecd1d97 IB/core: Change wc.slid from 16 to 32 bits
db58540b021a IB/core: Change port_attr.sm_lid from 16 to 32 bits
582faf3150f5 IB/core: Change port_attr.lid size from 16 to 32 bits
ac3a949fb2ff IB/CM: Set appropriate slid and dlid when handling CM request
06f8174a9782 IB/core: Protect sysfs entry on ib_unregister_device
62ede7779904 Add OPA extended LID support
13c19222889d IB/rdmavt, hfi1, qib: Modify check_ah() to account for extended LIDs
d98bb7f7e6fa IB/hfi1: Determine 9B/16B L2 header type based on Address handle
dcc9881e6767 RDMA/(core, ulp): Convert register/unregister event handler to be void
f808c13fd373 lib/interval_tree: fast overlap detection

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications
OFED: Various changes from Linux 4.12 2026-06-24T19:30:55+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:55+00:00 774a6620632ff621bd840c6945b705420efcd55d Most of the changes involve renaming InfiBand address handles (AH) to RDMA address handles including renaming various types and functions. Address handles now also include type-specific fields and a set of wrapper accessor functions for getting and setting fields. For some of the type and function renames, drivers in sys/dev had to be updated directly (typically via sed). This contains changes from the following Linux commits: f039f44fc331 IB/core: Add support for draining IB_POLL_DIRECT completion queues fedd9e1f7582 IB/cq: Don't process more than the given budget 403cd12e2cf7 IB/umem: Add contiguous ODP support 0008b84ea9af IB/umem: Add support to huge ODP 3e7e1193e28a IB: Replace ib_umem page_size by page_shift cb8637660ae8 IB/SA: Move functions update_sm_ah() and ib_sa_event() 680562b56939 IB/SA: Remove unwanted braces dbb6c91fd8e0 IB/SA: Add braces when using sizeof f96a31871449 IB/SA: Fix lines longer than 80 columns 94d595c56077 IB/core: Add rdma_cap_opa_ah to expose opa address handles ee1c60b1bff8 IB/SA: Modify SA to implicitly cache Class Port info aa4656d9a429 IB/core: Move opa_class_port_info definition to header file 2196f2716292 IB/SA: Add support to query opa classport info. 64b4646eaf3d IB/core: Define 'opa' rdma_ah_attr type 44c58487d51a IB/core: Define 'ib' and 'roce' rdma_ah_attr types d8966fcd4c25 IB/core: Use rdma_ah_attr accessor functions 2224c47ace23 IB/core: Add accessor functions for rdma_ah_attr fields 365231593409 IB/core: Rename ib_destroy_ah to rdma_destroy_ah bfbfd661c9ea IB/core: Rename ib_query_ah to rdma_query_ah 67b985b6c755 IB/core: Rename ib_modify_ah to rdma_modify_ah 0a18cfe4f6d7 IB/core: Rename ib_create_ah to rdma_create_ah 766b7f6cf0c0 IB/mthca: Rename to_ib_ah_attr to to_rdma_ah_attr 38349389fece IB/mlx5: Rename to_ib_ah_attr to to_rdma_ah_attr 71d53ab47ee6 IB/mlx4: Rename to_ib_ah_attr to to_rdma_ah_attr 90898850ec4e IB/core: Rename struct ib_ah_attr to rdma_ah_attr 4ba66093bdc6 IB/core: Check for global flag when using ah_attr cf0b9395d084 IB/core: Add braces when using sizeof cfd519358f50 IB/IPoIB: Remove 'else' when the 'if' has a return. 82ffc226483c IB/CM: Add braces when using sizeof dfa834e1d97e IB/SA: Introduce path record specific types c2f8fc4ec440 IB/SA: Rename ib_sa_path_rec to sa_path_rec 9fdca4da4d8c IB/SA: Split struct sa_path_rec based on IB and ROCE specific fields 4c33bd1926cc IB/SA: Add support to query OPA path records 57520751445b IB/SA: Add OPA path record type 87f0faadc685 IB/SA: Add OPA addr header eed7624552ca RDMA/mlx4: Fix MAD tunneling when SRIOV is enabled f937d93a9122 RDMA/uverbs: Declare local function static and add brackets to sizeof d3957b86a406 RDMA/SA: Fix kernel panic in CMA request handler flow The IPoIB portions of ee1c60b1bff8 were already present in FreeBSD from an earlier sync with OFED. Likewise, the ib_uverbs_cmd.c changes from 4ba66093bdc6 were also already present. Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
Most of the changes involve renaming InfiBand address handles (AH) to
RDMA address handles including renaming various types and functions.
Address handles now also include type-specific fields and a set of
wrapper accessor functions for getting and setting fields.  For some
of the type and function renames, drivers in sys/dev had to be updated
directly (typically via sed).

This contains changes from the following Linux commits:

f039f44fc331 IB/core: Add support for draining IB_POLL_DIRECT completion queues
fedd9e1f7582 IB/cq: Don't process more than the given budget
403cd12e2cf7 IB/umem: Add contiguous ODP support
0008b84ea9af IB/umem: Add support to huge ODP
3e7e1193e28a IB: Replace ib_umem page_size by page_shift
cb8637660ae8 IB/SA: Move functions update_sm_ah() and ib_sa_event()
680562b56939 IB/SA: Remove unwanted braces
dbb6c91fd8e0 IB/SA: Add braces when using sizeof
f96a31871449 IB/SA: Fix lines longer than 80 columns
94d595c56077 IB/core: Add rdma_cap_opa_ah to expose opa address handles
ee1c60b1bff8 IB/SA: Modify SA to implicitly cache Class Port info
aa4656d9a429 IB/core: Move opa_class_port_info definition to header file
2196f2716292 IB/SA: Add support to query opa classport info.
64b4646eaf3d IB/core: Define 'opa' rdma_ah_attr type
44c58487d51a IB/core: Define 'ib' and 'roce' rdma_ah_attr types
d8966fcd4c25 IB/core: Use rdma_ah_attr accessor functions
2224c47ace23 IB/core: Add accessor functions for rdma_ah_attr fields
365231593409 IB/core: Rename ib_destroy_ah to rdma_destroy_ah
bfbfd661c9ea IB/core: Rename ib_query_ah to rdma_query_ah
67b985b6c755 IB/core: Rename ib_modify_ah to rdma_modify_ah
0a18cfe4f6d7 IB/core: Rename ib_create_ah to rdma_create_ah
766b7f6cf0c0 IB/mthca: Rename to_ib_ah_attr to to_rdma_ah_attr
38349389fece IB/mlx5: Rename to_ib_ah_attr to to_rdma_ah_attr
71d53ab47ee6 IB/mlx4: Rename to_ib_ah_attr to to_rdma_ah_attr
90898850ec4e IB/core: Rename struct ib_ah_attr to rdma_ah_attr
4ba66093bdc6 IB/core: Check for global flag when using ah_attr
cf0b9395d084 IB/core: Add braces when using sizeof
cfd519358f50 IB/IPoIB: Remove 'else' when the 'if' has a return.
82ffc226483c IB/CM: Add braces when using sizeof
dfa834e1d97e IB/SA: Introduce path record specific types
c2f8fc4ec440 IB/SA: Rename ib_sa_path_rec to sa_path_rec
9fdca4da4d8c IB/SA: Split struct sa_path_rec based on IB and ROCE specific fields
4c33bd1926cc IB/SA: Add support to query OPA path records
57520751445b IB/SA: Add OPA path record type
87f0faadc685 IB/SA: Add OPA addr header
eed7624552ca RDMA/mlx4: Fix MAD tunneling when SRIOV is enabled
f937d93a9122 RDMA/uverbs: Declare local function static and add brackets to sizeof
d3957b86a406 RDMA/SA: Fix kernel panic in CMA request handler flow

The IPoIB portions of ee1c60b1bff8 were already present in FreeBSD
from an earlier sync with OFED.  Likewise, the ib_uverbs_cmd.c
changes from 4ba66093bdc6 were also already present.

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications
OFED: Various changes from Linux 4.11 2026-06-24T19:30:55+00:00 John Baldwin jhb@FreeBSD.org 2026-06-24T19:30:55+00:00 8d57de34d51eeb70d758f2d463cf7cf2d829dd49 This contains changes from the following Linux commits: 55efcfcd7776 RDMA/core: Fix incorrect structure packing for booleans aaaca121c7cf RDMA/core: add port state cache 9e2c3f1c7f3e RDMA/core: export ib_get_cached_port_state 93b1f29de71f RDMA/cma: resolve to first active ib port d43dbacfc063 IB/core: Change the type of an ib_dma_alloc_coherent() argument 6532c380bf40 IB/core: Remove ib_dma_*map_single_attrs() 0bbb3b7496ea IB/rxe, IB/rdmavt: Use dma_virt_ops instead of duplicating it f57e8ca50e23 IB/mad: Add port_num to error message 828f6fa65ce7 IB/umem: Release pid in error and ODP flow 19b752a19dce IB/cma: Allow port reuse for rdma_id 21d6454a392d RDMA/core: create struct ib_port_cache 25bf14d6f589 IB/core: Add implicit MR flag d9d0674c0f8a IB/umem: Indicate that process is being terminated d07d1d70ce1a IB/umem: Update on demand page (ODP) support a748d60df32e IB/mlx4: Take source GID by index from HW GID table 89052d784bc9 IB/cma: Add default RoCE TOS to CMA configfs 6df6b4a9ce43 IB/cma: Destination and source addr families must match On FreeBSD, the default RoCE TOS setting is available as per-port sysctls similar to the existing default RoCE mode sysctls. Tested by: Wafa Hamzah <wafah@nvidia.com> (mlx5_ib) Tested by: John Baldwin <jhb@FreeBSD.org> (iw_cxgbe) Sponsored by: Chelsio Communications 
This contains changes from the following Linux commits:

55efcfcd7776 RDMA/core: Fix incorrect structure packing for booleans
aaaca121c7cf RDMA/core: add port state cache
9e2c3f1c7f3e RDMA/core: export ib_get_cached_port_state
93b1f29de71f RDMA/cma: resolve to first active ib port
d43dbacfc063 IB/core: Change the type of an ib_dma_alloc_coherent() argument
6532c380bf40 IB/core: Remove ib_dma_*map_single_attrs()
0bbb3b7496ea IB/rxe, IB/rdmavt: Use dma_virt_ops instead of duplicating it
f57e8ca50e23 IB/mad: Add port_num to error message
828f6fa65ce7 IB/umem: Release pid in error and ODP flow
19b752a19dce IB/cma: Allow port reuse for rdma_id
21d6454a392d RDMA/core: create struct ib_port_cache
25bf14d6f589 IB/core: Add implicit MR flag
d9d0674c0f8a IB/umem: Indicate that process is being terminated
d07d1d70ce1a IB/umem: Update on demand page (ODP) support
a748d60df32e IB/mlx4: Take source GID by index from HW GID table
89052d784bc9 IB/cma: Add default RoCE TOS to CMA configfs
6df6b4a9ce43 IB/cma: Destination and source addr families must match

On FreeBSD, the default RoCE TOS setting is available as per-port
sysctls similar to the existing default RoCE mode sysctls.

Tested by:	Wafa Hamzah <wafah@nvidia.com> (mlx5_ib)
Tested by:	John Baldwin <jhb@FreeBSD.org> (iw_cxgbe)
Sponsored by:	Chelsio Communications