Skip to contentSkip to conversation

KVM: stats: Fix value for KVM_STATS_UNIT_MAX for boolean stats

PATCH In review Oliver Upton 2 participants 2 messages Jul 19, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KVM: stats: Fix value for KVM_STATS_UNIT_MAX for boolean stats

commit 1b870fa5573e ("kvm: stats: tell userspace which values are boolean") added a new stat unit (boolean) but failed to raise KVM_STATS_UNIT_MAX.

Fix by pointing UNIT_MAX at the new max value of UNIT_BOOLEAN.

Fixes 1b870fa5573e ("kvm: stats: tell userspace which values are boolean")

---

Tested with kvm_binary_stats_test, which now passes.

Sending out a few improvements to assertions in kvm_binary_stats_test separately.

 Documentation/virt/kvm/api.rst | 2 +-
 include/uapi/linux/kvm.h       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/virt/kvm/api.rst +1 -1
index 6e090fb96a0e..98a283930307 100644
@@ -5658,7 +5658,7 @@ by a string of size ``name_size``.
 	#define KVM_STATS_UNIT_SECONDS		(0x2 << KVM_STATS_UNIT_SHIFT)
 	#define KVM_STATS_UNIT_CYCLES		(0x3 << KVM_STATS_UNIT_SHIFT)
 	#define KVM_STATS_UNIT_BOOLEAN		(0x4 << KVM_STATS_UNIT_SHIFT)
-	#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_CYCLES
+	#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_BOOLEAN
 
 	#define KVM_STATS_BASE_SHIFT		8
 	#define KVM_STATS_BASE_MASK		(0xF << KVM_STATS_BASE_SHIFT)
include/uapi/linux/kvm.h +1 -1
index 811897dadcae..860f867c50c0 100644
@@ -2084,7 +2084,7 @@ struct kvm_stats_header {
 #define KVM_STATS_UNIT_SECONDS		(0x2 << KVM_STATS_UNIT_SHIFT)
 #define KVM_STATS_UNIT_CYCLES		(0x3 << KVM_STATS_UNIT_SHIFT)
 #define KVM_STATS_UNIT_BOOLEAN		(0x4 << KVM_STATS_UNIT_SHIFT)
-#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_CYCLES
+#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_BOOLEAN
 
 #define KVM_STATS_BASE_SHIFT		8
 #define KVM_STATS_BASE_MASK		(0xF << KVM_STATS_BASE_SHIFT)

base-commit: 79629181607e801c0b41b8790ac4ee2eb5d7bc3e

Signature · 1 line
2.37.0.170.g444d1eabd0-goog
maintainer
#1 lore raw
Quoted 47 lines · Oliver Upton

commit 1b870fa5573e ("kvm: stats: tell userspace which values are boolean") added a new stat unit (boolean) but failed to raise KVM_STATS_UNIT_MAX.

Fix by pointing UNIT_MAX at the new max value of UNIT_BOOLEAN.

Fixes 1b870fa5573e ("kvm: stats: tell userspace which values are boolean")

---

Tested with kvm_binary_stats_test, which now passes.

Sending out a few improvements to assertions in kvm_binary_stats_test separately.

  Documentation/virt/kvm/api.rst | 2 +-
  include/uapi/linux/kvm.h       | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/virt/kvm/api.rst +1 -1
index 6e090fb96a0e..98a283930307 100644
@@ -5658,7 +5658,7 @@ by a string of size ``name_size``.
  	#define KVM_STATS_UNIT_SECONDS		(0x2 << KVM_STATS_UNIT_SHIFT)
  	#define KVM_STATS_UNIT_CYCLES		(0x3 << KVM_STATS_UNIT_SHIFT)
  	#define KVM_STATS_UNIT_BOOLEAN		(0x4 << KVM_STATS_UNIT_SHIFT)
-	#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_CYCLES
+	#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_BOOLEAN
 
  	#define KVM_STATS_BASE_SHIFT		8
  	#define KVM_STATS_BASE_MASK		(0xF << KVM_STATS_BASE_SHIFT)
include/uapi/linux/kvm.h +1 -1
index 811897dadcae..860f867c50c0 100644
@@ -2084,7 +2084,7 @@ struct kvm_stats_header {
  #define KVM_STATS_UNIT_SECONDS		(0x2 << KVM_STATS_UNIT_SHIFT)
  #define KVM_STATS_UNIT_CYCLES		(0x3 << KVM_STATS_UNIT_SHIFT)
  #define KVM_STATS_UNIT_BOOLEAN		(0x4 << KVM_STATS_UNIT_SHIFT)
-#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_CYCLES
+#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_BOOLEAN
 
  #define KVM_STATS_BASE_SHIFT		8
  #define KVM_STATS_BASE_MASK		(0xF << KVM_STATS_BASE_SHIFT)
Quoted 1 line

base-commit: 79629181607e801c0b41b8790ac4ee2eb5d7bc3e

Oops, thanks.

Paolo