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

7b1cd95d · Linus Torvalds <[email protected]> · 2018-01-31 12:05:10 -08:00

Pull RDMA subsystem updates from Jason Gunthorpe:
 "Overall this cycle did not have any major excitement, and did not
  require any shared branch with netdev.

  Lots of driver updates, particularly of the scale-up and performance
  variety. The largest body of core work was Parav's patches fixing and
  restructing some of the core code to make way for future RDMA
  containerization.

  Summary:

   - misc small driver fixups to
     bnxt_re/hfi1/qib/hns/ocrdma/rdmavt/vmw_pvrdma/nes

   - several major feature adds to bnxt_re driver: SRIOV VF RoCE
     support, HugePages support, extended hardware stats support, and
     SRQ support

   - a notable number of fixes to the i40iw driver from debugging scale
     up testing

   - more work to enable the new hip08 chip in the hns driver

   - misc small ULP fixups to srp/srpt//ipoib

   - preparation for srp initiator and target to support the RDMA-CM
     protocol for connections

   - add RDMA-CM support to srp initiator, srp target is still a WIP

   - fixes for a couple of places where ipoib could spam the dmesg log

   - fix encode/decode of FDR/EDR data rates in the core

   - many patches from Parav with ongoing work to clean up
     inconsistencies and bugs in RoCE support around the rdma_cm

   - mlx5 driver support for the userspace features 'thread domain',
     'wallclock timestamps' and 'DV Direct Connected transport'. Support
     for the firmware dual port rocee capability

   - core support for more than 32 rdma devices in the char dev
     allocation

   - kernel doc updates from Randy Dunlap

   - new netlink uAPI for inspecting RDMA objects similar in spirit to 'ss'

   - one minor change to the kobject code acked by Greg KH"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (259 commits)
  RDMA/nldev: Provide detailed QP information
  RDMA/nldev: Provide global resource utilization
  RDMA/core: Add resource tracking for create and destroy PDs
  RDMA/core: Add resource tracking for create and destroy CQs
  RDMA/core: Add resource tracking for create and destroy QPs
  RDMA/restrack: Add general infrastructure to track RDMA resources
  RDMA/core: Save kernel caller name when creating PD and CQ objects
  RDMA/core: Use the MODNAME instead of the function name for pd callers
  RDMA: Move enum ib_cq_creation_flags to uapi headers
  IB/rxe: Change RDMA_RXE kconfig to use select
  IB/qib: remove qib_keys.c
  IB/mthca: remove mthca_user.h
  RDMA/cm: Fix access to uninitialized variable
  RDMA/cma: Use existing netif_is_bond_master function
  IB/core: Avoid SGID attributes query while converting GID from OPA to IB
  RDMA/mlx5: Avoid memory leak in case of XRCD dealloc failure
  IB/umad: Fix use of unprotected device pointer
  IB/iser: Combine substrings for three messages
  IB/iser: Delete an unnecessary variable initialisation in iser_send_data_out()
  IB/iser: Delete an error message for a failed memory allocation in iser_send_data_out()
  ...

Commit: 7b1cd95d65eb3b1e13f8a90eb757e0ea232c7899
Parents: 2155e69a · e7996a9a

Merge commit. Changes below are compared with the first parent: 2155e69a.

Changes

187 files changed · +10240 −4028

