Commit a50243b1 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 been a slightly more active cycle than normal with ongoing
  core changes and quite a lot of collected driver updates.

   - Various driver fixes for bnxt_re, cxgb4, hns, mlx5, pvrdma, rxe

   - A new data transfer mode for HFI1 giving higher performance

   - Significant functional and bug fix update to the mlx5
     On-Demand-Paging MR feature

   - A chip hang reset recovery system for hns

   - Change mm->pinned_vm to an atomic64

   - Update bnxt_re to support a new 57500 chip

   - A sane netlink 'rdma link add' method for creating rxe devices and
     fixing the various unregistration race conditions in rxe's
     unregister flow

   - Allow lookup up objects by an ID over netlink

   - Various reworking of the core to driver interface:
       - drivers should not assume umem SGLs are in PAGE_SIZE chunks
       - ucontext is accessed via udata not other means
       - start to make the core code responsible for object memory
         allocation
       - drivers should convert struct device to struct ib_device via a
         helper
       - drivers have more tools to avoid use after unregister problems"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (280 commits)
  net/mlx5: ODP support for XRC transport is not enabled by default in FW
  IB/hfi1: Close race condition on user context disable and close
  RDMA/umem: Revert broken 'off by one' fix
  RDMA/umem: minor bug fix in error handling path
  RDMA/hns: Use GFP_ATOMIC in hns_roce_v2_modify_qp
  cxgb4: kfree mhp after the debug print
  IB/rdmavt: Fix concurrency panics in QP post_send and modify to error
  IB/rdmavt: Fix loopback send with invalidate ordering
  IB/iser: Fix dma_nents type definition
  IB/mlx5: Set correct write permissions for implicit ODP MR
  bnxt_re: Clean cq for kernel consumers only
  RDMA/uverbs: Don't do double free of allocated PD
  RDMA: Handle ucontext allocations by IB/core
  RDMA/core: Fix a WARN() message
  bnxt_re: fix the regression due to changes in alloc_pbl
  IB/mlx4: Increase the timeout for CM cache
  IB/core: Abort page fault handler silently during owning process exit
  IB/mlx5: Validate correct PD before prefetch MR
  IB/mlx5: Protect against prefetch of invalid MR
  RDMA/uverbs: Store PR pointer before it is overwritten
  ...
parents 2901752c fca22e7e

.clang-format

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ ForEachMacros: 
  - 'for_each_set_bit'

  - 'for_each_set_bit_from'

  - 'for_each_sg'

  - 'for_each_sg_dma_page'

  - 'for_each_sg_page'

  - 'for_each_sibling_event'

  - '__for_each_thread'
@@ -360,6 +361,7 @@ ForEachMacros: 
  - 'radix_tree_for_each_slot'

  - 'radix_tree_for_each_tagged'

  - 'rbtree_postorder_for_each_entry_safe'

  - 'rdma_for_each_port'

  - 'resource_list_for_each_entry'

  - 'resource_list_for_each_entry_safe'

  - 'rhl_for_each_entry_rcu'

Documentation/infiniband/user_verbs.txt

+2 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ Memory pinning 
  I/O targets be kept resident at the same physical address.  The

  ib_uverbs module manages pinning and unpinning memory regions via

  get_user_pages() and put_page() calls.  It also accounts for the

  amount of memory pinned in the process's locked_vm, and checks that

  amount of memory pinned in the process's pinned_vm, and checks that

  unprivileged processes do not exceed their RLIMIT_MEMLOCK limit.



  Pages that are pinned multiple times are counted each time they are

  pinned, so the value of locked_vm may be an overestimate of the

  pinned, so the value of pinned_vm may be an overestimate of the

  number of pages pinned by a process.



/dev files

drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c

+7 −1
Original line number Diff line number Diff line
@@ -311,7 +311,13 @@ static dma_addr_t __vmw_piter_dma_addr(struct vmw_piter *viter) 


static dma_addr_t __vmw_piter_sg_addr(struct vmw_piter *viter)

{

	return sg_page_iter_dma_address(&viter->iter);

	/*

	 * FIXME: This driver wrongly mixes DMA and CPU SG list iteration and

	 * needs revision. See

	 * https://lore.kernel.org/lkml/20190104223531.GA1705@ziepe.ca/

	 */

	return sg_page_iter_dma_address(

		container_of(&viter->iter, struct sg_dma_page_iter, base));

}

drivers/infiniband/Kconfig

+7 −8
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ config INFINIBAND_ADDR_TRANS_CONFIGFS 
	  This allows the user to config the default GID type that the CM

	  uses for each device, when initiaing new connections.



if INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS

source "drivers/infiniband/hw/mthca/Kconfig"

source "drivers/infiniband/hw/qib/Kconfig"

source "drivers/infiniband/hw/cxgb3/Kconfig"
@@ -101,6 +102,12 @@ source "drivers/infiniband/hw/ocrdma/Kconfig" 
source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"

source "drivers/infiniband/hw/usnic/Kconfig"

source "drivers/infiniband/hw/hns/Kconfig"

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

source "drivers/infiniband/hw/hfi1/Kconfig"

source "drivers/infiniband/hw/qedr/Kconfig"

source "drivers/infiniband/sw/rdmavt/Kconfig"

source "drivers/infiniband/sw/rxe/Kconfig"

endif



source "drivers/infiniband/ulp/ipoib/Kconfig"
@@ -111,13 +118,5 @@ source "drivers/infiniband/ulp/iser/Kconfig" 
source "drivers/infiniband/ulp/isert/Kconfig"



source "drivers/infiniband/ulp/opa_vnic/Kconfig"

source "drivers/infiniband/sw/rdmavt/Kconfig"

source "drivers/infiniband/sw/rxe/Kconfig"



source "drivers/infiniband/hw/hfi1/Kconfig"



source "drivers/infiniband/hw/qedr/Kconfig"



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



endif # INFINIBAND

drivers/infiniband/core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ ib_core-y := packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \ 
				nldev.o restrack.o



ib_core-$(CONFIG_SECURITY_INFINIBAND) += security.o

ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o

ib_core-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o

ib_core-$(CONFIG_CGROUP_RDMA) += cgroup.o



ib_cm-y :=			cm.o
@@ -39,3 +37,5 @@ ib_uverbs-y := uverbs_main.o uverbs_cmd.o uverbs_marshall.o \ 
				uverbs_std_types_flow_action.o uverbs_std_types_dm.o \

				uverbs_std_types_mr.o uverbs_std_types_counters.o \

				uverbs_uapi.o uverbs_std_types_device.o

ib_uverbs-$(CONFIG_INFINIBAND_USER_MEM) += umem.o

ib_uverbs-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE