scsi: zfcp: Move shost updates during xconfig data handling into fenced function

When executing exchange config data for a FCP device for the first time, or
after an adapter recovery, we update several properties of the scsi host or
fibre channel host object that represent that FCP device.

When moving the scsi host object allocation and registration - and thus
also the fibre channel host object allocation - to after the first exchange
config and exchange port data, this is not possible for the former case.

Move all these update into separate, and fenced function that first checks
whether the scsi host object already exists or not, before making the
updates.

During the first ever exchange config data in the adapter life cycle this
will make the exchange config data handler skip over this update step, but
we can repeat it later, after we allocated the scsi host object.

For any further recovery of that adapter the work flow is only changed
slightly because then the scsi host object already exists and we don't free
it until we release the adapter completely at the end of its life cycle.

Link: https://lore.kernel.org/r/5fc3f4d38d4334f7aa595497c6f7865fb1102e0f.1588956679.git.bblock@linux.ibm.com
Reviewed-by: Steffen Maier <maier@linux.ibm.com>
Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index d67f31b9b8599658185565fd59b1520e044f280d..4c4be754cf6e31def077f9b3634e8a942040ba72 100644 (file)
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -125,6 +125,7 @@ extern int zfcp_fsf_exchange_config_data_sync(struct zfcp_qdio *,
 extern int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *);
 extern int zfcp_fsf_exchange_port_data_sync(struct zfcp_qdio *,
                                            struct fsf_qtcb_bottom_port *);
+extern u32 zfcp_fsf_convert_portspeed(u32 fsf_speed);
 extern void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *);
 extern int zfcp_fsf_status_read(struct zfcp_qdio *);
 extern int zfcp_status_read_refill(struct zfcp_adapter *adapter);
@@ -171,6 +172,10 @@ extern void zfcp_scsi_schedule_rport_block(struct zfcp_port *);
 extern void zfcp_scsi_schedule_rports_block(struct zfcp_adapter *);
 extern void zfcp_scsi_set_prot(struct zfcp_adapter *);
 extern void zfcp_scsi_dif_sense_error(struct scsi_cmnd *, int);
+extern void zfcp_scsi_shost_update_config_data(
+       struct zfcp_adapter *const adapter,
+       const struct fsf_qtcb_bottom_config *const bottom,
+       const bool bottom_incomplete);
 
 /* zfcp_sysfs.c */
 extern const struct attribute_group *zfcp_unit_attr_groups[];

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 111fe3fc32d7600e97ad06c6c389909c0ab90932..54edfcbe84ce33b370c04ffe381af359c9979b65 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -479,7 +479,7 @@ void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *adapter)
 #define ZFCP_FSF_PORTSPEED_128GBIT     (1 <<  8)
 #define ZFCP_FSF_PORTSPEED_NOT_NEGOTIATED (1 << 15)
 
