mirror of
https://github.com/SCST-project/scst.git
synced 2026-09-19 22:44:24 +00:00
Merged revisions 5409-5452,5454 via svnmerge from
svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/trunk
........
r5409 | bvassche | 2014-04-06 23:13:53 +0300 (Sun, 06 Apr 2014) | 4 lines
scstadmin: Restore LUNs in "scstadmin -list_sessions" output
Signed-off-by: Dave Butler <tears.the@gmail.com>
........
r5410 | bvassche | 2014-04-06 23:26:08 +0300 (Sun, 06 Apr 2014) | 1 line
scstadmin: List keys alphabetically in the -list_sessions output
........
r5411 | vlnb | 2014-04-10 02:58:20 +0300 (Thu, 10 Apr 2014) | 10 lines
vdisk_blockio: Specify REQ_SYNC for synchronous I/O requests
Using READ_SYNC instead of READ increases the priority of read requests.
Using WRITE_SYNC instead of REQ_WRITE increases the priority of write
requests and avoids that the CFQ scheduler queues such writes waiting
for further write requests.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
r5412 | vlnb | 2014-04-10 02:59:02 +0300 (Thu, 10 Apr 2014) | 18 lines
vdisk_blockio: Reenable COMPARE AND WRITE
The COMPARE AND WRITE implementation has been tested as follows against
an SCST vdisk_blockio device:
lba=7
bdev=$bdev
for ((i=0;i<4;i++)); do dd if=/dev/urandom of=b$i bs=8k count=1; done
for p in "0 1" "1 2" "2 3" "3 0"; do set $p; cat b$1 b$2 >b$1$2; done
dd if=/dev/urandom of=$bdev
dd if=b0 of=$bdev seek=$lba
md5sum $bdev
for ((i=0;i<10000;i++)); do for f in b01 b12 b23 b30; do sg_compare_and_write -l $lba -i $f -n 16 -x 16384 $bdev; done; done
md5sum $bdev
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
r5413 | bvassche | 2014-04-15 09:03:59 +0300 (Tue, 15 Apr 2014) | 1 line
ib_srpt: Fix a sparse warning
........
r5414 | vlnb | 2014-04-16 00:26:06 +0300 (Wed, 16 Apr 2014) | 5 lines
Fix READ(6)/WRITE(6)
LBA in those commands is 3 bytes long, not 2.
........
r5415 | vlnb | 2014-04-16 00:30:26 +0300 (Wed, 16 Apr 2014) | 3 lines
Add SYNCHRONIZE_CACHE(16)
........
r5416 | vlnb | 2014-04-16 01:04:54 +0300 (Wed, 16 Apr 2014) | 6 lines
Make HEAD OF QUEUE requests sync
Since the block layer has no way to specify bio as HQ, there's no
choice, but to use every measure to approximate it as close as possible.
........
r5417 | vlnb | 2014-04-16 01:17:34 +0300 (Wed, 16 Apr 2014) | 3 lines
Add NULLIO VERIFY
........
r5418 | vlnb | 2014-04-16 04:02:50 +0300 (Wed, 16 Apr 2014) | 3 lines
REPORT SUPPORTED OPERATION CODES added
........
r5419 | vlnb | 2014-04-16 04:05:49 +0300 (Wed, 16 Apr 2014) | 3 lines
Cleanup
........
r5420 | vlnb | 2014-04-16 05:24:44 +0300 (Wed, 16 Apr 2014) | 3 lines
Follow up for r5418: some cleanups and fixes
........
r5421 | bvassche | 2014-04-16 09:17:19 +0300 (Wed, 16 Apr 2014) | 6 lines
scst_targ: Fix a checkpatch complaint
Avoid that checkpatch reports the following message:
ERROR: space required before the open parenthesis '('
........
r5422 | bvassche | 2014-04-16 09:35:19 +0300 (Wed, 16 Apr 2014) | 1 line
scst_vdisk: Build fix for kernels < 2.6.36 (see also r5416)
........
r5423 | bvassche | 2014-04-16 10:30:34 +0300 (Wed, 16 Apr 2014) | 6 lines
ib_srpt: Disable RDMA access by the initiator
With the SRP protocol all RDMA operations are initiated by the target.
Since no RDMA operations are initiated by the initiator, do not grant
the initiator permission to submit RDMA reads or writes to the target.
........
r5424 | bvassche | 2014-04-16 11:01:58 +0300 (Wed, 16 Apr 2014) | 1 line
ib_srpt: Constify two arguments of srpt_get_nexus()
........
r5425 | bvassche | 2014-04-16 11:08:50 +0300 (Wed, 16 Apr 2014) | 1 line
ib_srpt: Clean up the code that prints the dgid during login
........
r5426 | bvassche | 2014-04-16 11:23:11 +0300 (Wed, 16 Apr 2014) | 1 line
ib_srpt: Cache P_Key lookups
........
r5427 | bvassche | 2014-04-16 12:14:31 +0300 (Wed, 16 Apr 2014) | 1 line
ib_srpt: Remove a superfluous assignment
........
r5428 | bvassche | 2014-04-16 12:31:56 +0300 (Wed, 16 Apr 2014) | 1 line
scst_vdisk: Avoid that checkpatch complains about unnecessary line continuations
........
r5429 | bvassche | 2014-04-16 12:35:18 +0300 (Wed, 16 Apr 2014) | 1 line
scst_lib: Avoid that checkpatch complains about unnecessary line continuations
........
r5430 | bvassche | 2014-04-17 09:09:41 +0300 (Thu, 17 Apr 2014) | 1 line
scst_vdisk: Kernel 2.6.27 build fix
........
r5431 | bvassche | 2014-04-17 09:12:07 +0300 (Thu, 17 Apr 2014) | 5 lines
scst_vdisk: Fix a kernel 2.6.27 compiler warning
Avoid that the compiler reports that variables 'start_sector' and 'nr_sects'
are set but not used when building against kernel 2.6.27.
........
r5432 | vlnb | 2014-04-18 03:32:51 +0300 (Fri, 18 Apr 2014) | 3 lines
Update to kernels 3.14
........
r5433 | bvassche | 2014-04-18 08:50:04 +0300 (Fri, 18 Apr 2014) | 1 line
nightly build: Add kernel 3.14 build infrastructure
........
r5434 | bvassche | 2014-04-18 08:54:29 +0300 (Fri, 18 Apr 2014) | 1 line
nightly build: Add kernel version 3.14.1 and update other kernel versions
........
r5435 | bvassche | 2014-04-18 08:56:35 +0300 (Fri, 18 Apr 2014) | 6 lines
iscsi-scst: Fix a checkpatch warning
Fix the following checkpatch 3.14 warning:
Unnecessary parentheses - maybe == should be = ?
........
r5436 | bvassche | 2014-04-18 09:03:34 +0300 (Fri, 18 Apr 2014) | 6 lines
scst.h: Fix a checkpatch warning
Fix the following checkpatch 3.14 warning:
Unnecessary space after function pointer name
........
r5437 | bvassche | 2014-04-18 09:08:07 +0300 (Fri, 18 Apr 2014) | 6 lines
scst: Fix a checkpatch warning
Fix the following checkpatch 3.14 warning:
Unnecessary space after function pointer name
........
r5438 | bvassche | 2014-04-18 09:13:03 +0300 (Fri, 18 Apr 2014) | 6 lines
scst: Fix a checkpatch 3.14 warning about whitespace
Fix the following checkpatch 3.14 warning:
missing space after return type
........
r5439 | bvassche | 2014-04-18 14:09:55 +0300 (Fri, 18 Apr 2014) | 1 line
ib_srpt: Update README
........
r5440 | bvassche | 2014-04-18 15:04:05 +0300 (Fri, 18 Apr 2014) | 2 lines
ib_srpt: Move IB/CM knowledge out of srpt_cm_req_recv()
........
r5441 | bvassche | 2014-04-18 15:08:00 +0300 (Fri, 18 Apr 2014) | 6 lines
ib_srpt: Remove a superfluous check from the REQ handler
ib_send_cm_rep() checks the connection state before sending a response.
Hence checking ch->state before calling ib_send_cm_rep() is superfluous,
so remove that check and also the locking that is no longer needed.
........
r5442 | bvassche | 2014-04-18 15:09:33 +0300 (Fri, 18 Apr 2014) | 5 lines
ib_srpt: Prepare RDMA/CM support
Move IB/CM members into a new struct. Report channel pointer instead of CM ID
pointer in diagnostic messages.
........
r5443 | bvassche | 2014-04-18 15:10:47 +0300 (Fri, 18 Apr 2014) | 5 lines
ib_srpt: Use a mutex instead of a spinlock to protect the channel list
This is allowed because all CM callback functions are invoked from thread
context.
........
r5444 | bvassche | 2014-04-18 15:11:18 +0300 (Fri, 18 Apr 2014) | 2 lines
ib_srpt: Move the code for checking the QP timeout
........
r5445 | bvassche | 2014-04-18 15:22:30 +0300 (Fri, 18 Apr 2014) | 4 lines
ib_srpt: Add RDMA/CM support
Or in other words, add RoCE and iWARP support.
........
r5446 | bvassche | 2014-04-18 15:38:39 +0300 (Fri, 18 Apr 2014) | 1 line
ib_srpt: Build fix for kernel versions < 3.0
........
r5447 | bvassche | 2014-04-18 15:44:48 +0300 (Fri, 18 Apr 2014) | 1 line
ib_srpt: RHEL 6.5 build fix
........
r5448 | bvassche | 2014-04-19 14:48:33 +0300 (Sat, 19 Apr 2014) | 1 line
scst_vdisk, COMPARE AND WRITE: Convert a kernel warning into a SCSI sense code
........
r5449 | bvassche | 2014-04-19 14:52:34 +0300 (Sat, 19 Apr 2014) | 33 lines
vdisk_blockio: Make COMPARE AND WRITE compatible with the scsi_debug driver
This patch fixes the following kernel oops:
BUG: unable to handle kernel paging request at ffffeae380000690
Call Trace:
[<ffffffff812f69f9>] sg_miter_next+0x9/0xd0
[<ffffffff812f6b60>] sg_copy_buffer+0xa0/0x100
[<ffffffffa0507fc6>] do_device_access.isra.8+0xa6/0x150 [scsi_debug]
[<ffffffffa05085f4>] resp_read+0xe4/0x240 [scsi_debug]
[<ffffffffa050b285>] scsi_debug_queuecommand_lck+0x11e5/0x2060 [scsi_debug]
[<ffffffffa050c130>] scsi_debug_queuecommand+0x30/0x48 [scsi_debug]
[<ffffffff813fe23f>] scsi_dispatch_cmd+0xaf/0x260
[<ffffffff814068ed>] scsi_request_fn+0x32d/0x540
[<ffffffff812bda2a>] __blk_run_queue+0x2a/0x40
[<ffffffff812c25a4>] blk_queue_bio+0x274/0x350
[<ffffffff812bd878>] generic_make_request+0xa8/0xf0
[<ffffffff812bd92c>] submit_bio+0x6c/0x140
[<ffffffffa06247f6>] blockio_rw_sync.isra.29+0x106/0x170 [scst_vdisk]
[<ffffffffa0629bf9>] vdisk_exec_caw+0xd9/0x3c0 [scst_vdisk]
[<ffffffffa061ff5e>] vdev_do_job+0x9e/0x320 [scst_vdisk]
[<ffffffffa0622c47>] non_fileio_exec+0x57/0xd0 [scst_vdisk]
[<ffffffffa054cde2>] scst_do_real_exec+0x92/0x3b0 [scst]
[<ffffffffa05502d2>] scst_exec_check_blocking+0xe2/0x300 [scst]
[<ffffffffa055066b>] scst_exec_check_sn+0x17b/0x2d0 [scst]
[<ffffffffa0553231>] scst_process_active_cmd+0x431/0x770 [scst]
[<ffffffffa0554a0a>] scst_do_job_active+0xea/0x180 [scst]
[<ffffffffa0554bc6>] scst_cmd_thread+0x126/0x290 [scst]
[<ffffffff81075241>] kthread+0xc1/0xe0
[<ffffffff81598ccc>] ret_from_fork+0x7c/0xb0
Reported-by: Sebastian Herbszt <herbszt@gmx.de>
........
r5450 | bvassche | 2014-04-20 09:24:23 +0300 (Sun, 20 Apr 2014) | 1 line
iscsi-scst/kernel/patches/put_page_callback-3.2.57.patch: Add
........
r5451 | bvassche | 2014-04-22 09:56:37 +0300 (Tue, 22 Apr 2014) | 1 line
scst: Revert r5438, a whitespace-only change
........
r5452 | bvassche | 2014-04-22 10:05:21 +0300 (Tue, 22 Apr 2014) | 1 line
scripts/run-regression-tests: Suppress the checkpatch warning "missing space after return type"
........
r5454 | bvassche | 2014-04-22 10:32:44 +0300 (Tue, 22 Apr 2014) | 1 line
scst/README: Update the section about Linux initiator ALUA support
........
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5455 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Yan Burman
+44
-17
@@ -1,11 +1,10 @@
|
||||
SCSI RDMA Protocol (SRP) Target driver for Linux
|
||||
=================================================
|
||||
|
||||
The SRP target driver has been designed to work on top of the Linux
|
||||
InfiniBand kernel drivers -- either the InfiniBand drivers included
|
||||
with a Linux distribution or the OFED InfiniBand drivers. For more
|
||||
information about using the SRP target driver in combination with
|
||||
OFED, see also README.ofed.
|
||||
The SRP target driver has been designed to work on top of the Linux RDMA
|
||||
kernel drivers -- either the RDMA drivers included with a Linux distribution
|
||||
or the OFED RDMA drivers. For more information about using the SRP target
|
||||
driver in combination with OFED, see also README.ofed.
|
||||
|
||||
The SRP target driver has been implemented as an SCST driver. This
|
||||
makes it possible to support a lot of I/O modes on real and virtual
|
||||
@@ -30,9 +29,13 @@ Installation
|
||||
Building and installing the SRP target driver is possible as follows:
|
||||
|
||||
cd ${SCST_DIR}
|
||||
make -s scst_clean scst scst_install
|
||||
make -s srpt_clean srpt srpt_install
|
||||
make -s scstadm scstadm_install
|
||||
if type -p rpm >/dev/null; then
|
||||
make -s rpm
|
||||
sudo rpm -U rpmbuilddir/RPMS/*/*rpm scstadmin/rpmbuilddir/RPMS/*/*rpm
|
||||
else
|
||||
make -s scst_clean srpt_clean scst srpt scstadmin
|
||||
sudo make -s scst_install srpt_install scstadm_install
|
||||
fi
|
||||
|
||||
The ib_srpt kernel module supports the following parameters:
|
||||
* one_target_per_port (boolean) and
|
||||
@@ -48,6 +51,11 @@ The ib_srpt kernel module supports the following parameters:
|
||||
use_node_guid_in_target_name are false. Mode (2) is choosen if
|
||||
one_target_per_port is false and use_node_guid_in_target_name is true. Mode
|
||||
(3) is choosen if one_target_per_port is true.
|
||||
* rdma_cm_port (number)
|
||||
A 16-bit number that specifies the port number to be registered via the
|
||||
RDMA/CM. Must be specified to make communication over RoCE or iWARP
|
||||
possible. If this parameter is zero (the default value) the SRP target
|
||||
driver does not register with the RDMA/CM.
|
||||
* srp_max_req_size (number)
|
||||
Maximum size of an SRP control message in bytes. Examples of SRP control
|
||||
messages are: login request, logout request, data transfer request, ...
|
||||
@@ -109,6 +117,11 @@ Now verify that loading the configuration from file works correctly:
|
||||
|
||||
/etc/init.d/scst reload
|
||||
|
||||
Note: when using InfiniBand loading the ib_ipoib kernel module and assigning
|
||||
an IP address to each IPoIB interface is only needed when using the RDMA/CM.
|
||||
When using the IB/CM however, it is allowed but not necessary to load the
|
||||
ib_ipoib kernel module.
|
||||
|
||||
|
||||
Configuring the SRP Initiator System
|
||||
------------------------------------
|
||||
@@ -117,7 +130,8 @@ First of all, load the SRP kernel module as follows:
|
||||
|
||||
modprobe ib_srp
|
||||
|
||||
Next, discover the new SRP target by running the srp_daemon command:
|
||||
Next, when using InfiniBand, discover the new SRP target by running the
|
||||
srp_daemon command:
|
||||
|
||||
for d in /dev/infiniband/umad*; do srp_daemon -oacd$d; done
|
||||
|
||||
@@ -138,7 +152,20 @@ The meaning of the parameters in the above command is as follows:
|
||||
* pkey: IB partition key (P_Key) of the target to connect to.
|
||||
* service_id: must match ioc_guid.
|
||||
|
||||
Target GIDs can be queried e.g. via sysfs:
|
||||
When using RoCE or iWARP, log in to the target system to determine the id_ext
|
||||
and ioc_guid parameters and use these to log in. An example:
|
||||
|
||||
[ target system ]
|
||||
# sed 's/,\(pkey\|dgid\|ioc_guid\)=[^,]*//g' $(find /sys/kernel/scst_tgt/targets/ib_srpt -name login_info) | uniq
|
||||
id_ext=0002c90300a34270,ioc_guid=0002c90300a34270
|
||||
|
||||
[ initiator system ]
|
||||
echo dest=192.168.5.1:5000,id_ext=0002c90300a34270,ioc_guid=0002c90300a34270
|
||||
>/sys/class/infiniband_srp/srp-mlx4_0-1/add_target
|
||||
echo dest=192.168.6.1:5000,id_ext=0002c90300a34270,ioc_guid=0002c90300a34270
|
||||
>/sys/class/infiniband_srp/srp-mlx4_0-2/add_target
|
||||
|
||||
Initiator port GIDs can be queried e.g. via sysfs:
|
||||
|
||||
$ for f in /sys/devices/*/*/*/infiniband/*/ports/*/gids/0; do echo $f; \
|
||||
cat $f | sed 's/://g'; done
|
||||
@@ -166,9 +193,9 @@ Target names
|
||||
|
||||
The name assigned by the ib_srpt target driver to an SCST target is either
|
||||
ib_srpt_target_<n>, the node GUID of a HCA in hexadecimal form with a colon
|
||||
after every fourth digit or the port GUID with a colon afer every fourth
|
||||
digit. The HCA node and port GUIDs can be obtained via the ibv_devinfo
|
||||
command. An example:
|
||||
after every fourth digit or the port GID with a colon afer every fourth
|
||||
digit. The HCA node GUID and the port GIDs can be obtained via the
|
||||
ibv_devinfo command. An example:
|
||||
|
||||
# ibv_devinfo -v | grep -E '[^a-z]port:|guid|GID'
|
||||
node_guid: 0002:c903:0005:f34e
|
||||
@@ -359,7 +386,8 @@ Performance Notes - Initiator Side
|
||||
|
||||
* The SRP initiator limits by default the queue depth to 64 commands. If your
|
||||
workload benefits from a larger queue depth, enlarge the queue depth by
|
||||
setting the max_cmd_per_lun parameter in the SRP login string.
|
||||
setting the max_cmd_per_lun and queue_size parameters in the SRP login
|
||||
string.
|
||||
|
||||
* The following parameters have a small but measurable impact on SRP
|
||||
performance:
|
||||
@@ -372,7 +400,7 @@ Performance Notes - Both Sides
|
||||
------------------------------
|
||||
|
||||
* Disabling CONFIG_SCHED_DEBUG and CONFIG_SCHEDSTATS in the kernel config
|
||||
helps.
|
||||
improves performance.
|
||||
|
||||
* Disable CONFIG_IRQSOFF_TRACER such that CONFIG_TRACE_IRQFLAGS is disabled.
|
||||
|
||||
@@ -421,5 +449,4 @@ A: This means that you are using a system on which OFED has been installed but
|
||||
Feedback
|
||||
--------
|
||||
|
||||
Send questions about this driver to scst-devel@lists.sourceforge.net, CC:
|
||||
Vu Pham <vuhuong@mellanox.com> and Bart Van Assche <bvanassche@acm.org>.
|
||||
Send questions about this driver to scst-devel@lists.sourceforge.net.
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 540f7b2..078307f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -361,6 +361,7 @@ USERINCLUDE := \
|
||||
# Use LINUXINCLUDE when you must reference the include/ directory.
|
||||
# Needed to be compatible with the O= option
|
||||
LINUXINCLUDE := \
|
||||
+ $(PRE_CFLAGS) \
|
||||
-I$(srctree)/arch/$(hdr-arch)/include \
|
||||
-Iarch/$(hdr-arch)/include/generated \
|
||||
$(if $(KBUILD_SRC), -I$(srctree)/include) \
|
||||
@@ -2,7 +2,8 @@
|
||||
==============================
|
||||
|
||||
The following actions related to SRP sessions can all occur concurrently:
|
||||
* IB communication manager (CM) invokes srpt_cm_handler().
|
||||
* The communication manager invokes either srpt_ib_cm_handler() or
|
||||
srpt_rdma_cm_handler().
|
||||
* HCA driver invokes the queue pair (QP) completion handler srpt_completion().
|
||||
* HCA driver invokes the QP async event handler srpt_qp_event().
|
||||
* HCA transfers data between initiator and target via RDMA.
|
||||
@@ -11,7 +12,7 @@ The following actions related to SRP sessions can all occur concurrently:
|
||||
|
||||
The actions that occur over the lifetime of a session are as follows:
|
||||
- A REQ message is received from the initiator.
|
||||
- srpt_cm_req_recv() is invoked and allocates a queue pair and creates a
|
||||
- srpt_cm_req_recv() is invoked, allocates a queue pair and creates a
|
||||
completion thread.
|
||||
- If the connection request is not accepted, a REJ message is sent and
|
||||
srpt_close_ch() is invoked. The srpt_close_ch() call causes the completion
|
||||
@@ -21,14 +22,12 @@ The actions that occur over the lifetime of a session are as follows:
|
||||
invoked. That function changes the queue pair state into RTS, the channel
|
||||
state into CH_LIVE and wakes up the completion thread.
|
||||
- RDMA communication starts and continues until either a DREQ message is
|
||||
received or sent. The function ib_send_cm_dreq() can get invoked
|
||||
either because a target port is disabled or from inside the
|
||||
srpt_close_session() function.
|
||||
received or sent. A DREQ is sent either because a target port is disabled or
|
||||
from inside the srpt_close_session() function.
|
||||
- After a DREQ has been sent either a DREP will be received
|
||||
(srpt_cm_drep_recv()) or the TimeWait state will be reached and will be left
|
||||
(srpt_cm_timewait_exit()).
|
||||
- srpt_cm_dre[pq]_recv() and srpt_cm_timewait_exit() all invoke
|
||||
srpt_close_ch().
|
||||
- srpt_cm_drep_recv() and srpt_cm_timewait_exit() invoke srpt_close_ch().
|
||||
- srpt_close_ch() changes the channel state into CH_DISCONNECTING, the
|
||||
queue pair state into IB_QPS_ERR and queues a zero-length write.
|
||||
- Upon receipt of the zero-length write completion the channel state is
|
||||
|
||||
+355
-227
File diff suppressed because it is too large
Load Diff
+34
-6
@@ -41,6 +41,7 @@
|
||||
#include <rdma/ib_verbs.h>
|
||||
#include <rdma/ib_sa.h>
|
||||
#include <rdma/ib_cm.h>
|
||||
#include <rdma/rdma_cm.h>
|
||||
#include <scsi/srp.h>
|
||||
#if defined(INSIDE_KERNEL_TREE)
|
||||
#include <scst/scst.h>
|
||||
@@ -327,15 +328,22 @@ enum rdma_ch_state {
|
||||
* @cmd_wait_list: list of SCST commands that arrived before the RTU event. This
|
||||
* list contains struct srpt_ioctx elements and is protected
|
||||
* against concurrent modification by the cm_id spinlock.
|
||||
* @pkey_index: P_Key index of the IB partition for this SRP channel.
|
||||
* @pkey: P_Key of the IB partition for this SRP channel.
|
||||
* @scst_sess: SCST session information associated with this SRP channel.
|
||||
* @sess_name: SCST session name.
|
||||
*/
|
||||
struct srpt_rdma_ch {
|
||||
struct task_struct *thread;
|
||||
struct srpt_nexus *nexus;
|
||||
struct ib_cm_id *cm_id;
|
||||
struct ib_qp *qp;
|
||||
union {
|
||||
struct {
|
||||
struct ib_cm_id *cm_id;
|
||||
} ib_cm;
|
||||
struct {
|
||||
struct rdma_cm_id *cm_id;
|
||||
} rdma_cm;
|
||||
};
|
||||
struct ib_cq *cq;
|
||||
struct kref kref;
|
||||
int rq_size;
|
||||
@@ -354,7 +362,8 @@ struct srpt_rdma_ch {
|
||||
enum rdma_ch_state state;
|
||||
struct list_head list;
|
||||
struct list_head cmd_wait_list;
|
||||
uint16_t pkey_index;
|
||||
uint16_t pkey;
|
||||
bool using_rdma_cm;
|
||||
bool processing_wait_list;
|
||||
|
||||
struct scst_session *scst_sess;
|
||||
@@ -364,7 +373,7 @@ struct srpt_rdma_ch {
|
||||
/**
|
||||
* struct srpt_nexus - I_T nexus
|
||||
* @entry: srpt_tgt.nexus_list list node.
|
||||
* @ch_list: struct srpt_rdma_ch list. Protected by srpt_tgt.spinlock
|
||||
* @ch_list: struct srpt_rdma_ch list. Protected by srpt_tgt.mutex.
|
||||
* @i_port_id: 128-bit initiator port identifier copied from SRP_LOGIN_REQ.
|
||||
* @t_port_id: 128-bit target port identifier copied from SRP_LOGIN_REQ.
|
||||
*/
|
||||
@@ -378,14 +387,14 @@ struct srpt_nexus {
|
||||
/**
|
||||
* struct srpt_tgt
|
||||
* @ch_releaseQ: Enables waiting for removal from nexus_list.
|
||||
* @spinlock: Protects nexus_list.
|
||||
* @mutex: Protects @nexus_list and srpt_nexus.ch_list.
|
||||
* @nexus_list: Per-device I_T nexus list.
|
||||
* @scst_tgt: SCST target information associated with this HCA.
|
||||
* @enabled: Whether or not this SCST target is enabled.
|
||||
*/
|
||||
struct srpt_tgt {
|
||||
wait_queue_head_t ch_releaseQ;
|
||||
spinlock_t spinlock;
|
||||
struct mutex mutex;
|
||||
struct list_head nexus_list;
|
||||
struct scst_tgt *scst_tgt;
|
||||
bool enabled;
|
||||
@@ -444,6 +453,25 @@ struct srpt_device {
|
||||
struct srpt_tgt srpt_tgt;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct srp_login_req_rdma - RDMA/CM login parameters.
|
||||
*
|
||||
* RDMA/CM over InfiniBand can only carry 92 - 36 = 56 bytes of private
|
||||
* data. srp_login_req_rdma contains the same information as
|
||||
* struct srp_login_req but with the reserved data removed.
|
||||
*
|
||||
* To do: Move this structure to <scsi/srp.h>.
|
||||
*/
|
||||
struct srp_login_req_rdma {
|
||||
u64 tag;
|
||||
__be16 req_buf_fmt;
|
||||
u8 req_flags;
|
||||
u8 opcode;
|
||||
__be32 req_it_iu_len;
|
||||
u8 initiator_port_id[16];
|
||||
u8 target_port_id[16];
|
||||
};
|
||||
|
||||
#endif /* IB_SRPT_H */
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user