File	Status	Add	Del	Content
MAINTAINERS	modified	+4	−3	View file
drivers/infiniband/core/Makefile	modified	+1	−1	View file
drivers/infiniband/core/addr.c	modified	+8	−57	View file
drivers/infiniband/core/cache.c	modified	+7	−16	View file
drivers/infiniband/core/cm.c	modified	+159	−68	View file
drivers/infiniband/core/cma.c	modified	+156	−96	View file
drivers/infiniband/core/cma_configfs.c	modified	+1	−1	View file
drivers/infiniband/core/core_priv.h	modified	+31	−21	View file
drivers/infiniband/core/cq.c	modified	+25	−14	View file
drivers/infiniband/core/device.c	modified	+22	−20	View file
drivers/infiniband/core/fmr_pool.c	modified	+5	−7	View file
drivers/infiniband/core/iwpm_util.c	modified	+1	−0	View file
drivers/infiniband/core/mad.c	modified	+0	−1	View file
drivers/infiniband/core/netlink.c	modified	+3	−7	View file
drivers/infiniband/core/nldev.c	modified	+388	−6	View file
drivers/infiniband/core/restrack.c	added	+164	−0	View file
drivers/infiniband/core/roce_gid_mgmt.c	modified	+8	−5	View file
drivers/infiniband/core/sa_query.c	modified	+14	−4	View file
drivers/infiniband/core/security.c	modified	+4	−6	View file
drivers/infiniband/core/sysfs.c	modified	+0	−1	View file
drivers/infiniband/core/ucm.c	modified	+28	−45	View file
drivers/infiniband/core/ucma.c	modified	+10	−9	View file
drivers/infiniband/core/umem.c	modified	+1	−1	View file
drivers/infiniband/core/user_mad.c	modified	+57	−66	View file
drivers/infiniband/core/uverbs_cmd.c	modified	+7	−7	View file
drivers/infiniband/core/uverbs_ioctl.c	modified	+13	−6	View file
drivers/infiniband/core/uverbs_main.c	modified	+34	−61	View file
drivers/infiniband/core/uverbs_std_types.c	modified	+3	−0	View file
drivers/infiniband/core/verbs.c	modified	+177	−135	View file
drivers/infiniband/hw/bnxt_re/bnxt_re.h	modified	+34	−9	View file
drivers/infiniband/hw/bnxt_re/hw_counters.c	modified	+135	−10	View file
drivers/infiniband/hw/bnxt_re/hw_counters.h	modified	+39	−0	View file
drivers/infiniband/hw/bnxt_re/ib_verbs.c	modified	+348	−56	View file
drivers/infiniband/hw/bnxt_re/ib_verbs.h	modified	+20	−0	View file
drivers/infiniband/hw/bnxt_re/main.c	modified	+209	−42	View file
drivers/infiniband/hw/bnxt_re/qplib_fp.c	modified	+400	−63	View file
drivers/infiniband/hw/bnxt_re/qplib_fp.h	modified	+54	−24	View file
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c	modified	+3	−2	View file
drivers/infiniband/hw/bnxt_re/qplib_rcfw.h	modified	+3	−4	View file
drivers/infiniband/hw/bnxt_re/qplib_res.c	modified	+4	−5	View file
drivers/infiniband/hw/bnxt_re/qplib_sp.c	modified	+136	−5	View file
drivers/infiniband/hw/bnxt_re/qplib_sp.h	modified	+88	−3	View file
drivers/infiniband/hw/bnxt_re/roce_hsi.h	modified	+126	−1	View file
drivers/infiniband/hw/cxgb4/cm.c	modified	+16	−11	View file
drivers/infiniband/hw/cxgb4/device.c	modified	+16	−20	View file
drivers/infiniband/hw/cxgb4/ev.c	modified	+1	−1	View file
drivers/infiniband/hw/cxgb4/iw_cxgb4.h	modified	+2	−2	View file
drivers/infiniband/hw/cxgb4/qp.c	modified	+3	−3	View file
drivers/infiniband/hw/cxgb4/t4.h	modified	+2	−2	View file
drivers/infiniband/hw/hfi1/chip.c	modified	+31	−56	View file
drivers/infiniband/hw/hfi1/chip.h	modified	+1	−1	View file
drivers/infiniband/hw/hfi1/driver.c	modified	+0	−16	View file
drivers/infiniband/hw/hfi1/firmware.c	modified	+16	−48	View file
drivers/infiniband/hw/hfi1/hfi.h	modified	+13	−12	View file
drivers/infiniband/hw/hfi1/init.c	modified	+2	−0	View file
drivers/infiniband/hw/hfi1/mad.c	modified	+1	−5	View file
drivers/infiniband/hw/hfi1/qp.c	modified	+8	−2	View file
drivers/infiniband/hw/hfi1/rc.c	modified	+4	−4	View file
drivers/infiniband/hw/hfi1/verbs.c	modified	+1	−5	View file
drivers/infiniband/hw/hns/Makefile	modified	+1	−1	View file
drivers/infiniband/hw/hns/hns_roce_cmd.c	modified	+1	−0	View file
drivers/infiniband/hw/hns/hns_roce_cmd.h	modified	+10	−0	View file
drivers/infiniband/hw/hns/hns_roce_common.h	modified	+11	−0	View file
drivers/infiniband/hw/hns/hns_roce_cq.c	modified	+10	−9	View file
drivers/infiniband/hw/hns/hns_roce_device.h	modified	+96	−7	View file
drivers/infiniband/hw/hns/hns_roce_eq.c	deleted	+0	−759	View before deletion
drivers/infiniband/hw/hns/hns_roce_eq.h	deleted	+0	−134	View before deletion
drivers/infiniband/hw/hns/hns_roce_hw_v1.c	modified	+741	−17	View file
drivers/infiniband/hw/hns/hns_roce_hw_v1.h	modified	+42	−2	View file
drivers/infiniband/hw/hns/hns_roce_hw_v2.c	modified	+1655	−182	View file
drivers/infiniband/hw/hns/hns_roce_hw_v2.h	modified	+278	−5	View file
drivers/infiniband/hw/hns/hns_roce_main.c	modified	+6	−10	View file
drivers/infiniband/hw/hns/hns_roce_qp.c	modified	+63	−9	View file
drivers/infiniband/hw/i40iw/Kconfig	modified	+0	−1	View file
drivers/infiniband/hw/i40iw/i40iw.h	modified	+3	−0	View file
drivers/infiniband/hw/i40iw/i40iw_cm.c	modified	+39	−29	View file
drivers/infiniband/hw/i40iw/i40iw_cm.h	modified	+4	−4	View file
drivers/infiniband/hw/i40iw/i40iw_ctrl.c	modified	+8	−17	View file
drivers/infiniband/hw/i40iw/i40iw_d.h	modified	+1	−0	View file
drivers/infiniband/hw/i40iw/i40iw_hw.c	modified	+2	−1	View file
drivers/infiniband/hw/i40iw/i40iw_main.c	modified	+10	−3	View file
drivers/infiniband/hw/i40iw/i40iw_puda.c	modified	+2	−3	View file
drivers/infiniband/hw/i40iw/i40iw_puda.h	modified	+1	−0	View file
drivers/infiniband/hw/i40iw/i40iw_uk.c	modified	+2	−16	View file
drivers/infiniband/hw/i40iw/i40iw_user.h	modified	+1	−2	View file
drivers/infiniband/hw/i40iw/i40iw_utils.c	modified	+47	−3	View file
drivers/infiniband/hw/i40iw/i40iw_verbs.c	modified	+2	−3	View file
drivers/infiniband/hw/mlx4/cq.c	modified	+2	−2	View file
drivers/infiniband/hw/mlx4/main.c	modified	+11	−8	View file
drivers/infiniband/hw/mlx4/qp.c	modified	+18	−2	View file
drivers/infiniband/hw/mlx5/cong.c	modified	+59	−24	View file
drivers/infiniband/hw/mlx5/cq.c	modified	+1	−1	View file
drivers/infiniband/hw/mlx5/mad.c	modified	+15	−8	View file
drivers/infiniband/hw/mlx5/main.c	modified	+1115	−296	View file
drivers/infiniband/hw/mlx5/mlx5_ib.h	modified	+91	−20	View file
drivers/infiniband/hw/mlx5/mr.c	modified	+3	−0	View file
drivers/infiniband/hw/mlx5/odp.c	modified	+0	−9	View file
drivers/infiniband/hw/mlx5/qp.c	modified	+405	−27	View file
drivers/infiniband/hw/mthca/mthca_memfree.c	modified	+3	−4	View file
drivers/infiniband/hw/mthca/mthca_user.h	deleted	+0	−112	View before deletion
drivers/infiniband/hw/nes/nes_cm.c	modified	+1	−1	View file
drivers/infiniband/hw/nes/nes_cm.h	modified	+1	−2	View file
drivers/infiniband/hw/ocrdma/ocrdma_hw.c	modified	+7	−12	View file
drivers/infiniband/hw/ocrdma/ocrdma_stats.c	modified	+3	−5	View file
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c	modified	+4	−6	View file
drivers/infiniband/hw/qedr/verbs.c	modified	+7	−8	View file
drivers/infiniband/hw/qib/qib.h	modified	+3	−5	View file
drivers/infiniband/hw/qib/qib_driver.c	modified	+0	−16	View file
drivers/infiniband/hw/qib/qib_eeprom.c	modified	+1	−2	View file
drivers/infiniband/hw/qib/qib_file_ops.c	modified	+25	−43	View file
drivers/infiniband/hw/qib/qib_init.c	modified	+2	−0	View file
drivers/infiniband/hw/qib/qib_keys.c	deleted	+0	−235	View before deletion
drivers/infiniband/hw/qib/qib_rc.c	modified	+3	−3	View file
drivers/infiniband/hw/qib/qib_verbs.c	modified	+0	−2	View file
drivers/infiniband/hw/usnic/usnic_ib_sysfs.c	modified	+0	−1	View file
drivers/infiniband/hw/usnic/usnic_ib_verbs.c	modified	+0	−1	View file
drivers/infiniband/hw/vmw_pvrdma/pvrdma.h	modified	+2	−2	View file
drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c	modified	+6	−7	View file
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c	modified	+10	−11	View file
drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c	modified	+4	−11	View file
drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c	modified	+5	−6	View file
drivers/infiniband/sw/rdmavt/cq.c	modified	+9	−6	View file
drivers/infiniband/sw/rdmavt/mcast.c	modified	+2	−2	View file
drivers/infiniband/sw/rdmavt/mr.c	modified	+1	−1	View file
drivers/infiniband/sw/rdmavt/qp.c	modified	+13	−14	View file
drivers/infiniband/sw/rdmavt/srq.c	modified	+9	−7	View file
drivers/infiniband/sw/rdmavt/trace.h	modified	+2	−2	View file
drivers/infiniband/sw/rdmavt/trace_qp.h	modified	+42	−0	View file
drivers/infiniband/sw/rdmavt/vt.c	modified	+5	−5	View file
drivers/infiniband/sw/rdmavt/vt.h	modified	+3	−3	View file
drivers/infiniband/sw/rxe/Kconfig	modified	+2	−2	View file
drivers/infiniband/sw/rxe/rxe.c	modified	+0	−6	View file
drivers/infiniband/sw/rxe/rxe.h	modified	+5	−1	View file
drivers/infiniband/sw/rxe/rxe_loc.h	modified	+0	−1	View file
drivers/infiniband/sw/rxe/rxe_net.c	modified	+6	−12	View file
drivers/infiniband/sw/rxe/rxe_net.h	modified	+0	−1	View file
drivers/infiniband/sw/rxe/rxe_qp.c	modified	+10	−2	View file
drivers/infiniband/sw/rxe/rxe_recv.c	modified	+1	−2	View file
drivers/infiniband/sw/rxe/rxe_req.c	modified	+1	−8	View file
drivers/infiniband/sw/rxe/rxe_resp.c	modified	+2	−3	View file
drivers/infiniband/sw/rxe/rxe_verbs.c	modified	+2	−0	View file
drivers/infiniband/sw/rxe/rxe_verbs.h	modified	+3	−0	View file
drivers/infiniband/ulp/ipoib/ipoib_cm.c	modified	+10	−8	View file
drivers/infiniband/ulp/ipoib/ipoib_ib.c	modified	+2	−3	View file
drivers/infiniband/ulp/ipoib/ipoib_main.c	modified	+67	−31	View file
drivers/infiniband/ulp/ipoib/ipoib_verbs.c	modified	+3	−3	View file
drivers/infiniband/ulp/iser/iser_initiator.c	modified	+6	−10	View file
drivers/infiniband/ulp/isert/ib_isert.c	modified	+7	−0	View file
drivers/infiniband/ulp/isert/ib_isert.h	modified	+1	−0	View file
drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c	modified	+1	−1	View file
drivers/infiniband/ulp/srp/ib_srp.c	modified	+624	−171	View file
drivers/infiniband/ulp/srp/ib_srp.h	modified	+36	−7	View file
drivers/infiniband/ulp/srpt/ib_srpt.c	modified	+585	−377	View file
drivers/infiniband/ulp/srpt/ib_srpt.h	modified	+66	−34	View file
drivers/net/ethernet/mellanox/mlx4/qp.c	modified	+3	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/eq.c	modified	+8	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c	modified	+6	−5	View file
drivers/net/ethernet/mellanox/mlx5/core/fw.c	modified	+9	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c	modified	+1	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c	modified	+55	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c	modified	+4	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/main.c	modified	+14	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h	modified	+1	−1	View file
drivers/net/ethernet/mellanox/mlx5/core/qp.c	modified	+113	−12	View file
drivers/net/ethernet/mellanox/mlx5/core/vport.c	modified	+85	−6	View file
include/linux/mlx5/device.h	modified	+16	−0	View file
include/linux/mlx5/driver.h	modified	+41	−2	View file
include/linux/mlx5/mlx5_ifc.h	modified	+25	−7	View file
include/linux/mlx5/qp.h	modified	+12	−0	View file
include/linux/mlx5/vport.h	modified	+4	−0	View file
include/rdma/ib_addr.h	modified	+9	−29	View file
include/rdma/ib_sa.h	modified	+5	−5	View file
include/rdma/ib_verbs.h	modified	+46	−18	View file
include/rdma/opa_addr.h	modified	+16	−0	View file
include/rdma/rdma_cm.h	modified	+19	−0	View file
include/rdma/rdma_cm_ib.h	modified	+4	−4	View file
include/rdma/rdma_vt.h	modified	+24	−7	View file
include/rdma/restrack.h	added	+157	−0	View file
include/scsi/srp.h	modified	+17	−0	View file
include/uapi/rdma/bnxt_re-abi.h	modified	+9	−0	View file
include/uapi/rdma/ib_user_verbs.h	modified	+8	−3	View file
include/uapi/rdma/mlx4-abi.h	modified	+4	−3	View file
include/uapi/rdma/mlx5-abi.h	modified	+49	−4	View file
include/uapi/rdma/rdma_netlink.h	modified	+49	−0	View file
include/uapi/rdma/vmw_pvrdma-abi.h	modified	+7	−5	View file
lib/kobject.c	modified	+2	−0	View file
net/rds/ib.c	modified	+2	−4	View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 7b5ef9a..88cdd29 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6892,7 +6892,7 @@ M:	Jason Gunthorpe <[email protected]>
 L:	[email protected]
 W:	http://www.openfabrics.org/
 Q:	http://patchwork.kernel.org/project/linux-rdma/list/
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
 S:	Supported
 F:	Documentation/devicetree/bindings/infiniband/
 F:	Documentation/infiniband/
