Merge branch 'svn-trunk'

2026-05-18 19:21:26 +00:00 · 2016-10-10 19:20:15 -07:00
parent 5f2d3420cd 74a537dcfd
commit f48396cc5f
2 changed files with 52 additions and 48 deletions
--- a/srpt/README
+++ b/srpt/README
@@ -72,11 +72,10 @@ The ib_srpt kernel module supports the following parameters:
  ib_srpt uses a shared receive queue (SRQ) for processing incoming SRP
  requests. This number may have to be increased when a large number of
  initiator systems is accessing a single SRP target system.
-* srpt_sq_size (number, default 4096)
-  Per-channel InfiniBand send queue size. The default setting is sufficient
-  for a credit limit of 128. Changing this parameter to a smaller value may
-  cause RDMA requests to be retried and hence may slow down data transfer
-  severely.
+* srpt_sq_size (number, default 256)
+  Per-channel InfiniBand send queue size. Depending on the queue depth,
+  changing this parameter to a smaller value may cause RDMA requests to be
+  retried and hence may slow down data transfer severely.
 * trace_flag (unsigned integer, only available in debug builds)
  The individual bits of the trace_flag parameter define which categories of
  trace messages should be sent to the kernel log and which ones not.
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -129,7 +129,7 @@ MODULE_PARM_DESC(srp_max_rsp_size,
 		 "Maximum size of SRP response messages in bytes.");

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) \
-    || defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5
+	|| defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5
 static int use_srq;
 #else
 static bool use_srq;
@@ -149,7 +149,7 @@ MODULE_PARM_DESC(srpt_sq_size,
 		 "Per-channel send queue (SQ) size.");

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) \
-    || defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5
+	|| defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5
 static int use_port_guid_in_session_name;
 #else
 static bool use_port_guid_in_session_name;
@@ -160,7 +160,7 @@ MODULE_PARM_DESC(use_port_guid_in_session_name,
 		 " redundant paths between multiport systems can be masked.");

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) \
-    || defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5
+	|| defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5
 static int use_node_guid_in_target_name;
 #else
 static bool use_node_guid_in_target_name;
@@ -2209,7 +2209,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
 {
 	struct ib_qp_init_attr *qp_init;
 	struct srpt_device *sdev = ch->sport->sdev;
-	int i, ret;
+	int sq_size = srpt_sq_size, i, ret;

 	EXTRACHECKS_WARN_ON(ch->rq_size < 1);

@@ -2218,20 +2218,21 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
 	if (!qp_init)
 		goto out;

+retry:
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) && \
 	!defined(RHEL_RELEASE_CODE)
 	ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch,
-			      ch->rq_size + srpt_sq_size);
+			      ch->rq_size + sq_size);
 #elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) ||	\
 	defined(MOFED_MAJOR)) &&	\
 	!defined(IB_CREATE_CQ_HAS_INIT_ATTR)
 	ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch,
-			      ch->rq_size + srpt_sq_size, ch->comp_vector);
+			      ch->rq_size + sq_size, ch->comp_vector);
 #else
 	{
 	struct ib_cq_init_attr ia = { };

-	ia.cqe = ch->rq_size + srpt_sq_size;
+	ia.cqe = ch->rq_size + sq_size;
 	ia.comp_vector = ch->comp_vector;
 	ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch, &ia);
 	}
@@ -2239,7 +2240,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
 	if (IS_ERR(ch->cq)) {
 		ret = PTR_ERR(ch->cq);
 		pr_err("failed to create CQ: cqe %d; c.v. %d; ret %d\n",
-		       ch->rq_size + srpt_sq_size, ch->comp_vector, ret);
+		       ch->rq_size + sq_size, ch->comp_vector, ret);
 		goto out;
 	}

@@ -2250,7 +2251,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
 	qp_init->recv_cq = ch->cq;
 	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;
