From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 8 Oct 2021 09:47:07 +0000 (+0100)
Subject: x86/traps: Collect PERFC_exceptions stats for IST vectors too
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~1301
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d9f60a924c03761081b99145a51bc85ee54efcdc;p=xen.git

x86/traps: Collect PERFC_exceptions stats for IST vectors too

This causes NMIs, #DB and #MC to be counted, rather than being reported as 0.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index d5998acf88..3caa565476 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -1005,6 +1005,13 @@ handle_ist_exception:
 #endif
         movq  %rsp,%rdi
         movzbl UREGS_entry_vector(%rsp),%eax
+
+#ifdef CONFIG_PERF_COUNTERS
+        lea   per_cpu__perfcounters(%rip), %rcx
+        add   STACK_CPUINFO_FIELD(per_cpu_offset)(%r14), %rcx
+        incl  ASM_PERFC_exceptions * 4(%rcx, %rax, 4)
+#endif
+
         leaq  exception_table(%rip),%rdx
         mov   (%rdx, %rax, 8), %rdx
         INDIRECT_CALL %rdx