Commit d204087a authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "qla2xxx target mode improvements" 

Tony Battersby <tonyb@cybernetics.com> says:

This patch series improves the qla2xxx FC driver in target mode. I
developed these patches using the out-of-tree SCST target-mode
subsystem (https://scst.sourceforge.net/), although most of the
improvements will also apply to the other target-mode subsystems such
as the in-tree LIO.  Unfortunately qla2xxx+LIO does not pass all of my
tests, but my patches do not make it any worse (results below). These
patches have been well-tested at my employer with qla2xxx+SCST in both
initiator mode and target mode and with a variety of FC HBAs and
initiators. Since SCST is out-of-tree, some of the patches have parts
that apply in-tree and other parts that apply out-of-tree to SCST. The
SCST patches can be found in the v2 posting linked above.

All patches apply to linux 6.17 and SCST 3.10 master branch.

Summary of patches:
- bugfixes
- cleanups
- improve handling of aborts and task management requests
- improve log message
- add back SLER / SRR support (removed in 2017)

Some of these patches improve handling of aborts and task management
requests. This is some of the testing that I did:

Test 1: Use /dev/sg to queue random disk I/O with short timeouts; make
sure cmds are aborted successfully.
Test 2: Queue lots of disk I/O, then use "sg_reset -N -d /dev/sg" on
initiator to reset logical unit.
Test 3: Queue lots of disk I/O, then use "sg_reset -N -t /dev/sg" on
initiator to reset target.
Test 4: Queue lots of disk I/O, then use "sg_reset -N -b /dev/sg" on
initiator to reset bus.
Test 5: Queue lots of disk I/O, then use "sg_reset -N -H /dev/sg" on
initiator to reset host.
Test 6: Use fiber channel attenuator to trigger SRR during
write/read/compare test; check data integrity.

With my patches, SCST passes all of these tests.

Results with in-tree LIO target-mode subsystem:

Test 1: Seems to abort the same cmd multiple times (both
qlt_24xx_retry_term_exchange() and __qlt_send_term_exchange()). But
cmds get aborted, so give it a pass?

Test 2: Seems to work; cmds are aborted.

Test 3: Target reset doesn't seem to abort cmds, instead, a few seconds
later:
qla2xxx [0000:04:00.0]-f058:9: qla_target(0): tag 1314312, op 2a: CTIO
with TIMEOUT status 0xb received (state 1, port 51:40:2e:c0:18:1d:9f:cc,
LUN 0)

Tests 4 and 5: The initiator is unable to log back in to the target; the
following messages are repeated over and over on the target:
qla2xxx [0000:04:00.0]-e01c:9: Sending TERM ELS CTIO (ha=00000000f8811390)
qla2xxx [0000:04:00.0]-f097:9: Linking sess 000000008df5aba8 [0] wwn
51:40:2e:c0:18:1d:9f:cc with PLOGI ACK to wwn 51:40:2e:c0:18:1d:9f:cc
s_id 00:00:01, ref=2 pla 00000000835a9271 link 0

Test 6: passes with my patches; SRR not supported previously.

So qla2xxx+LIO seems a bit flaky when handling exceptions, but my
patches do not make it any worse. Perhaps someone who is more familiar
with LIO can look at the difference between LIO and SCST and figure out
how to improve it.

Tony Battersby
https://www.cybernetics.com/

v1: https://lore.kernel.org/r/f8977250-638c-4d7d-ac0c-65f742b8d535@cybernetics.com/
v2: https://lore.kernel.org/linux-scsi/e95ee7d0-3580-4124-b854-7f73ca3a3a84@cybernetics.com/
Link: https://patch.msgid.link/aaea0ab0-da8b-4153-9369-60db7507ff7a@cybernetics.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents ab57a186 4f5eb50f

drivers/scsi/qla2xxx/qla_dbg.c

+2 −1
Original line number Diff line number Diff line
@@ -54,10 +54,11 @@ 
 * | Misc                         |       0xd303       | 0xd031-0xd0ff	|

 * |                              |                    | 0xd101-0xd1fe	|

 * |                              |                    | 0xd214-0xd2fe	|

 * | Target Mode		  |	  0xe081       |		|

 * | Target Mode		  |	  0xe089       |		|

 * | Target Mode Management	  |	  0xf09b       | 0xf002		|

 * |                              |                    | 0xf046-0xf049  |

 * | Target Mode Task Management  |	  0x1000d      |		|

 * | Target Mode SRR		  |	  0x11038      |		|

 * ----------------------------------------------------------------------

 */

drivers/scsi/qla2xxx/qla_def.h

+0 −1
Original line number Diff line number Diff line
@@ -3503,7 +3503,6 @@ struct isp_operations { 
#define QLA_MSIX_RSP_Q			0x01

#define QLA_ATIO_VECTOR		0x02

#define QLA_MSIX_QPAIR_MULTIQ_RSP_Q	0x03

#define QLA_MSIX_QPAIR_MULTIQ_RSP_Q_HS	0x04



#define QLA_MIDX_DEFAULT	0

#define QLA_MIDX_RSP_Q		1

drivers/scsi/qla2xxx/qla_gbl.h

+1 −1
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ extern int qla2x00_dfs_remove(scsi_qla_host_t *); 


/* Globa function prototypes for multi-q */

extern int qla25xx_request_irq(struct qla_hw_data *, struct qla_qpair *,

	struct qla_msix_entry *, int);

	struct qla_msix_entry *);

extern int qla25xx_init_req_que(struct scsi_qla_host *, struct req_que *);

extern int qla25xx_init_rsp_que(struct scsi_qla_host *, struct rsp_que *);

extern int qla25xx_create_req_que(struct qla_hw_data *, uint16_t, uint8_t,

drivers/scsi/qla2xxx/qla_init.c

+1 −0
Original line number Diff line number Diff line
@@ -4369,6 +4369,7 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) 
						ha->max_npiv_vports =

						    MIN_MULTI_ID_FABRIC - 1;

				}

				qlt_config_nvram_with_fw_version(vha);

				qla2x00_get_resource_cnts(vha);

				qla_init_iocb_limit(vha);

