lkml.org 
[lkml]   [2017]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 007/126] zfcp: trace on request for open and close of WKA port
    3.2.85-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Steffen Maier <maier@linux.vnet.ibm.com>

    commit d27a7cb91960cf1fdd11b10071e601828cbf4b1f upstream.

    Since commit a54ca0f62f953898b05549391ac2a8a4dad6482b
    ("[SCSI] zfcp: Redesign of the debug tracing for HBA records.")
    HBA records no longer contain WWPN, D_ID, or LUN
    to reduce duplicate information which is already in REC records.
    In contrast to "regular" target ports, we don't use recovery to open
    WKA ports such as directory/nameserver, so we don't get REC records.
    Therefore, introduce pseudo REC running records without any
    actual recovery action but including D_ID of WKA port on open/close.

    Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com>
    Fixes: a54ca0f62f95 ("[SCSI] zfcp: Redesign of the debug tracing for HBA records.")
    Reviewed-by: Benjamin Block <bblock@linux.vnet.ibm.com>
    Reviewed-by: Hannes Reinecke <hare@suse.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/s390/scsi/zfcp_dbf.c | 32 ++++++++++++++++++++++++++++++++
    drivers/s390/scsi/zfcp_ext.h | 1 +
    drivers/s390/scsi/zfcp_fsf.c | 8 ++++++--
    3 files changed, 39 insertions(+), 2 deletions(-)

    --- a/drivers/s390/scsi/zfcp_dbf.c
    +++ b/drivers/s390/scsi/zfcp_dbf.c
    @@ -314,6 +314,38 @@ void zfcp_dbf_rec_run(char *tag, struct
    spin_unlock_irqrestore(&dbf->rec_lock, flags);
    }

    +/**
    + * zfcp_dbf_rec_run_wka - trace wka port event with info like running recovery
    + * @tag: identifier for event
    + * @wka_port: well known address port
    + * @req_id: request ID to correlate with potential HBA trace record
    + */
    +void zfcp_dbf_rec_run_wka(char *tag, struct zfcp_fc_wka_port *wka_port,
    + u64 req_id)
    +{
    + struct zfcp_dbf *dbf = wka_port->adapter->dbf;
    + struct zfcp_dbf_rec *rec = &dbf->rec_buf;
    + unsigned long flags;
    +
    + spin_lock_irqsave(&dbf->rec_lock, flags);
    + memset(rec, 0, sizeof(*rec));
    +
    + rec->id = ZFCP_DBF_REC_RUN;
    + memcpy(rec->tag, tag, ZFCP_DBF_TAG_LEN);
    + rec->port_status = wka_port->status;
    + rec->d_id = wka_port->d_id;
    + rec->lun = ZFCP_DBF_INVALID_LUN;
    +
    + rec->u.run.fsf_req_id = req_id;
    + rec->u.run.rec_status = ~0;
    + rec->u.run.rec_step = ~0;
    + rec->u.run.rec_action = ~0;
    + rec->u.run.rec_count = ~0;
    +
    + debug_event(dbf->rec, 1, rec, sizeof(*rec));
    + spin_unlock_irqrestore(&dbf->rec_lock, flags);
    +}
    +
    static inline
    void zfcp_dbf_san(char *tag, struct zfcp_dbf *dbf, void *data, u8 id, u16 len,
    u64 req_id, u32 d_id)
    --- a/drivers/s390/scsi/zfcp_ext.h
    +++ b/drivers/s390/scsi/zfcp_ext.h
    @@ -49,6 +49,7 @@ extern void zfcp_dbf_adapter_unregister(
    extern void zfcp_dbf_rec_trig(char *, struct zfcp_adapter *,
    struct zfcp_port *, struct scsi_device *, u8, u8);
    extern void zfcp_dbf_rec_run(char *, struct zfcp_erp_action *);
    +extern void zfcp_dbf_rec_run_wka(char *, struct zfcp_fc_wka_port *, u64);
    extern void zfcp_dbf_hba_fsf_uss(char *, struct zfcp_fsf_req *);
    extern void zfcp_dbf_hba_fsf_res(char *, int, struct zfcp_fsf_req *);
    extern void zfcp_dbf_hba_bit_err(char *, struct zfcp_fsf_req *);
    --- a/drivers/s390/scsi/zfcp_fsf.c
    +++ b/drivers/s390/scsi/zfcp_fsf.c
    @@ -1575,7 +1575,7 @@ out:
    int zfcp_fsf_open_wka_port(struct zfcp_fc_wka_port *wka_port)
    {
    struct zfcp_qdio *qdio = wka_port->adapter->qdio;
    - struct zfcp_fsf_req *req;
    + struct zfcp_fsf_req *req = NULL;
    int retval = -EIO;

    spin_lock_irq(&qdio->req_q_lock);
    @@ -1604,6 +1604,8 @@ int zfcp_fsf_open_wka_port(struct zfcp_f
    zfcp_fsf_req_free(req);
    out:
    spin_unlock_irq(&qdio->req_q_lock);
    + if (req && !IS_ERR(req))
    + zfcp_dbf_rec_run_wka("fsowp_1", wka_port, req->req_id);
    return retval;
    }

    @@ -1628,7 +1630,7 @@ static void zfcp_fsf_close_wka_port_hand
    int zfcp_fsf_close_wka_port(struct zfcp_fc_wka_port *wka_port)
    {
    struct zfcp_qdio *qdio = wka_port->adapter->qdio;
    - struct zfcp_fsf_req *req;
    + struct zfcp_fsf_req *req = NULL;
    int retval = -EIO;

    spin_lock_irq(&qdio->req_q_lock);
    @@ -1657,6 +1659,8 @@ int zfcp_fsf_close_wka_port(struct zfcp_
    zfcp_fsf_req_free(req);
    out:
    spin_unlock_irq(&qdio->req_q_lock);
    + if (req && !IS_ERR(req))
    + zfcp_dbf_rec_run_wka("fscwp_1", wka_port, req->req_id);
    return retval;
    }

    \
     
     \ /
      Last update: 2017-02-15 23:51    [W:2.930 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site