@@ -11218,7 +11218,8 @@ S:	Maintained
 F:	drivers/firmware/qemu_fw_cfg.c
 
 QIB DRIVER
-M:	Mike Marciniszyn <[email protected]>
+M:	Dennis Dalessandro <[email protected]>
+M:	Mike Marciniszyn <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/infiniband/hw/qib/
@@ -11245,7 +11246,6 @@ F:	include/linux/qed/
 F:	drivers/net/ethernet/qlogic/qede/
 
 QLOGIC QL4xxx RDMA DRIVER
-M:	Ram Amrani <[email protected]>
 M:	Michal Kalderon <[email protected]>
 M:	Ariel Elior <[email protected]>
 L:	[email protected]
@@ -11507,6 +11507,7 @@ F:	drivers/net/ethernet/rdc/r6040.c
 
 RDMAVT - RDMA verbs software
 M:	Dennis Dalessandro <[email protected]>
+M:	Mike Marciniszyn <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/infiniband/sw/rdmavt

drivers/infiniband/core/Makefile

View file

diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index 504b926..f69833d 100644
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -12,7 +12,7 @@ ib_core-y :=			packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \
 				device.o fmr_pool.o cache.o netlink.o \
 				roce_gid_mgmt.o mr_pool.o addr.o sa_query.o \
 				multicast.o mad.o smi.o agent.o mad_rmpp.o \
