lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0083/1126] scsi: scsi_transport_fc: Fix FPIN Link Integrity statistics counters
    Date
    From: James Smart <jsmart2021@gmail.com>

    commit 07e0984b96ec1ba8c6de1c092b986b00ea0c114c upstream.

    In the original FPIN commit, stats were incremented by the event_count.
    Event_count is the minimum # of events that must occur before an FPIN is
    sent. Thus, its not the actual number of events, and could be significantly
    off (too low) as it doesn't reflect anything not reported. Rather than
    attempt to count events, have the statistic count how many FPINS cross the
    threshold and were reported.

    Link: https://lore.kernel.org/r/20220301175536.60250-1-jsmart2021@gmail.com
    Fixes: 3dcfe0de5a97 ("scsi: fc: Parse FPIN packets and update statistics")
    Cc: <stable@vger.kernel.org> # v5.11+
    Cc: Shyam Sundar <ssundar@marvell.com>
    Cc: Nilesh Javali <njavali@marvell.com>
    Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
    Signed-off-by: James Smart <jsmart2021@gmail.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/scsi/scsi_transport_fc.c | 39 ++++++++++++++++-----------------------
    1 file changed, 16 insertions(+), 23 deletions(-)

    --- a/drivers/scsi/scsi_transport_fc.c
    +++ b/drivers/scsi/scsi_transport_fc.c
    @@ -34,7 +34,7 @@ static int fc_bsg_hostadd(struct Scsi_Ho
    static int fc_bsg_rportadd(struct Scsi_Host *, struct fc_rport *);
    static void fc_bsg_remove(struct request_queue *);
    static void fc_bsg_goose_queue(struct fc_rport *);
    -static void fc_li_stats_update(struct fc_fn_li_desc *li_desc,
    +static void fc_li_stats_update(u16 event_type,
    struct fc_fpin_stats *stats);
    static void fc_delivery_stats_update(u32 reason_code,
    struct fc_fpin_stats *stats);
    @@ -670,42 +670,34 @@ fc_find_rport_by_wwpn(struct Scsi_Host *
    EXPORT_SYMBOL(fc_find_rport_by_wwpn);

    static void
    -fc_li_stats_update(struct fc_fn_li_desc *li_desc,
    +fc_li_stats_update(u16 event_type,
    struct fc_fpin_stats *stats)
    {
    - stats->li += be32_to_cpu(li_desc->event_count);
    - switch (be16_to_cpu(li_desc->event_type)) {
    + stats->li++;
    + switch (event_type) {
    case FPIN_LI_UNKNOWN:
    - stats->li_failure_unknown +=
    - be32_to_cpu(li_desc->event_count);
    + stats->li_failure_unknown++;
    break;
    case FPIN_LI_LINK_FAILURE:
    - stats->li_link_failure_count +=
    - be32_to_cpu(li_desc->event_count);
    + stats->li_link_failure_count++;
    break;
    case FPIN_LI_LOSS_OF_SYNC:
    - stats->li_loss_of_sync_count +=
    - be32_to_cpu(li_desc->event_count);
    + stats->li_loss_of_sync_count++;
    break;
    case FPIN_LI_LOSS_OF_SIG:
    - stats->li_loss_of_signals_count +=
    - be32_to_cpu(li_desc->event_count);
    + stats->li_loss_of_signals_count++;
    break;
    case FPIN_LI_PRIM_SEQ_ERR:
    - stats->li_prim_seq_err_count +=
    - be32_to_cpu(li_desc->event_count);
    + stats->li_prim_seq_err_count++;
    break;
    case FPIN_LI_INVALID_TX_WD:
    - stats->li_invalid_tx_word_count +=
    - be32_to_cpu(li_desc->event_count);
    + stats->li_invalid_tx_word_count++;
    break;
    case FPIN_LI_INVALID_CRC:
    - stats->li_invalid_crc_count +=
    - be32_to_cpu(li_desc->event_count);
    + stats->li_invalid_crc_count++;
    break;
    case FPIN_LI_DEVICE_SPEC:
    - stats->li_device_specific +=
    - be32_to_cpu(li_desc->event_count);
    + stats->li_device_specific++;
    break;
    }
    }
    @@ -767,6 +759,7 @@ fc_fpin_li_stats_update(struct Scsi_Host
    struct fc_rport *attach_rport = NULL;
    struct fc_host_attrs *fc_host = shost_to_fc_host(shost);
    struct fc_fn_li_desc *li_desc = (struct fc_fn_li_desc *)tlv;
    + u16 event_type = be16_to_cpu(li_desc->event_type);
    u64 wwpn;

    rport = fc_find_rport_by_wwpn(shost,
    @@ -775,7 +768,7 @@ fc_fpin_li_stats_update(struct Scsi_Host
    (rport->roles & FC_PORT_ROLE_FCP_TARGET ||
    rport->roles & FC_PORT_ROLE_NVME_TARGET)) {
    attach_rport = rport;
    - fc_li_stats_update(li_desc, &attach_rport->fpin_stats);
    + fc_li_stats_update(event_type, &attach_rport->fpin_stats);
    }

    if (be32_to_cpu(li_desc->pname_count) > 0) {
    @@ -789,14 +782,14 @@ fc_fpin_li_stats_update(struct Scsi_Host
    rport->roles & FC_PORT_ROLE_NVME_TARGET)) {
    if (rport == attach_rport)
    continue;
    - fc_li_stats_update(li_desc,
    + fc_li_stats_update(event_type,
    &rport->fpin_stats);
    }
    }
    }

    if (fc_host->port_name == be64_to_cpu(li_desc->attached_wwpn))
    - fc_li_stats_update(li_desc, &fc_host->fpin_stats);
    + fc_li_stats_update(event_type, &fc_host->fpin_stats);
    }

    /*

    \
     
     \ /
      Last update: 2022-09-17 16:19    [W:3.324 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site