Commit 1d21b1bf authored Jun 10, 2014 by Linus Torvalds

infiniband

Pull main InfiniBand/RDMA updates from Roland Dreier:

 - add iWARP port mapper to avoid conflicts between RDMA and normal
   stack TCP connections.

 - fixes for i386 / x86-64 structure padding differences (ABI
   compatibility for 32-on-64) from Yann Droneaud.

 - a pile of SRP initiator fixes from Bart Van Assche.

 - fixes for a writeback / memory allocation deadlock with NFS over
   IPoIB connected mode from Jiri Kosina.

 - the usual fixes and cleanups to mlx4, mlx5, cxgb4 and other low-level
   drivers.

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (61 commits)
  RDMA/cxgb4: Add support for iWARP Port Mapper user space service
  RDMA/nes: Add support for iWARP Port Mapper user space service
  RDMA/core: Add support for iWARP Port Mapper user space service
  IB/mlx4: Fix gfp passing in create_qp_common()
  IB/umad: Fix use-after-free on close
  IB/core: Fix kobject leak on device register error flow
  RDMA/cxgb4: add missing padding at end of struct c4iw_alloc_ucontext_resp
  mlx4_core: Fix GFP flags parameters to be gfp_t
  IB/core: Fix port kobject deletion during error flow
  IB/core: Remove unneeded kobject_get/put calls
  IB/core: Fix sparse warnings about redeclared functions
  IB/mad: Fix sparse warning about gfp_t use
  IB/mlx4: Implement IB_QP_CREATE_USE_GFP_NOIO
  IB: Add a QP creation flag to use GFP_NOIO allocations
  IB: Return error for unsupported QP creation flags
  IB: Allow build of hw/ and ulp/ subdirectories independently
  mlx4_core: Move handling of MLX4_QP_ST_MLX to proper switch statement
  RDMA/cxgb4: Add missing padding at end of struct c4iw_create_cq_resp
  IB/srp: Avoid problems if a header uses pr_fmt
  IB/umad: Fix error handling
  ...

parents 77c32bbb eeaddf36

drivers/infiniband/Makefile

+2 −17

Original line number	Diff line number	Diff line
		obj-$(CONFIG_INFINIBAND) += core/
		obj-$(CONFIG_INFINIBAND_MTHCA) += hw/mthca/
		obj-$(CONFIG_INFINIBAND_IPATH) += hw/ipath/
		obj-$(CONFIG_INFINIBAND_QIB) += hw/qib/
		obj-$(CONFIG_INFINIBAND_EHCA) += hw/ehca/
		obj-$(CONFIG_INFINIBAND_AMSO1100) += hw/amso1100/
		obj-$(CONFIG_INFINIBAND_CXGB3) += hw/cxgb3/
		obj-$(CONFIG_INFINIBAND_CXGB4) += hw/cxgb4/
		obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/
		obj-$(CONFIG_MLX5_INFINIBAND) += hw/mlx5/
		obj-$(CONFIG_INFINIBAND_NES) += hw/nes/
		obj-$(CONFIG_INFINIBAND_OCRDMA) += hw/ocrdma/
		obj-$(CONFIG_INFINIBAND_USNIC) += hw/usnic/
		obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/
		obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/
		obj-$(CONFIG_INFINIBAND_SRPT) += ulp/srpt/
		obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/
		obj-$(CONFIG_INFINIBAND_ISERT) += ulp/isert/
		obj-$(CONFIG_INFINIBAND) += hw/
		obj-$(CONFIG_INFINIBAND) += ulp/

drivers/infiniband/core/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ ib_sa-y := sa_query.o multicast.o

		ib_cm-y := cm.o

		iw_cm-y := iwcm.o
		iw_cm-y := iwcm.o iwpm_util.o iwpm_msg.o

		rdma_cm-y := cma.o

drivers/infiniband/core/cma.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3607,7 +3607,8 @@ static int cma_get_id_stats(struct sk_buff skb, struct netlink_callback cb)

		id_stats = ibnl_put_msg(skb, &nlh, cb->nlh->nlmsg_seq,
		sizeof *id_stats, RDMA_NL_RDMA_CM,
		RDMA_NL_RDMA_CM_ID_STATS);
		RDMA_NL_RDMA_CM_ID_STATS,
		NLM_F_MULTI);
		if (!id_stats)
		goto out;

drivers/infiniband/core/iwpm_msg.c

0 → 100644

+685 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/core/iwpm_util.c

0 → 100644

+607 −0

File added.

Preview size limit exceeded, changes collapsed.