Merged revisions 3799-3800,3818-3819,3823-3825,3828,3831,3833 via svnmerge from

https://vlnb@scst.svn.sourceforge.net/svnroot/scst/trunk ........ r3799 | vlnb | 2011-08-04 22:07:35 -0400 (Thu, 04 Aug 2011) | 37 lines Modified patch from Bart Van Assche <bvanassche@acm.org>: The range unmapped by the scst_vdisk handler when processing an UNMAP command is not correct. The patch below fixes that and also prevents that the following kernel crash can be triggered on the target: Call Trace: [<ffffffffa06b5350>] ? srpt_post_send+0xd0/0x140 [ib_srpt] [<ffffffff811bb595>] ? cpumask_next_and+0x35/0x50 [<ffffffff810e6296>] shmem_truncate_range+0x7a6/0xa50 [<ffffffffa0612ceb>] ? scst_get_buf_full+0x16b/0x270 [scst] [<ffffffffa069beb6>] vdisk_exec_unmap+0x1d6/0x4b0 [scst_vdisk] [<ffffffff813c0cb6>] ? _raw_spin_unlock+0x16/0x40 [<ffffffffa069dadc>] vdisk_do_job+0x5fc/0x950 [scst_vdisk] [<ffffffffa0605402>] scst_do_real_exec+0xb2/0x400 [scst] [<ffffffffa06076a7>] scst_exec+0xd7/0x240 [scst] [<ffffffffa06079b6>] scst_send_for_exec+0x1a6/0x2f0 [scst] [<ffffffffa06086f8>] scst_process_active_cmd+0x4f8/0x790 [scst] [<ffffffffa0608a29>] scst_do_job_active+0x99/0x170 [scst] [<ffffffffa060a3da>] scst_cmd_thread+0x15a/0x3b0 [scst] [<ffffffff81047470>] ? default_wake_function+0x0/0x20 [<ffffffffa060a280>] ? scst_cmd_thread+0x0/0x3b0 [scst] [<ffffffff8106dc26>] kthread+0x96/0xa0 [<ffffffff81003cd4>] kernel_thread_helper+0x4/0x10 [<ffffffff8103db01>] ? finish_task_switch+0x51/0xb0 [<ffffffff813c0c7c>] ? _raw_spin_unlock_irq+0x1c/0x40 [<ffffffff813c18b1>] ? restore_args+0x0/0x30 [<ffffffff8106db90>] ? kthread+0x0/0xa0 [<ffffffff81003cd0>] ? kernel_thread_helper+0x0/0x10 Invoking truncate_range() with an end len that is not page-size aligned triggers it. In other words, with a block size that is below PAGE_CACHE_SIZE some UNMAP commands could trigger a kernel bug. I think it's better to print an error message and to skip an UNMAP command instead of triggering a kernel oops. ........ r3800 | vlnb | 2011-08-08 21:04:57 -0400 (Mon, 08 Aug 2011) | 3 lines Update of SCST_Gentoo_HOWTO.txt to SCST 2.x. Thanks to Willem Boterenbrood <w.boterenbrood@gmail.com>! ........ r3818 | vlnb | 2011-08-17 20:17:06 -0400 (Wed, 17 Aug 2011) | 3 lines Fix for forgotten devt initialization in preparing internal commands ........ r3819 | vlnb | 2011-08-17 20:27:12 -0400 (Wed, 17 Aug 2011) | 6 lines Disable accepting initiator mode commands if initiator mode not enabled for 23xx- chips as well as suggested by ido benda <idombd@gmail.com>. This is extension of r3261 to qla2x00_queuecommand(). ........ r3823 | vlnb | 2011-08-19 19:20:22 -0400 (Fri, 19 Aug 2011) | 3 lines Update of SCST_Gentoo_HOWTO.txt from Willem Boterenbrood <w.boterenbrood@gmail.com> ........ r3824 | vlnb | 2011-08-19 19:55:31 -0400 (Fri, 19 Aug 2011) | 3 lines Fix for one more forgotten initialization in preparing internal commands spotted by kordex@gmail.com ........ r3825 | bvassche | 2011-08-20 10:04:52 -0400 (Sat, 20 Aug 2011) | 1 line documentation, spelling: Change phisical into physical ........ r3828 | bvassche | 2011-08-22 15:19:56 -0400 (Mon, 22 Aug 2011) | 11 lines scst: Avoid triggering BUG() on uniprocessor systems On uniprocessor systems with lock debugging disabled spin_is_locked() returns false. Disable the spin_is_locked() checks if CONFIG_SMP has not been defined. Reported-by: Frank <frank@debian-nas.org> Signed-off-by: Dave Carroll <dcarroll@astekcorp.com> Cc: scst-devel <scst-devel@lists.sourceforge.net> Cc: Frank <frank@debian-nas.org> ........ r3831 | vlnb | 2011-08-25 14:08:45 -0400 (Thu, 25 Aug 2011) | 3 lines Fix possible crash on rel_tgt_id set on transports without is_target_enabled() defined. ........ r3833 | vlnb | 2011-09-01 14:22:27 -0400 (Thu, 01 Sep 2011) | 5 lines - Fix possible deadlock between vdev_sysfs_process_get_filename() and vdisk_del_device() - Cleanups ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3836 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2026-08-20 14:16:31 +00:00 · 2011-09-01 18:49:22 +00:00
parent 98df3f4c7f
commit 2e0329c2d2
10 changed files with 247 additions and 166 deletions
@@ -1,176 +1,196 @@
-This HOWTO is for iSCSI-SCST v1.x. Updates for v2.x are welcome!
+==============================================
+SCST 2.x Installation on Gentoo Linux
+==============================================

