| Message ID | 20210430165527.GA3573658@nvidia.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [GIT,PULL] Please pull RDMA subsystem changes | expand |
On Fri, Apr 30, 2021 at 01:55:27PM -0300, Jason Gunthorpe wrote: > Hi Linus, > > These are the proposed RDMA patches for 5.13. > > We are continuing to see small cycles in RDMA, this may be a new > structural normal. > > This time hns and rtrs lead the pack in change volume, but must is > cleaning not features. Oh! I forget to include the minor conflict resolution for hfi against v5.12: @@@ -1402,7 -1408,8 +1402,8 @@@ struct hfi1_devdata /* Lock to protect IRQ SRC register access */ spinlock_t irq_src_lock; int vnic_num_vports; - struct net_device *dummy_netdev; + struct hfi1_netdev_rx *netdev_rx; + struct hfi1_affinity_node *affinity_entry; /* Keeps track of IPoIB RSM rule users */ atomic_t ipoib_rsm_usr_num; Sorry, Jason
The pull request you sent on Fri, 30 Apr 2021 13:55:27 -0300:
> git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git tags/for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f34b2cf17825d69ae1e227871059ab18c2f57817
Thank you!
Hi Linus, These are the proposed RDMA patches for 5.13. We are continuing to see small cycles in RDMA, this may be a new structural normal. This time hns and rtrs lead the pack in change volume, but must is cleaning not features. Thanks, Jason The following changes since commit e71b75f73763d88665b3a19c5a4d52d559aa7732: net/mlx5: Implement sriov_get_vf_total_msix/count() callbacks (2021-04-04 10:30:38 +0300) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git tags/for-linus for you to fetch changes up to 6da7bda36388ae00822f732c11febfe2ebbb5544: IB/qib: Remove redundant assignment to ret (2021-04-30 10:58:15 -0300) ---------------------------------------------------------------- RDMA merge window pull request This is significantly bug fixes and general cleanups. The noteworthy new features are fairly small: - XRC support for HNS and improves RQ operations - Bug fixes and updates for hns, mlx5, bnxt_re, hfi1, i40iw, rxe, siw and qib - Quite a few general cleanups on spelling, error handling, static checker detections, etc - Increase the number of device ports supported beyond 255. High port count software switches now exist - Several bug fixes for rtrs - mlx5 Device Memory support for host controlled atomics - Report SRQ tables through to rdma-tool ---------------------------------------------------------------- Bernard Metzler (1): RDMA/iwcm: Allow AFONLY binding for IPv6 addresses Bhaskar Chowdhury (4): RDMA/include: Mundane typo fixes throughout the file IB/hns: Fix mispelling of subsystem IB/hfi1: Fix a typo RDMA: Fix a typo Bob Pearson (3): RDMA/rxe: Split MEM into MR and MW RDMA/rxe: Fix missing acks from responder RDMA/rxe: Fix a bug in rxe_fill_ip_info() Christophe JAILLET (1): RDMA/mlx4: Remove an unused variable Danil Kipnis (1): MAINTAINERS: Change maintainer for rtrs module Gal Pressman (4): RDMA/core: Remove unused req_ncomp_notif device operation RDMA/cma: Remove unused leftovers in cma code RDMA/efa: Use strscpy instead of strlcpy RDMA/nldev: Add copy-on-fork attribute to get sys command Gioh Kim (9): RDMA/rtrs: New function converting rtrs_addr to string RDMA/rtrs-srv: Report temporary sessname for error message RDMA/rtrs-clt: destroy sysfs after removing session from active list RDMA/rtrs-clt: Add a minimum latency multipath policy RDMA/rtrs-clt: New sysfs attribute to print the latency of each path Documentation/ABI/rtrs-clt: Add descriptions for min-latency policy RDMA/rtrs-clt: Print more info when an error happens RDMA/rtrs-srv: More debugging info when fail to send reply RDMA/rtrs-clt: Simplify error message Guoqing Jiang (4): RDMA/rtrs-clt: Remove redundant code from rtrs_clt_read_req RDMA/rtrs: Kill the put label in rtrs_srv_create_once_sysfs_root_folders RDMA/rtrs: Remove sessname and sess_kobj from rtrs_attrs RDMA/rtrs: Cleanup the code in rtrs_srv_rdma_cm_handler Håkon Bugge (4): RDMA/core: Fix corrupted SL on passive side IB/cma: Introduce rdma_set_min_rnr_timer() rds: ib: Remove two ib_modify_qp() calls RDMA/core: Unify RoCE check and re-factor code Jack Wang (5): RDMA/rtrs: Use new shared CQ mechanism RDMA/rtrs-clt: Use rdma_event_msg in log RDMA/rtrs: Cleanup unused 's' variable in __alloc_sess RDMA/rtrs-clt: Cap max_io_size RDMA/ipoib: Print a message if only child interface is UP Jason Gunthorpe (7): RDMA/mlx5: Zero out ODP related items in the mlx5_ib_mr RDMA/mlx5: Use a union inside mlx5_ib_mr RDMA/mlx5: Consolidate MR destruction to mlx5_ib_dereg_mr() RDMA/mlx5: Rename mlx5_mr_cache_invalidate() to revoke_mr() RDMA/mlx5: Allow larger pages in DevX umem Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux Merge branch 'mlx5_memic_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux Jiapeng Chong (2): RDMA/qib: Remove useless qib_read_ureg() function IB/hfi1: Remove redundant variable rcd Kaike Wan (1): IB/hfi1: Remove unused function Kamal Heib (1): RDMA/rxe: Remove rxe_dma_device declaration Lang Cheng (5): RDMA/hns: Use new SQ doorbell register for HIP09 RDMA/hns: Support to query firmware version RDMA/hns: Enable all CMDQ context RDMA/hns: Support more return types of command queue RDMA/hns: Prevent le32 from being implicitly converted to u32 Leon Romanovsky (6): RDMA/mlx5: Add missing returned error check of mlx5_ib_dereg_mr RDMA: Fix kernel-doc compilation warnings RDMA: Delete not-used static inline functions RDMA/bnxt_re: Depend on bnxt ethernet driver and not blindly select it RDMA/bnxt_re: Create direct symbol link between bnxt modules RDMA/bnxt_re: Get rid of custom module reference counting Lv Yunlong (3): IB/isert: Fix a use after free in isert_connect_request RDMA/siw: Fix a use after free in siw_alloc_mr RDMA/bnxt_re: Fix a double free in bnxt_qplib_alloc_res Manjunath Patil (1): IB/ipoib: Improve latency in ipoib/cm connection formation Maor Gottlieb (10): RDMA/mlx5: Fix query RoCE port RDMA/mlx5: Fix drop packet rule in egress table net/mlx5: Add MEMIC operations related bits RDMA/uverbs: Make UVERBS_OBJECT_METHODS to consider line number RDMA/mlx5: Move all DM logic to separate file RDMA/mlx5: Re-organize the DM code RDMA/mlx5: Add support to MODIFY_MEMIC command RDMA/mlx5: Add support in MEMIC operations RDMA/mlx5: Expose UAPI to query DM RDMA/mlx5: Fix type assignment for ICM DM Mark Bloch (2): RDMA: Support more than 255 rdma ports RDMA/mlx5: Expose private query port Mark Zhang (1): RDMA/mlx5: Fix mlx5 rates to IB rates map Mike Marciniszyn (8): IB/hfi1: Add AIP tx traces IB/{ipoib,hfi1}: Add a timeout handler for rdma_netdev IB/hfi1: Correct oversized ring allocation IB/hfi1: Use napi_schedule_irqoff() for tx napi IB/hfi1: Remove indirect call to hfi1_ipoib_send_dma() IB/hfi1: Add additional usdma traces IB/hfi1: Use kzalloc() for mmu_rb_handler allocation IB/hfi1: Rework AIP and VNIC dummy netdev usage Neta Ostrovsky (4): RDMA/nldev: Return context information RDMA/restrack: Add support to get resource tracking for SRQ RDMA/nldev: Return SRQ information RDMA/nldev: Add QP numbers to SRQ information Parav Pandit (2): IB/mlx5: Set right RoCE l3 type and roce version while deleting GID RDMA/cma: Skip device which doesn't support CM Patrisious Haddad (1): RDMA/uverbs: Refactor rdma_counter_set_auto_mode and __counter_set_mode Potnuri Bharat Teja (1): RDMA/cxgb4: add missing qpid increment Praveen Kumar Kannoju (1): IB/mlx5: Reduce max order of memory allocated for xlt update Ruiqi Gong (1): RDMA/hns: Fix a spelling mistake in hns_roce_hw_v1.c Selvin Xavier (1): RDMA/bnxt_re: Move device to error state upon device crash Shay Drory (3): RDMA/mlx5: Create ODP EQ only when ODP MR is created RDMA/mlx5: Set ODP caps only if device profile support ODP RDMA/core: Add CM to restrack after successful attachment to a device Sindhu Devale (1): RDMA/i40iw: Fix error unwinding when i40iw_hmc_sd_one fails Tang Yizhou (1): RDMA/iw_cxgb4: Use DEFINE_SPINLOCK() for spinlock Wan Jiabing (2): RDMA/iser: struct iscsi_iser_task is declared twice IB/ipoib: Remove unnecessary struct declaration Wang Wensheng (4): RDMA/qedr: Fix error return code in qedr_iw_connect() IB/hfi1: Fix error return code in parse_platform_config() RDMA/bnxt_re: Fix error return code in bnxt_qplib_cq_process_terminal() RDMA/srpt: Fix error return code in srpt_cm_req_recv() Wei Xu (5): RDMA/hns: Support query information of functions from FW RDMA/hns: Query the number of functions supported by the PF RDMA/hns: Reserve the resource for the VFs RDMA/hns: Set parameters of all the functions belong to a PF RDMA/hns: Enable RoCE on virtual functions Wei Yongjun (1): RDMA/hns: Use GFP_ATOMIC under spin lock Weihang Li (5): RDMA/hns: Fix memory corruption when allocating XRCDN MAINTAINERS: remove Xavier as maintainer of HISILICON ROCE DRIVER RDMA/hns: Refactor hns_roce_v2_poll_one() RDMA/hns: Avoid enabling RQ inline on UD RDMA/hns: Fix missing assignment of max_inline_data Wenpeng Liang (11): RDMA/hns: Add support for XRC on HIP09 RDMA/hns: Modify prints for mailbox and command queue RDMA/hns: Delete redundant abnormal interrupt status RDMA/hns: Remove unsupported QP types RDMA/hns: Add XRC subtype in QPC and XRC type in SRQC RDMA/core: Print the function name by __func__ instead of an fixed string RDMA/core: Remove the redundant return statements RDMA/core: Add necessary spaces RDMA/core: Remove redundant spaces RDMA/core: Correct format of braces RDMA/core: Correct format of block comments Xi Wang (5): RDMA/hns: Refactor reset state checking flow RDMA/hns: Reorganize process of setting HEM RDMA/hns: Simplify command fields for HEM base address configuration RDMA/hns: Simplify function's resource related command RDMA/hns: Remove duplicated hem page size config code Yang Li (1): IB/qib: Remove redundant assignment to ret Yangyang Li (4): RDMA/core: Correct misspellings of two words in comments RDMA/hns: Support congestion control type selection according to the FW RDMA/hns: Delete redundant condition judgment related to eq RDMA/hns: Delete unused members in the structure hns_roce_hw Ye Bin (1): RDMA/i40iw: Use DEFINE_SPINLOCK() for spinlock Yishai Hadas (2): IB/core: Drop WARN_ON() from ib_umem_find_best_pgsz() IB/core: Split uverbs_get_const/default to consider target type Yixian Liu (4): RDMA/hns: Support configuring doorbell mode of RQ and CQ RDMA/hns: Reorganize doorbell update interfaces for all queues RDMA/core: Make the wc status prompt message clearer RDMA/hns: Remove unnecessary flush operation for workqueue Yixing Liu (2): RDMA/hns: Reorganize hns_roce_create_cq() RDMA/hns: Simplify the function config_eqc() YueHaibing (1): RDMA/uverbs: Fix -Wunused-function warning Documentation/ABI/testing/sysfs-class-rtrs-client | 12 + .../bindings/infiniband/hisilicon-hns-roce.txt | 2 +- MAINTAINERS | 5 +- drivers/infiniband/core/cache.c | 87 +- drivers/infiniband/core/cm.c | 58 +- drivers/infiniband/core/cm_msgs.h | 4 +- drivers/infiniband/core/cma.c | 116 +- drivers/infiniband/core/cma_configfs.c | 8 +- drivers/infiniband/core/cma_priv.h | 10 +- drivers/infiniband/core/core_priv.h | 28 +- drivers/infiniband/core/counters.c | 62 +- drivers/infiniband/core/device.c | 37 +- drivers/infiniband/core/iwpm_msg.c | 3 +- drivers/infiniband/core/mad.c | 79 +- drivers/infiniband/core/mad_rmpp.c | 10 +- drivers/infiniband/core/multicast.c | 8 +- drivers/infiniband/core/nldev.c | 176 +- drivers/infiniband/core/opa_smi.h | 4 +- drivers/infiniband/core/rdma_core.c | 4 +- drivers/infiniband/core/restrack.c | 3 + drivers/infiniband/core/roce_gid_mgmt.c | 52 +- drivers/infiniband/core/rw.c | 25 +- drivers/infiniband/core/sa.h | 2 +- drivers/infiniband/core/sa_query.c | 22 +- drivers/infiniband/core/security.c | 8 +- drivers/infiniband/core/smi.c | 12 +- drivers/infiniband/core/smi.h | 4 +- drivers/infiniband/core/sysfs.c | 29 +- drivers/infiniband/core/ucma.c | 8 +- drivers/infiniband/core/umem.c | 8 +- drivers/infiniband/core/umem_dmabuf.c | 4 + drivers/infiniband/core/user_mad.c | 34 +- drivers/infiniband/core/uverbs_cmd.c | 25 +- drivers/infiniband/core/uverbs_ioctl.c | 32 +- drivers/infiniband/core/verbs.c | 43 +- drivers/infiniband/hw/bnxt_re/Kconfig | 4 +- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 + drivers/infiniband/hw/bnxt_re/hw_counters.c | 4 +- drivers/infiniband/hw/bnxt_re/hw_counters.h | 4 +- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 10 +- drivers/infiniband/hw/bnxt_re/ib_verbs.h | 10 +- drivers/infiniband/hw/bnxt_re/main.c | 63 +- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 1 + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 2 + drivers/infiniband/hw/bnxt_re/qplib_res.c | 1 + drivers/infiniband/hw/cxgb4/cm.c | 3 +- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 11 - drivers/infiniband/hw/cxgb4/provider.c | 12 +- drivers/infiniband/hw/cxgb4/resource.c | 2 +- drivers/infiniband/hw/cxgb4/t4.h | 33 - drivers/infiniband/hw/efa/efa.h | 14 +- drivers/infiniband/hw/efa/efa_main.c | 10 +- drivers/infiniband/hw/efa/efa_verbs.c | 14 +- drivers/infiniband/hw/hfi1/affinity.c | 8 +- drivers/infiniband/hw/hfi1/chip.c | 10 +- drivers/infiniband/hw/hfi1/chip.h | 5 - drivers/infiniband/hw/hfi1/driver.c | 2 +- drivers/infiniband/hw/hfi1/exp_rcv.c | 6 +- drivers/infiniband/hw/hfi1/firmware.c | 1 + drivers/infiniband/hw/hfi1/hfi.h | 20 +- drivers/infiniband/hw/hfi1/init.c | 7 +- drivers/infiniband/hw/hfi1/iowait.h | 2 +- drivers/infiniband/hw/hfi1/ipoib.h | 15 +- drivers/infiniband/hw/hfi1/ipoib_main.c | 13 +- drivers/infiniband/hw/hfi1/ipoib_tx.c | 71 +- drivers/infiniband/hw/hfi1/mad.c | 128 +- drivers/infiniband/hw/hfi1/mad.h | 2 +- drivers/infiniband/hw/hfi1/mmu_rb.c | 2 +- drivers/infiniband/hw/hfi1/msix.c | 12 +- drivers/infiniband/hw/hfi1/netdev.h | 39 +- drivers/infiniband/hw/hfi1/netdev_rx.c | 172 +- drivers/infiniband/hw/hfi1/sdma.c | 2 +- drivers/infiniband/hw/hfi1/sdma.h | 18 - drivers/infiniband/hw/hfi1/sysfs.c | 2 +- drivers/infiniband/hw/hfi1/trace_tx.h | 179 ++ drivers/infiniband/hw/hfi1/user_sdma.c | 12 +- drivers/infiniband/hw/hfi1/user_sdma.h | 1 + drivers/infiniband/hw/hfi1/verbs.c | 8 +- drivers/infiniband/hw/hfi1/verbs.h | 4 +- drivers/infiniband/hw/hfi1/verbs_txreq.h | 5 - drivers/infiniband/hw/hfi1/vnic.h | 2 +- drivers/infiniband/hw/hfi1/vnic_main.c | 2 +- drivers/infiniband/hw/hns/hns_roce_alloc.c | 3 + drivers/infiniband/hw/hns/hns_roce_cmd.c | 114 +- drivers/infiniband/hw/hns/hns_roce_common.h | 25 +- drivers/infiniband/hw/hns/hns_roce_cq.c | 92 +- drivers/infiniband/hw/hns/hns_roce_device.h | 91 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 55 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2267 +++++++++++--------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 578 ++--- drivers/infiniband/hw/hns/hns_roce_main.c | 74 +- drivers/infiniband/hw/hns/hns_roce_pd.c | 59 + drivers/infiniband/hw/hns/hns_roce_qp.c | 124 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 5 +- drivers/infiniband/hw/i40iw/i40iw.h | 9 - drivers/infiniband/hw/i40iw/i40iw_cm.c | 4 +- drivers/infiniband/hw/i40iw/i40iw_hmc.c | 4 +- drivers/infiniband/hw/i40iw/i40iw_main.c | 5 +- drivers/infiniband/hw/i40iw/i40iw_osdep.h | 22 - drivers/infiniband/hw/i40iw/i40iw_pble.c | 6 +- drivers/infiniband/hw/i40iw/i40iw_puda.c | 2 +- drivers/infiniband/hw/i40iw/i40iw_utils.c | 2 +- drivers/infiniband/hw/i40iw/i40iw_verbs.c | 14 +- drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 2 +- drivers/infiniband/hw/mlx4/alias_GUID.c | 16 +- drivers/infiniband/hw/mlx4/mad.c | 46 +- drivers/infiniband/hw/mlx4/main.c | 47 +- drivers/infiniband/hw/mlx4/mlx4_ib.h | 26 +- drivers/infiniband/hw/mlx4/qp.c | 3 - drivers/infiniband/hw/mlx5/Makefile | 1 + drivers/infiniband/hw/mlx5/cmd.c | 101 - drivers/infiniband/hw/mlx5/cmd.h | 3 - drivers/infiniband/hw/mlx5/cong.c | 8 +- drivers/infiniband/hw/mlx5/counters.c | 10 +- drivers/infiniband/hw/mlx5/counters.h | 2 +- drivers/infiniband/hw/mlx5/devx.c | 64 +- drivers/infiniband/hw/mlx5/dm.c | 587 +++++ drivers/infiniband/hw/mlx5/dm.h | 68 + drivers/infiniband/hw/mlx5/fs.c | 9 +- drivers/infiniband/hw/mlx5/ib_rep.c | 4 +- drivers/infiniband/hw/mlx5/ib_rep.h | 4 +- drivers/infiniband/hw/mlx5/ib_virt.c | 16 +- drivers/infiniband/hw/mlx5/mad.c | 16 +- drivers/infiniband/hw/mlx5/main.c | 343 +-- drivers/infiniband/hw/mlx5/mlx5_ib.h | 182 +- drivers/infiniband/hw/mlx5/mr.c | 163 +- drivers/infiniband/hw/mlx5/odp.c | 185 +- drivers/infiniband/hw/mlx5/qp.c | 17 +- drivers/infiniband/hw/mlx5/std_types.c | 173 ++ drivers/infiniband/hw/mthca/mthca_av.c | 6 +- drivers/infiniband/hw/mthca/mthca_dev.h | 8 +- drivers/infiniband/hw/mthca/mthca_mad.c | 4 +- drivers/infiniband/hw/mthca/mthca_provider.c | 10 +- drivers/infiniband/hw/mthca/mthca_qp.c | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_main.c | 4 +- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 7 +- drivers/infiniband/hw/qedr/main.c | 8 +- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 4 +- drivers/infiniband/hw/qedr/verbs.c | 9 +- drivers/infiniband/hw/qedr/verbs.h | 11 +- drivers/infiniband/hw/qib/qib.h | 34 +- drivers/infiniband/hw/qib/qib_common.h | 7 - drivers/infiniband/hw/qib/qib_file_ops.c | 5 +- drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- drivers/infiniband/hw/qib/qib_iba7220.c | 4 +- drivers/infiniband/hw/qib/qib_iba7322.c | 26 +- drivers/infiniband/hw/qib/qib_init.c | 2 +- drivers/infiniband/hw/qib/qib_mad.c | 4 +- drivers/infiniband/hw/qib/qib_qp.c | 4 +- drivers/infiniband/hw/qib/qib_sd7220.c | 1 - drivers/infiniband/hw/qib/qib_sysfs.c | 2 +- drivers/infiniband/hw/qib/qib_verbs.c | 6 +- drivers/infiniband/hw/qib/qib_verbs.h | 6 +- drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 +- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 6 +- drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 6 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 10 - drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 2 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 12 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 45 +- drivers/infiniband/sw/rdmavt/mad.c | 5 +- drivers/infiniband/sw/rdmavt/mad.h | 2 +- drivers/infiniband/sw/rdmavt/vt.c | 34 +- drivers/infiniband/sw/rdmavt/vt.h | 11 +- drivers/infiniband/sw/rxe/rxe_av.c | 2 +- drivers/infiniband/sw/rxe/rxe_comp.c | 5 +- drivers/infiniband/sw/rxe/rxe_hw_counters.c | 4 +- drivers/infiniband/sw/rxe/rxe_hw_counters.h | 4 +- drivers/infiniband/sw/rxe/rxe_loc.h | 30 +- drivers/infiniband/sw/rxe/rxe_mr.c | 271 ++- drivers/infiniband/sw/rxe/rxe_pool.c | 14 +- drivers/infiniband/sw/rxe/rxe_req.c | 10 +- drivers/infiniband/sw/rxe/rxe_resp.c | 52 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 32 +- drivers/infiniband/sw/rxe/rxe_verbs.h | 60 +- drivers/infiniband/sw/siw/iwarp.h | 13 - drivers/infiniband/sw/siw/siw_cm.c | 19 +- drivers/infiniband/sw/siw/siw_mem.c | 4 +- drivers/infiniband/sw/siw/siw_mem.h | 5 - drivers/infiniband/sw/siw/siw_verbs.c | 8 +- drivers/infiniband/sw/siw/siw_verbs.h | 10 +- drivers/infiniband/ulp/ipoib/ipoib.h | 6 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 6 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 26 +- drivers/infiniband/ulp/iser/iscsi_iser.h | 1 - drivers/infiniband/ulp/isert/ib_isert.c | 16 +- drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 48 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 122 +- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 3 + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 20 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 36 +- drivers/infiniband/ulp/rtrs/rtrs.c | 35 +- drivers/infiniband/ulp/rtrs/rtrs.h | 3 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 - drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 1 + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c | 4 +- include/linux/mlx5/driver.h | 2 +- include/linux/mlx5/mlx5_ifc.h | 42 +- include/rdma/ib_cache.h | 18 +- include/rdma/ib_mad.h | 2 +- include/rdma/ib_sa.h | 15 +- include/rdma/ib_verbs.h | 199 +- include/rdma/iw_cm.h | 1 + include/rdma/rdma_cm.h | 4 +- include/rdma/rdma_counter.h | 16 +- include/rdma/rdma_vt.h | 18 +- include/rdma/restrack.h | 4 + include/rdma/rw.h | 18 +- include/rdma/uverbs_ioctl.h | 81 +- include/rdma/uverbs_named_ioctl.h | 2 +- include/uapi/rdma/hns-abi.h | 2 + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 29 + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 25 + include/uapi/rdma/rdma_netlink.h | 16 + net/rds/ib_cm.c | 35 +- net/rds/rdma_transport.c | 1 + 226 files changed, 5325 insertions(+), 4036 deletions(-) (diffstat from tag for-linus-merged)