To pick the changes in: 86bdf3ebcfe1ded0 ("KVM: Support dirty ring in conjunction with bitmap") 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/, a simple test build didn't succeed, but for another reason: lib/kvm_util.c: In function ‘vm_enable_dirty_ring’: lib/kvm_util.c:125:30: error: ‘KVM_CAP_DIRTY_LOG_RING_ACQ_REL’ undeclared (first use in this function); did you mean ‘KVM_CAP_DIRTY_LOG_RING’? 125 | if (vm_check_cap(vm, KVM_CAP_DIRTY_LOG_RING_ACQ_REL)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | KVM_CAP_DIRTY_LOG_RING I'll send a separate patch for that. 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
Showing the changes to tools/include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -98,7 +98,7 @@ struct kvm_userspace_memory_region { · 97 unmodified lines | |||
| 98 | /* | 98 | /* |
| 99 | * The bit 0 ~ bit 15 of kvm_userspace_memory_region::flags are visible for | 99 | * The bit 0 ~ bit 15 of kvm_userspace_memory_region::flags are visible for |
| 100 | * userspace, other bits are reserved for kvm internal use which are defined | 100 | * userspace, other bits are reserved for kvm internal use which are defined |
| 101 | *in include/linux/kvm_host.h. | 101 | * in include/linux/kvm_host.h. |
| 102 | */ | 102 | */ |
| 103 | #define KVM_MEM_LOG_DIRTY_PAGES (1UL << 0) | 103 | #define KVM_MEM_LOG_DIRTY_PAGES (1UL << 0) |
| 104 | #define KVM_MEM_READONLY (1UL << 1) | 104 | #define KVM_MEM_READONLY (1UL << 1) |
| @@ -477,6 +477,9 @@ struct kvm_run { · 372 unmodified lines | |||
| 477 | #define KVM_MSR_EXIT_REASON_INVAL (1 << 0) | 477 | #define KVM_MSR_EXIT_REASON_INVAL (1 << 0) |
| 478 | #define KVM_MSR_EXIT_REASON_UNKNOWN (1 << 1) | 478 | #define KVM_MSR_EXIT_REASON_UNKNOWN (1 << 1) |
| 479 | #define KVM_MSR_EXIT_REASON_FILTER (1 << 2) | 479 | #define KVM_MSR_EXIT_REASON_FILTER (1 << 2) |
| 480 | #define KVM_MSR_EXIT_REASON_VALID_MASK (KVM_MSR_EXIT_REASON_INVAL | \ | ||
| 481 | KVM_MSR_EXIT_REASON_UNKNOWN | \ | ||
| 482 | KVM_MSR_EXIT_REASON_FILTER) | ||
| 480 | __u32 reason; /* kernel -> user */ | 483 | __u32 reason; /* kernel -> user */ |
| 481 | __u32 index; /* kernel -> user */ | 484 | __u32 index; /* kernel -> user */ |
| 482 | __u64 data; /* kernel <-> user */ | 485 | __u64 data; /* kernel <-> user */ |
| @@ -1170,6 +1173,8 @@ struct kvm_ppc_resize_hpt { · 687 unmodified lines | |||
| 1170 | #define KVM_CAP_S390_ZPCI_OP 221 | 1173 | #define KVM_CAP_S390_ZPCI_OP 221 |
| 1171 | #define KVM_CAP_S390_CPU_TOPOLOGY 222 | 1174 | #define KVM_CAP_S390_CPU_TOPOLOGY 222 |
| 1172 | #define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223 | 1175 | #define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223 |
| 1176 | #define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 224 | ||
| 1177 | #define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225 | ||
| 1173 | 1178 | ||
| 1174 | #ifdef KVM_CAP_IRQ_ROUTING | 1179 | #ifdef KVM_CAP_IRQ_ROUTING |
| 1175 | 1180 | ||
| @@ -1259,6 +1264,7 @@ struct kvm_x86_mce { · 83 unmodified lines | |||
| 1259 | #define KVM_XEN_HVM_CONFIG_RUNSTATE (1 << 3) | 1264 | #define KVM_XEN_HVM_CONFIG_RUNSTATE (1 << 3) |
| 1260 | #define KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL (1 << 4) | 1265 | #define KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL (1 << 4) |
| 1261 | #define KVM_XEN_HVM_CONFIG_EVTCHN_SEND (1 << 5) | 1266 | #define KVM_XEN_HVM_CONFIG_EVTCHN_SEND (1 << 5) |
| 1267 | #define KVM_XEN_HVM_CONFIG_RUNSTATE_UPDATE_FLAG (1 << 6) | ||
| 1262 | 1268 | ||
| 1263 | struct kvm_xen_hvm_config { | 1269 | struct kvm_xen_hvm_config { |
| 1264 | __u32 flags; | 1270 | __u32 flags; |
| @@ -1726,6 +1732,8 @@ enum pv_cmd_id { · 461 unmodified lines | |||
| 1726 | KVM_PV_UNSHARE_ALL, | 1732 | KVM_PV_UNSHARE_ALL, |
| 1727 | KVM_PV_INFO, | 1733 | KVM_PV_INFO, |
| 1728 | KVM_PV_DUMP, | 1734 | KVM_PV_DUMP, |
| 1735 | KVM_PV_ASYNC_CLEANUP_PREPARE, | ||
| 1736 | KVM_PV_ASYNC_CLEANUP_PERFORM, | ||
| 1729 | }; | 1737 | }; |
| 1730 | 1738 | ||
| 1731 | struct kvm_pv_cmd { | 1739 | struct kvm_pv_cmd { |
| @@ -1756,6 +1764,7 @@ struct kvm_xen_hvm_attr { · 24 unmodified lines | |||
| 1756 | union { | 1764 | union { |
| 1757 | __u8 long_mode; | 1765 | __u8 long_mode; |
| 1758 | __u8 vector; | 1766 | __u8 vector; |
| 1767 | __u8 runstate_update_flag; | ||
| 1759 | struct { | 1768 | struct { |
| 1760 | __u64 gfn; | 1769 | __u64 gfn; |
| 1761 | } shared_info; | 1770 | } shared_info; |
| @@ -1796,6 +1805,8 @@ struct kvm_xen_hvm_attr { · 34 unmodified lines | |||
| 1796 | /* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_EVTCHN_SEND */ | 1805 | /* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_EVTCHN_SEND */ |
| 1797 | #define KVM_XEN_ATTR_TYPE_EVTCHN 0x3 | 1806 | #define KVM_XEN_ATTR_TYPE_EVTCHN 0x3 |
| 1798 | #define KVM_XEN_ATTR_TYPE_XEN_VERSION 0x4 | 1807 | #define KVM_XEN_ATTR_TYPE_XEN_VERSION 0x4 |
| 1808 | /* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_RUNSTATE_UPDATE_FLAG */ | ||
| 1809 | #define KVM_XEN_ATTR_TYPE_RUNSTATE_UPDATE_FLAG 0x5 | ||
| 1799 | 1810 | ||
| 1800 | /* Per-vCPU Xen attributes */ | 1811 | /* Per-vCPU Xen attributes */ |
| 1801 | #define KVM_XEN_VCPU_GET_ATTR _IOWR(KVMIO, 0xca, struct kvm_xen_vcpu_attr) | 1812 | #define KVM_XEN_VCPU_GET_ATTR _IOWR(KVMIO, 0xca, struct kvm_xen_vcpu_attr) |