Skip to content
  • Arnaldo Carvalho de Melo's avatar
    tools kvm headers: Update KVM headers from the kernel sources · aa04899a
    Arnaldo Carvalho de Melo authored
    
    
    Some should cause changes in tooling, like the one adding LAST_EXCP, but
    the way it is structured end up not making that happen.
    
    The new SVM_EXIT_INVPCID should get used by arch/x86/util/kvm-stat.c,
    in the svm_exit_reasons table.
    
    The tools/perf/trace/beauty part has scripts to catch changes and
    automagically create tables, like tools/perf/trace/beauty/kvm_ioctl.sh,
    but changes are needed to make tools/perf/arch/x86/util/kvm-stat.c catch
    those automatically.
    
    These were handled by the existing scripts:
    
      $ 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	2020-11-03 08:43:52.910728608 -0300
      +++ after	2020-11-03 08:44:04.273959984 -0300
      @@ -89,6 +89,7 @@
       	[0xbf] = "SET_NESTED_STATE",
       	[0xc0] = "CLEAR_DIRTY_LOG",
       	[0xc1] = "GET_SUPPORTED_HV_CPUID",
      +	[0xc6] = "X86_SET_MSR_FILTER",
       	[0xe0] = "CREATE_DEVICE",
       	[0xe1] = "SET_DEVICE_ATTR",
       	[0xe2] = "GET_DEVICE_ATTR",
      $
      $ tools/perf/trace/beauty/vhost_virtio_ioctl.sh > before
      $ cp include/uapi/linux/vhost.h tools/include/uapi/linux/vhost.h
      $
      $ tools/perf/trace/beauty/vhost_virtio_ioctl.sh > after
      $ diff -u before after
      --- before	2020-11-03 08:45:55.522225198 -0300
      +++ after	2020-11-03 08:46:12.881578666 -0300
      @@ -37,4 +37,5 @@
       	[0x71] = "VDPA_GET_STATUS",
       	[0x73] = "VDPA_GET_CONFIG",
       	[0x76] = "VDPA_GET_VRING_NUM",
      +	[0x78] = "VDPA_GET_IOVA_RANGE",
       };
      $
    
    This addresses these perf build warnings:
    
      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/s390/include/uapi/asm/sie.h' differs from latest version at 'arch/s390/include/uapi/asm/sie.h'
      diff -u tools/arch/s390/include/uapi/asm/sie.h arch/s390/include/uapi/asm/sie.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/arch/x86/include/uapi/asm/svm.h' differs from latest version at 'arch/x86/include/uapi/asm/svm.h'
      diff -u tools/arch/x86/include/uapi/asm/svm.h arch/x86/include/uapi/asm/svm.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
      Warning: Kernel ABI header at 'tools/include/uapi/linux/vhost.h' differs from latest version at 'include/uapi/linux/vhost.h'
      diff -u tools/include/uapi/linux/vhost.h include/uapi/linux/vhost.h
    
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
    Cc: Borislav Petkov <bp@suse.de>
    Cc: Christian Borntraeger <borntraeger@de.ibm.com>
    Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Joerg Roedel <jroedel@suse.de>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    aa04899a