-1) If you haven't done so already install a base gentoo installation:
-download: http://www.gentoo.org/main/en/where.xml
-documentation: http://www.gentoo.org/doc/en/handbook/index.xml
+This howto will get you a working SCST installation on Gentoo Linux, it
+will follow the official howto as much as possible with a few exceptions
+because of Gentoo specifics or my preferences. Most of it will also work
+on other Linux Distributions so my changes from the official howto might
+help you get SCST working on another distro.

-2) Lets make sure our package info is up2date
-'emerge --sync'
+Prerequisites:
+- A working and up2date Gentoo Linux installation
+- Free storage space
+- Installation of the following packages: gentoo-sources, subversion
+- User with root privileges
+- Read the official iSCSI-SCST howto for more options and information

-3) You can get the SCST source files from http://scst.sourceforge.net/downloads.html
-As I want a stable platform I use the downloads from "Download released versions"
-For the iscsi-target we need three files: scst, iscsi-scst and scstadmin.
-You can get these files in varios ways, in the example they are downloaded with links.
-If links is not already installed install it:
-'emerge links'
-Go the the directory where you want the files (the example uses /root) and get the files:
-'cd /root'
-'links http://scst.sourceforge.net/downloads.html'
-and download under stable the three needed files, at this moment they are scst-1.0.1.1.tar.gz, scstadmin-1.0.6.tar.gz and iscsi-scst-1.0.1.1.tar.gz
-after downloading exit links:
-'q'
+Assumptions for this howto:
+- User logged on as root
+- Gentoo Sources version 2.6.39-r3 installed
+- Manual build kernel without initramfs
+- Gentoo AMD64 version
+- Grub bootloader
+- /boot on a separate partition
+- One iSCSI target with 2 LUNS, both LUNS virtual disk files
+- One iSCSI target with one LUN, LUN is a real device

-4) Now extract the three downloaded files
-'tar -zxf scst-1.0.1.1.tar.gz'
-'tar -zxf scstadmin-1.0.6.tar.gz'
-'tar -zxf iscsi-scst-1.0.1.1.tar.gz'
+When the above options differ from your environment/setup you will need
+to change some of the commands provided in this howto for things to
+work.

-5) Because SCST needs some kernel patches we need to check which kernels are supported.
-'ls /root/scst-1.0.1.1/kernel/'
-This shows a list of kernel patches, we can see now the newest kernel scst 1.0.1.1 has patches for is kernel 2.6.29.
-Now lets see which is the newest gentoo kernel.
-'emerge --search gentoo-sources'
-This shows the current installed kernel (if you are running the gentoo-sources kernel) and the newest version at this moment is 2.6.30-r6.
-As we need an older kernel to use SCST we will need to explicitly tell emerge which kernel we want.
-To find out which kernel we need we can take a look at http://packages.gentoo.org/package/sys-kernel/gentoo-sources
-'links http://packages.gentoo.org/package/sys-kernel/gentoo-sources'
-You will need to scroll down a bit to see the table. At this moment is shows that 2.6.29-r5 is the newest for the x86 and amd64 platform, so we want the 29-r5 kernel.
-'emerge =gentoo-sources-2.6.29-r5'
-The kernel source will now be in /usr/src/linux-2.6.29-gentoo-r5

