[S390] fix mismatch in summation of I/O IRQ statistics

Current IRQ statistics support does not show detail counts for I/O
interrupts which are processed internally only. The result is a
summation count which is way off such as this one:

           CPU0       CPU1       CPU2
I/O:       1331        710        442
[...]
QAI:         15         16         16   [I/O] QDIO Adapter Interrupt
QDI:          1          0          0   [I/O] QDIO Interrupt
DAS:        706        645        381   [I/O] DASD
C15:         26         10          0   [I/O] 3215
C70:          0          0          0   [I/O] 3270
TAP:          0          0          0   [I/O] Tape
VMR:          0          0          0   [I/O] Unit Record Devices
LCS:          0          0          0   [I/O] LCS
CLW:          0          0          0   [I/O] CLAW
CTC:          0          0          0   [I/O] CTC
APB:          0          0          0   [I/O] AP Bus

Fix this by moving I/O interrupt accounting into the common I/O layer.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

5 files changed, 41 insertions, 6 deletions

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index eb3140ee821e..5586c1376cb0 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -622,6 +622,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
                 sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
                 if (!sch) {
                         /* Clear pending interrupt condition. */
+                        kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                         tsch(tpi_info->schid, irb);
                         continue;
                 }
@@ -634,7 +635,10 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
                         /* Call interrupt handler if there is one. */
                         if (sch->driver && sch->driver->irq)
                                 sch->driver->irq(sch);
-                }
+                        else
+                                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
+                } else
+                        kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                 spin_unlock(sch->lock);
                 /*
                  * Are more interrupts pending?
@@ -667,18 +671,23 @@ static int cio_tpi(void)
         tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;
         if (tpi(NULL) != 1)
                 return 0;
+        kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++;
         if (tpi_info->adapter_IO) {
                 do_adapter_IO(tpi_info->isc);
                 return 1;
         }
         irb = (struct irb *)&S390_lowcore.irb;
         /* Store interrupt response block to lowcore. */
-        if (tsch(tpi_info->schid, irb) != 0)
+        if (tsch(tpi_info->schid, irb) != 0) {
                 /* Not status pending or not operational. */
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                 return 1;
+        }
         sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
-        if (!sch)
+        if (!sch) {
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                 return 1;
+        }
         irq_context = in_interrupt();
         if (!irq_context)
                 local_bh_disable();
@@ -687,6 +696,8 @@ static int cio_tpi(void)
         memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
         if (sch->driver && sch->driver->irq)
                 sch->driver->irq(sch);
+        else
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
         spin_unlock(sch->lock);
         irq_exit();
         if (!irq_context)
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 8e04c00cf0ad..d734f4a0ecac 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -21,6 +21,7 @@
 #include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/timer.h>
+#include <linux/kernel_stat.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -747,6 +748,7 @@ static int io_subchannel_initialize_dev(struct subchannel *sch,
                                         struct ccw_device *cdev)
 {
         cdev->private->cdev = cdev;
+        cdev->private->int_class = IOINT_CIO;
         atomic_set(&cdev->private->onoff, 0);
         cdev->dev.parent = &sch->dev;
         cdev->dev.release = ccw_device_release;
@@ -1010,6 +1012,8 @@ static void io_subchannel_irq(struct subchannel *sch)
         CIO_TRACE_EVENT(6, dev_name(&sch->dev));
         if (cdev)
                 dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
+        else
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
 }
 
 void io_subchannel_init_config(struct subchannel *sch)
@@ -1621,6 +1625,7 @@ ccw_device_probe_console(void)
         memset(&console_private, 0, sizeof(struct ccw_device_private));
         console_cdev.private = &console_private;
         console_private.cdev = &console_cdev;
+        console_private.int_class = IOINT_CIO;
         ret = ccw_device_console_enable(&console_cdev, sch);
         if (ret) {
                 cio_release_console();
@@ -1702,11 +1707,18 @@ ccw_device_probe (struct device *dev)
         int ret;
 
         cdev->drv = cdrv; /* to let the driver call _set_online */
+        /* Note: we interpret class 0 in this context as an uninitialized
+         * field since it translates to a non-I/O interrupt class. */
+        if (cdrv->int_class != 0)
+                cdev->private->int_class = cdrv->int_class;
+        else
+                cdev->private->int_class = IOINT_CIO;
 
         ret = cdrv->probe ? cdrv->probe(cdev) : -ENODEV;
 
         if (ret) {
                 cdev->drv = NULL;
+                cdev->private->int_class = IOINT_CIO;
                 return ret;
         }
 
@@ -1740,6 +1752,7 @@ ccw_device_remove (struct device *dev)
         }
         ccw_device_set_timeout(cdev, 0);
         cdev->drv = NULL;
+        cdev->private->int_class = IOINT_CIO;
         return 0;
 }
 
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 0b7245c72d5e..179824b3082f 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -5,6 +5,7 @@
 #include <linux/atomic.h>
 #include <linux/wait.h>
 #include <linux/notifier.h>
+#include <linux/kernel_stat.h>
 #include "io_sch.h"
 
 /*
@@ -56,7 +57,17 @@ extern fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS];
 static inline void
 dev_fsm_event(struct ccw_device *cdev, enum dev_event dev_event)
 {
-        dev_jumptable[cdev->private->state][dev_event](cdev, dev_event);
+        int state = cdev->private->state;
+
+        if (dev_event == DEV_EVENT_INTERRUPT) {
+                if (state == DEV_STATE_ONLINE)
+                        kstat_cpu(smp_processor_id()).
+                                irqs[cdev->private->int_class]++;
+                else if (state != DEV_STATE_CMFCHANGE &&
+                         state != DEV_STATE_CMFUPDATE)
+                        kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
+        }
+        dev_jumptable[state][dev_event](cdev, dev_event);
 }
 
 /*
diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h
index ba31ad88f4f7..2ebb492a5c17 100644
--- a/drivers/s390/cio/io_sch.h
+++ b/drivers/s390/cio/io_sch.h
@@ -4,6 +4,7 @@
 #include <linux/types.h>
 #include <asm/schid.h>
 #include <asm/ccwdev.h>
+#include <asm/irq.h>
 #include "css.h"
 #include "orb.h"
 
@@ -157,6 +158,7 @@ struct ccw_device_private {
         struct list_head cmb_list;      /* list of measured devices */
         u64 cmb_start_time;             /* clock value of cmb reset */
         void *cmb_wait;                 /* deferred cmb enable/disable */
+        enum interruption_class int_class;
 };
 
 static inline int rsch(struct subchannel_id schid)
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 6547ff469410..7ded1b26fd25 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -15,7 +15,6 @@
 #include <linux/delay.h>
 #include <linux/gfp.h>
 #include <linux/io.h>
-#include <linux/kernel_stat.h>
 #include <linux/atomic.h>
 #include <asm/debug.h>
 #include <asm/qdio.h>
@@ -1128,7 +1127,6 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
                 return;
         }
 
-        kstat_cpu(smp_processor_id()).irqs[IOINT_QDI]++;
         if (irq_ptr->perf_stat_enabled)
                 irq_ptr->perf_stat.qdio_int++;