Commit 55aa394a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma updates from Jason Gunthorpe:
 "This has another new RDMA driver 'bng_en' for latest generation
  Broadcom NICs. There might be one more new driver still to come.

  Otherwise it is a fairly quite cycle. Summary:

   - Minor driver bug fixes and updates to cxgb4, rxe, rdmavt, bnxt_re,
     mlx5

   - Many bug fix patches for irdma

   - WQ_PERCPU annotations and system_dfl_wq changes

   - Improved mlx5 support for "other eswitches" and multiple PFs

   - 1600Gbps link speed reporting support. Four Digits Now!

   - New driver bng_en for latest generation Broadcom NICs

   - Bonding support for hns

   - Adjust mlx5's hmm based ODP to work with the very large address
     space created by the new 5 level paging default on x86

   - Lockdep fixups in rxe and siw"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (65 commits)
  RDMA/rxe: reclassify sockets in order to avoid false positives from lockdep
  RDMA/siw: reclassify sockets in order to avoid false positives from lockdep
  RDMA/bng_re: Remove prefetch instruction
  RDMA/core: Reduce cond_resched() frequency in __ib_umem_release
  RDMA/irdma: Fix SRQ shadow area address initialization
  RDMA/irdma: Remove doorbell elision logic
  RDMA/irdma: Do not set IBK_LOCAL_DMA_LKEY for GEN3+
  RDMA/irdma: Do not directly rely on IB_PD_UNSAFE_GLOBAL_RKEY
  RDMA/irdma: Add missing mutex destroy
  RDMA/irdma: Fix SIGBUS in AEQ destroy
  RDMA/irdma: Add a missing kfree of struct irdma_pci_f for GEN2
  RDMA/irdma: Fix data race in irdma_free_pble
  RDMA/irdma: Fix data race in irdma_sc_ccq_arm
  RDMA/mlx5: Add support for 1600_8x lane speed
  RDMA/core: Add new IB rate for XDR (8x) support
  IB/mlx5: Reduce IMR KSM size when 5-level paging is enabled
  RDMA/bnxt_re: Pass correct flag for dma mr creation
  RDMA/bnxt_re: Fix the inline size for GenP7 devices
  RDMA/hns: Support reset recovery for bond
  RDMA/hns: Support link state reporting for bond
  ...
parents 056daec2 80a85a77

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -5243,6 +5243,13 @@ W: http://www.broadcom.com 
F:	drivers/infiniband/hw/bnxt_re/

F:	include/uapi/rdma/bnxt_re-abi.h









BROADCOM 800 GIGABIT ROCE DRIVER









M:	Siva Reddy Kallam <siva.kallam@broadcom.com>









L:	linux-rdma@vger.kernel.org









S:	Supported









W:	http://www.broadcom.com









F:	drivers/infiniband/hw/bng_re/

















BROADCOM NVRAM DRIVER









M:	Rafał Miłecki <zajec5@gmail.com>









L:	linux-mips@vger.kernel.org
































drivers/infiniband/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -80,6 +80,7 @@ config INFINIBAND_VIRT_DMA







if INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS









if !UML









source "drivers/infiniband/hw/bnxt_re/Kconfig"









source "drivers/infiniband/hw/bng_re/Kconfig"









source "drivers/infiniband/hw/cxgb4/Kconfig"









source "drivers/infiniband/hw/efa/Kconfig"









source "drivers/infiniband/hw/erdma/Kconfig"
































drivers/infiniband/core/cm.c



+4
−5






























Original line number
Diff line number
Diff line







@@ -34,7 +34,6 @@ MODULE_AUTHOR("Sean Hefty");







MODULE_DESCRIPTION("InfiniBand CM");









MODULE_LICENSE("Dual BSD/GPL");



















#define CM_DESTROY_ID_WAIT_TIMEOUT 10000 /* msecs */









#define CM_DIRECT_RETRY_CTX ((void *) 1UL)









#define CM_MRA_SETTING 24 /* 4.096us * 2^24 = ~68.7 seconds */


















@@ -1057,6 +1056,7 @@ static void cm_destroy_id(struct ib_cm_id *cm_id, int err)







{









	struct cm_id_private *cm_id_priv;









	enum ib_cm_state old_state;









	unsigned long timeout;









	struct cm_work *work;









	int ret;


















@@ -1167,10 +1167,9 @@ static void cm_destroy_id(struct ib_cm_id *cm_id, int err)

















	xa_erase(&cm.local_id_table, cm_local_id(cm_id->local_id));









	cm_deref_id(cm_id_priv);









	timeout = msecs_to_jiffies((cm_id_priv->max_cm_retries * cm_id_priv->timeout_ms * 5) / 4);









	do {









		ret = wait_for_completion_timeout(&cm_id_priv->comp,









						  msecs_to_jiffies(









						  CM_DESTROY_ID_WAIT_TIMEOUT));









		ret = wait_for_completion_timeout(&cm_id_priv->comp, timeout);









		if (!ret) /* timeout happened */









			cm_destroy_id_wait_timeout(cm_id, old_state);









	} while (!ret);








@@ -4518,7 +4517,7 @@ static int __init ib_cm_init(void)







	get_random_bytes(&cm.random_id_operand, sizeof cm.random_id_operand);









	INIT_LIST_HEAD(&cm.timewait_list);



















	cm.wq = alloc_workqueue("ib_cm", 0, 1);









	cm.wq = alloc_workqueue("ib_cm", WQ_PERCPU, 1);









	if (!cm.wq) {









		ret = -ENOMEM;









		goto error2;
































drivers/infiniband/core/cma.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -4475,6 +4475,8 @@ int rdma_connect_locked(struct rdma_cm_id *id,







		container_of(id, struct rdma_id_private, id);









	int ret;



















	lockdep_assert_held(&id_priv->handler_mutex);



















	if (!cma_comp_exch(id_priv, RDMA_CM_ROUTE_RESOLVED, RDMA_CM_CONNECT))









		return -EINVAL;










































drivers/infiniband/core/device.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -3021,7 +3021,7 @@ static int __init ib_core_init(void)







{









	int ret = -ENOMEM;



















	ib_wq = alloc_workqueue("infiniband", 0, 0);









	ib_wq = alloc_workqueue("infiniband", WQ_PERCPU, 0);









	if (!ib_wq)









		return -ENOMEM;


















@@ -3031,7 +3031,7 @@ static int __init ib_core_init(void)







		goto err;



















	ib_comp_wq = alloc_workqueue("ib-comp-wq",









			WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_SYSFS, 0);









			WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_SYSFS | WQ_PERCPU, 0);









	if (!ib_comp_wq)









		goto err_unbound;