Skip to content

Commit 29e4d12

Browse files
committed
tools headers UAPI: Sync linux/kvm.h with the kernel sources
To pick the changes in: fe2bf62 ("KVM: guest_memfd: Add INIT_SHARED flag, reject user page faults if not set") d2042d8 ("KVM: Rework KVM_CAP_GUEST_MEMFD_MMAP into KVM_CAP_GUEST_MEMFD_FLAGS") 3d3a04f ("KVM: Allow and advertise support for host mmap() on guest_memfd files") That just rebuilds perf, as these patches don't add any new KVM ioctl to be harvested for the 'perf trace' ioctl syscall argument beautifiers. This addresses this perf build warning: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h Please see tools/include/uapi/README for further details. Cc: Sean Christopherson <[email protected]> Cc: Fuad Tabba <[email protected]> Cc: Paolo Bonzini <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent f8950b4 commit 29e4d12

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

  • tools/include/uapi/linux

tools/include/uapi/linux/kvm.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,7 @@ struct kvm_enable_cap {
962962
#define KVM_CAP_ARM_EL2_E2H0 241
963963
#define KVM_CAP_RISCV_MP_STATE_RESET 242
964964
#define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243
965+
#define KVM_CAP_GUEST_MEMFD_FLAGS 244
965966

966967
struct kvm_irq_routing_irqchip {
967968
__u32 irqchip;
@@ -1598,6 +1599,8 @@ struct kvm_memory_attributes {
15981599
#define KVM_MEMORY_ATTRIBUTE_PRIVATE (1ULL << 3)
15991600

16001601
#define KVM_CREATE_GUEST_MEMFD _IOWR(KVMIO, 0xd4, struct kvm_create_guest_memfd)
1602+
#define GUEST_MEMFD_FLAG_MMAP (1ULL << 0)
1603+
#define GUEST_MEMFD_FLAG_INIT_SHARED (1ULL << 1)
16011604

16021605
struct kvm_create_guest_memfd {
16031606
__u64 size;

0 commit comments

Comments
 (0)