-static u32 zfcp_fsf_convert_portspeed(u32 fsf_speed)
+u32 zfcp_fsf_convert_portspeed(u32 fsf_speed)
 {
        u32 fdmi_speed = 0;
        if (fsf_speed & ZFCP_FSF_PORTSPEED_1GBIT)
@@ -509,64 +509,36 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)
 {
        struct fsf_qtcb_bottom_config *bottom = &req->qtcb->bottom.config;
        struct zfcp_adapter *adapter = req->adapter;
-       struct Scsi_Host *shost = adapter->scsi_host;
-       struct fc_els_flogi *nsp, *plogi;
+       struct fc_els_flogi *plogi;
 
        /* adjust pointers for missing command code */
-       nsp = (struct fc_els_flogi *) ((u8 *)&bottom->nport_serv_param
-                                       - sizeof(u32));
        plogi = (struct fc_els_flogi *) ((u8 *)&bottom->plogi_payload
                                        - sizeof(u32));
 
        if (req->data)
                memcpy(req->data, bottom, sizeof(*bottom));
 
-       snprintf(fc_host_manufacturer(shost), FC_SERIAL_NUMBER_SIZE, "%s",
-                "IBM");
-       fc_host_port_name(shost) = be64_to_cpu(nsp->fl_wwpn);
-       fc_host_node_name(shost) = be64_to_cpu(nsp->fl_wwnn);
-       fc_host_supported_classes(shost) = FC_COS_CLASS2 | FC_COS_CLASS3;
-
        adapter->timer_ticks = bottom->timer_interval & ZFCP_FSF_TIMER_INT_MASK;
        adapter->stat_read_buf_num = max(bottom->status_read_buf_num,
                                         (u16)FSF_STATUS_READS_RECOM);
 
-       zfcp_scsi_set_prot(adapter);
-
        /* no error return above here, otherwise must fix call chains */
        /* do not evaluate invalid fields */
        if (req->qtcb->header.fsf_status == FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE)
                return 0;
 
-       fc_host_port_id(shost) = ntoh24(bottom->s_id);
-       fc_host_speed(shost) =
-               zfcp_fsf_convert_portspeed(bottom->fc_link_speed);
-
        adapter->hydra_version = bottom->adapter_type;
-       snprintf(fc_host_model(shost), FC_SYMBOLIC_NAME_SIZE, "0x%04x",
-                bottom->adapter_type);
 
        switch (bottom->fc_topology) {
        case FSF_TOPO_P2P:
                adapter->peer_d_id = ntoh24(bottom->peer_d_id);
                adapter->peer_wwpn = be64_to_cpu(plogi->fl_wwpn);
                adapter->peer_wwnn = be64_to_cpu(plogi->fl_wwnn);
-               fc_host_port_type(shost) = FC_PORTTYPE_PTP;
-               fc_host_fabric_name(shost) = 0;
                break;
        case FSF_TOPO_FABRIC:
-               fc_host_fabric_name(shost) = be64_to_cpu(plogi->fl_wwnn);
-               if (bottom->connection_features & FSF_FEATURE_NPIV_MODE)
-                       fc_host_port_type(shost) = FC_PORTTYPE_NPIV;
-               else
-                       fc_host_port_type(shost) = FC_PORTTYPE_NPORT;
                break;
        case FSF_TOPO_AL:
-               fc_host_port_type(shost) = FC_PORTTYPE_NLPORT;
-               fc_host_fabric_name(shost) = 0;
-               fallthrough;
        default:
-               fc_host_fabric_name(shost) = 0;
                dev_err(&adapter->ccw_device->dev,
                        "Unknown or unsupported arbitrated loop "
                        "fibre channel topology detected\n");
@@ -584,13 +556,10 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
                &adapter->diagnostics->config_data.header;
        struct fsf_qtcb *qtcb = req->qtcb;
        struct fsf_qtcb_bottom_config *bottom = &qtcb->bottom.config;
-       struct Scsi_Host *shost = adapter->scsi_host;
 
        if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
                return;
 
-       snprintf(fc_host_firmware_version(shost), FC_VERSION_STRING_SIZE,
-                "0x%08x", bottom->lic_version);
        adapter->fsf_lic_version = bottom->lic_version;
        adapter->adapter_features = bottom->adapter_features;
        adapter->connection_features = bottom->connection_features;
@@ -606,6 +575,7 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
                 */
                zfcp_diag_update_xdata(diag_hdr, bottom, false);
 
+               zfcp_scsi_shost_update_config_data(adapter, bottom, false);
                if (zfcp_fsf_exchange_config_evaluate(req))
                        return;
 
@@ -630,6 +600,8 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
                                &adapter->status);
                zfcp_fsf_link_down_info_eval(req,
                        &qtcb->header.fsf_status_qual.link_down_info);
+
+               zfcp_scsi_shost_update_config_data(adapter, bottom, true);
                if (zfcp_fsf_exchange_config_evaluate(req))
                        return;
                break;
@@ -638,16 +610,8 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
                return;
        }
 