+	qp_init->cap.max_send_wr = sq_size;
 	/*
 	 * For max_sge values > 2 * max_sge_delta, subtract max_sge_delta. For
 	 * max_sge values < max_sge_delta, use max_sge. For intermediate
@@ -2272,24 +2273,29 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
 	if (ch->using_rdma_cm) {
 		ret = rdma_create_qp(ch->rdma_cm.cm_id, sdev->pd, qp_init);
 		ch->qp = ch->rdma_cm.cm_id->qp;
-		if (ret)
-			pr_err("failed to create queue pair (%d)\n", ret);
 	} else {
 		ch->qp = ib_create_qp(sdev->pd, qp_init);
 		if (!IS_ERR(ch->qp)) {
 			ret = srpt_init_ch_qp(ch, ch->qp);
-			if (ret) {
-				pr_err("srpt_init_ch_qp(%#x) failed (%d)\n",
-				       ch->qp->qp_num, ret);
+			if (ret)
 				ib_destroy_qp(ch->qp);
-			}
 		} else {
 			ret = PTR_ERR(ch->qp);
-			pr_err("failed to create queue pair (%d)\n", ret);
 		}
 	}
-	if (ret)
-		goto err_destroy_cq;
+	if (ret) {
+		bool retry = sq_size > MIN_SRPT_SQ_SIZE;
+
+		pr_err("failed to create queue pair with sq_size = %d (%d)%s\n",
+		       sq_size, ret, retry ? " - retrying" : "");
+		if (retry) {
+			ib_destroy_cq(ch->cq);
+			sq_size = max(sq_size / 2, MIN_SRPT_SQ_SIZE);
+			goto retry;
+		} else {
+			goto err_destroy_cq;
+		}
+	}

 	pr_debug("qp_num = %#x\n", ch->qp->qp_num);

@@ -4255,6 +4261,7 @@ static const struct attribute *srpt_sess_attrs[] = {
 static struct scst_tgt_template srpt_template = {
 	.name				 = DRV_NAME,
 	.sg_tablesize			 = 1 << 16,
+	.use_clustering			 = true,
 	.max_hw_pending_time		 = RDMA_COMPL_TIMEOUT_S,
 #if !defined(CONFIG_SCST_PROC)
 	.enable_target			 = srpt_enable_target,
@@ -4395,6 +4402,29 @@ static void srpt_add_one(struct ib_device *device)
 		}
 	}

+	WARN_ON(sdev->device->phys_port_cnt > ARRAY_SIZE(sdev->port));
+
+	for (i = 1; i <= sdev->device->phys_port_cnt; i++) {
+		sport = &sdev->port[i - 1];
+		sport->sdev = sdev;
+		sport->port = i;
+		srpt_init_sport(sport, sdev->device);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) && !defined(BACKPORT_LINUX_WORKQUEUE_TO_2_6_19)
+		/*
+		 * A vanilla 2.6.19 or older kernel without backported OFED
+		 * kernel headers.
+		 */
+		INIT_WORK(&sport->work, srpt_refresh_port_work, sport);
+#else
+		INIT_WORK(&sport->work, srpt_refresh_port_work);
+#endif
+		if (srpt_refresh_port(sport)) {
+			pr_err("MAD registration failed for %s-%d.\n",
+			       sdev->device->name, i);
+			goto err_ring;
+		}
+	}
+
 	if (!srpt_service_guid)
 		srpt_service_guid = be64_to_cpu(device->node_guid) &
 			~be64_to_cpu(IB_SERVICE_ID_AGN_MASK);
@@ -4435,37 +4465,12 @@ static void srpt_add_one(struct ib_device *device)
 		goto err_cm;
 	}

-	WARN_ON(sdev->device->phys_port_cnt > ARRAY_SIZE(sdev->port));
-
-	for (i = 1; i <= sdev->device->phys_port_cnt; i++) {
-		sport = &sdev->port[i - 1];
-		sport->sdev = sdev;
-		sport->port = i;
-		srpt_init_sport(sport, sdev->device);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) && !defined(BACKPORT_LINUX_WORKQUEUE_TO_2_6_19)
-		/*
-		 * A vanilla 2.6.19 or older kernel without backported OFED
-		 * kernel headers.
-		 */
-		INIT_WORK(&sport->work, srpt_refresh_port_work, sport);
-#else
-		INIT_WORK(&sport->work, srpt_refresh_port_work);
-#endif
-		if (srpt_refresh_port(sport)) {
-			pr_err("MAD registration failed for %s-%d.\n",
-			       sdev->device->name, i);
-			goto err_event;
-		}
-	}
-
 	atomic_inc(&srpt_device_count);
 out:
 	ib_set_client_data(device, &srpt_client, sdev);

 	return;

-err_event:
-	ib_unregister_event_handler(&sdev->event_handler);
 err_cm:
 	ib_destroy_cm_id(sdev->cm_id);
 err_ring: