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

Pull infiniband/rdma updates from Roland Dreier:
 - Re-enable flow steering verbs with new improved userspace ABI
 - Fixes for slow connection due to GID lookup scalability
 - IPoIB fixes
 - Many fixes to HW drivers including mlx4, mlx5, ocrdma and qib
 - Further improvements to SRP error handling
 - Add new transport type for Cisco usNIC

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (66 commits)
  IB/core: Re-enable create_flow/destroy_flow uverbs
  IB/core: extended command: an improved infrastructure for uverbs commands
  IB/core: Remove ib_uverbs_flow_spec structure from userspace
  IB/core: Use a common header for uverbs flow_specs
  IB/core: Make uverbs flow structure use names like verbs ones
  IB/core: Rename 'flow' structs to match other uverbs structs
  IB/core: clarify overflow/underflow checks on ib_create/destroy_flow
  IB/ucma: Convert use of typedef ctl_table to struct ctl_table
  IB/cm: Convert to using idr_alloc_cyclic()
  IB/mlx5: Fix page shift in create CQ for userspace
  IB/mlx4: Fix device max capabilities check
  IB/mlx5: Fix list_del of empty list
  IB/mlx5: Remove dead code
  IB/core: Encorce MR access rights rules on kernel consumers
  IB/mlx4: Fix endless loop in resize CQ
  RDMA/cma: Remove unused argument and minor dead code
  RDMA/ucma: Discard events for IDs not yet claimed by user space
  IB/core: Add Cisco usNIC rdma node and transport types
  RDMA/nes: Remove self-assignment from nes_query_qp()
  IB/srp: Report receive errors correctly
  ...

2 files changed, 52 insertions, 0 deletions

diff --git a/Documentation/ABI/stable/sysfs-driver-ib_srp b/Documentation/ABI/stable/sysfs-driver-ib_srp
index 5c53d28f775c..b9688de8455b 100644
--- a/Documentation/ABI/stable/sysfs-driver-ib_srp
+++ b/Documentation/ABI/stable/sysfs-driver-ib_srp
@@ -61,6 +61,12 @@ Description:	Interface for making ib_srp connect to a new target.
                   interrupt is handled by a different CPU then the comp_vector
                   parameter can be used to spread the SRP completion workload
                   over multiple CPU's.
+                * tl_retry_count, a number in the range 2..7 specifying the
+                  IB RC retry count.
+                * queue_size, the maximum number of commands that the
+                  initiator is allowed to queue per SCSI host. The default
+                  value for this parameter is 62. The lowest supported value
+                  is 2.
 
 What:           /sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev
 Date:           January 2, 2006
@@ -153,6 +159,13 @@ Contact:	linux-rdma@vger.kernel.org
 Description:    InfiniBand service ID used for establishing communication with
                 the SRP target.
 
+What:           /sys/class/scsi_host/host<n>/sgid
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-rdma@vger.kernel.org
+Description:    InfiniBand GID of the source port used for communication with
+                the SRP target.
+
 What:           /sys/class/scsi_host/host<n>/zero_req_lim
 Date:           September 20, 2006
 KernelVersion:  2.6.18
diff --git a/Documentation/ABI/stable/sysfs-transport-srp b/Documentation/ABI/stable/sysfs-transport-srp
index b36fb0dc13c8..ec7af69fea0a 100644
--- a/Documentation/ABI/stable/sysfs-transport-srp
+++ b/Documentation/ABI/stable/sysfs-transport-srp
@@ -5,6 +5,24 @@ Contact:	linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
 Description:    Instructs an SRP initiator to disconnect from a target and to
                 remove all LUNs imported from that target.
 
+What:           /sys/class/srp_remote_ports/port-<h>:<n>/dev_loss_tmo
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
+Description:    Number of seconds the SCSI layer will wait after a transport
+                layer error has been observed before removing a target port.
+                Zero means immediate removal. Setting this attribute to "off"
+                will disable the dev_loss timer.
+
+What:           /sys/class/srp_remote_ports/port-<h>:<n>/fast_io_fail_tmo
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
+Description:    Number of seconds the SCSI layer will wait after a transport
+                layer error has been observed before failing I/O. Zero means
+                failing I/O immediately. Setting this attribute to "off" will
+                disable the fast_io_fail timer.
+
 What:           /sys/class/srp_remote_ports/port-<h>:<n>/port_id
 Date:           June 27, 2007
 KernelVersion:  2.6.24
@@ -12,8 +30,29 @@ Contact:	linux-scsi@vger.kernel.org
 Description:    16-byte local SRP port identifier in hexadecimal format. An
                 example: 4c:49:4e:55:58:20:56:49:4f:00:00:00:00:00:00:00.
 
+What:           /sys/class/srp_remote_ports/port-<h>:<n>/reconnect_delay
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
+Description:    Number of seconds the SCSI layer will wait after a reconnect
+                attempt failed before retrying. Setting this attribute to
+                "off" will disable time-based reconnecting.
+
 What:           /sys/class/srp_remote_ports/port-<h>:<n>/roles
 Date:           June 27, 2007
 KernelVersion:  2.6.24
 Contact:        linux-scsi@vger.kernel.org
 Description:    Role of the remote port. Either "SRP Initiator" or "SRP Target".
+
+What:           /sys/class/srp_remote_ports/port-<h>:<n>/state
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
+Description:    State of the transport layer used for communication with the
+                remote port. "running" if the transport layer is operational;
+                "blocked" if a transport layer error has been encountered but
+                the fast_io_fail_tmo timer has not yet fired; "fail-fast"
+                after the fast_io_fail_tmo timer has fired and before the
+                "dev_loss_tmo" timer has fired; "lost" after the
+                "dev_loss_tmo" timer has fired and before the port is finally
+                removed.