Skip to content

Commit 821d6e5

Browse files
Vikas ChaudharyJames Bottomley
Vikas Chaudhary
authored and
James Bottomley
committed
[SCSI] qla4xxx: do not retry login to CHAP auth failed targets
Per RFC 3720, Login Response Status Code 0x02 should not be retried. Condensed connection error checking code to a single routine, and added check for status class 0x02. Signed-off-by: Karen Higgins <karen.higgins@qlogic.com> Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Signed-off-by: Ravi Anand <ravi.anand@qlogic.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
1 parent c301b02 commit 821d6e5

File tree

3 files changed

+94
-43
lines changed

3 files changed

+94
-43
lines changed

‎drivers/scsi/qla4xxx/ql4_glbl.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,12 @@ struct srb * qla4xxx_del_from_active_array(struct scsi_qla_host *ha,
6767
uint32_t index);
6868
void qla4xxx_srb_compl(struct scsi_qla_host *ha, struct srb *srb);
6969
int qla4xxx_reinitialize_ddb_list(struct scsi_qla_host * ha);
70-
int qla4xxx_process_ddb_changed(struct scsi_qla_host * ha,
71-
uint32_t fw_ddb_index, uint32_t state);
70+
int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
71+
uint32_t state, uint32_t conn_error);
7272
void qla4xxx_dump_buffer(void *b, uint32_t size);
7373
int qla4xxx_send_marker_iocb(struct scsi_qla_host *ha,
7474
struct ddb_entry *ddb_entry, int lun, uint16_t mrkr_mod);
75+
int qla4_is_relogin_allowed(struct scsi_qla_host *ha, uint32_t conn_err);
7576

7677
extern int ql4xextended_error_logging;
7778
extern int ql4xdiscoverywait;

‎drivers/scsi/qla4xxx/ql4_init.c

