Pull KVM fixes from Paolo Bonzini: "RISC-V: - Fix missing PAGE_PFN_MASK - Fix SRCU deadlock caused by kvm_riscv_check_vcpu_requests() x86: - Fix for nested virtualization when TSC scaling is active - Estimate the size of fastcc subroutines conservatively, avoiding disastrous underestimation when return thunks are enabled - Avoid possible use of uninitialized fields of 'struct kvm_lapic_irq' Generic: - Mark as such the boolean values available from the statistics file descriptors - Clarify statistics documentation" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: emulate: do not adjust size of fastop and setcc subroutines KVM: x86: Fully initialize 'struct kvm_lapic_irq' in kvm_pv_kick_cpu_op() Documentation: kvm: clarify histogram units kvm: stats: tell userspace which values are boolean x86/kvm: fix FASTOP_SIZE when return thunks are enabled KVM: nVMX: Always enable TSC scaling for L2 when it was enabled for L1 RISC-V: KVM: Fix SRCU deadlock caused by kvm_riscv_check_vcpu_requests() riscv: Fix missing PAGE_PFN_MASK
Showing the changes to include/linux (1 of 10 files). Show all
Unified · Split
| @@ -1822,6 +1822,15 @@ struct _kvm_stats_desc { · 1821 unmodified lines | ||
| 1822 | 1822 | STATS_DESC_PEAK(SCOPE, name, KVM_STATS_UNIT_NONE, \ |
| 1823 | 1823 | KVM_STATS_BASE_POW10, 0) |
| 1824 | 1824 | |
| 1825 | +/* Instantaneous boolean value, read only */ | |
| 1826 | +#define STATS_DESC_IBOOLEAN(SCOPE, name) \ | |
| 1827 | + STATS_DESC_INSTANT(SCOPE, name, KVM_STATS_UNIT_BOOLEAN, \ | |
| 1828 | + KVM_STATS_BASE_POW10, 0) | |
| 1829 | +/* Peak (sticky) boolean value, read/write */ | |
| 1830 | +#define STATS_DESC_PBOOLEAN(SCOPE, name) \ | |
| 1831 | + STATS_DESC_PEAK(SCOPE, name, KVM_STATS_UNIT_BOOLEAN, \ | |
| 1832 | + KVM_STATS_BASE_POW10, 0) | |
| 1833 | + | |
| 1825 | 1834 | /* Cumulative time in nanosecond */ |
| 1826 | 1835 | #define STATS_DESC_TIME_NSEC(SCOPE, name) \ |
| 1827 | 1836 | STATS_DESC_CUMULATIVE(SCOPE, name, KVM_STATS_UNIT_SECONDS, \ |
| @@ -1853,7 +1862,7 @@ struct _kvm_stats_desc { · 25 unmodified lines | ||
| 1853 | 1862 | HALT_POLL_HIST_COUNT), \ |
| 1854 | 1863 | STATS_DESC_LOGHIST_TIME_NSEC(VCPU_GENERIC, halt_wait_hist, \ |
| 1855 | 1864 | HALT_POLL_HIST_COUNT), \ |
| 1856 | − STATS_DESC_ICOUNTER(VCPU_GENERIC, blocking) | |
| 1865 | + STATS_DESC_IBOOLEAN(VCPU_GENERIC, blocking) | |
| 1857 | 1866 | |
| 1858 | 1867 | extern struct dentry *kvm_debugfs_dir; |
| 1859 | 1868 | |