[S390] qdio: add timestamp for last queue scan time

Add a timestamp per queue and update the timestamp when the queue is
scanned. Add the queue timestamps and the timestamp of the last
adapter interrupt to the debugfs output. The timestamps are useful
for debugging stall conditions.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 3dd86441da3d33ef7077a11e677d6ed600d34e73..c15624b769075b9017c4653bb91df624b47af3a1 100644 (file)
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -290,6 +290,9 @@ struct qdio_q {
        /* error condition during a data transfer */
        unsigned int qdio_error;
 
+       /* last scan of the queue */
+       u64 timestamp;
+
        struct tasklet_struct tasklet;
        struct qdio_queue_perf_stat q_stats;
 
@@ -449,6 +452,8 @@ static inline int shared_ind(struct qdio_q *q)
        return references_shared_dsci(i) || has_multiple_inq_on_dsci(i);
 }
 
+extern u64 last_ai_time;
+
 /* prototypes for thin interrupt */
 void qdio_setup_thinint(struct qdio_irq *irq_ptr);
 int qdio_establish_thinint(struct qdio_irq *irq_ptr);

diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index aaf7f935bfd37e16c44e6ff70e84b38bde1c71c4..ed68245f9741612f5826a5a244907758f9f36901 100644 (file)
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -54,15 +54,17 @@ static int qstat_show(struct seq_file *m, void *v)
        if (!q)
                return 0;
 
-       seq_printf(m, "DSCI: %d   nr_used: %d\n",
-                  *(u32 *)q->irq_ptr->dsci, atomic_read(&q->nr_buf_used));
-       seq_printf(m, "ftc: %d  last_move: %d\n",
+       seq_printf(m, "Timestamp: %Lx  Last AI: %Lx\n",
+                  q->timestamp, last_ai_time);
+       seq_printf(m, "nr_used: %d  ftc: %d  last_move: %d\n",
+                  atomic_read(&q->nr_buf_used),
                   q->first_to_check, q->last_move);
        if (q->is_input_q) {
                seq_printf(m, "polling: %d  ack start: %d  ack count: %d\n",
                           q->u.in.polling, q->u.in.ack_start,
                           q->u.in.ack_count);
-               seq_printf(m, "IRQs disabled: %u\n",
+               seq_printf(m, "DSCI: %d   IRQs disabled: %u\n",
+                          *(u32 *)q->irq_ptr->dsci,
                           test_bit(QDIO_QUEUE_IRQS_DISABLED,
                           &q->u.in.queue_irq_state));
        }

diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 7ded1b26fd25615c0c001df9c4182410fadd203f..a76d6764ce670b74beba3f3f83dda16491c3bff0 100644 (file)
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -512,6 +512,8 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
        int count, stop;
        unsigned char state = 0;
 
+       q->timestamp = get_clock_fast();
+
        /*
         * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
         * would return 0.
@@ -781,6 +783,8 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
        int count, stop;
        unsigned char state = 0;
 
+       q->timestamp = get_clock_fast();
+
        if (need_siga_sync(q))
                if (((queue_type(q) != QDIO_IQDIO_QFMT) &&
                    !pci_out_supported(q)) ||

diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index a3e3949d7b692d36c4aec1260b1aab74fd6b6e74..8c1f412b7e6d6981e6c5da135f82e920874ced88 100644 (file)
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -36,7 +36,7 @@ static u8 *tiqdio_alsi;
 
 struct indicator_t *q_indicators;
 
-static u64 last_ai_time;
+u64 last_ai_time;
 
 /* returns addr for the device state change indicator */
 static u32 *get_indicator(void)