queue-4.14/kvm-x86-avoid-misreporting-level-triggered-irqs-as-e.patch

   1 From 694ea319ede15d7ff0289564da15a0b184311cac Mon Sep 17 00:00:00 2001
   2 From: Vitaly Kuznetsov <vkuznets@redhat.com>
   3 Date: Wed, 27 Mar 2019 15:12:20 +0100
   4 Subject: KVM: x86: avoid misreporting level-triggered irqs as edge-triggered
   5  in tracing
   6
   7 [ Upstream commit 7a223e06b1a411cef6c4cd7a9b9a33c8d225b10e ]
   8
   9 In __apic_accept_irq() interface trig_mode is int and actually on some code
  10 paths it is set above u8:
  11
  12 kvm_apic_set_irq() extracts it from 'struct kvm_lapic_irq' where trig_mode
  13 is u16. This is done on purpose as e.g. kvm_set_msi_irq() sets it to
  14 (1 << 15) & e->msi.data
  15
  16 kvm_apic_local_deliver sets it to reg & (1 << 15).
  17
  18 Fix the immediate issue by making 'tm' into u16. We may also want to adjust
  19 __apic_accept_irq() interface and use proper sizes for vector, level,
  20 trig_mode but this is not urgent.
  21
  22 Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
  23 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  24 Signed-off-by: Sasha Levin <sashal@kernel.org>
  25 ---
  26  arch/x86/kvm/trace.h | 4 ++--
  27  1 file changed, 2 insertions(+), 2 deletions(-)
  28
  29 diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
  30 index 9807c314c4788..3bf41413ab151 100644
  31 --- a/arch/x86/kvm/trace.h
  32 +++ b/arch/x86/kvm/trace.h
  33 @@ -438,13 +438,13 @@ TRACE_EVENT(kvm_apic_ipi,
  34  );
  35
  36  TRACE_EVENT(kvm_apic_accept_irq,
  37 -           TP_PROTO(__u32 apicid, __u16 dm, __u8 tm, __u8 vec),
  38 +           TP_PROTO(__u32 apicid, __u16 dm, __u16 tm, __u8 vec),
  39             TP_ARGS(apicid, dm, tm, vec),
  40
  41         TP_STRUCT__entry(
  42                 __field(        __u32,          apicid          )
  43                 __field(        __u16,          dm              )
  44 -               __field(        __u8,           tm              )
  45 +               __field(        __u16,          tm              )
  46                 __field(        __u8,           vec             )
  47         ),
  48
  49 --
  50 2.20.1
  51