scsi: libfc: sanitize E_D_TOV and R_A_TOV setting

When setting the FCP timeout we need to ensure a lower boundary
for E_D_TOV and R_A_TOV, otherwise we'd be getting spurious I/O
issues due to the fcp timer firing too early.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 9f9eb7b0ba2d56d7c124cd3aa333356c0d335123..10faca2686bad05a23278099b13bd3fc9315d3da 100644 (file)
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -1137,8 +1137,11 @@ static int fc_fcp_pkt_send(struct fc_lport *lport, struct fc_fcp_pkt *fsp)
 static inline unsigned int get_fsp_rec_tov(struct fc_fcp_pkt *fsp)
 {
        struct fc_rport_libfc_priv *rpriv = fsp->rport->dd_data;
+       unsigned int e_d_tov = FC_DEF_E_D_TOV;
 
-       return msecs_to_jiffies(rpriv->e_d_tov) + HZ;
+       if (rpriv && rpriv->e_d_tov > e_d_tov)
+               e_d_tov = rpriv->e_d_tov;
+       return msecs_to_jiffies(e_d_tov) + HZ;
 }
 
 /**
@@ -1693,7 +1696,6 @@ static void fc_fcp_srr(struct fc_fcp_pkt *fsp, enum fc_rctl r_ctl, u32 offset)
        struct fc_seq *seq;
        struct fcp_srr *srr;
        struct fc_frame *fp;
-       unsigned int rec_tov;
 
        rport = fsp->rport;
        rpriv = rport->dd_data;
@@ -1717,10 +1719,9 @@ static void fc_fcp_srr(struct fc_fcp_pkt *fsp, enum fc_rctl r_ctl, u32 offset)
                       rpriv->local_port->port_id, FC_TYPE_FCP,
                       FC_FCTL_REQ, 0);
 
-       rec_tov = get_fsp_rec_tov(fsp);
        seq = lport->tt.exch_seq_send(lport, fp, fc_fcp_srr_resp,
                                      fc_fcp_pkt_destroy,
-                                     fsp, jiffies_to_msecs(rec_tov));
+                                     fsp, get_fsp_rec_tov(fsp));
        if (!seq)
                goto retry;
 

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 4e11c90c783c6acc46fb122569904f9c09801362..81ad8ac5a33dbdac15238354b9b82252cf1aefbf 100644 (file)
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -1777,7 +1777,7 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
        if ((csp_flags & FC_SP_FT_FPORT) == 0) {
                if (e_d_tov > lport->e_d_tov)
                        lport->e_d_tov = e_d_tov;
-               lport->r_a_tov = 2 * e_d_tov;
+               lport->r_a_tov = 2 * lport->e_d_tov;
                fc_lport_set_port_id(lport, did, fp);
                printk(KERN_INFO "host%d: libfc: "
                       "Port (%6.6x) entered "
@@ -1789,8 +1789,10 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
                                   get_unaligned_be64(
                                           &flp->fl_wwnn));
        } else {
-               lport->e_d_tov = e_d_tov;
-               lport->r_a_tov = r_a_tov;
+               if (e_d_tov > lport->e_d_tov)
+                       lport->e_d_tov = e_d_tov;
+               if (r_a_tov > lport->r_a_tov)
+                       lport->r_a_tov = r_a_tov;
                fc_host_fabric_name(lport->host) =
                        get_unaligned_be64(&flp->fl_wwnn);
                fc_lport_set_port_id(lport, did, fp);

diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index bb7e9d9a31790fee8de85c1ba6fa61fdbad638ba..3d2baba4103e69bf04c32d25de562765cbe5e015 100644 (file)
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -1296,13 +1296,15 @@ static void fc_rport_rtv_resp(struct fc_seq *sp, struct fc_frame *fp,
                        tov = ntohl(rtv->rtv_r_a_tov);
                        if (tov == 0)
                                tov = 1;
-                       rdata->r_a_tov = tov;
+                       if (tov > rdata->r_a_tov)
+                               rdata->r_a_tov = tov;
                        tov = ntohl(rtv->rtv_e_d_tov);
                        if (toq & FC_ELS_RTV_EDRES)
                                tov /= 1000000;
                        if (tov == 0)
                                tov = 1;
-                       rdata->e_d_tov = tov;
+                       if (tov > rdata->e_d_tov)
+                               rdata->e_d_tov = tov;
                }
        }