drivers/scsi/qla2xxx/qla_isr.c

+3 −29
Original line number Diff line number Diff line
@@ -4467,32 +4467,6 @@ qla2xxx_msix_rsp_q(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



irqreturn_t

qla2xxx_msix_rsp_q_hs(int irq, void *dev_id)

{

	struct qla_hw_data *ha;

	struct qla_qpair *qpair;

	struct device_reg_24xx __iomem *reg;

	unsigned long flags;



	qpair = dev_id;

	if (!qpair) {

		ql_log(ql_log_info, NULL, 0x505b,

		    "%s: NULL response queue pointer.\n", __func__);

		return IRQ_NONE;

	}

	ha = qpair->hw;



	reg = &ha->iobase->isp24;

	spin_lock_irqsave(&ha->hardware_lock, flags);

	wrt_reg_dword(&reg->hccr, HCCRX_CLR_RISC_INT);

	spin_unlock_irqrestore(&ha->hardware_lock, flags);



	queue_work(ha->wq, &qpair->q_work);



	return IRQ_HANDLED;

}



/* Interrupt handling helpers. */



struct qla_init_msix_entry {
@@ -4505,7 +4479,6 @@ static const struct qla_init_msix_entry msix_entries[] = { 
	{ "rsp_q", qla24xx_msix_rsp_q },

	{ "atio_q", qla83xx_msix_atio_q },

	{ "qpair_multiq", qla2xxx_msix_rsp_q },

	{ "qpair_multiq_hs", qla2xxx_msix_rsp_q_hs },

};



static const struct qla_init_msix_entry qla82xx_msix_entries[] = {
@@ -4792,9 +4765,10 @@ qla2x00_free_irqs(scsi_qla_host_t *vha) 
}



int qla25xx_request_irq(struct qla_hw_data *ha, struct qla_qpair *qpair,

	struct qla_msix_entry *msix, int vector_type)

	struct qla_msix_entry *msix)

{

	const struct qla_init_msix_entry *intr = &msix_entries[vector_type];

	const struct qla_init_msix_entry *intr =

		&msix_entries[QLA_MSIX_QPAIR_MULTIQ_RSP_Q];

	scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);

	int ret;