mirror of
https://github.com/SCST-project/scst.git
synced 2026-08-19 21:56:31 +00:00
svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/trunk
........
r5875 | bvassche | 2014-11-16 19:58:07 +0200 (Sun, 16 Nov 2014) | 1 line
nightly build: Update kernel versions
........
r5878 | bvassche | 2014-11-19 02:17:41 +0200 (Wed, 19 Nov 2014) | 1 line
srpt/Makefile: Add double quotes around a path
........
r5879 | bvassche | 2014-11-19 02:20:20 +0200 (Wed, 19 Nov 2014) | 1 line
scripts/generate-release-archive: Accept an optional list of file names
........
r5880 | bvassche | 2014-11-22 13:12:29 +0200 (Sat, 22 Nov 2014) | 1 line
nightly build: Update kernel versions
........
r5881 | bvassche | 2014-11-24 19:59:14 +0200 (Mon, 24 Nov 2014) | 4 lines
ib_srpt: Add support for HCA's that do not support SRQ
Based on a patch provided by Parav Pandit <Parav.Pandit@Emulex.Com>
........
r5882 | vlnb | 2014-11-26 09:02:17 +0200 (Wed, 26 Nov 2014) | 3 lines
Update for kernels 3.17.x
........
r5883 | bvassche | 2014-11-26 10:05:09 +0200 (Wed, 26 Nov 2014) | 1 line
Add kernel 3.17 build infrastructure
........
r5884 | bvassche | 2014-11-26 10:07:08 +0200 (Wed, 26 Nov 2014) | 1 line
nightly build: Add kernel 3.17
........
r5885 | bvassche | 2014-11-26 10:16:44 +0200 (Wed, 26 Nov 2014) | 6 lines
Fix kernel 3.17 checkpatch warnings about 'long long unsigned'
Avoid that checkpatch reports the following warning:
WARNING: type 'long long unsigned' should be specified in 'unsigned long long' order.
........
r5886 | bvassche | 2014-11-26 15:38:52 +0200 (Wed, 26 Nov 2014) | 1 line
Build fixes for RHEL 6.6 kernel 2.6.32-504
........
r5887 | bvassche | 2014-11-26 16:39:51 +0200 (Wed, 26 Nov 2014) | 1 line
ib_srpt: Make the send queue full messages more informational
........
r5888 | bvassche | 2014-11-26 18:25:57 +0200 (Wed, 26 Nov 2014) | 1 line
scripts/specialize-patch: Support blanks around numbers inside parentheses
........
r5889 | bvassche | 2014-11-26 21:42:10 +0200 (Wed, 26 Nov 2014) | 1 line
scripts/specialize-patch: Reduce noise in nightly build output
........
r5890 | vlnb | 2014-11-27 06:36:33 +0200 (Thu, 27 Nov 2014) | 3 lines
Cleanup
........
r5891 | bvassche | 2014-11-27 17:18:58 +0200 (Thu, 27 Nov 2014) | 1 line
scst.h: Add uintptr_t
........
r5892 | bvassche | 2014-11-27 17:19:21 +0200 (Thu, 27 Nov 2014) | 1 line
ib_srpt: Add support for immediate data
........
r5893 | bvassche | 2014-11-27 17:24:17 +0200 (Thu, 27 Nov 2014) | 1 line
ib_srpt: Log reject reason
........
r5894 | bvassche | 2014-11-27 17:29:29 +0200 (Thu, 27 Nov 2014) | 1 line
ib_srpt: Rework the max_sge computation changes from r5795
........
r5895 | bvassche | 2014-11-28 11:16:37 +0200 (Fri, 28 Nov 2014) | 1 line
scst: Add scripts/rebuild-rhel-kernel-rpm to the SCST release archive
........
r5903 | bvassche | 2014-12-03 13:50:06 +0200 (Wed, 03 Dec 2014) | 4 lines
scripts/rebuild-rhel-kernel-rpm: Fix an error message
Reported-by: Hiroyuki Sato <hiroysato@gmail.com>
........
r5904 | bvassche | 2014-12-03 19:06:57 +0200 (Wed, 03 Dec 2014) | 1 line
iscsi-scst/kernel/patches/rhel/put_page_callback-2.6.32-504.patch: Add
........
r5905 | bvassche | 2014-12-03 19:07:31 +0200 (Wed, 03 Dec 2014) | 1 line
scripts/rebuild-rhel-kernel-rpm: Add support for RHEL 6.6
........
r5910 | bvassche | 2014-12-04 13:50:58 +0200 (Thu, 04 Dec 2014) | 1 line
scripts/generate-kernel-patch: Swap two filters
........
r5912 | bvassche | 2014-12-04 14:19:56 +0200 (Thu, 04 Dec 2014) | 4 lines
/etc/init.d/scst: Exit with status code 0 upon 'start' if already running
Reported-by: Dimitar Tanev <dimitar@linuxdevgroup.org>
........
r5913 | vlnb | 2014-12-05 01:41:52 +0200 (Fri, 05 Dec 2014) | 3 lines
FORMAT commands should be strictly serialized
........
r5914 | vlnb | 2014-12-05 01:43:51 +0200 (Fri, 05 Dec 2014) | 3 lines
Oops, fix for the previous commit
........
r5928 | vlnb | 2014-12-06 07:02:27 +0200 (Sat, 06 Dec 2014) | 3 lines
Web updates
........
r5929 | bvassche | 2014-12-09 14:33:16 +0200 (Tue, 09 Dec 2014) | 1 line
rpm build: Add support for qla2x00t driver in QLogic git repository
........
r5931 | vlnb | 2014-12-11 06:27:17 +0200 (Thu, 11 Dec 2014) | 3 lines
Docs update
........
r5932 | vlnb | 2014-12-11 06:34:36 +0200 (Thu, 11 Dec 2014) | 8 lines
scst_vdisk: Increase virtual device name length
This change makes integration with OpenStack easier since OpenStack GUIDs
are 36 characters long: 32 hex characters and four dashes.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
r5933 | vlnb | 2014-12-11 06:38:04 +0200 (Thu, 11 Dec 2014) | 11 lines
vdisk_blockio: Report invalid scatterlists
It is possible for a target driver to pass a scatterlist via
scst_cmd_set_tgt_sg() that is valid for the vdisk_fileio handler
but not for the vdisk_blockio handler. Complain loudly if an invalid
scatterlist is passed to vdisk_blockio because such scatterlists
cause silent data corruption with most Linux block drivers.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
r5934 | bvassche | 2014-12-11 14:31:03 +0200 (Thu, 11 Dec 2014) | 1 line
scst_vdisk: Follow-up for r5932
........
r5935 | bvassche | 2014-12-11 14:37:02 +0200 (Thu, 11 Dec 2014) | 1 line
ib_srpt: Log P_Key during login
........
r5936 | bvassche | 2014-12-12 11:29:42 +0200 (Fri, 12 Dec 2014) | 1 line
scripts/generate-kernel-patch: Include scst_pg.sgml instead of sgv_cache.sgml
........
r5937 | bvassche | 2014-12-12 11:34:55 +0200 (Fri, 12 Dec 2014) | 1 line
doc/scst_pg.sgml: Remove trailing whitespace
........
r5938 | bvassche | 2014-12-17 09:48:40 +0200 (Wed, 17 Dec 2014) | 1 line
nightly build: Update kernel versions
........
r5939 | vlnb | 2014-12-19 05:50:58 +0200 (Fri, 19 Dec 2014) | 3 lines
Fallback to the old qla driver if the git one not detected
........
r5940 | vlnb | 2014-12-19 05:55:14 +0200 (Fri, 19 Dec 2014) | 7 lines
Replace in cases, where sporadic failures are possible, HARDWARE ERROR
by INTERNAL TARGET FAILURE, which is retriable (some OS'es don't retry
HARDWARE ERROR)
Reported and suggested by Shahar Salzman <shahar.salzman@kaminario.com>
........
r5941 | vlnb | 2014-12-20 05:48:07 +0200 (Sat, 20 Dec 2014) | 7 lines
scst_vdisk: Only accept NAA IDs allowed by SPC
See also paragraph 7.8.6.6 NAA designator format in SPC-4.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
r5942 | vlnb | 2014-12-20 05:49:23 +0200 (Sat, 20 Dec 2014) | 11 lines
scst_vdisk: Remove superfluous llseek() calls
vfs_read() and vfs_write() ignore the file offset set by llseek().
Hence remove the llseek() calls that occur just before vfs_read() and
vfs_write(). See also the implementation in the Linux kernel of the
pread64() and pwrite64() system calls for examples of code that uses
vfs_read() and vfs_write().
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
r5943 | bvassche | 2014-12-22 14:28:13 +0200 (Mon, 22 Dec 2014) | 1 line
Source code spelling fix: Equivilant -> Equivalent
........
r5944 | bvassche | 2014-12-22 14:28:56 +0200 (Mon, 22 Dec 2014) | 1 line
Source code spelling fix: accesss -> access
........
r5945 | bvassche | 2014-12-22 14:29:51 +0200 (Mon, 22 Dec 2014) | 1 line
Source code spelling fix: addres -> address
........
r5946 | bvassche | 2014-12-22 14:31:08 +0200 (Mon, 22 Dec 2014) | 1 line
Source code spelling fix: authentification -> authentication
........
r5947 | bvassche | 2014-12-22 14:32:30 +0200 (Mon, 22 Dec 2014) | 1 line
Source code comment spelling fix: explicitely -> explicitly
........
r5948 | bvassche | 2014-12-22 14:33:06 +0200 (Mon, 22 Dec 2014) | 1 line
Source code comment spelling fix: hander -> handler
........
r5949 | bvassche | 2014-12-22 14:33:37 +0200 (Mon, 22 Dec 2014) | 1 line
Source code comment spelling fix: loosing -> losing
........
r5950 | bvassche | 2014-12-22 14:35:00 +0200 (Mon, 22 Dec 2014) | 1 line
Spelling fix: occured -> occurred
........
r5951 | bvassche | 2014-12-22 14:35:51 +0200 (Mon, 22 Dec 2014) | 1 line
Source code comment spelling fix: refering -> referring
........
r5952 | bvassche | 2014-12-22 14:36:47 +0200 (Mon, 22 Dec 2014) | 1 line
Spelling fix: shrinked -> shrunk
........
r5953 | bvassche | 2014-12-22 15:08:34 +0200 (Mon, 22 Dec 2014) | 1 line
Spelling fix: choosen -> chosen
........
r5954 | bvassche | 2014-12-22 15:09:20 +0200 (Mon, 22 Dec 2014) | 1 line
Spelling fix: existant -> existent
........
r5955 | bvassche | 2014-12-22 15:10:41 +0200 (Mon, 22 Dec 2014) | 1 line
Update for kernel 3.18
........
r5956 | bvassche | 2014-12-22 15:15:55 +0200 (Mon, 22 Dec 2014) | 1 line
Spelling fix: immediatelly -> immediately
........
r5957 | bvassche | 2014-12-24 16:28:36 +0200 (Wed, 24 Dec 2014) | 1 line
nightly build: Add kernel 3.18
........
r5958 | bvassche | 2014-12-29 14:14:52 +0200 (Mon, 29 Dec 2014) | 1 line
scst_lib: Convert spaces into tabs (reported by checkpatch)
........
r5959 | bvassche | 2015-01-06 15:25:28 +0200 (Tue, 06 Jan 2015) | 1 line
scst_calc_block_shift: Log block shift and sector size upon mismatch
........
r5960 | bvassche | 2015-01-07 11:20:06 +0200 (Wed, 07 Jan 2015) | 4 lines
scst_local: Fix unique per session sas address
Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
........
r5961 | bvassche | 2015-01-09 14:23:25 +0200 (Fri, 09 Jan 2015) | 4 lines
scst_sysfs: return EINVAL on too big LUN
Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
........
r5962 | bvassche | 2015-01-10 17:52:57 +0200 (Sat, 10 Jan 2015) | 1 line
nightly build: Update kernel versions
........
r5963 | bvassche | 2015-01-13 10:42:28 +0200 (Tue, 13 Jan 2015) | 10 lines
scst: Switch to thread context before executing a reservation command
Persistent reservation commands need thread context because
scst_pr_is_cmd_allowed() locks the PR mutex. Reservation commands
either need BH or thread context. Hence switch from atomic to
thread context before processing such commands.
Reported-by: Shahar Salzman <shahar.salzman@kaminario.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
r5964 | bvassche | 2015-01-13 10:51:08 +0200 (Tue, 13 Jan 2015) | 5 lines
scst_parse_unmap_descriptors(): Avoid using GFP_KERNEL in atomic context
Reported-by: Shahar Salzman <shahar.salzman@kaminario.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
r5965 | bvassche | 2015-01-13 10:55:46 +0200 (Tue, 13 Jan 2015) | 68 lines
qla2x00t: Copy entire SCST sense buffer to q2x ctio
There seems to be a bug in passing sense information to QLA HBAs, where
the last 2 bytes of the sense data (ASC, ASCQ) are not copied to the low
level sense buffer.
We encountered this in ESX, which relies on these 2 bytes to parse the
MISCOMPARE sense code (0xE1, 0x1D, 0x00).
Bellow is a simple test to recreate this issue, but during vMotion
operations (where VMs are moved from one host to another), this may
cause the operation to fail leaving the VM in an inconsistent state.
The test I ran to verify that we are indeed missing the bytes is the
following:
1. Create a SCST based device
2. Expose the device to 2 ESX hosts
3. Format the device as VMFS5, create a test directory
4. From both hosts, I start writing to this directory (no VMs involved,
just write normal files)
At this stage, both ESX hosts try to take access to the directory.
The VMFS filesystem contains a per-directory lock which is managed by
COMPARE AND WRITE command.
Each ESX will attempt to change the VMFS lock location from unlocked to
locked to create the new file.
Obviously there are bound to be failures (which are equivalent to
programming locking conflicts), these are reported by the MISCOMPARE
sense code.
Upon these MISCOMPARE errors, the host will re-try taking the lock until
it succeeds, and will then proceed to perform the write operation on the
directory.
Due to the bug in copying the sense buffer from the SCST core to the QLA
ctio, instead of the full sense code, only the key (0xE) is sent, and
ESX does not know how to handle it resulting in IO error.
Here are the errors as they appear on the command line:
/vmfs/volumes/54a297c4-ca5af1cc-7f94-002219d20f28/ats_test #
./open_close_test-esx2.sh
./open_close_test-esx2.sh: line 8: can't create
ats_fileoptest-esx2_1.txt: Input/output error
./open_close_test-esx2.sh: line 8: can't create
ats_fileoptest-esx2_21.txt: Input/output error
./open_close_test-esx2.sh: line 8: can't create
ats_fileoptest-esx2_110.txt: Input/output error
./open_close_test-esx2.sh: line 8: can't create
ats_fileoptest-esx2_111.txt: Input/output error
In the /var/log/vmkernel.log, we can see that the sense information is
missing (0xE, 0x0, 0x0) instead of (0xE, 0x1D, 0x0).
2014-12-30T12:13:20.714Z cpu6:33519)ScsiDeviceIO: 2338:
Cmd(0x412e84f957c0) 0x89, CmdSN 0x234d from world 519051 to dev
"eui.0024f400d5020007" failed H:0x0 D:0x2 P:0x0 Valid sense data: 0xe 0x0 0x0.
2014-12-30T12:13:20.766Z cpu6:33519)ScsiDeviceIO: 2338:
Cmd(0x412e84f91d00) 0x89, CmdSN 0x2350 from world 519051 to dev
"eui.0024f400d5020007" failed H:0x0 D:0x2 P:0x0 Valid sense data: 0xe 0x0 0x0.
2014-12-30T12:13:20.766Z cpu6:33519)ScsiDeviceIO: 2338:
Cmd(0x412e80449fc0) 0x89, CmdSN 0x234f from world 519051 to dev
"eui.0024f400d5020007" failed H:0x0 D:0x2 P:0x0 Valid sense data: 0xe 0x0 0x0.
This patch fixes this issue, the test will run without a problem with the
fix (no IO errors, all the files are properly written to the directory).
Signed-off-by: Shahar Salzman <shahar.salzman@kaminario.com>
Reviewed-by: Eran Mann <eran.mann@kaminario.com>
[bvanassche: simplified implementation]
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
r5966 | bvassche | 2015-01-13 11:38:09 +0200 (Tue, 13 Jan 2015) | 5 lines
qla2x00t: Register for RSCNs in target mode
The QLogic firmware and qla2xxx do not register for RSCNs in
target-only mode, so do that explicitly.
........
r5967 | bvassche | 2015-01-14 10:06:12 +0200 (Wed, 14 Jan 2015) | 1 line
scst_targ: Use tabs instead of spaces for indentation (detected by checkpatch)
........
r5968 | bvassche | 2015-01-15 10:58:39 +0200 (Thu, 15 Jan 2015) | 4 lines
scst_targ: Avoid triggering a kernel panic if dev_user_parse() returns SCST_CMD_STATE_STOP
Reported-by: Ilan Steinberg <ilan.steinberg@kaminario.com>
........
r5969 | vlnb | 2015-01-16 03:21:10 +0200 (Fri, 16 Jan 2015) | 3 lines
Fix READ BUFFER and WRITE BUFFER commands
........
r5970 | vlnb | 2015-01-16 05:16:26 +0200 (Fri, 16 Jan 2015) | 3 lines
Follow up for r5968
........
r5971 | vlnb | 2015-01-16 05:53:29 +0200 (Fri, 16 Jan 2015) | 5 lines
Report during user devices unjam LUN NOT SUPPORTED sense
Reported-By: shahar.salzman <shahar.salzman@kaminario.com>
........
r5972 | bvassche | 2015-01-16 15:01:58 +0200 (Fri, 16 Jan 2015) | 2 lines
scst.spec.in: Rename variable kver into kversion
........
r5973 | bvassche | 2015-01-16 15:12:22 +0200 (Fri, 16 Jan 2015) | 2 lines
scst.spec.in: Pass kernel version via RPM-variable %{kversion} instead of shell variable ${KVER}
........
r5974 | bvassche | 2015-01-16 15:16:06 +0200 (Fri, 16 Jan 2015) | 6 lines
scst.spec.in: Determine version number correctly on a koji server
This patch has been tested on a koji build server and also on four
different RPM-based distributions (CentOS 7, Fedora 20, openSuSE 13.2
and SLES 11 SP3).
........
r5975 | bvassche | 2015-01-16 18:12:38 +0200 (Fri, 16 Jan 2015) | 1 line
scst.spec.in: Leave out kernel version from RPM name
........
r5976 | bvassche | 2015-01-16 18:20:10 +0200 (Fri, 16 Jan 2015) | 1 line
scst.spec.in: Add DKMS support
........
r5977 | vlnb | 2015-01-20 06:18:07 +0200 (Tue, 20 Jan 2015) | 3 lines
Revert r5964 as not needed
........
r5978 | vlnb | 2015-01-20 06:20:13 +0200 (Tue, 20 Jan 2015) | 3 lines
Revert r5963 as not needed
........
r5979 | bvassche | 2015-01-20 17:04:23 +0200 (Tue, 20 Jan 2015) | 13 lines
scst: Rework SCSI pass-through support for kernel versions >= 2.6.30
Changes in this patch:
- Rework the SCSI pass-through code such that for kernel versions
>= 2.6.30 the scst_exec_req_fifo patch is no longer needed.
- Modify the pass-through code such that blk_rq_append_bio() is only
called for kernel version 2.6.30. For later kernel versions
blk_make_request() is called instead.
- Rework scst_scsi_exec_async().
- Add debug tracing of SCSI pass-through result status.
- Add a lockdep_assert_held() call in scsi_end_async().
........
r5980 | bvassche | 2015-01-20 19:13:13 +0200 (Tue, 20 Jan 2015) | 1 line
nightly build: Update kernel versions
........
r5981 | vlnb | 2015-01-21 06:15:42 +0200 (Wed, 21 Jan 2015) | 3 lines
Follow up for r5979
........
r5982 | vlnb | 2015-01-21 06:20:53 +0200 (Wed, 21 Jan 2015) | 5 lines
Fix returning changeable values for caching mode page
Reported by Consus <consus@gmx.com>
........
r5983 | bvassche | 2015-01-21 15:11:56 +0200 (Wed, 21 Jan 2015) | 1 line
scst.h: Fix a sparse warning for kernels 2.6.29..2.6.31
........
r5984 | vlnb | 2015-01-22 07:03:17 +0200 (Thu, 22 Jan 2015) | 9 lines
[PATCH] scst_local: Fix bidirectional command support
scsi_setup_cmnd() sets sc_data_direction to DMA_TO_DEVICE for bidirectional
commands. Hence test SCpnt->request->next_rq instead of sc_data_direction
to figure out whether or not a command is bidirectional.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
........
r5985 | vlnb | 2015-01-22 07:06:45 +0200 (Thu, 22 Jan 2015) | 12 lines
[PATCH] scst_main: Suppress a checkpatch warning triggered by INIT_CACHEP{,_ALIGN}
Avoid that checkpatch v3.18 reports the following warning for these
two macros:
WARNING: Macros with flow control statements should be avoided
This patch does not change any functionality.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
........
r5986 | vlnb | 2015-01-22 07:09:17 +0200 (Thu, 22 Jan 2015) | 9 lines
scst_vdisk: Micro-optimize vdisk_caching_pg
This patch does not change any behavior but micro-optimizes
vdisk_caching_pg(). Declaring the array caching_pg[] const reduces
11 bytes from the assembler code of this function.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
........
r5987 | vlnb | 2015-01-22 07:10:42 +0200 (Thu, 22 Jan 2015) | 10 lines
scst: Suppress a smatch warning in vdisk_unmap_range()
Avoid that the static source code analysis tool 'smatch' reports
the following warning:
vdisk_unmap_range() warn: should 'blocks << cmd->dev->block_shift' be a 64 bit type?
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
........
r5988 | vlnb | 2015-01-22 07:13:59 +0200 (Thu, 22 Jan 2015) | 27 lines
scst_vdisk: Fix zero-copy read for tmpfs
For some filesystems, e.g. tmpfs, address_space.readpage is NULL.
Disable zero-copy reading for such filesystems. See also shmem_aops
in mm/shmem.c. See also inode_init_always() and empty_aops in fs/inode.c.
This patch avoids that the following call trace is triggered:
BUG: unable to handle kernel NULL pointer dereference at (null)
Call Trace:
[<ffffffffa0547d66>] prepare_read+0x106/0x1d0 [scst_vdisk]
[<ffffffffa0547f20>] fileio_alloc_data_buf+0xf0/0x330 [scst_vdisk]
[<ffffffffa046fc9b>] scst_prepare_space+0x9b/0x6e0 [scst]
[<ffffffffa047d4d5>] scst_process_active_cmd+0x545/0x840 [scst]
[<ffffffffa047dad2>] scst_cmd_init_done+0x302/0x5d0 [scst]
[<ffffffffa0563ab2>] scst_cmd_init_stage1_done.constprop.37+0x12/0x20 [iscsi_scst]
[<ffffffffa056a9ea>] scsi_cmnd_start+0x25a/0x550 [iscsi_scst]
[<ffffffffa056b4a8>] cmnd_rx_start+0x148/0x1a0 [iscsi_scst]
[<ffffffffa056e4f8>] process_read_io+0x3b8/0x800 [iscsi_scst]
[<ffffffffa056ea07>] scst_do_job_rd+0xc7/0x220 [iscsi_scst]
[<ffffffffa056efed>] istrd+0x16d/0x2e0 [iscsi_scst]
[<ffffffff81079efd>] kthread+0xed/0x110
[<ffffffff817227fc>] ret_from_fork+0x7c/0xb0
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
........
r5989 | vlnb | 2015-01-24 07:37:57 +0200 (Sat, 24 Jan 2015) | 5 lines
scst_local: Rework data direction detection code
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
........
r5990 | bvassche | 2015-01-26 13:32:32 +0200 (Mon, 26 Jan 2015) | 1 line
ib_srpt: Detect Mellanox OFED 2.3 correctly
........
r5991 | vlnb | 2015-01-28 07:07:46 +0200 (Wed, 28 Jan 2015) | 3 lines
Cleanups
........
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5993 d57e44dd-8a1f-0410-8b47-8ef2f437770f
1073 lines
26 KiB
C
1073 lines
26 KiB
C
/*
|
|
* Copyright (C) 2002 - 2003 Ardis Technolgies <roman@ardistech.com>
|
|
* Copyright (C) 2007 - 2014 Vladislav Bolkhovitin
|
|
* Copyright (C) 2007 - 2014 Fusion-io, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation, version 2
|
|
* of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/file.h>
|
|
#include <linux/ip.h>
|
|
#include <net/tcp.h>
|
|
|
|
#include "iscsi.h"
|
|
#include "digest.h"
|
|
#include "iscsit_transport.h"
|
|
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
|
|
#if defined(CONFIG_LOCKDEP) && !defined(CONFIG_SCST_PROC)
|
|
static struct lock_class_key scst_conn_key;
|
|
static struct lockdep_map scst_conn_dep_map =
|
|
STATIC_LOCKDEP_MAP_INIT("iscsi_conn_kref", &scst_conn_key);
|
|
#endif
|
|
#endif
|
|
|
|
static int print_conn_state(char *p, size_t size, struct iscsi_conn *conn)
|
|
{
|
|
int pos = 0;
|
|
|
|
if (conn->closing) {
|
|
pos += scnprintf(p, size, "%s", "closing");
|
|
goto out;
|
|
}
|
|
|
|
switch (conn->rd_state) {
|
|
case ISCSI_CONN_RD_STATE_PROCESSING:
|
|
pos += scnprintf(&p[pos], size - pos, "%s", "read_processing ");
|
|
break;
|
|
case ISCSI_CONN_RD_STATE_IN_LIST:
|
|
pos += scnprintf(&p[pos], size - pos, "%s", "in_read_list ");
|
|
break;
|
|
}
|
|
|
|
switch (conn->wr_state) {
|
|
case ISCSI_CONN_WR_STATE_PROCESSING:
|
|
pos += scnprintf(&p[pos], size - pos, "%s", "write_processing ");
|
|
break;
|
|
case ISCSI_CONN_WR_STATE_IN_LIST:
|
|
pos += scnprintf(&p[pos], size - pos, "%s", "in_write_list ");
|
|
break;
|
|
case ISCSI_CONN_WR_STATE_SPACE_WAIT:
|
|
pos += scnprintf(&p[pos], size - pos, "%s", "space_waiting ");
|
|
break;
|
|
}
|
|
|
|
if (test_bit(ISCSI_CONN_REINSTATING, &conn->conn_aflags))
|
|
pos += scnprintf(&p[pos], size - pos, "%s", "reinstating ");
|
|
else if (pos == 0)
|
|
pos += scnprintf(&p[pos], size - pos, "%s", "established idle ");
|
|
|
|
out:
|
|
return pos;
|
|
}
|
|
|
|
#ifdef CONFIG_SCST_PROC
|
|
|
|
static int print_digest_state(char *p, size_t size, unsigned long flags)
|
|
{
|
|
int pos;
|
|
|
|
if (DIGEST_NONE & flags)
|
|
pos = scnprintf(p, size, "%s", "none");
|
|
else if (DIGEST_CRC32C & flags)
|
|
pos = scnprintf(p, size, "%s", "crc32c");
|
|
else
|
|
pos = scnprintf(p, size, "%s", "unknown");
|
|
|
|
return pos;
|
|
}
|
|
|
|
/* target_mutex supposed to be locked */
|
|
void conn_info_show(struct seq_file *seq, struct iscsi_session *session)
|
|
{
|
|
struct iscsi_conn *conn;
|
|
struct sock *sk;
|
|
char buf[64];
|
|
|
|
lockdep_assert_held(&session->target->target_mutex);
|
|
|
|
list_for_each_entry(conn, &session->conn_list, conn_list_entry) {
|
|
sk = conn->sock->sk;
|
|
switch (sk->sk_family) {
|
|
case AF_INET:
|
|
snprintf(buf, sizeof(buf),
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
|
|
"%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->daddr));
|
|
#else
|
|
"%pI4", &inet_sk(sk)->inet_daddr);
|
|
#endif
|
|
break;
|
|
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
|
|
case AF_INET6:
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
|
|
snprintf(buf, sizeof(buf),
|
|
"[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
|
|
NIP6(inet6_sk(sk)->daddr));
|
|
#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
|
|
snprintf(buf, sizeof(buf), "[%p6]",
|
|
&inet6_sk(sk)->daddr);
|
|
#else
|
|
snprintf(buf, sizeof(buf), "[%p6]",
|
|
&sk->sk_v6_daddr);
|
|
#endif
|
|
break;
|
|
#endif
|
|
default:
|
|
snprintf(buf, sizeof(buf), "Unknown family %d",
|
|
sk->sk_family);
|
|
break;
|
|
}
|
|
seq_printf(seq, "\t\tcid:%u ip:%s ", conn->cid, buf);
|
|
print_conn_state(buf, sizeof(buf), conn);
|
|
seq_printf(seq, "state:%s ", buf);
|
|
print_digest_state(buf, sizeof(buf), conn->hdigest_type);
|
|
seq_printf(seq, "hd:%s ", buf);
|
|
print_digest_state(buf, sizeof(buf), conn->ddigest_type);
|
|
seq_printf(seq, "dd:%s\n", buf);
|
|
}
|
|
}
|
|
|
|
#else /* CONFIG_SCST_PROC */
|
|
|
|
static void iscsi_conn_release(struct kobject *kobj)
|
|
{
|
|
struct iscsi_conn *conn;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
conn = container_of(kobj, struct iscsi_conn, conn_kobj);
|
|
if (conn->conn_kobj_release_cmpl != NULL)
|
|
complete_all(conn->conn_kobj_release_cmpl);
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
struct kobj_type iscsi_conn_ktype = {
|
|
.release = iscsi_conn_release,
|
|
};
|
|
|
|
static ssize_t iscsi_get_initiator_ip(struct iscsi_conn *conn,
|
|
char *buf, int size)
|
|
{
|
|
return conn->transport->iscsit_get_initiator_ip(conn, buf, size);
|
|
}
|
|
|
|
static ssize_t iscsi_conn_ip_show(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
int pos;
|
|
struct iscsi_conn *conn;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
conn = container_of(kobj, struct iscsi_conn, conn_kobj);
|
|
|
|
pos = iscsi_get_initiator_ip(conn, buf, SCST_SYSFS_BLOCK_SIZE);
|
|
|
|
TRACE_EXIT_RES(pos);
|
|
return pos;
|
|
}
|
|
|
|
static struct kobj_attribute iscsi_conn_ip_attr =
|
|
__ATTR(ip, S_IRUGO, iscsi_conn_ip_show, NULL);
|
|
|
|
static ssize_t iscsi_conn_cid_show(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
int pos;
|
|
struct iscsi_conn *conn;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
conn = container_of(kobj, struct iscsi_conn, conn_kobj);
|
|
|
|
pos = sprintf(buf, "%u", conn->cid);
|
|
|
|
TRACE_EXIT_RES(pos);
|
|
return pos;
|
|
}
|
|
|
|
static struct kobj_attribute iscsi_conn_cid_attr =
|
|
__ATTR(cid, S_IRUGO, iscsi_conn_cid_show, NULL);
|
|
|
|
static ssize_t iscsi_conn_state_show(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
int pos;
|
|
struct iscsi_conn *conn;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
conn = container_of(kobj, struct iscsi_conn, conn_kobj);
|
|
|
|
pos = print_conn_state(buf, SCST_SYSFS_BLOCK_SIZE, conn);
|
|
|
|
TRACE_EXIT_RES(pos);
|
|
return pos;
|
|
}
|
|
|
|
static struct kobj_attribute iscsi_conn_state_attr =
|
|
__ATTR(state, S_IRUGO, iscsi_conn_state_show, NULL);
|
|
|
|
static void conn_sysfs_del(struct iscsi_conn *conn)
|
|
{
|
|
DECLARE_COMPLETION_ONSTACK(c);
|
|
|
|
TRACE_ENTRY();
|
|
|
|
conn->conn_kobj_release_cmpl = &c;
|
|
|
|
kobject_del(&conn->conn_kobj);
|
|
|
|
SCST_KOBJECT_PUT_AND_WAIT(&conn->conn_kobj, "conn",
|
|
conn->conn_kobj_release_cmpl,
|
|
&scst_conn_dep_map);
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
int conn_sysfs_add(struct iscsi_conn *conn)
|
|
{
|
|
int res;
|
|
struct iscsi_session *session = conn->session;
|
|
struct iscsi_conn *c;
|
|
int n = 1;
|
|
char addr[64];
|
|
|
|
TRACE_ENTRY();
|
|
|
|
lockdep_assert_held(&conn->target->target_mutex);
|
|
|
|
iscsi_get_initiator_ip(conn, addr, sizeof(addr));
|
|
|
|
restart:
|
|
list_for_each_entry(c, &session->conn_list, conn_list_entry) {
|
|
if (strcmp(addr, kobject_name(&c->conn_kobj)) == 0) {
|
|
char c_addr[64];
|
|
|
|
iscsi_get_initiator_ip(conn, c_addr, sizeof(c_addr));
|
|
|
|
TRACE_DBG("Duplicated conn from the same initiator "
|
|
"%s found", c_addr);
|
|
|
|
snprintf(addr, sizeof(addr), "%s_%d", c_addr, n);
|
|
n++;
|
|
goto restart;
|
|
}
|
|
}
|
|
|
|
res = kobject_init_and_add(&conn->conn_kobj, &iscsi_conn_ktype,
|
|
scst_sysfs_get_sess_kobj(session->scst_sess), addr);
|
|
if (res != 0) {
|
|
PRINT_ERROR("Unable create sysfs entries for conn %s",
|
|
addr);
|
|
goto out;
|
|
}
|
|
|
|
TRACE_DBG("conn %p, conn_kobj %p", conn, &conn->conn_kobj);
|
|
|
|
res = sysfs_create_file(&conn->conn_kobj,
|
|
&iscsi_conn_state_attr.attr);
|
|
if (res != 0) {
|
|
PRINT_ERROR("Unable create sysfs attribute %s for conn %s",
|
|
iscsi_conn_state_attr.attr.name, addr);
|
|
goto out_err;
|
|
}
|
|
|
|
res = sysfs_create_file(&conn->conn_kobj,
|
|
&iscsi_conn_cid_attr.attr);
|
|
if (res != 0) {
|
|
PRINT_ERROR("Unable create sysfs attribute %s for conn %s",
|
|
iscsi_conn_cid_attr.attr.name, addr);
|
|
goto out_err;
|
|
}
|
|
|
|
res = sysfs_create_file(&conn->conn_kobj,
|
|
&iscsi_conn_ip_attr.attr);
|
|
if (res != 0) {
|
|
PRINT_ERROR("Unable create sysfs attribute %s for conn %s",
|
|
iscsi_conn_ip_attr.attr.name, addr);
|
|
goto out_err;
|
|
}
|
|
|
|
out:
|
|
TRACE_EXIT_RES(res);
|
|
return res;
|
|
|
|
out_err:
|
|
conn_sysfs_del(conn);
|
|
goto out;
|
|
}
|
|
EXPORT_SYMBOL(conn_sysfs_add);
|
|
|
|
#endif /* CONFIG_SCST_PROC */
|
|
|
|
/* target_mutex supposed to be locked */
|
|
struct iscsi_conn *conn_lookup(struct iscsi_session *session, u16 cid)
|
|
{
|
|
struct iscsi_conn *conn;
|
|
|
|
lockdep_assert_held(&session->target->target_mutex);
|
|
|
|
/*
|
|
* We need to find the latest conn to correctly handle
|
|
* multi-reinstatements
|
|
*/
|
|
list_for_each_entry_reverse(conn, &session->conn_list,
|
|
conn_list_entry) {
|
|
if (conn->cid == cid)
|
|
return conn;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
void iscsi_make_conn_rd_active(struct iscsi_conn *conn)
|
|
{
|
|
struct iscsi_thread_pool *p = conn->conn_thr_pool;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
spin_lock_bh(&p->rd_lock);
|
|
|
|
TRACE_DBG("conn %p, rd_state %x, rd_data_ready %d", conn,
|
|
conn->rd_state, conn->rd_data_ready);
|
|
|
|
/*
|
|
* Let's start processing ASAP not waiting for all the being waited
|
|
* data be received, even if we need several wakup iteration to receive
|
|
* them all, because starting ASAP, i.e. in parallel, is better for
|
|
* performance, especially on multi-CPU/core systems.
|
|
*/
|
|
|
|
conn->rd_data_ready = 1;
|
|
|
|
if (conn->rd_state == ISCSI_CONN_RD_STATE_IDLE) {
|
|
list_add_tail(&conn->rd_list_entry, &p->rd_list);
|
|
conn->rd_state = ISCSI_CONN_RD_STATE_IN_LIST;
|
|
wake_up(&p->rd_waitQ);
|
|
}
|
|
|
|
spin_unlock_bh(&p->rd_lock);
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
void iscsi_make_conn_wr_active(struct iscsi_conn *conn)
|
|
{
|
|
struct iscsi_thread_pool *p = conn->conn_thr_pool;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
spin_lock_bh(&p->wr_lock);
|
|
|
|
TRACE_DBG("conn %p, wr_state %x, wr_space_ready %d", conn,
|
|
conn->wr_state, conn->wr_space_ready);
|
|
|
|
/*
|
|
* Let's start sending waiting to be sent data ASAP, even if there's
|
|
* still not all the needed buffers ready and we need several wakup
|
|
* iteration to send them all, because starting ASAP, i.e. in parallel,
|
|
* is better for performance, especially on multi-CPU/core systems.
|
|
*/
|
|
|
|
if (conn->wr_state == ISCSI_CONN_WR_STATE_IDLE) {
|
|
list_add_tail(&conn->wr_list_entry, &p->wr_list);
|
|
conn->wr_state = ISCSI_CONN_WR_STATE_IN_LIST;
|
|
wake_up(&p->wr_waitQ);
|
|
}
|
|
|
|
spin_unlock_bh(&p->wr_lock);
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
void iscsi_tcp_mark_conn_closed(struct iscsi_conn *conn, int flags)
|
|
{
|
|
spin_lock_bh(&conn->conn_thr_pool->rd_lock);
|
|
conn->closing = 1;
|
|
if (flags & ISCSI_CONN_ACTIVE_CLOSE)
|
|
conn->active_close = 1;
|
|
if (flags & ISCSI_CONN_DELETING)
|
|
conn->deleting = 1;
|
|
spin_unlock_bh(&conn->conn_thr_pool->rd_lock);
|
|
|
|
iscsi_make_conn_rd_active(conn);
|
|
}
|
|
|
|
void __mark_conn_closed(struct iscsi_conn *conn, int flags)
|
|
{
|
|
conn->transport->iscsit_mark_conn_closed(conn, flags);
|
|
}
|
|
|
|
void mark_conn_closed(struct iscsi_conn *conn)
|
|
{
|
|
__mark_conn_closed(conn, ISCSI_CONN_ACTIVE_CLOSE);
|
|
}
|
|
EXPORT_SYMBOL(mark_conn_closed);
|
|
|
|
static void __iscsi_state_change(struct sock *sk)
|
|
{
|
|
struct iscsi_conn *conn = sk->sk_user_data;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
if (unlikely(sk->sk_state != TCP_ESTABLISHED)) {
|
|
if (!conn->closing) {
|
|
PRINT_ERROR("Connection with initiator %s "
|
|
"unexpectedly closed!",
|
|
conn->session->initiator_name);
|
|
TRACE_MGMT_DBG("conn %p, sk state %d", conn,
|
|
sk->sk_state);
|
|
__mark_conn_closed(conn, 0);
|
|
}
|
|
} else
|
|
iscsi_make_conn_rd_active(conn);
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
static void iscsi_state_change(struct sock *sk)
|
|
{
|
|
struct iscsi_conn *conn = sk->sk_user_data;
|
|
|
|
__iscsi_state_change(sk);
|
|
conn->old_state_change(sk);
|
|
|
|
return;
|
|
}
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
|
|
static void iscsi_data_ready(struct sock *sk)
|
|
#else
|
|
static void iscsi_data_ready(struct sock *sk, int len)
|
|
#endif
|
|
{
|
|
struct iscsi_conn *conn = sk->sk_user_data;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
iscsi_make_conn_rd_active(conn);
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
|
|
conn->old_data_ready(sk);
|
|
#else
|
|
conn->old_data_ready(sk, len);
|
|
#endif
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
void __iscsi_write_space_ready(struct iscsi_conn *conn)
|
|
{
|
|
struct iscsi_thread_pool *p = conn->conn_thr_pool;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
spin_lock_bh(&p->wr_lock);
|
|
conn->wr_space_ready = 1;
|
|
if (conn->wr_state == ISCSI_CONN_WR_STATE_SPACE_WAIT) {
|
|
TRACE_DBG("wr space ready (conn %p)", conn);
|
|
list_add_tail(&conn->wr_list_entry, &p->wr_list);
|
|
conn->wr_state = ISCSI_CONN_WR_STATE_IN_LIST;
|
|
wake_up(&p->wr_waitQ);
|
|
}
|
|
spin_unlock_bh(&p->wr_lock);
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
static void iscsi_write_space_ready(struct sock *sk)
|
|
{
|
|
struct iscsi_conn *conn = sk->sk_user_data;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
TRACE_DBG("Write space ready for conn %p", conn);
|
|
|
|
__iscsi_write_space_ready(conn);
|
|
|
|
conn->old_write_space(sk);
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
static void conn_rsp_timer_fn(unsigned long arg)
|
|
{
|
|
struct iscsi_conn *conn = (struct iscsi_conn *)arg;
|
|
struct iscsi_cmnd *cmnd;
|
|
unsigned long j = jiffies;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
TRACE_DBG("Timer (conn %p)", conn);
|
|
|
|
spin_lock_bh(&conn->write_list_lock);
|
|
|
|
if (!list_empty(&conn->write_timeout_list)) {
|
|
unsigned long timeout_time;
|
|
cmnd = list_first_entry(&conn->write_timeout_list,
|
|
struct iscsi_cmnd, write_timeout_list_entry);
|
|
|
|
timeout_time = iscsi_get_timeout_time(cmnd) + ISCSI_ADD_SCHED_TIME;
|
|
|
|
if (unlikely(time_after_eq(j, iscsi_get_timeout_time(cmnd)))) {
|
|
if (!conn->closing) {
|
|
PRINT_ERROR("Timeout %ld sec sending data/waiting "
|
|
"for reply to/from initiator "
|
|
"%s (SID %llx), closing connection",
|
|
iscsi_get_timeout(cmnd)/HZ,
|
|
conn->session->initiator_name,
|
|
(unsigned long long int)
|
|
conn->session->sid);
|
|
/*
|
|
* We must call mark_conn_closed() outside of
|
|
* write_list_lock or we will have a circular
|
|
* locking dependency with rd_lock.
|
|
*/
|
|
spin_unlock_bh(&conn->write_list_lock);
|
|
mark_conn_closed(conn);
|
|
goto out;
|
|
}
|
|
} else if (!timer_pending(&conn->rsp_timer) ||
|
|
time_after(conn->rsp_timer.expires, timeout_time)) {
|
|
TRACE_DBG("Restarting timer on %ld (conn %p)",
|
|
timeout_time, conn);
|
|
/*
|
|
* Timer might have been restarted while we were
|
|
* entering here.
|
|
*
|
|
* Since we have not empty write_timeout_list, we are
|
|
* safe to restart the timer, because we not race with
|
|
* del_timer_sync() in conn_free().
|
|
*/
|
|
mod_timer(&conn->rsp_timer, timeout_time);
|
|
}
|
|
}
|
|
|
|
spin_unlock_bh(&conn->write_list_lock);
|
|
|
|
if (unlikely(conn->conn_tm_active)) {
|
|
TRACE_MGMT_DBG("TM active: making conn %p RD active", conn);
|
|
iscsi_make_conn_rd_active(conn);
|
|
}
|
|
|
|
out:
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
|
|
static void conn_nop_in_delayed_work_fn(void *p)
|
|
#else
|
|
static void conn_nop_in_delayed_work_fn(struct work_struct *work)
|
|
#endif
|
|
{
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
|
|
struct iscsi_conn *conn = (struct iscsi_conn *)p;
|
|
#else
|
|
struct iscsi_conn *conn = container_of(work, struct iscsi_conn,
|
|
nop_in_delayed_work.work);
|
|
#endif
|
|
unsigned long next_timeout = 0;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
if (time_after_eq(jiffies, conn->last_rcv_time +
|
|
conn->nop_in_interval)) {
|
|
if (list_empty(&conn->nop_req_list))
|
|
iscsi_send_nop_in(conn);
|
|
next_timeout = conn->nop_in_interval;
|
|
}
|
|
|
|
if ((conn->nop_in_interval > 0) &&
|
|
!test_bit(ISCSI_CONN_SHUTTINGDOWN, &conn->conn_aflags)) {
|
|
if (next_timeout == 0)
|
|
next_timeout = conn->nop_in_interval -
|
|
(jiffies - conn->last_rcv_time);
|
|
TRACE_DBG("Reschedule Nop-In work for conn %p in %lu", conn,
|
|
next_timeout + ISCSI_ADD_SCHED_TIME);
|
|
schedule_delayed_work(&conn->nop_in_delayed_work,
|
|
next_timeout + ISCSI_ADD_SCHED_TIME);
|
|
}
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
/* Must be called from rd thread only */
|
|
void iscsi_check_tm_data_wait_timeouts(struct iscsi_conn *conn, bool force)
|
|
{
|
|
struct iscsi_cmnd *cmnd;
|
|
unsigned long j = jiffies;
|
|
bool aborted_cmds_pending;
|
|
unsigned long timeout_time = j + ISCSI_TM_DATA_WAIT_TIMEOUT +
|
|
ISCSI_ADD_SCHED_TIME;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
TRACE_DBG_FLAG(TRACE_MGMT_DEBUG, "conn %p, read_cmnd %p, read_state "
|
|
"%d, j %ld (TIMEOUT %d, force %d)", conn, conn->read_cmnd,
|
|
conn->read_state, j,
|
|
ISCSI_TM_DATA_WAIT_TIMEOUT + ISCSI_ADD_SCHED_TIME, force);
|
|
|
|
iscsi_extracheck_is_rd_thread(conn);
|
|
|
|
again:
|
|
spin_lock_bh(&conn->conn_thr_pool->rd_lock);
|
|
spin_lock(&conn->write_list_lock);
|
|
|
|
aborted_cmds_pending = false;
|
|
list_for_each_entry(cmnd, &conn->write_timeout_list,
|
|
write_timeout_list_entry) {
|
|
/*
|
|
* This should not happen, because DATA OUT commands can't get
|
|
* into write_timeout_list.
|
|
*/
|
|
sBUG_ON(cmnd->cmd_req != NULL);
|
|
|
|
if (test_bit(ISCSI_CMD_ABORTED, &cmnd->prelim_compl_flags)) {
|
|
TRACE_MGMT_DBG("Checking aborted cmnd %p (scst_state "
|
|
"%d, on_write_timeout_list %d, write_start "
|
|
"%ld, r2t_len_to_receive %d)", cmnd,
|
|
cmnd->scst_state, cmnd->on_write_timeout_list,
|
|
cmnd->write_start, cmnd->r2t_len_to_receive);
|
|
if ((cmnd == conn->read_cmnd) ||
|
|
cmnd->data_out_in_data_receiving) {
|
|
sBUG_ON((cmnd == conn->read_cmnd) && force);
|
|
/*
|
|
* We can't abort command waiting for data from
|
|
* the net, because otherwise we are risking to
|
|
* get out of sync with the sender, so we have
|
|
* to wait until the timeout timer gets into the
|
|
* action and close this connection.
|
|
*/
|
|
TRACE_MGMT_DBG("Aborted cmnd %p is %s, "
|
|
"keep waiting", cmnd,
|
|
(cmnd == conn->read_cmnd) ? "RX cmnd" :
|
|
"waiting for DATA OUT data");
|
|
goto cont;
|
|
}
|
|
if ((cmnd->r2t_len_to_receive != 0) &&
|
|
(time_after_eq(j, cmnd->write_start + ISCSI_TM_DATA_WAIT_TIMEOUT) ||
|
|
force)) {
|
|
spin_unlock(&conn->write_list_lock);
|
|
spin_unlock_bh(&conn->conn_thr_pool->rd_lock);
|
|
iscsi_fail_data_waiting_cmnd(cmnd);
|
|
goto again;
|
|
}
|
|
cont:
|
|
aborted_cmds_pending = true;
|
|
}
|
|
}
|
|
|
|
if (aborted_cmds_pending) {
|
|
if (!force &&
|
|
(!timer_pending(&conn->rsp_timer) ||
|
|
time_after(conn->rsp_timer.expires, timeout_time))) {
|
|
TRACE_MGMT_DBG("Mod timer on %ld (conn %p)",
|
|
timeout_time, conn);
|
|
mod_timer(&conn->rsp_timer, timeout_time);
|
|
}
|
|
} else {
|
|
TRACE_MGMT_DBG("Clearing conn_tm_active for conn %p", conn);
|
|
conn->conn_tm_active = 0;
|
|
}
|
|
|
|
spin_unlock(&conn->write_list_lock);
|
|
spin_unlock_bh(&conn->conn_thr_pool->rd_lock);
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
/* target_mutex supposed to be locked */
|
|
void conn_reinst_finished(struct iscsi_conn *conn)
|
|
{
|
|
struct iscsi_cmnd *cmnd, *t;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
clear_bit(ISCSI_CONN_REINSTATING, &conn->conn_aflags);
|
|
|
|
list_for_each_entry_safe(cmnd, t, &conn->reinst_pending_cmd_list,
|
|
reinst_pending_cmd_list_entry) {
|
|
TRACE_MGMT_DBG("Restarting reinst pending cmnd %p",
|
|
cmnd);
|
|
|
|
list_del(&cmnd->reinst_pending_cmd_list_entry);
|
|
|
|
/* Restore the state for preliminary completion/cmnd_done() */
|
|
cmnd->scst_state = ISCSI_CMD_STATE_AFTER_PREPROC;
|
|
|
|
iscsi_restart_cmnd(cmnd);
|
|
}
|
|
|
|
TRACE_EXIT();
|
|
return;
|
|
}
|
|
|
|
int conn_activate(struct iscsi_conn *conn)
|
|
{
|
|
TRACE_MGMT_DBG("Enabling conn %p", conn);
|
|
|
|
/* Catch double bind */
|
|
sBUG_ON(conn->sock->sk->sk_state_change == iscsi_state_change);
|
|
|
|
write_lock_bh(&conn->sock->sk->sk_callback_lock);
|
|
|
|
conn->old_state_change = conn->sock->sk->sk_state_change;
|
|
conn->sock->sk->sk_state_change = iscsi_state_change;
|
|
|
|
conn->old_data_ready = conn->sock->sk->sk_data_ready;
|
|
conn->sock->sk->sk_data_ready = iscsi_data_ready;
|
|
|
|
conn->old_write_space = conn->sock->sk->sk_write_space;
|
|
conn->sock->sk->sk_write_space = iscsi_write_space_ready;
|
|
|
|
write_unlock_bh(&conn->sock->sk->sk_callback_lock);
|
|
|
|
/*
|
|
* Check, if conn was closed while we were initializing it.
|
|
* This function will make conn rd_active, if necessary.
|
|
*/
|
|
__iscsi_state_change(conn->sock->sk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Note: the code below passes a kernel space pointer (&opt) to setsockopt()
|
|
* while the declaration of setsockopt specifies that it expects a user space
|
|
* pointer. This seems to work fine, and this approach is also used in some
|
|
* other parts of the Linux kernel (see e.g. fs/ocfs2/cluster/tcp.c).
|
|
*/
|
|
static int conn_setup_sock(struct iscsi_conn *conn)
|
|
{
|
|
int res = 0;
|
|
int opt = 1;
|
|
mm_segment_t oldfs;
|
|
struct iscsi_session *session = conn->session;
|
|
|
|
TRACE_DBG("%llx", (unsigned long long int)session->sid);
|
|
|
|
conn->sock = SOCKET_I(conn->file->f_dentry->d_inode);
|
|
|
|
if (conn->sock->ops->sendpage == NULL) {
|
|
PRINT_ERROR("Socket for sid %llx doesn't support sendpage()",
|
|
(unsigned long long int)session->sid);
|
|
res = -EINVAL;
|
|
goto out;
|
|
}
|
|
|
|
#if 0
|
|
conn->sock->sk->sk_allocation = GFP_NOIO;
|
|
#endif
|
|
conn->sock->sk->sk_user_data = conn;
|
|
|
|
oldfs = get_fs();
|
|
set_fs(get_ds());
|
|
conn->sock->ops->setsockopt(conn->sock, SOL_TCP, TCP_NODELAY,
|
|
(void __force __user *)&opt, sizeof(opt));
|
|
set_fs(oldfs);
|
|
|
|
out:
|
|
return res;
|
|
}
|
|
|
|
void iscsi_tcp_conn_free(struct iscsi_conn *conn)
|
|
{
|
|
fput(conn->file);
|
|
conn->file = NULL;
|
|
conn->sock = NULL;
|
|
|
|
free_page((unsigned long)conn->read_iov);
|
|
|
|
kmem_cache_free(iscsi_conn_cache, conn);
|
|
}
|
|
|
|
/* target_mutex supposed to be locked */
|
|
void conn_free(struct iscsi_conn *conn)
|
|
{
|
|
struct iscsi_session *session = conn->session;
|
|
|
|
TRACE_ENTRY();
|
|
|
|
TRACE_MGMT_DBG("Freeing conn %p (sess=%p, %#Lx %u)", conn,
|
|
session, (unsigned long long int)session->sid, conn->cid);
|
|
|
|
lockdep_assert_held(&conn->target->target_mutex);
|
|
|
|
del_timer_sync(&conn->rsp_timer);
|
|
|
|
#ifndef CONFIG_SCST_PROC
|
|
conn_sysfs_del(conn);
|
|
#endif
|
|
|
|
sBUG_ON(atomic_read(&conn->conn_ref_cnt) != 0);
|
|
sBUG_ON(!list_empty(&conn->cmd_list));
|
|
sBUG_ON(!list_empty(&conn->write_list));
|
|
sBUG_ON(!list_empty(&conn->write_timeout_list));
|
|
sBUG_ON(conn->conn_reinst_successor != NULL);
|
|
sBUG_ON(!test_bit(ISCSI_CONN_SHUTTINGDOWN, &conn->conn_aflags));
|
|
|
|
/* Just in case if new conn gets freed before the old one */
|
|
if (test_bit(ISCSI_CONN_REINSTATING, &conn->conn_aflags)) {
|
|
struct iscsi_conn *c;
|
|
TRACE_MGMT_DBG("Freeing being reinstated conn %p", conn);
|
|
list_for_each_entry(c, &session->conn_list,
|
|
conn_list_entry) {
|
|
if (c->conn_reinst_successor == conn) {
|
|
c->conn_reinst_successor = NULL;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
list_del(&conn->conn_list_entry);
|
|
|
|
conn->transport->iscsit_conn_free(conn);
|
|
|
|
if (list_empty(&session->conn_list)) {
|
|
sBUG_ON(session->sess_reinst_successor != NULL);
|
|
session_free(session, true);
|
|
}
|
|
}
|
|
|
|
int iscsi_init_conn(struct iscsi_session *session,
|
|
struct iscsi_kern_conn_info *info,
|
|
struct iscsi_conn *conn)
|
|
{
|
|
int res;
|
|
|
|
atomic_set(&conn->conn_ref_cnt, 0);
|
|
conn->session = session;
|
|
if (session->sess_reinstating)
|
|
__set_bit(ISCSI_CONN_REINSTATING, &conn->conn_aflags);
|
|
conn->cid = info->cid;
|
|
conn->stat_sn = info->stat_sn;
|
|
conn->exp_stat_sn = info->exp_stat_sn;
|
|
conn->rd_state = ISCSI_CONN_RD_STATE_IDLE;
|
|
conn->wr_state = ISCSI_CONN_WR_STATE_IDLE;
|
|
|
|
conn->hdigest_type = session->sess_params.header_digest;
|
|
conn->ddigest_type = session->sess_params.data_digest;
|
|
res = digest_init(conn);
|
|
if (res != 0)
|
|
return res;
|
|
|
|
conn->target = session->target;
|
|
spin_lock_init(&conn->cmd_list_lock);
|
|
INIT_LIST_HEAD(&conn->cmd_list);
|
|
spin_lock_init(&conn->write_list_lock);
|
|
INIT_LIST_HEAD(&conn->write_list);
|
|
INIT_LIST_HEAD(&conn->write_timeout_list);
|
|
setup_timer(&conn->rsp_timer, conn_rsp_timer_fn, (unsigned long)conn);
|
|
init_waitqueue_head(&conn->read_state_waitQ);
|
|
init_completion(&conn->ready_to_free);
|
|
INIT_LIST_HEAD(&conn->reinst_pending_cmd_list);
|
|
INIT_LIST_HEAD(&conn->nop_req_list);
|
|
spin_lock_init(&conn->nop_req_list_lock);
|
|
|
|
conn->conn_thr_pool = session->sess_thr_pool;
|
|
|
|
conn->nop_in_ttt = 0;
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20))
|
|
INIT_DELAYED_WORK(&conn->nop_in_delayed_work,
|
|
conn_nop_in_delayed_work_fn);
|
|
#else
|
|
INIT_WORK(&conn->nop_in_delayed_work, conn_nop_in_delayed_work_fn,
|
|
conn);
|
|
#endif
|
|
conn->last_rcv_time = jiffies;
|
|
conn->data_rsp_timeout = session->tgt_params.rsp_timeout * HZ;
|
|
conn->nop_in_interval = session->tgt_params.nop_in_interval * HZ;
|
|
conn->nop_in_timeout = session->tgt_params.nop_in_timeout * HZ;
|
|
if (conn->nop_in_interval > 0) {
|
|
TRACE_DBG("Schedule Nop-In work for conn %p", conn);
|
|
schedule_delayed_work(&conn->nop_in_delayed_work,
|
|
conn->nop_in_interval + ISCSI_ADD_SCHED_TIME);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(iscsi_init_conn);
|
|
|
|
/* target_mutex supposed to be locked */
|
|
int iscsi_conn_alloc(struct iscsi_session *session,
|
|
struct iscsi_kern_conn_info *info, struct iscsi_conn **new_conn,
|
|
struct iscsit_transport *t)
|
|
{
|
|
struct iscsi_conn *conn;
|
|
int res = 0;
|
|
|
|
lockdep_assert_held(&session->target->target_mutex);
|
|
|
|
conn = kmem_cache_zalloc(iscsi_conn_cache, GFP_KERNEL);
|
|
if (!conn) {
|
|
res = -ENOMEM;
|
|
goto out_err;
|
|
}
|
|
|
|
TRACE_MGMT_DBG("Creating connection %p for sid %#Lx, cid %u", conn,
|
|
(unsigned long long int)session->sid, info->cid);
|
|
|
|
conn->transport = t;
|
|
|
|
/* Changing it, change ISCSI_CONN_IOV_MAX as well !! */
|
|
conn->read_iov = (struct iovec *)get_zeroed_page(GFP_KERNEL);
|
|
if (conn->read_iov == NULL) {
|
|
res = -ENOMEM;
|
|
goto out_err_free_conn;
|
|
}
|
|
|
|
res = iscsi_init_conn(session, info, conn);
|
|
if (res != 0)
|
|
goto out_free_iov;
|
|
|
|
conn->file = fget(info->fd);
|
|
|
|
res = conn_setup_sock(conn);
|
|
if (res != 0)
|
|
goto out_fput;
|
|
|
|
#ifndef CONFIG_SCST_PROC
|
|
res = conn_sysfs_add(conn);
|
|
if (res != 0)
|
|
goto out_fput;
|
|
#endif
|
|
|
|
list_add_tail(&conn->conn_list_entry, &session->conn_list);
|
|
|
|
*new_conn = conn;
|
|
|
|
out:
|
|
return res;
|
|
|
|
out_fput:
|
|
fput(conn->file);
|
|
|
|
out_free_iov:
|
|
free_page((unsigned long)conn->read_iov);
|
|
|
|
out_err_free_conn:
|
|
kmem_cache_free(iscsi_conn_cache, conn);
|
|
|
|
out_err:
|
|
goto out;
|
|
}
|
|
|
|
/* target_mutex supposed to be locked */
|
|
int __add_conn(struct iscsi_session *session, struct iscsi_kern_conn_info *info)
|
|
{
|
|
struct iscsi_conn *conn, *new_conn = NULL;
|
|
int err;
|
|
bool reinstatement = false;
|
|
struct iscsit_transport *t;
|
|
|
|
lockdep_assert_held(&session->target->target_mutex);
|
|
|
|
conn = conn_lookup(session, info->cid);
|
|
if ((conn != NULL) &&
|
|
!test_bit(ISCSI_CONN_SHUTTINGDOWN, &conn->conn_aflags)) {
|
|
/* conn reinstatement */
|
|
reinstatement = true;
|
|
} else if (!list_empty(&session->conn_list)) {
|
|
err = -EEXIST;
|
|
goto out;
|
|
}
|
|
|
|
if (session->sess_params.rdma_extensions)
|
|
t = iscsit_get_transport(ISCSI_RDMA);
|
|
else
|
|
t = iscsit_get_transport(ISCSI_TCP);
|
|
if (!t) {
|
|
err = -ENOENT;
|
|
goto out;
|
|
}
|
|
|
|
err = t->iscsit_conn_alloc(session, info, &new_conn, t);
|
|
if (err != 0)
|
|
goto out;
|
|
|
|
if (reinstatement) {
|
|
TRACE_MGMT_DBG("Reinstating conn (old %p, new %p)", conn,
|
|
new_conn);
|
|
conn->conn_reinst_successor = new_conn;
|
|
__set_bit(ISCSI_CONN_REINSTATING, &new_conn->conn_aflags);
|
|
__mark_conn_closed(conn, 0);
|
|
}
|
|
|
|
err = t->iscsit_conn_activate(new_conn);
|
|
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
/* target_mutex supposed to be locked */
|
|
int __del_conn(struct iscsi_session *session, struct iscsi_kern_conn_info *info)
|
|
{
|
|
struct iscsi_conn *conn;
|
|
int err = -EEXIST;
|
|
|
|
conn = conn_lookup(session, info->cid);
|
|
if (!conn) {
|
|
PRINT_WARNING("Connection %d not found", info->cid);
|
|
return err;
|
|
}
|
|
|
|
PRINT_INFO("Deleting connection with initiator %s (%p)",
|
|
conn->session->initiator_name, conn);
|
|
|
|
__mark_conn_closed(conn, ISCSI_CONN_ACTIVE_CLOSE|ISCSI_CONN_DELETING);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_SCST_EXTRACHECKS
|
|
|
|
void iscsi_extracheck_is_rd_thread(struct iscsi_conn *conn)
|
|
{
|
|
if (unlikely(current != conn->rd_task)) {
|
|
pr_emerg("conn %p rd_task != current %p (pid %d)\n",
|
|
conn, current, current->pid);
|
|
while (in_softirq())
|
|
local_bh_enable();
|
|
pr_emerg("rd_state %x\n", conn->rd_state);
|
|
pr_emerg("rd_task %p\n", conn->rd_task);
|
|
pr_emerg("rd_task->pid %d\n", conn->rd_task->pid);
|
|
BUG();
|
|
}
|
|
}
|
|
|
|
void iscsi_extracheck_is_wr_thread(struct iscsi_conn *conn)
|
|
{
|
|
if (unlikely(current != conn->wr_task)) {
|
|
pr_emerg("conn %p wr_task != current %p (pid %d)\n",
|
|
conn, current, current->pid);
|
|
while (in_softirq())
|
|
local_bh_enable();
|
|
pr_emerg("wr_state %x\n", conn->wr_state);
|
|
pr_emerg("wr_task %p\n", conn->wr_task);
|
|
pr_emerg("wr_task->pid %d\n", conn->wr_task->pid);
|
|
BUG();
|
|
}
|
|
}
|
|
|
|
#endif /* CONFIG_SCST_EXTRACHECKS */
|