-6) Now we need to patch the kernel sources. First we set the /usr/src/linux link to the new kernel sources.
-'rm /usr/src/linux'
-'ln -s /usr/src/linux-2.6.29-gentoo-r5/ /usr/src/linux'
-There are multiple kernel patches for SCST and not all are required but give better performance or new features.
-Read the documentation from SCST to see what the patches are for and which ones you need/want.
-The kernel patches are in /root/scst-1.0.1.1/kernel/ and /root/iscsi-scst-1.0.1.1/kernel/patches/.
-Now Patch the kernel sources
-'cd /usr/src/linux'
-'patch -p1 < /root/scst-1.0.1.1/kernel/io_context-2.6.29.patch'
-'patch -p1 < /root/scst-1.0.1.1/kernel/scst_exec_req_fifo-2.6.29.patch'
-'patch -p1 < /root/scst-1.0.1.1/kernel/readahead-context-2.6.29.patch'
-'patch -p1 < /root/scst-1.0.1.1/kernel/readahead-2.6.29.patch'
-'patch -p1 < /root/iscsi-scst-1.0.1.1/kernel/patches/put_page_callback-2.6.29.patch'
-? not required 'make clean'
+1. Download the latest SCST version.

-7) Lets configure and build the kernel
-'make menuconfig'
-Make sure to enable a few kernel options.
-in Networking Support -> Networking Options:
-"TCP/IP networking" and "TCP/IP zero-copy transfer completion notification"
-in Device Drivers -> SCSI Device Support:
-"SCSI disk support"
-Make sure you include all needed storage and lan drivers
+  cd /root
+  svn co https://scst.svn.sourceforge.net/svnroot/scst/trunk scst

-----optional, for maximum performance:-----
-in Enable the block layer -> IO Schedulers
-enable "CFQ I/O scheduler"
-set "Default I/O scheduler" to "CFQ"
-in Processor type and features
-set "Preemption Model" to "No Forced Preemption (Server)"
-set "High Memory Support" to "off" (use a 64bit kernel when using more then 1GB of RAM to get the best performance)
-in File systems
-enable "XFS filesystem support" (XFS is much faster then ext3 when using virtual-file-devices for the iSCSI target)
-----optional end-----

-Build the kernel and install the kernel modules
-'make'
-'make modules_install'
-Now copy the kernel to the boot directory (replace the directory after arch with your architecture, x86 for example)
-'cp arch/x86_64/boot/bzImage /boot/kernel-2.6.29-gentoo-r5'
-Add the new kernel to the configuration as described in the gentoo handbook (with grub you should edit /boot/grub/grub.conf)
-Reboot the system with the new kernel
-'shutdown -r now'
+2. Patch the kernel (Optional but required for the best speed)

-8) Lets configure, build and install SCST
-'cd /root/scst-1.0.1.1/src'
-'make all'
-'make install'
+  cd /usr/src/linux-2.6.39-gentoo-r3
+  patch -p1 < /root/scst/iscsi-scst/kernel/patches/put_page_callback-2.6.39.patch
+  patch -p1 < /root/scst/scst/kernel/scst_exec_req_fifo-2.6.39.patch
+  make clean

-9) Build and install scstadmin
-'cd /root/scstadmin-1.0.6'
-'make all'
-'make install'
-Remove the scst_disk module from the startup file
-'nano -w /etc/init.d/scst'
-change the line SCST_MODULES="scst scst-disk scst_vdisk" to SCST_MODULES="scst scst_vdisk"

-10) Build and install iscsi-scst
-'cd /root/iscsi-scst-1.0.1.1'
-'make all'
-'make install'
-'cp etc/initiators.* /etc'
-'cp etc/iscsi-scstd.conf /etc'
+3. Build the kernel

