Commit aaf2a859 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Paolo Bonzini
Browse files

megasas: Update queue logging 



Improve queue logging by displaying head and tail pointer
of the completion queue.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 200b6966

hw/scsi/megasas.c

+17 −9
Original line number Diff line number Diff line
@@ -527,8 +527,12 @@ static MegasasCmd *megasas_enqueue_frame(MegasasState *s, 
    cmd->count = count;

    s->busy++;



    if (s->consumer_pa) {

        s->reply_queue_tail = ldl_le_phys(&address_space_memory,

                                          s->consumer_pa);

    }

    trace_megasas_qf_enqueue(cmd->index, cmd->count, cmd->context,

                             s->reply_queue_head, s->busy);

                             s->reply_queue_head, s->reply_queue_tail, s->busy);



    return cmd;

}
@@ -558,8 +562,10 @@ static void megasas_complete_frame(MegasasState *s, uint64_t context) 
                        s->reply_queue_pa + queue_offset, context);

        }

        s->reply_queue_head = megasas_next_index(s, tail, s->fw_cmds);

        trace_megasas_qf_complete(context, tail, queue_offset,

                                  s->busy, s->doorbell);

        s->reply_queue_tail = ldl_le_phys(&address_space_memory,

                                          s->consumer_pa);

        trace_megasas_qf_complete(context, s->reply_queue_head,

                                  s->reply_queue_tail, s->busy, s->doorbell);

    }



    if (megasas_intr_enabled(s)) {
@@ -1649,7 +1655,6 @@ static int megasas_handle_scsi(MegasasState *s, MegasasCmd *cmd, 
                               bool is_logical)

{

    uint8_t *cdb;

    int len;

    bool is_write;

    struct SCSIDevice *sdev = NULL;
@@ -1710,16 +1715,16 @@ static int megasas_handle_scsi(MegasasState *s, MegasasCmd *cmd, 
    }



    is_write = (cmd->req->cmd.mode == SCSI_XFER_TO_DEV);

    len = megasas_enqueue_req(cmd, is_write);

    if (len > 0) {

    if (cmd->iov_size) {

        if (is_write) {

            trace_megasas_scsi_write_start(cmd->index, len);

            trace_megasas_scsi_write_start(cmd->index, cmd->iov_size);

        } else {

            trace_megasas_scsi_read_start(cmd->index, len);

            trace_megasas_scsi_read_start(cmd->index, cmd->iov_size);

        }

    } else {

        trace_megasas_scsi_nodata(cmd->index);

    }

    megasas_enqueue_req(cmd, is_write);

    return MFI_STAT_INVALID_STATUS;

}
@@ -2106,7 +2111,10 @@ static void megasas_mmio_write(void *opaque, hwaddr addr, 
        s->doorbell = 0;

        if (s->producer_pa && megasas_intr_enabled(s)) {

            /* Update reply queue pointer */

            trace_megasas_qf_update(s->reply_queue_head, s->busy);

            s->reply_queue_tail = ldl_le_phys(&address_space_memory,

                                              s->consumer_pa);

            trace_megasas_qf_update(s->reply_queue_head, s->reply_queue_tail,

                                    s->busy);

            stl_le_phys(&address_space_memory,

                        s->producer_pa, s->reply_queue_head);

            if (!msix_enabled(pci_dev)) {

trace-events

+4 −3
Original line number Diff line number Diff line
@@ -702,11 +702,11 @@ megasas_initq_mismatch(int queue_len, int fw_cmds) "queue size %d max fw cmds %d 
megasas_qf_found(unsigned int index, uint64_t pa) "mapped frame %x pa %" PRIx64 ""

megasas_qf_new(unsigned int index, void *cmd) "return new frame %x cmd %p"

megasas_qf_failed(unsigned long pa) "all frames busy for frame %lx"

megasas_qf_enqueue(unsigned int index, unsigned int count, uint64_t context, unsigned int tail, int busy) "enqueue frame %x count %d context %" PRIx64 " tail %x busy %d"

megasas_qf_update(unsigned int head, unsigned int busy) "reply queue head %x busy %d"

megasas_qf_enqueue(unsigned int index, unsigned int count, uint64_t context, unsigned int head, unsigned int tail, int busy) "frame %x count %d context %" PRIx64 " head %x tail %x busy %d"

megasas_qf_update(unsigned int head, unsigned int tail, unsigned int busy) "head %x tail %x busy %d"

megasas_qf_map_failed(int cmd, unsigned long frame) "scmd %d: frame %lu"

megasas_qf_complete_noirq(uint64_t context) "context %" PRIx64 " "

megasas_qf_complete(uint64_t context, unsigned int tail, unsigned int offset, int busy, unsigned int doorbell) "context %" PRIx64 " tail %x offset %d busy %d doorbell %x"

megasas_qf_complete(uint64_t context, unsigned int head, unsigned int tail, int busy, unsigned int doorbell) "context %" PRIx64 " head %x tail %x busy %d doorbell %x"

megasas_frame_busy(uint64_t addr) "frame %" PRIx64 " busy"

megasas_unhandled_frame_cmd(int cmd, uint8_t frame_cmd) "scmd %d: MFI cmd %x"

megasas_handle_scsi(const char *frame, int bus, int dev, int lun, void *sdev, unsigned long size) "%s dev %x/%x/%x sdev %p xfer %lu"
@@ -751,6 +751,7 @@ megasas_dcmd_ld_get_info(int cmd, int ld_id) "scmd %d: dev %d" 
megasas_dcmd_ld_list_query(int cmd, int flags) "scmd %d: query flags %x"

megasas_dcmd_pd_get_info(int cmd, int pd_id) "scmd %d: dev %d"

megasas_dcmd_pd_list_query(int cmd, int flags) "scmd %d: query flags %x"

megasas_dcmd_reset_ld(int cmd, int target_id) "scmd %d: dev %d"

megasas_dcmd_unsupported(int cmd, unsigned long size) "scmd %d: set properties len %ld"

megasas_abort_frame(int cmd, int abort_cmd) "scmd %d: frame %x"

megasas_abort_no_cmd(int cmd, uint64_t context) "scmd %d: no active command for frame context %" PRIx64 ""