-				security.o nldev.o
+				security.o nldev.o restrack.o
 
 ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o
 ib_core-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o

drivers/infiniband/core/addr.c

View file

diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index f4e8185..a5b4cf0 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -243,8 +243,7 @@ void rdma_copy_addr(struct rdma_dev_addr *dev_addr,
 EXPORT_SYMBOL(rdma_copy_addr);
 
 int rdma_translate_ip(const struct sockaddr *addr,
-		      struct rdma_dev_addr *dev_addr,
-		      u16 *vlan_id)
+		      struct rdma_dev_addr *dev_addr)
 {
 	struct net_device *dev;
 
@@ -266,9 +265,6 @@ int rdma_translate_ip(const struct sockaddr *addr,
 			return -EADDRNOTAVAIL;
 
 		rdma_copy_addr(dev_addr, dev, NULL);
-		dev_addr->bound_dev_if = dev->ifindex;
-		if (vlan_id)
-			*vlan_id = rdma_vlan_dev_vlan_id(dev);
 		dev_put(dev);
 		break;
 #if IS_ENABLED(CONFIG_IPV6)
@@ -279,9 +275,6 @@ int rdma_translate_ip(const struct sockaddr *addr,
 					  &((const struct sockaddr_in6 *)addr)->sin6_addr,
 					  dev, 1)) {
 				rdma_copy_addr(dev_addr, dev, NULL);
-				dev_addr->bound_dev_if = dev->ifindex;
-				if (vlan_id)
-					*vlan_id = rdma_vlan_dev_vlan_id(dev);
 				break;
 			}
 		}