-11) Make SCST init script work
-As the scst init scipt uses lsb init-functions which are not available for gentoo scst can not run yet.
-There are two easy ways to make it work. 1) Modify the SCST init script so it doesn't use init-functions. 2) Get the required init-functions scripts from another distro.
-Choose one these options.
+  make menuconfig
+  Select Networking support -> Networking options -> TCP/IP networking
+  Select Networking support -> Networking options -> TCP/IP zero-copy transfer completion notification
+  Select Device Drivers -> SCSI device support -> SCSI disk support
+  Select Enable the block layer -> IO Schedulers -> CFQ I/O Scheduler
+  Set Enable the Block layer -> IO Schedulers -> Default I/O Scheduler to 'CFQ'
+  Set Processor type and features -> Preemption Model to 'No Forced Preemption (Server)'
+  Exit
+  make
+  make modules_install

-11-1) Modify the SCST script
-The simplest way to do this is to remove/replace all lsb init-functions.
- remove or comment (put a # in front of) the line ". /lib/lsb/init-functions"
- replace all 'log_failure_msg' with 'echo "failure"' and replace all 'log_success_msg' with 'echo "succes"'

-11-2) Get /lib/lsb/init-functions and /etc/rc.status from another distribution
-See an example on how to do this on http://www.gentoo-wiki.info/Rivendell and only do the actions as described under "File creation"
-Now you should have created /etc/rc.status and /lib/lsb/init-functions and set their permissions.
+4. Install the new kernel and reboot the system

-12) Configure iSCSI-SCST configuration
-choose a target name and disk names and set it iscsi-scstd.conf, see the comments on the target name requirements in the same file.
-'nano -w /etc/iscsi-scstd.conf'
+  mount /boot
+  cp arch/x86_64/boot/bzImage /boot/kernel-2.6.39-gentoo-r3-SCST
+  nano -w /boot/grub/grub.conf  (add a new boot entry with the newly compiled kernel)
+  umount /boot
+  shutdown -r now

-----example iscsi-scstd.conf-----
-Target iqn.2009-10.nl.feka:storage.disk.1.vms
-Target iqn.2009-10.nl.feka:storage.disk.2.iso
-Target iqn.2009-10.nl.feka:storage.filedisk.1.backup
-----example end-----

-13) Configure SCST configuration
-SCSTadmin can create the SCST config but needs SCST to be loaded, unfortunately the initscript does not load SCST when scst.conf is not there.
-Create an empty scst.conf.
-'touch /etc/scst.conf'
-Start SCST
-'/etc/init.d/scst start'
-Create an empty configuration.
-'scstadmin -ClearConfig /etc/scst.conf'
-Add the iSCSI disk(s), make sure to replace the device name(s) in the command(s) below:
-'scstadmin -adddev disk01 -path /dev/sdb1 -handler vdisk -options BLOCKIO' (use this to add a disk/partition/file in BlockIO mode without caching)
-'scstadmin -adddev disk02 -path /dev/sdc -handler vdisk -options NV_CACHE' (use this to add a disk/partition/file in FileIO mode with linux cache)
-'scstadmin -adddev disk03 -path /root/vhdd1 -handler vdisk -options NV_CACHE' (use this to add a disk/partition/file in FileIO mode with linux cache)
-Create a group for each target. (make sure to name the entry after Default_ the same as the names specified in iscsi-scstd.conf)
-'scstadmin -addgroup Default_iqn.2009-10.nl.feka:storage.disk.1.vms'
-'scstadmin -addgroup Default_iqn.2009-10.nl.feka:storage.disk.2.iso'
-'scstadmin -addgroup Default_iqn.2009-10.nl.feka:storage.filedisk.1.backup'
-Assign the device(s) to the group(s).
-'scstadmin -assigndev disk01 -group Default_iqn.2009-10.nl.feka:storage.disk.1.vms -lun 0'
-'scstadmin -assigndev disk02 -group Default_iqn.2009-10.nl.feka:storage.disk.2.iso -lun 0'
-'scstadmin -assigndev disk03 -group Default_iqn.2009-10.nl.feka:storage.filedisk.1.backup -lun 0'
-Save the configuration.
-'scstadmin -WriteConfig /etc/scst.conf'
+5. Build SCST