-       if (adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT) {
+       if (adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT)
                adapter->hardware_version = bottom->hardware_version;
-               snprintf(fc_host_hardware_version(shost),
-                        FC_VERSION_STRING_SIZE,
-                        "0x%08x", bottom->hardware_version);
-               memcpy(fc_host_serial_number(shost), bottom->serial_number,
-                      min(FC_SERIAL_NUMBER_SIZE, 17));
-               EBCASC(fc_host_serial_number(shost),
-                      min(FC_SERIAL_NUMBER_SIZE, 17));
-       }
 
        if (FSF_QTCB_CURRENT_VERSION < bottom->low_qtcb_version) {
                dev_err(&adapter->ccw_device->dev,

diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 13d873f806e4afffec83c370fc3b7f406786210d..e1281a1ce48832ea88fe0cbe62c147391128a0e8 100644 (file)
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -4,7 +4,7 @@
  *
  * Interface to Linux SCSI midlayer.
  *
- * Copyright IBM Corp. 2002, 2018
+ * Copyright IBM Corp. 2002, 2020
  */
 
 #define KMSG_COMPONENT "zfcp"
@@ -841,6 +841,76 @@ void zfcp_scsi_dif_sense_error(struct scsi_cmnd *scmd, int ascq)
        set_host_byte(scmd, DID_SOFT_ERROR);
 }
 
+void zfcp_scsi_shost_update_config_data(
+       struct zfcp_adapter *const adapter,
+       const struct fsf_qtcb_bottom_config *const bottom,
+       const bool bottom_incomplete)
+{
+       struct Scsi_Host *const shost = adapter->scsi_host;
+       const struct fc_els_flogi *nsp, *plogi;
+
+       if (shost == NULL)
+               return;
+
+       snprintf(fc_host_firmware_version(shost), FC_VERSION_STRING_SIZE,
+                "0x%08x", bottom->lic_version);
+
+       if (adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT) {
+               snprintf(fc_host_hardware_version(shost),
+                        FC_VERSION_STRING_SIZE,
+                        "0x%08x", bottom->hardware_version);
+               memcpy(fc_host_serial_number(shost), bottom->serial_number,
+                      min(FC_SERIAL_NUMBER_SIZE, 17));
+               EBCASC(fc_host_serial_number(shost),
+                      min(FC_SERIAL_NUMBER_SIZE, 17));
+       }
+
+       /* adjust pointers for missing command code */
+       nsp = (struct fc_els_flogi *) ((u8 *)&bottom->nport_serv_param
+                                       - sizeof(u32));
+       plogi = (struct fc_els_flogi *) ((u8 *)&bottom->plogi_payload
+                                       - sizeof(u32));
+
+       snprintf(fc_host_manufacturer(shost), FC_SERIAL_NUMBER_SIZE, "%s",
+                "IBM");
+       fc_host_port_name(shost) = be64_to_cpu(nsp->fl_wwpn);
+       fc_host_node_name(shost) = be64_to_cpu(nsp->fl_wwnn);
+       fc_host_supported_classes(shost) = FC_COS_CLASS2 | FC_COS_CLASS3;
+
+       zfcp_scsi_set_prot(adapter);
+
+       /* do not evaluate invalid fields */
+       if (bottom_incomplete)
+               return;
+
+       fc_host_port_id(shost) = ntoh24(bottom->s_id);
+       fc_host_speed(shost) =
+               zfcp_fsf_convert_portspeed(bottom->fc_link_speed);
+
+       snprintf(fc_host_model(shost), FC_SYMBOLIC_NAME_SIZE, "0x%04x",
+                bottom->adapter_type);
+
+       switch (bottom->fc_topology) {
+       case FSF_TOPO_P2P:
+               fc_host_port_type(shost) = FC_PORTTYPE_PTP;
+               fc_host_fabric_name(shost) = 0;
+               break;
+       case FSF_TOPO_FABRIC:
+               fc_host_fabric_name(shost) = be64_to_cpu(plogi->fl_wwnn);
+               if (bottom->connection_features & FSF_FEATURE_NPIV_MODE)
+                       fc_host_port_type(shost) = FC_PORTTYPE_NPIV;
+               else
+                       fc_host_port_type(shost) = FC_PORTTYPE_NPORT;
+               break;
+       case FSF_TOPO_AL:
+               fc_host_port_type(shost) = FC_PORTTYPE_NLPORT;
+               fallthrough;
+       default:
+               fc_host_fabric_name(shost) = 0;
+               break;
+       }
+}
+
 struct fc_function_template zfcp_transport_functions = {
        .show_starget_port_id = 1,
        .show_starget_port_name = 1,