[SCSI] fnic: fnic Driver Tuneables Exposed through CLI (fc85799e) · Commits · 戴 / test

drivers/scsi/fnic/fnic.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@
		#define DFX DRV_NAME "%d: "

		#define DESC_CLEAN_LOW_WATERMARK 8
		#define FNIC_UCSM_DFLT_THROTTLE_CNT_BLD 16 /* UCSM default throttle count */
		#define FNIC_MIN_IO_REQ 256 /* Min IO throttle count */
		#define FNIC_MAX_IO_REQ 2048 /* scsi_cmnd tag map entries */
		#define FNIC_IO_LOCKS 64 /* IO locks: power of 2 */
		#define FNIC_DFLT_QUEUE_DEPTH 32
		@@ -223,6 +225,7 @@ struct fnic {
		char name[IFNAMSIZ];
		struct timer_list notify_timer; /* used for MSI interrupts */

		unsigned int fnic_max_tag_id;
		unsigned int err_intr_offset;
		unsigned int link_intr_offset;

drivers/scsi/fnic/fnic_main.c

+21 −8

Original line number	Diff line number	Diff line
		@@ -74,6 +74,10 @@ module_param(fnic_trace_max_pages, uint, S_IRUGO\|S_IWUSR);
		MODULE_PARM_DESC(fnic_trace_max_pages, "Total allocated memory pages "
		"for fnic trace buffer");

		static unsigned int fnic_max_qdepth = FNIC_DFLT_QUEUE_DEPTH;
		module_param(fnic_max_qdepth, uint, S_IRUGO\|S_IWUSR);
		MODULE_PARM_DESC(fnic_max_qdepth, "Queue depth to report for each LUN");

		static struct libfc_function_template fnic_transport_template = {
		.frame_send = fnic_send,
		.lport_set_port_id = fnic_set_port_id,
		@@ -91,7 +95,7 @@ static int fnic_slave_alloc(struct scsi_device *sdev)
		if (!rport \|\| fc_remote_port_chkready(rport))
		return -ENXIO;

		scsi_activate_tcq(sdev, FNIC_DFLT_QUEUE_DEPTH);
		scsi_activate_tcq(sdev, fnic_max_qdepth);
		return 0;
		}

		@@ -552,13 +556,6 @@ static int fnic_probe(struct pci_dev pdev, const struct pci_device_id ent)

		host->transportt = fnic_fc_transport;

		err = scsi_init_shared_tag_map(host, FNIC_MAX_IO_REQ);
		if (err) {
		shost_printk(KERN_ERR, fnic->lport->host,
		"Unable to alloc shared tag map\n");
		goto err_out_free_hba;
		}

		/* Setup PCI resources */
		pci_set_drvdata(pdev, fnic);

		@@ -671,6 +668,22 @@ static int fnic_probe(struct pci_dev pdev, const struct pci_device_id ent)
		"aborting.\n");
		goto err_out_dev_close;
		}

		/* Configure Maximum Outstanding IO reqs*/
		if (fnic->config.io_throttle_count != FNIC_UCSM_DFLT_THROTTLE_CNT_BLD) {
		host->can_queue = min_t(u32, FNIC_MAX_IO_REQ,
		max_t(u32, FNIC_MIN_IO_REQ,
		fnic->config.io_throttle_count));
		}
		fnic->fnic_max_tag_id = host->can_queue;

		err = scsi_init_shared_tag_map(host, fnic->fnic_max_tag_id);
		if (err) {
		shost_printk(KERN_ERR, fnic->lport->host,
		"Unable to alloc shared tag map\n");
		goto err_out_dev_close;
		}

		host->max_lun = fnic->config.luns_per_tgt;
		host->max_id = FNIC_MAX_FCP_TARGET;
		host->max_cmd_len = FCOE_MAX_CMD_LEN;