-14) Set initiator connection rights
-As default disable all targets for all initiators.
-Add one line to initiators.deny with "ALL ALL"
-'nano -w /etc/initiators.deny'
+  cd /root/scst
+  make 2perf
+  make scst scst_install
+  make iscsi iscsi_install
+  make scstadm scstadm_install

-----example initiators.deny-----
-ALL ALL
-----example end-----

-Add the inititators that may access the targets to initiators.allow.
-Add one line per initiator with all initiators that need access, see the comments in the same file
-'nano -w /etc/initiators.allow'
+6. Make a clean config and start SCST

-----example initiators.allow-----
-iqn.2009-10.nl.feka:storage.disk.1.vms 192.168.1.1, 192.168.1.2, 192.168.1.3
-iqn.2009-10.nl.feka:storage.disk.2.iso 192.168.1.1, 192.168.1.2, 192.168.1.3
-iqn.2009-10.nl.feka:storage.filedisk.1.backup 192.168.1.10
-----example end-----
+  echo "HANDLER vdisk_fileio {" >> /etc/scst.conf
+  echo "}" >> /etc/scst.conf
+  echo ""  >> /etc/scst.conf
+  echo "TARGET_DRIVER iscsi {"  >> /etc/scst.conf
+  echo "      	enabled 0"  >> /etc/scst.conf
+  echo "}"  >> /etc/scst.conf
+  /etc/init.d/scst start

-15) Add SCST and iSCSI-SCST to default run-level and start iscsi-scst
-'rc-update add scst default'
-'rc-update add iscsi-scst default'
-'/etc/init.d/iscsi-scst start'

