x86/msi: prevent watchdog triggering when dumping MSI state

Use the same check that's used in dump_irqs().

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
master commit: 594b22ca5be681ec1b42c34f321cc2600d582210
master date: 2024-05-20 14:29:44 +0100

diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c
index a78367d7cf5d8a6d8320853b72961f2d2f992e79..3eaeffd1e012d8518d9f5ac08789a109dcdae6c1 100644 (file)
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -17,6 +17,7 @@
 #include <xen/param.h>
 #include <xen/pci.h>
 #include <xen/pci_regs.h>
+#include <xen/softirq.h>
 #include <xen/iocap.h>
 #include <xen/keyhandler.h>
 #include <xen/pfn.h>
@@ -1405,6 +1406,9 @@ static void cf_check dump_msi(unsigned char key)
         unsigned long flags;
         const char *type = "???";
 
+        if ( !(irq & 0x1f) )
+            process_pending_softirqs();
+
         if ( !irq_desc_initialized(desc) )
             continue;