drivers/scsi/fnic/fnic_scsi.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -736,7 +736,7 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic,
		fcpio_tag_id_dec(&tag, &id);
		icmnd_cmpl = &desc->u.icmnd_cmpl;

		if (id >= FNIC_MAX_IO_REQ) {
		if (id >= fnic->fnic_max_tag_id) {
		shost_printk(KERN_ERR, fnic->lport->host,
		"Tag out of range tag %x hdr status = %s\n",
		id, fnic_fcpio_status_to_str(hdr_status));
		@@ -913,7 +913,7 @@ static void fnic_fcpio_itmf_cmpl_handler(struct fnic *fnic,
		fcpio_header_dec(&desc->hdr, &type, &hdr_status, &tag);
		fcpio_tag_id_dec(&tag, &id);

		if ((id & FNIC_TAG_MASK) >= FNIC_MAX_IO_REQ) {
		if ((id & FNIC_TAG_MASK) >= fnic->fnic_max_tag_id) {
		shost_printk(KERN_ERR, fnic->lport->host,
		"Tag out of range tag %x hdr status = %s\n",
		id, fnic_fcpio_status_to_str(hdr_status));
		@@ -1127,7 +1127,7 @@ static void fnic_cleanup_io(struct fnic *fnic, int exclude_id)
		spinlock_t *io_lock;
		unsigned long start_time = 0;

		for (i = 0; i < FNIC_MAX_IO_REQ; i++) {
		for (i = 0; i < fnic->fnic_max_tag_id; i++) {
		if (i == exclude_id)
		continue;

		@@ -1210,7 +1210,7 @@ void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq,
		fcpio_tag_id_dec(&desc->hdr.tag, &id);
		id &= FNIC_TAG_MASK;

		if (id >= FNIC_MAX_IO_REQ)
		if (id >= fnic->fnic_max_tag_id)
		return;

		sc = scsi_host_find_tag(fnic->lport->host, id);
		@@ -1314,7 +1314,7 @@ static void fnic_rport_exch_reset(struct fnic *fnic, u32 port_id)
		if (fnic->in_remove)
		return;

		for (tag = 0; tag < FNIC_MAX_IO_REQ; tag++) {
		for (tag = 0; tag < fnic->fnic_max_tag_id; tag++) {
		abt_tag = tag;
		io_lock = fnic_io_lock_tag(fnic, tag);
		spin_lock_irqsave(io_lock, flags);
		@@ -1448,7 +1448,7 @@ void fnic_terminate_rport_io(struct fc_rport *rport)
		if (fnic->in_remove)
		return;

		for (tag = 0; tag < FNIC_MAX_IO_REQ; tag++) {
		for (tag = 0; tag < fnic->fnic_max_tag_id; tag++) {
		abt_tag = tag;
		io_lock = fnic_io_lock_tag(fnic, tag);
		spin_lock_irqsave(io_lock, flags);
		@@ -1781,7 +1781,7 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,
		DECLARE_COMPLETION_ONSTACK(tm_done);
		enum fnic_ioreq_state old_ioreq_state;

		for (tag = 0; tag < FNIC_MAX_IO_REQ; tag++) {
		for (tag = 0; tag < fnic->fnic_max_tag_id; tag++) {
		io_lock = fnic_io_lock_tag(fnic, tag);
		spin_lock_irqsave(io_lock, flags);
		sc = scsi_host_find_tag(fnic->lport->host, tag);
		@@ -2404,7 +2404,7 @@ int fnic_is_abts_pending(struct fnic fnic, struct scsi_cmnd lr_sc)
		lun_dev = lr_sc->device;

		/* walk again to check, if IOs are still pending in fw */
		for (tag = 0; tag < FNIC_MAX_IO_REQ; tag++) {
		for (tag = 0; tag < fnic->fnic_max_tag_id; tag++) {
		sc = scsi_host_find_tag(fnic->lport->host, tag);
		/*
		* ignore this lun reset cmd or cmds that do not belong to

drivers/scsi/fnic/vnic_scsi.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,8 @@
		#define VNIC_FNIC_PLOGI_TIMEOUT_MIN 1000
		#define VNIC_FNIC_PLOGI_TIMEOUT_MAX 255000

		#define VNIC_FNIC_IO_THROTTLE_COUNT_MIN 256
		#define VNIC_FNIC_IO_THROTTLE_COUNT_MAX 4096
		#define VNIC_FNIC_IO_THROTTLE_COUNT_MIN 1
		#define VNIC_FNIC_IO_THROTTLE_COUNT_MAX 2048

		#define VNIC_FNIC_LINK_DOWN_TIMEOUT_MIN 0
		#define VNIC_FNIC_LINK_DOWN_TIMEOUT_MAX 240000

Admin message