Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5',... (b4fdf52b) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/ABI/stable/sysfs-driver-ib_srp

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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		interrupt is handled by a different CPU then the comp_vector
	parameter can be used to spread the SRP completion workload		parameter can be used to spread the SRP completion workload
	over multiple CPU's.		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		What: /sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev
	Date: January 2, 2006		Date: January 2, 2006
	@@ -153,6 +159,13 @@ Contact: linux-rdma@vger.kernel.org
	Description: InfiniBand service ID used for establishing communication with		Description: InfiniBand service ID used for establishing communication with
	the SRP target.		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		What: /sys/class/scsi_host/host<n>/zero_req_lim
	Date: September 20, 2006		Date: September 20, 2006
	KernelVersion: 2.6.18		KernelVersion: 2.6.18

Documentation/ABI/stable/sysfs-transport-srp

+39 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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		Description: Instructs an SRP initiator to disconnect from a target and to
	remove all LUNs imported from that target.		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		What: /sys/class/srp_remote_ports/port-<h>:<n>/port_id
	Date: June 27, 2007		Date: June 27, 2007
	KernelVersion: 2.6.24		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		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.		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		What: /sys/class/srp_remote_ports/port-<h>:<n>/roles
	Date: June 27, 2007		Date: June 27, 2007
	KernelVersion: 2.6.24		KernelVersion: 2.6.24
	Contact: linux-scsi@vger.kernel.org		Contact: linux-scsi@vger.kernel.org
	Description: Role of the remote port. Either "SRP Initiator" or "SRP Target".		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.

drivers/infiniband/Kconfig

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -31,17 +31,6 @@ config INFINIBAND_USER_ACCESS
	libibverbs, libibcm and a hardware driver library from		libibverbs, libibcm and a hardware driver library from
	<http://www.openfabrics.org/git/>.		<http://www.openfabrics.org/git/>.

	config INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
	bool "Experimental and unstable ABI for userspace access to flow steering verbs"
	depends on INFINIBAND_USER_ACCESS
	depends on STAGING
	---help---
	The final ABI for userspace access to flow steering verbs
	has not been defined. To use the current ABI, *WHICH WILL
	CHANGE IN THE FUTURE*, say Y here.

	If unsure, say N.

	config INFINIBAND_USER_MEM		config INFINIBAND_USER_MEM
	bool		bool
	depends on INFINIBAND_USER_ACCESS != n		depends on INFINIBAND_USER_ACCESS != n

drivers/infiniband/core/cm.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -383,14 +383,11 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
	{		{
	unsigned long flags;		unsigned long flags;
	int id;		int id;
	static int next_id;

	idr_preload(GFP_KERNEL);		idr_preload(GFP_KERNEL);
	spin_lock_irqsave(&cm.lock, flags);		spin_lock_irqsave(&cm.lock, flags);

	id = idr_alloc(&cm.local_id_table, cm_id_priv, next_id, 0, GFP_NOWAIT);		id = idr_alloc_cyclic(&cm.local_id_table, cm_id_priv, 0, 0, GFP_NOWAIT);
	if (id >= 0)
	next_id = max(id + 1, 0);

	spin_unlock_irqrestore(&cm.lock, flags);		spin_unlock_irqrestore(&cm.lock, flags);
	idr_preload_end();		idr_preload_end();

drivers/infiniband/core/netlink.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -148,7 +148,7 @@ static int ibnl_rcv_msg(struct sk_buff skb, struct nlmsghdr nlh)
	list_for_each_entry(client, &client_list, list) {		list_for_each_entry(client, &client_list, list) {
	if (client->index == index) {		if (client->index == index) {
	if (op < 0 \|\| op >= client->nops \|\|		if (op < 0 \|\| op >= client->nops \|\|
	!client->cb_table[RDMA_NL_GET_OP(op)].dump)		!client->cb_table[op].dump)
	return -EINVAL;		return -EINVAL;

	{		{