Merged revisions 5785-5786,5793-5796,5798,5801-5802,5804-5806,5808,5810-5811,5814,5816-5817 via svnmerge from

svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/trunk ........ r5785 | bvassche | 2014-09-09 14:09:20 +0300 (Tue, 09 Sep 2014) | 9 lines scst_local: Change max_lun into SCST_MAX_LUN (16383) Today SCST does not support LUN numbers >= 16384. Additionally, there is a bug in older Linux initiator systems that prevents proper handling of LUN numbers >= 2**32. See also Hannes Reinecke, scsi_scan: Fixup scsilun_to_int(), June 25, 2014 (commit ID d9e5d6183715e691b37afd3785c311d05cd1338d). Hence set max_lun to 16383. ........ r5786 | bvassche | 2014-09-09 14:27:27 +0300 (Tue, 09 Sep 2014) | 6 lines scst_local: Set max_id to 1 The value 0 is not valid for the max_id member of struct Scsi_Host. Signed-off-by: Sebastian Herbszt <herbszt@gmx.de> ........ r5793 | bvassche | 2014-09-10 14:42:54 +0300 (Wed, 10 Sep 2014) | 1 line scstadmin: Sync saved configuration files ........ r5794 | bvassche | 2014-09-10 14:44:14 +0300 (Wed, 10 Sep 2014) | 2 lines scstadmin test 06-cont-on-err.t: Filter out scstadmin version number ........ r5795 | bvassche | 2014-09-10 15:18:09 +0300 (Wed, 10 Sep 2014) | 1 line ib_srpt: Add max_sge_delta kernel module parameter ........ r5796 | bvassche | 2014-09-10 15:20:30 +0300 (Wed, 10 Sep 2014) | 1 line ib_srpt: Update Subversion ignore lists ........ r5798 | bvassche | 2014-09-12 14:16:35 +0300 (Fri, 12 Sep 2014) | 1 line fcst/Makefile: Add release-archive target ........ r5801 | bvassche | 2014-09-12 14:20:16 +0300 (Fri, 12 Sep 2014) | 1 line fcst: Change version number from 0.3 into 3.1.0-pre ........ r5802 | vlnb | 2014-09-13 04:13:29 +0300 (Sat, 13 Sep 2014) | 3 lines Fix autofinding SCST headers in fileio_tgt ........ r5804 | vlnb | 2014-09-13 04:35:12 +0300 (Sat, 13 Sep 2014) | 3 lines Web updates ........ r5805 | vlnb | 2014-09-13 04:37:12 +0300 (Sat, 13 Sep 2014) | 3 lines Update root README to use symlink instead of bind mount for QLogic git driver integration ........ r5806 | bvassche | 2014-09-15 15:30:43 +0300 (Mon, 15 Sep 2014) | 1 line ib_srpt: Make "make -j<n> install" work for n >= 2 if "make all" has not been run first ........ r5808 | bvassche | 2014-09-16 14:06:00 +0300 (Tue, 16 Sep 2014) | 6 lines scst/src/Makefile: Make "make install" without prior "make" work Avoid that MOD_VERS and MODS_VERS evaluate to an empty string. Reported-by: Yan Burman <yanb@mellanox.com> ........ r5810 | bvassche | 2014-09-17 13:54:25 +0300 (Wed, 17 Sep 2014) | 1 line scst_vdisk: Insert a blank line ........ r5811 | bvassche | 2014-09-17 13:56:40 +0300 (Wed, 17 Sep 2014) | 14 lines vdisk_blockio: Make large COMPARE AND WRITE requests work for stacked block devices Stacked block devices impose weird restrictions on S/G-lists. Hence make the COMPARE AND WRITE implementation independent of these restrictions. Additionally, reduce the MAXIMUM COMPARE AND WRITE LENGTH limit from 0xff (no limit) to 0xfe to reduce the maximum amount of memory allocated during a COMPARE AND WRITE. Also serialize COMPARE AND WRITE operations, fix the offset reported for miscompares and fix the start offset of the region that is synchronized if the FUA bit has been set. Reported-by: Vishal Tripathi <vishal.tripathi@calsoftinc.com> ........ r5814 | bvassche | 2014-09-18 10:08:49 +0300 (Thu, 18 Sep 2014) | 1 line nightly build: Update kernel versions ........ r5816 | vlnb | 2014-09-20 09:31:43 +0300 (Sat, 20 Sep 2014) | 3 lines Web updates ........ r5817 | bvassche | 2014-09-28 21:54:04 +0200 (Sun, 28 Sep 2014) | 1 line scripts/rebuild-rhel-kernel-rpm: Enable put_page_callback patch for RHEL 7 ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5819 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2026-09-06 16:17:03 +00:00 · 2014-09-29 08:31:12 +00:00
parent 7bc8357709
commit f704a4afee
24 changed files with 149 additions and 80 deletions
@@ -87,7 +87,7 @@ all: src/$(MODULE_SYMVERS)
 	  PRE_CFLAGS="$(OFED_CFLAGS) $(AUTOCONF_FLAGS)" \
 	  KCFLAGS="$(AUTOCONF_FLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) modules

