[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 e5c966462c5ad2ae9001e6a4df863c8133feb46c..a5dd0e640dec776ce97693068f81314ba513daf7 100644 (file)
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -289,6 +289,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;
 
@@ -437,6 +440,8 @@ static inline int shared_ind(u32 *dsci)
        return dsci == &q_indicators[TIQDIO_SHARED_IND].ind;
 }
 
+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 0e615cb912d0eb0a90a2d510b5814d3586b06297..7cc4a751331d1770162a906bd533089f0eda3c97 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 d7b5f422d28a72b0dcbf4a904e70cb500d7202b5..e82d9367dff454600e4ae70b2fd368062efeeea4 100644 (file)
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -492,6 +492,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.
@@ -658,6 +660,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 2a1d4dfaf859ac9e6899a5efb7c31422238b18d4..d4a5cd90716f5e6d399b5a7ae65e81f36b870faa 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)