Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e28f3d5b authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] libiscsi: don't cap queue depth in iscsi modules 



There is no need to cap the queue depth in the modules. We set
this in userspace and can do that there. For performance testing
with ram based targets, this is helpful since we can have very
high queue depths.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent c93f87c7

drivers/infiniband/ulp/iser/iscsi_iser.c

+2 −2
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep, 
	struct Scsi_Host *shost;

	struct iser_conn *ib_conn;



	shost = iscsi_host_alloc(&iscsi_iser_sht, 0, ISCSI_MAX_CMD_PER_LUN);

	shost = iscsi_host_alloc(&iscsi_iser_sht, 0, ISER_DEF_CMD_PER_LUN);

	if (!shost)

		return NULL;

	shost->transportt = iscsi_iser_scsi_transport;
@@ -596,7 +596,7 @@ static struct scsi_host_template iscsi_iser_sht = { 
	.change_queue_depth	= iscsi_change_queue_depth,

	.sg_tablesize           = ISCSI_ISER_SG_TABLESIZE,

	.max_sectors		= 1024,

	.cmd_per_lun            = ISCSI_MAX_CMD_PER_LUN,

	.cmd_per_lun            = ISER_DEF_CMD_PER_LUN,

	.eh_abort_handler       = iscsi_eh_abort,

	.eh_device_reset_handler= iscsi_eh_device_reset,

	.eh_target_reset_handler= iscsi_eh_target_reset,

drivers/infiniband/ulp/iser/iscsi_iser.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 


					/* support upto 512KB in one RDMA */

#define ISCSI_ISER_SG_TABLESIZE         (0x80000 >> SHIFT_4K)

#define ISCSI_ISER_MAX_LUN		256

#define ISER_DEF_CMD_PER_LUN		128



/* QP settings */

/* Maximal bounds on received asynchronous PDUs */

drivers/scsi/libiscsi.c

+1 −8
Original line number Diff line number Diff line
@@ -1451,8 +1451,6 @@ EXPORT_SYMBOL_GPL(iscsi_queuecommand); 


int iscsi_change_queue_depth(struct scsi_device *sdev, int depth)

{

	if (depth > ISCSI_MAX_CMD_PER_LUN)

		depth = ISCSI_MAX_CMD_PER_LUN;

	scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);

	return sdev->queue_depth;

}
@@ -2062,13 +2060,8 @@ struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht, 
	if (!shost)

		return NULL;



	if (qdepth > ISCSI_MAX_CMD_PER_LUN || qdepth < 1) {

		if (qdepth != 0)

			printk(KERN_ERR "iscsi: invalid queue depth of %d. "

			       "Queue depth must be between 1 and %d.\n",

			       qdepth, ISCSI_MAX_CMD_PER_LUN);

	if (qdepth == 0)

		qdepth = ISCSI_DEF_CMD_PER_LUN;

	}

	shost->cmd_per_lun = qdepth;



	ihost = shost_priv(shost);

include/scsi/libiscsi.h

+1 −2
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ struct device; 
#define ISCSI_MGMT_CMDS_MAX	15



#define ISCSI_DEF_CMD_PER_LUN	32

#define ISCSI_MAX_CMD_PER_LUN		128



/* Task Mgmt states */

enum {