-Willem Boterenbrood
+7. Configure SCST
+
+In this example disk01 is a virtual disk that is stored in the file
+/vdisks/vdisk1 and is mounted read_only, disk02 is the same as disk01
+but with file /vdisks/vdisk2 and it has its blocksize increased from 512
+to 4096 (see notes below), and finaly disk03 is a real disk used as a
+blockdevice. Both disk01 and disk02 are connected to the same target
+with different luns and disk03 is connected to a different target as
+LUN0, if the allowed_target atttribute is not set the target is open
+to all ip's
+
+  scstadmin -open_dev disk01 -handler vdisk_fileio -attributes filename=/vdisks/vdisk1,read_only
+  scstadmin -open_dev disk02 -handler vdisk_fileio -attributes filename=/vdisks/vdisk2,blocksize=4096
+  scstadmin -open_dev disk03 -handler vdisk_blockio -attributes filename=/dev/sdc1
+  scstadmin -add_target iqn.2011-08.nl.feka:storage.vdisk1 -driver iscsi
+  scstadmin -add_target iqn.2011-08.nl.feka:storage.vdisk2 -driver iscsi
+  scstadmin -add_lun 0 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk1 -device disk01
+  scstadmin -add_lun 1 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk1 -device disk02
+  scstadmin -add_lun 0 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk2 -device disk03
+  scstadmin -enable_target iqn.2011-08.nl.feka:storage.vdisk1 -driver iscsi
+  scstadmin -enable_target iqn.2011-08.nl.feka:storage.vdisk2 -driver iscsi
+  scstadmin -set_drv_attr iscsi -attributes enabled=1
+  scstadmin -write_config /etc/scst.conf
+
+
+8. Run SCST automatically at startup
+
+For SCST 2.1 SVN version r3805 and newer do:
+  rc-update add scst default
+
+For SCST 2.0 and for a SVN version before r3805 and Gentoo with the old baselayout without OpenRC do:
+  rc-update add scst default
+
+For SCST 2.0 and for a SVN version before r3805 and you have the new Gentoo baselayout do:
+  echo "/etc/init.d/scst start" >> /etc/local.d/scst.start
+  echo "/etc/init.d/scst stop" >> /etc/local.d/scst.stop
+  chmod 775 /etc/local.d/scst.*
+(the SCST init script doesn't work with openRC and changing it would be a lot of work so local.d is used as an easy workaround)
+
+
+9. Using SCST access control (optional)
+
+SCST listens on all the targets IP addresses and allows access to any
+initiators per default. There are a couple of ways to restict access and
+here I will give some examples. For the full documentation see the
+README file in the scst/iscsi-scst/ directory
+
+To make a target accessible on only one IP address do:
+  scstadmin -set_tgt_attr iqn.2011-08.nl.feka:storage.vdisk1 -driver iscsi -attributes allowed_portal=192.168.100.15
+(Remember the IP address is the address of the target machine, not of
+ the allowed initiator, you can add multiple entries on the same target
+ by repeating the above command, you can also use the wildcards * and ?
+ where the ? stands for any single digit)
+
+To make targets only accessible by specific inititators add a group to
+each target and define the allowed inititiators on each group and add
+the lun to the group instead of the target:
+(remove the old lun if it already exists directly under the target)
+  scstadmin -add_group vCenter -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk2
+  scstadmin -add_group ESXi -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk1
+  scstadmin -add_init iqn.2011-08.nl.feka:vcenterserver  -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk2 -group vCenter
+  scstadmin -add_init iqn.1998-01.com.vmware:esx1-47f53b1d -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk1 -group ESXi
+  scstadmin -add_init iqn.1998-01.com.vmware:esx2-23e64b45 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk1 -group ESXi
+  scstadmin -rem_lun 0 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk1 -device disk01
+  scstadmin -rem_lun 1 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk1 -device disk02
+  scstadmin -rem_lun 0 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk2 -device disk03
+  scstadmin -add_lun 0 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk1 -group ESXi -device disk01
+  scstadmin -add_lun 1 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk1 -group ESXi -device disk02
+  scstadmin -add_lun 0 -driver iscsi -target iqn.2011-08.nl.feka:storage.vdisk2 -group vCenter -device disk03
+
+
+==============================================
+Notes
+==============================================
+
+SCST's vdisk_fileio handler will use a default blocksize of 512b, this
+is the only safe option for vmware ESXi or older windows versions, for
+best performance with newer windows versions a blocksize of 4096 will be
+much faster.
+
+The TCP/IP zero-copy transfer completion notification provided by the
+put_page_callback patch will only improve performance if your network
+adapter supports TX offloading. You can check this by running ethtool -k
+eth0 (substitute eth0 for the nic you use),  at least "tx-checksumming"
+and "scatter-gather" should be enabled. If your adapter is unable to do
+so consider upgrading to a good server grade nic, both Intel and
+Broadcom make good server grade nics.
+
+If you have an Intel CPU that supports SSE4.2 make sure to add the
+crc32c-intel module to the kernel, so iSCSI-SCST will do all digest
+calculations with hardware acceleration. You can find this option in the
+kernel Cryptographic API -> CRC32c INTEL hardware acceleration
+
+It is recommended to increase the read ahead size to at least 512KB on
+the initiators and the target. To do this for dev/sdb and /dev/sdc on
+the scst target do this:
+
+  nano -w /etc/local.d/blockdev.start
+    blockdev --setra 1024 /dev/sdb
+    blockdev --setra 1024 /dev/sdc
+  chmod 775 /etc/local.d/blockdev.start
+(--setra 1024 means 1024x512bytes)
+
+When running a firewall you need to open TCP Port 3260 on the required
+interface, see below example for iptables.
+iptables -A INPUT -p TCP -i eth0 --dport 3260 -m state --state NEW -j ACCEPT
+
@@ -461,6 +461,16 @@ qla2x00_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)
 		goto qc_host_busy;
 	}

+#ifdef CONFIG_SCSI_QLA2XXX_TARGET
+	if (unlikely(!qla_ini_mode_enabled(ha))) {
+		DEBUG2_3_11(printk("%s(%ld): Initiator command in the initiator "
+			"disabled mode\n", __func__, ha->host_no));
+		cmd->result = DID_NO_CONNECT << 16;
+		goto qc_fail_command;
+	}
+#endif
+
+
 	spin_unlock_irq(ha->host->host_lock);

 	sp = qla2x00_get_new_sp(ha, fcport, cmd, done);
@@ -36,7 +36,7 @@ Summary of changes between versions 1.0.1 and 1.0.2

 - REQUEST SENSE now can return the most recent sense

- - READ CAPACITY(16) now reports number of logical blocks per phisical
+ - READ CAPACITY(16) now reports number of logical blocks per physical
   block

 - Parameters scst_max_cmd_mem and scst_max_dev_cmd_mem as well as
