Skip to content

Commit dfa0045

Browse files
committed
tools headers UAPI: Sync linux/kvm.h with the kernel sources
To pick the changes in: f95937c ("KVM: stats: Support linear and logarithmic histogram statistics") f0376ed ("KVM: arm64: Add ioctl to fetch/store tags in a guest") ea7fc1b ("KVM: arm64: Introduce MTE VM feature") That just rebuilds perf, as these patches don't add any new KVM ioctl to be harvested for the the 'perf trace' ioctl syscall argument beautifiers. This is also by now used by tools/testing/selftests/kvm/, so that will pick the new KVM_STATS_TYPE_LINEAR_HIST and KVM_STATS_TYPE_LOG_HIST defines. This silences this perf build warning: 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 Cc: Jing Zhang <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Steven Price <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 03d6f3f commit dfa0045

File tree

1 file changed

+7
-4
lines changed
  • tools/include/uapi/linux

1 file changed

+7
-4
lines changed

tools/include/uapi/linux/kvm.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,9 @@ struct kvm_stats_header {
19651965
#define KVM_STATS_TYPE_CUMULATIVE (0x0 << KVM_STATS_TYPE_SHIFT)
19661966
#define KVM_STATS_TYPE_INSTANT (0x1 << KVM_STATS_TYPE_SHIFT)
19671967
#define KVM_STATS_TYPE_PEAK (0x2 << KVM_STATS_TYPE_SHIFT)
1968-
#define KVM_STATS_TYPE_MAX KVM_STATS_TYPE_PEAK
1968+
#define KVM_STATS_TYPE_LINEAR_HIST (0x3 << KVM_STATS_TYPE_SHIFT)
1969+
#define KVM_STATS_TYPE_LOG_HIST (0x4 << KVM_STATS_TYPE_SHIFT)
1970+
#define KVM_STATS_TYPE_MAX KVM_STATS_TYPE_LOG_HIST
19691971

19701972
#define KVM_STATS_UNIT_SHIFT 4
19711973
#define KVM_STATS_UNIT_MASK (0xF << KVM_STATS_UNIT_SHIFT)
@@ -1988,8 +1990,9 @@ struct kvm_stats_header {
19881990
* @size: The number of data items for this stats.
19891991
* Every data item is of type __u64.
19901992
* @offset: The offset of the stats to the start of stat structure in
1991-
* struture kvm or kvm_vcpu.
1992-
* @unused: Unused field for future usage. Always 0 for now.
1993+
* structure kvm or kvm_vcpu.
1994+
* @bucket_size: A parameter value used for histogram stats. It is only used
1995+
* for linear histogram stats, specifying the size of the bucket;
19931996
* @name: The name string for the stats. Its size is indicated by the
19941997
* &kvm_stats_header->name_size.
19951998
*/
@@ -1998,7 +2001,7 @@ struct kvm_stats_desc {
19982001
__s16 exponent;
19992002
__u16 size;
20002003
__u32 offset;
2001-
__u32 unused;
2004+
__u32 bucket_size;
20022005
char name[];
20032006
};
20042007

0 commit comments

Comments
 (0)