@@ -481,7 +474,7 @@ static int addr_resolve_neigh(struct dst_entry *dst,
 	if (dst->dev->flags & IFF_LOOPBACK) {
 		int ret;
 
-		ret = rdma_translate_ip(dst_in, addr, NULL);
+		ret = rdma_translate_ip(dst_in, addr);
 		if (!ret)
 			memcpy(addr->dst_dev_addr, addr->src_dev_addr,
 			       MAX_ADDR_LEN);
@@ -558,7 +551,7 @@ static int addr_resolve(struct sockaddr *src_in,
 	}
 
 	if (ndev->flags & IFF_LOOPBACK) {
-		ret = rdma_translate_ip(dst_in, addr, NULL);
+		ret = rdma_translate_ip(dst_in, addr);
 		/*
 		 * Put the loopback device and get the translated
 		 * device instead.
@@ -744,7 +737,6 @@ void rdma_addr_cancel(struct rdma_dev_addr *addr)
 EXPORT_SYMBOL(rdma_addr_cancel);
 
 struct resolve_cb_context {
-	struct rdma_dev_addr *addr;
 	struct completion comp;
 	int status;
 };
@@ -752,39 +744,31 @@ struct resolve_cb_context {
 static void resolve_cb(int status, struct sockaddr *src_addr,
 	     struct rdma_dev_addr *addr, void *context)
 {
-	if (!status)
-		memcpy(((struct resolve_cb_context *)context)->addr,
-		       addr, sizeof(struct rdma_dev_addr));
 	((struct resolve_cb_context *)context)->status = status;
 	complete(&((struct resolve_cb_context *)context)->comp);
 }
 
 int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
 				 const union ib_gid *dgid,
-				 u8 *dmac, u16 *vlan_id, int *if_index,
+				 u8 *dmac, const struct net_device *ndev,
 				 int *hoplimit)
 {
-	int ret = 0;
 	struct rdma_dev_addr dev_addr;
 	struct resolve_cb_context ctx;
-	struct net_device *dev;
-
 	union {
 		struct sockaddr     _sockaddr;
 		struct sockaddr_in  _sockaddr_in;
 		struct sockaddr_in6 _sockaddr_in6;
 	} sgid_addr, dgid_addr;
-
+	int ret;
 
 	rdma_gid2ip(&sgid_addr._sockaddr, sgid);
 	rdma_gid2ip(&dgid_addr._sockaddr, dgid);
 
 	memset(&dev_addr, 0, sizeof(dev_addr));
-	if (if_index)
-		dev_addr.bound_dev_if = *if_index;
+	dev_addr.bound_dev_if = ndev->ifindex;
 	dev_addr.net = &init_net;
 
-	ctx.addr = &dev_addr;
 	init_completion(&ctx.comp);
 	ret = rdma_resolve_ip(&self, &sgid_addr._sockaddr, &dgid_addr._sockaddr,
 			&dev_addr, 1000, resolve_cb, &ctx);
@@ -798,42 +782,9 @@ int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
 		return ret;
 
 	memcpy(dmac, dev_addr.dst_dev_addr, ETH_ALEN);
-	dev = dev_get_by_index(&init_net, dev_addr.bound_dev_if);
-	if (!dev)
-		return -ENODEV;
-	if (if_index)
-		*if_index = dev_addr.bound_dev_if;
-	if (vlan_id)
-		*vlan_id = rdma_vlan_dev_vlan_id(dev);
-	if (hoplimit)
-		*hoplimit = dev_addr.hoplimit;
-	dev_put(dev);
-	return ret;
-}
-EXPORT_SYMBOL(rdma_addr_find_l2_eth_by_grh);
-
-int rdma_addr_find_smac_by_sgid(union ib_gid *sgid, u8 *smac, u16 *vlan_id)
-{
-	int ret = 0;
-	struct rdma_dev_addr dev_addr;
-	union {
-		struct sockaddr     _sockaddr;
-		struct sockaddr_in  _sockaddr_in;
-		struct sockaddr_in6 _sockaddr_in6;
-	} gid_addr;
-
-	rdma_gid2ip(&gid_addr._sockaddr, sgid);
-
-	memset(&dev_addr, 0, sizeof(dev_addr));
-	dev_addr.net = &init_net;
-	ret = rdma_translate_ip(&gid_addr._sockaddr, &dev_addr, vlan_id);
-	if (ret)
-		return ret;
-
-	memcpy(smac, dev_addr.src_dev_addr, ETH_ALEN);
-	return ret;
+	*hoplimit = dev_addr.hoplimit;
+	return 0;
 }
-EXPORT_SYMBOL(rdma_addr_find_smac_by_sgid);
 
 static int netevent_callback(struct notifier_block *self, unsigned long event,
 	void *ctx)

drivers/infiniband/core/cache.c

View file

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 7751563..e9a409d 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -573,27 +573,24 @@ static int ib_cache_gid_find_by_filter(struct ib_device *ib_dev,
 		struct ib_gid_attr attr;
 
 		if (table->data_vec[i].props & GID_TABLE_ENTRY_INVALID)
-			goto next;
+			continue;
 
 		if (memcmp(gid, &table->data_vec[i].gid, sizeof(*gid)))
-			goto next;
+			continue;
 
 		memcpy(&attr, &table->data_vec[i].attr, sizeof(attr));
 
-		if (filter(gid, &attr, context))
+		if (filter(gid, &attr, context)) {
 			found = true;
-
-next:
-		if (found)
+			if (index)
+				*index = i;
 			break;
+		}
 	}
 	read_unlock_irqrestore(&table->rwlock, flags);
 
 	if (!found)
 		return -ENOENT;
-
-	if (index)
-		*index = i;
 	return 0;
 }
 
@@ -824,12 +821,7 @@ static int gid_table_setup_one(struct ib_device *ib_dev)
 	if (err)
 		return err;
 
-	err = roce_rescan_device(ib_dev);
-
-	if (err) {
-		gid_table_cleanup_one(ib_dev);
-		gid_table_release_one(ib_dev);
-	}
+	rdma_roce_rescan_device(ib_dev);
 
 	return err;
 }
@@ -883,7 +875,6 @@ int ib_find_gid_by_filter(struct ib_device *device,
 					   port_num, filter,
 					   context, index);
 }
-EXPORT_SYMBOL(ib_find_gid_by_filter);
 
 int ib_get_cached_pkey(struct ib_device *device,
 		       u8                port_num,

drivers/infiniband/core/cm.c

View file

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index f6b159d..e674915 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -452,13 +452,14 @@ static void cm_set_private_data(struct cm_id_private *cm_id_priv,
 	cm_id_priv->private_data_len = private_data_len;
 }
 
-static void cm_init_av_for_response(struct cm_port *port, struct ib_wc *wc,
-				    struct ib_grh *grh, struct cm_av *av)
+static int cm_init_av_for_response(struct cm_port *port, struct ib_wc *wc,
+				   struct ib_grh *grh, struct cm_av *av)
 {
 	av->port = port;
 	av->pkey_index = wc->pkey_index;
-	ib_init_ah_from_wc(port->cm_dev->ib_device, port->port_num, wc,
-			   grh, &av->ah_attr);
+	return ib_init_ah_attr_from_wc(port->cm_dev->ib_device,
+				       port->port_num, wc,
+				       grh, &av->ah_attr);
 }
 
 static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av,
@@ -494,8 +495,11 @@ static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av,
 		return ret;
 
 	av->port = port;
-	ib_init_ah_from_path(cm_dev->ib_device, port->port_num, path,
-			     &av->ah_attr);
+	ret = ib_init_ah_attr_from_path(cm_dev->ib_device, port->port_num, path,
+					&av->ah_attr);
+	if (ret)
+		return ret;
+
 	av->timeout = path->packet_life_time + 1;
 
 	spin_lock_irqsave(&cm.lock, flags);
@@ -1560,6 +1564,35 @@ static u16 cm_get_bth_pkey(struct cm_work *work)
 	return pkey;
 }
 
+/**
+ * Convert OPA SGID to IB SGID
+ * ULPs (such as IPoIB) do not understand OPA GIDs and will
+ * reject them as the local_gid will not match the sgid. Therefore,
+ * change the pathrec's SGID to an IB SGID.
+ *
+ * @work: Work completion
+ * @path: Path record
+ */
+static void cm_opa_to_ib_sgid(struct cm_work *work,
+			      struct sa_path_rec *path)
+{
+	struct ib_device *dev = work->port->cm_dev->ib_device;
+	u8 port_num = work->port->port_num;
+
+	if (rdma_cap_opa_ah(dev, port_num) &&
+	    (ib_is_opa_gid(&path->sgid))) {
+		union ib_gid sgid;
+
+		if (ib_get_cached_gid(dev, port_num, 0, &sgid, NULL)) {
+			dev_warn(&dev->dev,
+				 "Error updating sgid in CM request\n");
+			return;
+		}
+
+		path->sgid = sgid;
+	}
+}
+
 static void cm_format_req_event(struct cm_work *work,
 				struct cm_id_private *cm_id_priv,
 				struct ib_cm_id *listen_id)
@@ -1573,10 +1606,13 @@ static void cm_format_req_event(struct cm_work *work,
 	param->bth_pkey = cm_get_bth_pkey(work);
 	param->port = cm_id_priv->av.port->port_num;
 	param->primary_path = &work->path[0];
-	if (cm_req_has_alt_path(req_msg))
+	cm_opa_to_ib_sgid(work, param->primary_path);
+	if (cm_req_has_alt_path(req_msg)) {
 		param->alternate_path = &work->path[1];
-	else
+		cm_opa_to_ib_sgid(work, param->alternate_path);
+	} else {
 		param->alternate_path = NULL;
+	}
 	param->remote_ca_guid = req_msg->local_ca_guid;
 	param->remote_qkey = be32_to_cpu(req_msg->local_qkey);
 	param->remote_qpn = be32_to_cpu(cm_req_get_local_qpn(req_msg));
@@ -1826,9 +1862,11 @@ static int cm_req_handler(struct cm_work *work)
 
 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);
 	cm_id_priv->id.remote_id = req_msg->local_comm_id;
-	cm_init_av_for_response(work->port, work->mad_recv_wc->wc,
-				work->mad_recv_wc->recv_buf.grh,
-				&cm_id_priv->av);
+	ret = cm_init_av_for_response(work->port, work->mad_recv_wc->wc,
+				      work->mad_recv_wc->recv_buf.grh,
+				      &cm_id_priv->av);
+	if (ret)
+		goto destroy;
 	cm_id_priv->timewait_info = cm_create_timewait_info(cm_id_priv->
 							    id.local_id);
 	if (IS_ERR(cm_id_priv->timewait_info)) {
@@ -1841,9 +1879,10 @@ static int cm_req_handler(struct cm_work *work)
 
 	listen_cm_id_priv = cm_match_req(work, cm_id_priv);
 	if (!listen_cm_id_priv) {
+		pr_debug("%s: local_id %d, no listen_cm_id_priv\n", __func__,
+			 be32_to_cpu(cm_id->local_id));
 		ret = -EINVAL;
-		kfree(cm_id_priv->timewait_info);
-		goto destroy;
+		goto free_timeinfo;
 	}
 
 	cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler;
@@ -1861,56 +1900,50 @@ static int cm_req_handler(struct cm_work *work)
 				work->port->port_num,
 				grh->sgid_index,
 				&gid, &gid_attr);
-	if (!ret) {
-		if (gid_attr.ndev) {
-			work->path[0].rec_type =
-				sa_conv_gid_to_pathrec_type(gid_attr.gid_type);
-			sa_path_set_ifindex(&work->path[0],
-					    gid_attr.ndev->ifindex);
-			sa_path_set_ndev(&work->path[0],
-					 dev_net(gid_attr.ndev));
-			dev_put(gid_attr.ndev);
-		} else {
-			cm_path_set_rec_type(work->port->cm_dev->ib_device,
-					     work->port->port_num,
-					     &work->path[0],
-					     &req_msg->primary_local_gid);
-		}
-		if (cm_req_has_alt_path(req_msg))
-			work->path[1].rec_type = work->path[0].rec_type;
-		cm_format_paths_from_req(req_msg, &work->path[0],
-					 &work->path[1]);
-		if (cm_id_priv->av.ah_attr.type == RDMA_AH_ATTR_TYPE_ROCE)
-			sa_path_set_dmac(&work->path[0],
-					 cm_id_priv->av.ah_attr.roce.dmac);
-		work->path[0].hop_limit = grh->hop_limit;
-		ret = cm_init_av_by_path(&work->path[0], &cm_id_priv->av,
-					 cm_id_priv);
+	if (ret) {
+		ib_send_cm_rej(cm_id, IB_CM_REJ_UNSUPPORTED, NULL, 0, NULL, 0);
+		goto rejected;
+	}
+
+	if (gid_attr.ndev) {
+		work->path[0].rec_type =
+			sa_conv_gid_to_pathrec_type(gid_attr.gid_type);
+		sa_path_set_ifindex(&work->path[0],
+				    gid_attr.ndev->ifindex);
+		sa_path_set_ndev(&work->path[0],
+				 dev_net(gid_attr.ndev));
+		dev_put(gid_attr.ndev);
+	} else {
+		cm_path_set_rec_type(work->port->cm_dev->ib_device,
+				     work->port->port_num,
+				     &work->path[0],
+				     &req_msg->primary_local_gid);
 	}
+	if (cm_req_has_alt_path(req_msg))
+		work->path[1].rec_type = work->path[0].rec_type;
+	cm_format_paths_from_req(req_msg, &work->path[0],
+				 &work->path[1]);
+	if (cm_id_priv->av.ah_attr.type == RDMA_AH_ATTR_TYPE_ROCE)
+		sa_path_set_dmac(&work->path[0],
+				 cm_id_priv->av.ah_attr.roce.dmac);
+	work->path[0].hop_limit = grh->hop_limit;
+	ret = cm_init_av_by_path(&work->path[0], &cm_id_priv->av,
+				 cm_id_priv);
 	if (ret) {
-		int err = ib_get_cached_gid(work->port->cm_dev->ib_device,
-					    work->port->port_num, 0,
-					    &work->path[0].sgid,
-					    &gid_attr);
-		if (!err && gid_attr.ndev) {
-			work->path[0].rec_type =
-				sa_conv_gid_to_pathrec_type(gid_attr.gid_type);
-			sa_path_set_ifindex(&work->path[0],
-					    gid_attr.ndev->ifindex);
-			sa_path_set_ndev(&work->path[0],
-					 dev_net(gid_attr.ndev));
-			dev_put(gid_attr.ndev);
-		} else {
-			cm_path_set_rec_type(work->port->cm_dev->ib_device,
-					     work->port->port_num,
-					     &work->path[0],
-					     &req_msg->primary_local_gid);
-		}
-		if (cm_req_has_alt_path(req_msg))
-			work->path[1].rec_type = work->path[0].rec_type;
-		ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_GID,
-			       &work->path[0].sgid, sizeof work->path[0].sgid,
-			       NULL, 0);
+		int err;
+
+		err = ib_get_cached_gid(work->port->cm_dev->ib_device,
+					work->port->port_num, 0,
+					&work->path[0].sgid,
+					NULL);
+		if (err)
+			ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_GID,
+				       NULL, 0, NULL, 0);
+		else
+			ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_GID,
+				       &work->path[0].sgid,
+				       sizeof(work->path[0].sgid),
+				       NULL, 0);
 		goto rejected;
 	}
 	if (cm_req_has_alt_path(req_msg)) {
@@ -1919,7 +1952,7 @@ static int cm_req_handler(struct cm_work *work)
 		if (ret) {
 			ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_ALT_GID,
 				       &work->path[0].sgid,
-				       sizeof work->path[0].sgid, NULL, 0);
+				       sizeof(work->path[0].sgid), NULL, 0);
 			goto rejected;
 		}
 	}