@@ -2218,6 +2218,14 @@ struct scst_device {
 	/* Set, if a strictly serialized cmd is waiting blocked */
 	unsigned short strictly_serialized_cmd_waiting:1;

+	/*
+	 * Set, if this device is being unregistered. Useful to let sysfs
+	 * attributes know when they should exit immediatelly to prevent
+	 * possible deadlocks with their device unregistration waiting for
+	 * their kobj last put.
+	 */
+	unsigned short dev_unregistering:1;
+
 	/**************************************************************/

 	/*************************************************************
@@ -37,7 +37,10 @@
 #include <asm/atomic.h>
 #include <linux/kthread.h>
 #include <linux/sched.h>
+#include <linux/delay.h>
+#ifndef INSIDE_KERNEL_TREE
 #include <linux/version.h>
+#endif
 #include <asm/div64.h>
 #include <asm/unaligned.h>
 #include <linux/slab.h>
@@ -1363,12 +1366,22 @@ static void vdisk_exec_unmap(struct scst_cmd *cmd, struct scst_vdisk_thr *thr)
 		goto out_put;
 #endif
 		} else {
+			const int block_shift = virt_dev->block_shift;
+
 			/*
 			 * We are guaranteed by thin_provisioned flag
 			 * that truncate_range is not NULL.
 			 */
+			if (((start + len) << block_shift) &
+			    (PAGE_CACHE_SIZE - 1)) {
+				PRINT_ERROR("Invalid UNMAP range [%llu, %llu); "
+					"block size = %d", start, start + len,
+					virt_dev->block_size);
+				goto out_put;
+			}
 			inode->i_op->truncate_range(inode,
-				start, start + len);
+					start << block_shift,
+					((start + len) << block_shift) - 1);
 		}
 	}

@@ -4287,9 +4300,24 @@ static int vdev_sysfs_process_get_filename(struct scst_sysfs_work_item *work)

 	dev = work->dev;

-	if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
-		res = -EINTR;
-		goto out_put;
+	/*
+	 * Since we have a get() on dev->dev_kobj, we can not simply mutex_lock
+	 * scst_vdisk_mutex, because otherwise we can fall in a deadlock with
+	 * vdisk_del_device(), which is waiting for the last ref to dev_kobj
+	 * under scst_vdisk_mutex.
+	 */
+	while (!mutex_trylock(&scst_vdisk_mutex)) {
+		if ((volatile bool)(dev->dev_unregistering)) {
+			TRACE_MGMT_DBG("Skipping being unregistered dev %s",
+				dev->virt_name);
+			res = -ENOENT;
+			goto out_put;
+		}
+		if (signal_pending(current)) {
+			res = -EINTR;
+			goto out_put;
+		}
+		msleep(100);
 	}

 	virt_dev = dev->dh_priv;
@@ -3750,6 +3750,7 @@ static struct scst_cmd *scst_create_prepare_internal_cmd(
 	res->tgt = orig_cmd->tgt;
 	res->dev = orig_cmd->dev;
 	res->tgt_dev = orig_cmd->tgt_dev;
+	res->cur_order_data = orig_cmd->tgt_dev->curr_order_data;
 	res->lun = orig_cmd->lun;
 	res->queue_type = SCST_CMD_QUEUE_HEAD_OF_QUEUE;
 	res->data_direction = SCST_DATA_UNKNOWN;
@@ -6738,7 +6739,9 @@ void scst_unblock_dev(struct scst_device *dev)
 	TRACE_MGMT_DBG("Device UNBLOCK(new %d), dev %s",
 		dev->block_count-1, dev->virt_name);

+#ifdef CONFIG_SMP
 	EXTRACHECKS_BUG_ON(!spin_is_locked(&dev->dev_lock));
+#endif

 	if (--dev->block_count == 0) {
 		struct scst_cmd *cmd, *tcmd;
@@ -1006,6 +1006,8 @@ static void scst_unregister_device(struct scsi_device *scsidp)
 		goto out_unlock;
 	}

+	dev->dev_unregistering = 1;
+
 	list_del(&dev->dev_list_entry);

 	scst_dg_dev_remove_by_dev(dev);
@@ -1254,6 +1256,8 @@ void scst_unregister_virtual_device(int id)
 		goto out_unlock;
 	}

+	dev->dev_unregistering = 1;
+
 	list_del(&dev->dev_list_entry);

 	scst_pr_clear_dev(dev);
