Skip to content
  • Arnaldo Carvalho de Melo's avatar
    tools headers UAPI: Update tools's copy of kvm.h headers · e0d99c4d
    Arnaldo Carvalho de Melo authored
    Picking the changes from:
    
      66bb8a06 ("KVM: x86: PMU Event Filter")
      f087a029 ("KVM: nVMX: Stash L1's CR3 in vmcs01.GUEST_CR3 on nested entry w/o EPT")
      99adb567 ("KVM: arm/arm64: Add save/restore support for firmware workaround state")
    
    Silencing this perf build warning:
    
      Warning: Kernel ABI header at 'tools/arch/arm/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm/include/uapi/asm/kvm.h'
      diff -u tools/arch/arm/include/uapi/asm/kvm.h arch/arm/include/uapi/asm/kvm.h
      Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm64/include/uapi/asm/kvm.h'
      diff -u tools/arch/arm64/include/uapi/asm/kvm.h arch/arm64/include/uapi/asm/kvm.h
      Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/vmx.h' differs from latest version at 'arch/x86/include/uapi/asm/vmx.h'
      diff -u tools/arch/x86/include/uapi/asm/vmx.h arch/x86/include/uapi/asm/vmx.h
      Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h' differs from latest version at 'arch/x86/include/uapi/asm/kvm.h'
      diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h
      Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from latest version at 'include/uapi/linux/kvm.h'
      diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h
    
    Now 'perf trace' and other code that might use the tools/perf/trace/beauty autogenerated
    tables will be able to translate this new ioctl code into a string:
    
      $ tools/perf/trace/beauty/kvm_ioctl.sh > before
      $
      $ cp include/uapi/linux/kvm.h tools/include/uapi/linux/kvm.h
      $ tools/perf/trace/beauty/kvm_ioctl.sh > after
      $ diff -u before after
      --- before 2019-07-26 12:32:47.959220236 -0300
      +++ after 2019-07-26 12:33:05.766464871 -0300
      @@ -79,6 +79,7 @@
            [0xac] = "SET_ONE_REG",
            [0xad] = "KVMCLOCK_CTRL",
            [0xb0] = "GET_REG_LIST",
      +     [0xb2] = "SET_PMU_EVENT_FILTER",
            [0xb7] = "SMI",
            [0xba] = "MEMORY_ENCRYPT_OP",
            [0xbb] = "MEMORY_ENCRYPT_REG_REGION",
      $
    
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Andre Przywara <andre.przywara@arm.com>
    Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
    Cc: Eric Hankland <ehankland@google.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
    Cc: Marc Zyngier <marc.zyngier@arm.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Sean Christopherson <sean.j.christopherson@intel.com>
    Link: https://lkml.kernel.org/n/tip-py1gcmt6rboehlwg6zvagfg2@git.kernel.org
    
    
    Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    e0d99c4d