@@ -1945,6 +1978,8 @@ static int cm_req_handler(struct cm_work *work)
 rejected:
 	atomic_dec(&cm_id_priv->refcount);
 	cm_deref_id(listen_cm_id_priv);
+free_timeinfo:
+	kfree(cm_id_priv->timewait_info);
 destroy:
 	ib_destroy_cm_id(cm_id);
 	return ret;
@@ -1997,6 +2032,8 @@ int ib_send_cm_rep(struct ib_cm_id *cm_id,
 	spin_lock_irqsave(&cm_id_priv->lock, flags);
 	if (cm_id->state != IB_CM_REQ_RCVD &&
 	    cm_id->state != IB_CM_MRA_REQ_SENT) {
+		pr_debug("%s: local_comm_id %d, cm_id->state: %d\n", __func__,
+			 be32_to_cpu(cm_id_priv->id.local_id), cm_id->state);
 		ret = -EINVAL;
 		goto out;
 	}
@@ -2063,6 +2100,8 @@ int ib_send_cm_rtu(struct ib_cm_id *cm_id,
 	spin_lock_irqsave(&cm_id_priv->lock, flags);
 	if (cm_id->state != IB_CM_REP_RCVD &&
 	    cm_id->state != IB_CM_MRA_REP_SENT) {
+		pr_debug("%s: local_id %d, cm_id->state %d\n", __func__,
+			 be32_to_cpu(cm_id->local_id), cm_id->state);
 		ret = -EINVAL;
 		goto error;
 	}
@@ -2170,6 +2209,8 @@ static int cm_rep_handler(struct cm_work *work)
 	cm_id_priv = cm_acquire_id(rep_msg->remote_comm_id, 0);
 	if (!cm_id_priv) {
 		cm_dup_rep_handler(work);
+		pr_debug("%s: remote_comm_id %d, no cm_id_priv\n", __func__,
+			 be32_to_cpu(rep_msg->remote_comm_id));
 		return -EINVAL;
 	}
 
@@ -2183,6 +2224,10 @@ static int cm_rep_handler(struct cm_work *work)
 	default:
 		spin_unlock_irq(&cm_id_priv->lock);
 		ret = -EINVAL;
+		pr_debug("%s: cm_id_priv->id.state: %d, local_comm_id %d, remote_comm_id %d\n",
+			 __func__, cm_id_priv->id.state,
+			 be32_to_cpu(rep_msg->local_comm_id),
+			 be32_to_cpu(rep_msg->remote_comm_id));
 		goto error;
 	}
 
@@ -2196,6 +2241,8 @@ static int cm_rep_handler(struct cm_work *work)
 		spin_unlock(&cm.lock);
 		spin_unlock_irq(&cm_id_priv->lock);
 		ret = -EINVAL;
+		pr_debug("%s: Failed to insert remote id %d\n", __func__,
+			 be32_to_cpu(rep_msg->remote_comm_id));
 		goto error;
 	}
 	/* Check for a stale connection. */
