Pull KVM fixes from Paolo Bonzini: - Doc fixes - selftests fixes - Add runstate information to the new Xen support - Allow compiling out the Xen interface - 32-bit PAE without EPT bugfix - NULL pointer dereference bugfix * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: SVM: Clear the CR4 register on reset KVM: x86/xen: Add support for vCPU runstate information KVM: x86/xen: Fix return code when clearing vcpu_info and vcpu_time_info selftests: kvm: Mmap the entire vcpu mmap area KVM: Documentation: Fix index for KVM_CAP_PPC_DAWR1 KVM: x86: allow compiling out the Xen hypercall interface KVM: xen: flush deferred static key before checking it KVM: x86/mmu: Set SPTE_AD_WRPROT_ONLY_MASK if and only if PML is enabled KVM: x86: hyper-v: Fix Hyper-V context null-ptr-deref KVM: x86: remove misplaced comment on active_mmu_pages KVM: Documentation: rectify rst markup in kvm_run->flags Documentation: kvm: fix messy conversion from .txt to .rst
Showing the changes to include/uapi/linux (1 of 13 files). Show all
Unified · Split
| @@ -1154,6 +1154,7 @@ struct kvm_x86_mce { · 1153 unmodified lines | |||
| 1154 | #define KVM_XEN_HVM_CONFIG_HYPERCALL_MSR (1 << 0) | 1154 | #define KVM_XEN_HVM_CONFIG_HYPERCALL_MSR (1 << 0) |
| 1155 | #define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL (1 << 1) | 1155 | #define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL (1 << 1) |
| 1156 | #define KVM_XEN_HVM_CONFIG_SHARED_INFO (1 << 2) | 1156 | #define KVM_XEN_HVM_CONFIG_SHARED_INFO (1 << 2) |
| 1157 | #define KVM_XEN_HVM_CONFIG_RUNSTATE (1 << 3) | ||
| 1157 | 1158 | ||
| 1158 | struct kvm_xen_hvm_config { | 1159 | struct kvm_xen_hvm_config { |
| 1159 | __u32 flags; | 1160 | __u32 flags; |
| @@ -1621,12 +1622,24 @@ struct kvm_xen_vcpu_attr { · 461 unmodified lines | |||
| 1621 | union { | 1622 | union { |
| 1622 | __u64 gpa; | 1623 | __u64 gpa; |
| 1623 | __u64 pad[8]; | 1624 | __u64 pad[8]; |
| 1625 | struct { | ||
| 1626 | __u64 state; | ||
| 1627 | __u64 state_entry_time; | ||
| 1628 | __u64 time_running; | ||
| 1629 | __u64 time_runnable; | ||
| 1630 | __u64 time_blocked; | ||
| 1631 | __u64 time_offline; | ||
| 1632 | } runstate; | ||
| 1624 | } u; | 1633 | } u; |
| 1625 | }; | 1634 | }; |
| 1626 | 1635 | ||
| 1627 | /* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_SHARED_INFO */ | 1636 | /* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_SHARED_INFO */ |
| 1628 | #define KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO 0x0 | 1637 | #define KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO 0x0 |
| 1629 | #define KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO 0x1 | 1638 | #define KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO 0x1 |
| 1639 | #define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADDR 0x2 | ||
| 1640 | #define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_CURRENT 0x3 | ||
| 1641 | #define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_DATA 0x4 | ||
| 1642 | #define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADJUST 0x5 | ||
| 1630 | 1643 | ||
| 1631 | /* Secure Encrypted Virtualization command */ | 1644 | /* Secure Encrypted Virtualization command */ |
| 1632 | enum sev_cmd_id { | 1645 | enum sev_cmd_id { |