2020-07-30 09:48:04

by Alexander Graf

[permalink] [raw]
Subject: [PATCH] KVM: arm: Add trace name for ARM_NISV

Commit c726200dd106d ("KVM: arm/arm64: Allow reporting non-ISV data aborts
to userspace") introduced a mechanism to deflect MMIO traffic the kernel
can not handle to user space. For that, it introduced a new exit reason.

However, it did not update the trace point array that gives human readable
names to these exit reasons inside the trace log.

Let's fix that up after the fact, so that trace logs are pretty even when
we get user space MMIO traps on ARM.

Fixes: c726200dd106d ("KVM: arm/arm64: Allow reporting non-ISV data aborts to userspace")
Signed-off-by: Alexander Graf <[email protected]>
---
include/trace/events/kvm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index 2c735a3e6613..9417a34aad08 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -17,7 +17,7 @@
ERSN(NMI), ERSN(INTERNAL_ERROR), ERSN(OSI), ERSN(PAPR_HCALL), \
ERSN(S390_UCONTROL), ERSN(WATCHDOG), ERSN(S390_TSCH), ERSN(EPR),\
ERSN(SYSTEM_EVENT), ERSN(S390_STSI), ERSN(IOAPIC_EOI), \
- ERSN(HYPERV)
+ ERSN(HYPERV), ERSN(ARM_NISV)

TRACE_EVENT(kvm_userspace_exit,
TP_PROTO(__u32 reason, int errno),
--
2.16.4




Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879




2020-07-30 14:00:42

by Marc Zyngier

[permalink] [raw]
Subject: Re: [PATCH] KVM: arm: Add trace name for ARM_NISV

On Thu, 30 Jul 2020 11:44:41 +0200, Alexander Graf wrote:
> Commit c726200dd106d ("KVM: arm/arm64: Allow reporting non-ISV data aborts
> to userspace") introduced a mechanism to deflect MMIO traffic the kernel
> can not handle to user space. For that, it introduced a new exit reason.
>
> However, it did not update the trace point array that gives human readable
> names to these exit reasons inside the trace log.
>
> [...]

Applied to kvm-arm64/misc-5.9, thanks!

[1/1] KVM: arm: Add trace name for ARM_NISV
commit: 1ccf2fe35c30f79102ad129c5aa71059daaaed7f

Cheers,

M.
--
Without deviation from the norm, progress is not possible.