Lines changed: 90 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,7 @@ static int qla4xxx_update_ddb_entry(struct scsi_qla_host *ha,
505505
struct dev_db_entry *fw_ddb_entry = NULL;
506506
dma_addr_t fw_ddb_entry_dma;
507507
int status = QLA_ERROR;
508+
uint32_t conn_err;
508509

509510
if (ddb_entry == NULL) {
510511
DEBUG2(printk("scsi%ld: %s: ddb_entry is NULL\n", ha->host_no,
@@ -525,7 +526,7 @@ static int qla4xxx_update_ddb_entry(struct scsi_qla_host *ha,
525526

526527
if (qla4xxx_get_fwddb_entry(ha, fw_ddb_index, fw_ddb_entry,
527528
fw_ddb_entry_dma, NULL, NULL,
528-
&ddb_entry->fw_ddb_device_state, NULL,
529+
&ddb_entry->fw_ddb_device_state, &conn_err,
529530
&ddb_entry->tcp_source_port_num,
530531
&ddb_entry->connection_id) ==
531532
QLA_ERROR) {
@@ -578,12 +579,26 @@ static int qla4xxx_update_ddb_entry(struct scsi_qla_host *ha,
578579
fw_ddb_entry->link_local_ipv6_addr,
579580
min(sizeof(ddb_entry->link_local_ipv6_addr),
580581
sizeof(fw_ddb_entry->link_local_ipv6_addr)));
581-
}
582-
583-
DEBUG2(printk("scsi%ld: %s: ddb[%d] - State= %x status= %d.\n",
584-
ha->host_no, __func__, fw_ddb_index,
585-
ddb_entry->fw_ddb_device_state, status));
586582

583+
DEBUG2(dev_info(&ha->pdev->dev, "%s: DDB[%d] osIdx = %d "
584+
"State %04x ConnErr %08x IP %pI6 "
585+
":%04d \"%s\"\n",
586+
__func__, fw_ddb_index,
587+
ddb_entry->os_target_id,
588+
ddb_entry->fw_ddb_device_state,
589+
conn_err, fw_ddb_entry->ip_addr,
590+
le16_to_cpu(fw_ddb_entry->port),
591+
fw_ddb_entry->iscsi_name));
592+
} else
593+
DEBUG2(dev_info(&ha->pdev->dev, "%s: DDB[%d] osIdx = %d "
594+
"State %04x ConnErr %08x IP %pI4 "
595+
":%04d \"%s\"\n",
596+
__func__, fw_ddb_index,
597+
ddb_entry->os_target_id,
598+
ddb_entry->fw_ddb_device_state,
599+
conn_err, fw_ddb_entry->ip_addr,
600+
le16_to_cpu(fw_ddb_entry->port),
601+
fw_ddb_entry->iscsi_name));
587602
exit_update_ddb:
588603
if (fw_ddb_entry)
589604
dma_free_coherent(&ha->pdev->dev, sizeof(*fw_ddb_entry),
@@ -629,6 +644,40 @@ static struct ddb_entry * qla4xxx_alloc_ddb(struct scsi_qla_host *ha,
629644
return ddb_entry;
630645
}
631646

647+
/**
648+
* qla4_is_relogin_allowed - Are we allowed to login?
649+
* @ha: Pointer to host adapter structure.
650+
* @conn_err: Last connection error associated with the ddb
651+
*
652+
* This routine tests the given connection error to determine if
653+
* we are allowed to login.
654+
**/
655+
int qla4_is_relogin_allowed(struct scsi_qla_host *ha, uint32_t conn_err)
656+
{
657+
uint32_t err_code, login_rsp_sts_class;
658+
int relogin = 1;
659+
660+
err_code = ((conn_err & 0x00ff0000) >> 16);
661+
login_rsp_sts_class = ((conn_err & 0x0000ff00) >> 8);
662+
if (err_code == 0x1c || err_code == 0x06) {
663+
DEBUG2(dev_info(&ha->pdev->dev,
664+
": conn_err=0x%08x, send target completed"
665+
" or access denied failure\n", conn_err));
666+
relogin = 0;
667+
}
668+
if ((err_code == 0x08) && (login_rsp_sts_class == 0x02)) {
669+
/* Login Response PDU returned an error.
670+
Login Response Status in Error Code Detail
671+
indicates login should not be retried.*/
672+
DEBUG2(dev_info(&ha->pdev->dev,
673+
": conn_err=0x%08x, do not retry relogin\n",
674+
conn_err));
675+
relogin = 0;
676+
}
677+
678+
return relogin;
679+
}
680+
632681
/**
633682
* qla4xxx_configure_ddbs - builds driver ddb list
634683
* @ha: Pointer to host adapter structure.
@@ -643,18 +692,30 @@ static int qla4xxx_build_ddb_list(struct scsi_qla_host *ha)
643692
uint32_t fw_ddb_index = 0;
644693
uint32_t next_fw_ddb_index = 0;
645694
uint32_t ddb_state;
646-
uint32_t conn_err, err_code;
695+
uint32_t conn_err;
647696
struct ddb_entry *ddb_entry;
697+
struct dev_db_entry *fw_ddb_entry = NULL;
698+
dma_addr_t fw_ddb_entry_dma;
699+
uint32_t ipv6_device;
648700
uint32_t new_tgt;
649701

702+
fw_ddb_entry = dma_alloc_coherent(&ha->pdev->dev, sizeof(*fw_ddb_entry),
703+
&fw_ddb_entry_dma, GFP_KERNEL);
704+
if (fw_ddb_entry == NULL) {
705+
DEBUG2(dev_info(&ha->pdev->dev, "%s: DMA alloc failed\n",
706+
__func__));
707+
return QLA_ERROR;
708+
}
709+
650710
dev_info(&ha->pdev->dev, "Initializing DDBs ...\n");
651711
for (fw_ddb_index = 0; fw_ddb_index < MAX_DDB_ENTRIES;
652712
fw_ddb_index = next_fw_ddb_index) {
653713
/* First, let's see if a device exists here */
654-
if (qla4xxx_get_fwddb_entry(ha, fw_ddb_index, NULL, 0, NULL,
655-
&next_fw_ddb_index, &ddb_state,
656-
&conn_err, NULL, NULL) ==
657-
QLA_ERROR) {
714+
if (qla4xxx_get_fwddb_entry(ha, fw_ddb_index, fw_ddb_entry,
715+
0, NULL, &next_fw_ddb_index,
716+
&ddb_state, &conn_err,
717+
NULL, NULL) ==
718+
QLA_ERROR) {
658719
DEBUG2(printk("scsi%ld: %s: get_ddb_entry, "
659720
"fw_ddb_index %d failed", ha->host_no,
660721
__func__, fw_ddb_index));
@@ -671,18 +732,19 @@ static int qla4xxx_build_ddb_list(struct scsi_qla_host *ha)
671732
/* Try and login to device */
672733
DEBUG2(printk("scsi%ld: %s: Login to DDB[%d]\n",
673734
ha->host_no, __func__, fw_ddb_index));
674-
err_code = ((conn_err & 0x00ff0000) >> 16);
675-
if (err_code == 0x1c || err_code == 0x06) {
676-
DEBUG2(printk("scsi%ld: %s send target "
677-
"completed "
678-
"or access denied failure\n",
679-
ha->host_no, __func__));
680-
} else {
735+
ipv6_device = le16_to_cpu(fw_ddb_entry->options) &
736+
DDB_OPT_IPV6_DEVICE;
737+
if (qla4_is_relogin_allowed(ha, conn_err) &&
738+
((!ipv6_device &&
739+
*((uint32_t *)fw_ddb_entry->ip_addr))
740+
|| ipv6_device)) {
681741
qla4xxx_set_ddb_entry(ha, fw_ddb_index, 0);
682742
if (qla4xxx_get_fwddb_entry(ha, fw_ddb_index,
683-
NULL, 0, NULL, &next_fw_ddb_index,
684-
&ddb_state, &conn_err, NULL, NULL)
685-
== QLA_ERROR) {
743+
NULL, 0, NULL,
744+
&next_fw_ddb_index,
745+
&ddb_state, &conn_err,
746+
NULL, NULL)
747+
== QLA_ERROR) {
686748
DEBUG2(printk("scsi%ld: %s:"
687749
"get_ddb_entry %d failed\n",
688750
ha->host_no,
@@ -737,7 +799,6 @@ static int qla4xxx_build_ddb_list(struct scsi_qla_host *ha)
737799
struct qla4_relog_scan {
738800
int halt_wait;
739801
uint32_t conn_err;
740-
uint32_t err_code;
741802
uint32_t fw_ddb_index;
742803
uint32_t next_fw_ddb_index;
743804
uint32_t fw_ddb_device_state;
@@ -747,18 +808,7 @@ static int qla4_test_rdy(struct scsi_qla_host *ha, struct qla4_relog_scan *rs)
747808
{
748809
struct ddb_entry *ddb_entry;
749810

750-
/*
751-
* Don't want to do a relogin if connection
752-
* error is 0x1c.
753-
*/
754-
rs->err_code = ((rs->conn_err & 0x00ff0000) >> 16);
755-
if (rs->err_code == 0x1c || rs->err_code == 0x06) {
756-
DEBUG2(printk(
757-
"scsi%ld: %s send target"
758-
" completed or "
759-
"access denied failure\n",
760-
ha->host_no, __func__));
761-
} else {
811+
if (qla4_is_relogin_allowed(ha, rs->conn_err)) {
762812
/* We either have a device that is in
763813
* the process of relogging in or a
764814
* device that is waiting to be
@@ -1411,8 +1461,8 @@ static void qla4xxx_add_device_dynamically(struct scsi_qla_host *ha,
14111461
*
14121462
* This routine processes a Decive Database Changed AEN Event.
14131463
**/
1414-
int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha,
1415-
uint32_t fw_ddb_index, uint32_t state)
1464+
int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
1465+
uint32_t state, uint32_t conn_err)
14161466
{
14171467
struct ddb_entry * ddb_entry;
14181468
uint32_t old_fw_ddb_device_state;
@@ -1470,21 +1520,21 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha,
14701520

14711521
/*
14721522
* Relogin if device state changed to a not active state.
1473-
* However, do not relogin if this aen is a result of an IOCTL
1474-
* logout (DF_NO_RELOGIN) or if this is a discovered device.
1523+
* However, do not relogin if a RELOGIN is in process, or
1524+
* we are not allowed to relogin to this DDB.
14751525
*/
14761526
if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED &&
14771527
!test_bit(DF_RELOGIN, &ddb_entry->flags) &&
14781528
!test_bit(DF_NO_RELOGIN, &ddb_entry->flags) &&
1479-
!test_bit(DF_ISNS_DISCOVERED, &ddb_entry->flags)) {
1529+
qla4_is_relogin_allowed(ha, conn_err)) {
14801530
/*
14811531
* This triggers a relogin. After the relogin_timer
14821532
* expires, the relogin gets scheduled. We must wait a
14831533
* minimum amount of time since receiving an 0x8014 AEN
14841534
* with failed device_state or a logout response before
14851535
* we can issue another relogin.
14861536
*/
1487-
/* Firmware padds this timeout: (time2wait +1).
1537+
/* Firmware pads this timeout: (time2wait +1).
14881538
* Driver retry to login should be longer than F/W.
14891539
* Otherwise F/W will fail
14901540
* set_ddb() mbx cmd with 0x4005 since it still

‎drivers/scsi/qla4xxx/ql4_isr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ void qla4xxx_process_aen(struct scsi_qla_host * ha, uint8_t process_aen)
838838
qla4xxx_reinitialize_ddb_list(ha);
839839
} else if (mbox_sts[1] == 1) { /* Specific device. */
840840
qla4xxx_process_ddb_changed(ha, mbox_sts[2],
841-
mbox_sts[3]);
841+
mbox_sts[3], mbox_sts[4]);
842842
}
843843
break;
844844
}

0 commit comments

Comments
 (0)