@@ -55,7 +55,9 @@ static inline void scst_inc_pr_readers_count(struct scst_cmd *cmd,
 	if (!locked)
 		spin_lock_bh(&dev->dev_lock);

+#ifdef CONFIG_SMP
 	EXTRACHECKS_BUG_ON(!spin_is_locked(&dev->dev_lock));
+#endif

 	dev->pr_readers_count++;
 	cmd->dec_pr_readers_count_needed = 1;
@@ -84,7 +86,9 @@ static inline void scst_dec_pr_readers_count(struct scst_cmd *cmd,
 	if (!locked)
 		spin_lock_bh(&dev->dev_lock);

+#ifdef CONFIG_SMP
 	EXTRACHECKS_BUG_ON(!spin_is_locked(&dev->dev_lock));
+#endif

 	dev->pr_readers_count--;
 	cmd->dec_pr_readers_count_needed = 0;
@@ -541,9 +541,9 @@ int scst_sysfs_queue_wait_work(struct scst_sysfs_work_item *work)
 	 * for the last put during some object unregistration and at the same
 	 * time another queued work is having reference on that object taken and
 	 * waiting for attention from the sysfs thread. Generally, all sysfs
-	 * function calling kobject_get() and then queuing sysfs thread job. For
-	 * instance. This is especially dangerous in read only cases, like
-	 * vdev_sysfs_filename_show().
+	 * functions calling kobject_get() and then queuing sysfs thread job
+	 * affected by this. This is especially dangerous in read only cases,
+	 * like vdev_sysfs_filename_show().
 	 *
 	 * So, to eliminate that deadlock we will create an extra sysfs thread
 	 * for each queued sysfs work. This thread will quit as soon as it will
@@ -567,8 +567,7 @@ int scst_sysfs_queue_wait_work(struct scst_sysfs_work_item *work)
 				timeout = 5*HZ;
 				continue;
 			}
-			TRACE_MGMT_DBG("Time out waiting for work %p",
-				work);
+			TRACE_MGMT_DBG("Time out waiting for work %p", work);
 			res = -EAGAIN;
 			goto out_put;
 		} else if (rc < 0) {
@@ -2146,6 +2145,7 @@ static int scst_process_rel_tgt_id_store(struct scst_sysfs_work_item *work)
 	int res = 0;
 	struct scst_tgt *tgt = work->tgt_r;
 	unsigned long rel_tgt_id = work->rel_tgt_id;
+	bool enabled;

 	TRACE_ENTRY();

@@ -2154,8 +2154,12 @@ static int scst_process_rel_tgt_id_store(struct scst_sysfs_work_item *work)
 	TRACE_DBG("Trying to set relative target port id %d",
 		(uint16_t)rel_tgt_id);

-	if (tgt->tgtt->is_target_enabled(tgt) &&
-	    rel_tgt_id != tgt->rel_tgt_id) {
+	if (tgt->tgtt->is_target_enabled != NULL)
+		enabled = tgt->tgtt->is_target_enabled(tgt);
+	else
+		enabled = true;
+
+	if (enabled && rel_tgt_id != tgt->rel_tgt_id) {
 		if (!scst_is_relative_target_port_id_unique(rel_tgt_id, tgt)) {
 			PRINT_ERROR("Relative port id %d is not unique",
 				(uint16_t)rel_tgt_id);
@@ -2166,7 +2170,7 @@ static int scst_process_rel_tgt_id_store(struct scst_sysfs_work_item *work)

 	if (rel_tgt_id < SCST_MIN_REL_TGT_ID ||
 	    rel_tgt_id > SCST_MAX_REL_TGT_ID) {
-		if ((rel_tgt_id == 0) && !tgt->tgtt->is_target_enabled(tgt))
+		if ((rel_tgt_id == 0) && !enabled)
 			goto set;

 		PRINT_ERROR("Invalid relative port id %d",
@@ -141,7 +141,7 @@ the following additional entry:
 Each target subdirectory contains the following additional entries:

 - phys_transport_version - contains and allows to change physical
-   transport version descriptor. It determines by which phisical
+   transport version descriptor. It determines by which physical
   interface this target will look like. See SPC for more details. By
   default, it is not defined (0).