@@ -2213,6 +2260,10 @@ static int cm_rep_handler(struct cm_work *work)
 			     IB_CM_REJ_STALE_CONN, CM_MSG_RESPONSE_REP,
 			     NULL, 0);
 		ret = -EINVAL;
+		pr_debug("%s: Stale connection. local_comm_id %d, remote_comm_id %d\n",
+			 __func__, be32_to_cpu(rep_msg->local_comm_id),
+			 be32_to_cpu(rep_msg->remote_comm_id));
+
 		if (cur_cm_id_priv) {
 			cm_id = &cur_cm_id_priv->id;
 			ib_send_cm_dreq(cm_id, NULL, 0);
@@ -2359,6 +2410,8 @@ int ib_send_cm_dreq(struct ib_cm_id *cm_id,
 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);
 	spin_lock_irqsave(&cm_id_priv->lock, flags);
 	if (cm_id->state != IB_CM_ESTABLISHED) {
+		pr_debug("%s: local_id %d, cm_id->state: %d\n", __func__,
+			 be32_to_cpu(cm_id->local_id), cm_id->state);
 		ret = -EINVAL;
 		goto out;
 	}
@@ -2428,6 +2481,8 @@ int ib_send_cm_drep(struct ib_cm_id *cm_id,
 	if (cm_id->state != IB_CM_DREQ_RCVD) {
 		spin_unlock_irqrestore(&cm_id_priv->lock, flags);
 		kfree(data);
+		pr_debug("%s: local_id %d, cm_idcm_id->state(%d) != IB_CM_DREQ_RCVD\n",
+			 __func__, be32_to_cpu(cm_id->local_id), cm_id->state);
 		return -EINVAL;
 	}
 
@@ -2493,6 +2548,9 @@ static int cm_dreq_handler(struct cm_work *work)
 		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
 				counter[CM_DREQ_COUNTER]);
 		cm_issue_drep(work->port, work->mad_recv_wc);
+		pr_debug("%s: no cm_id_priv, local_comm_id %d, remote_comm_id %d\n",
+			 __func__, be32_to_cpu(dreq_msg->local_comm_id),
+			 be32_to_cpu(dreq_msg->remote_comm_id));
 		return -EINVAL;
 	}
 
@@ -2535,6 +2593,9 @@ static int cm_dreq_handler(struct cm_work *work)
 				counter[CM_DREQ_COUNTER]);
 		goto unlock;
 	default:
+		pr_debug("%s: local_id %d, cm_id_priv->id.state: %d\n",
+			 __func__, be32_to_cpu(cm_id_priv->id.local_id),
+			 cm_id_priv->id.state);
 		goto unlock;
 	}
 	cm_id_priv->id.state = IB_CM_DREQ_RCVD;
@@ -2638,6 +2699,8 @@ int ib_send_cm_rej(struct ib_cm_id *cm_id,
 		cm_enter_timewait(cm_id_priv);
 		break;
 	default:
+		pr_debug("%s: local_id %d, cm_id->state: %d\n", __func__,
+			 be32_to_cpu(cm_id_priv->id.local_id), cm_id->state);
 		ret = -EINVAL;
 		goto out;
 	}
@@ -2748,6 +2811,9 @@ static int cm_rej_handler(struct cm_work *work)