-install: all src/ib_srpt.ko
+install: all
 	@[ -z "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && \
 	  find /lib/modules/$(KVER) -name ib_srpt.ko -exec rm {} \; ; \
 	  true
@@ -38,6 +38,15 @@ Building and installing the SRP target driver is possible as follows:
   fi

 The ib_srpt kernel module supports the following parameters:
+
+* max_sge_delta (unsigned): Number to subtract from max_sge. Some but not
+  all HCA's allow to use up to max_sge S/G-list elements in RDMA
+  communication. The default value of this parameter is 3 and works with all
+  HCA's. If you know that the HCA's that are used by the ib_srpt driver allow
+  to use S/G-lists that are longer than max_sge - 3 then you can decrease this
+  parameter. Note: setting this parameter too low will cause SRP every login
+  to fail and will cause a message similar to the following to be logged on
+  the target system: "ib_srpt: RDMA t ... for idx ... failed with status 12".
 * one_target_per_port (boolean) and
 * use_node_guid_in_target_name (boolean)
  ib_srpt can operate in one of the following three modes:
@@ -171,6 +171,10 @@ MODULE_PARM_DESC(srpt_service_guid,
 		 "Using this value for ioc_guid, id_ext, and cm_listen_id"
 		 " instead of using the node_guid of the first HCA.");

+static unsigned max_sge_delta = 3;
+module_param(max_sge_delta, uint, 0444);
+MODULE_PARM_DESC(max_sge_delta, "Number to subtract from max_sge.");
+
 /*
 * Note: changing any of the two constants below into SCST_CONTEXT_DIRECT is
 * dangerous because it might cause IB completions to be processed too late
@@ -2151,19 +2155,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
 	qp_init->sq_sig_type = IB_SIGNAL_REQ_WR;
 	qp_init->qp_type = IB_QPT_RC;
 	qp_init->cap.max_send_wr = srpt_sq_size;
-	/*
-	 * A quote from the OFED 1.5.3.1 release notes
-	 * (docs/release_notes/mthca_release_notes.txt), section "Known Issues":
-	 * In mem-free devices, RC QPs can be created with a maximum of
-	 * (max_sge - 1) entries only; UD QPs can be created with a maximum of
-	 * (max_sge - 3) entries.
-	 * A quote from the OFED 1.2.5 release notes
-	 * (docs/mthca_release_notes.txt), section "Known Issues":
-	 * In mem-free devices, RC QPs can be created with a maximum of
-	 * (max_sge - 3) entries only.
-	 */
-	ch->max_sge = sdev->dev_attr.max_sge - 3;
-	WARN_ON(ch->max_sge < 1);
+	ch->max_sge = max_t(int, 1, sdev->dev_attr.max_sge - max_sge_delta);
 	qp_init->cap.max_send_sge = ch->max_sge;

 	if (ch->using_rdma_cm) {