Skip to contentSkip to conversation

KVM: selftests: Stop assuming stats are contiguous in kvm_binary_stats_test

PATCH In review David Matlack 2 participants 2 messages Jan 17, 2023 – Jan 19, 2023

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

PATCH 1/1 KVM: selftests: Stop assuming stats are contiguous in kvm_binary_stats_test

From: Jing Zhang <[email protected]>

Remove the assumption from kvm_binary_stats_test that all stats are laid out contiguously in memory. The current stats in KVM are contiguously laid out in memory, but that may change in the future and the ABI specifically allows holes in the stats data (since each stat exposes its own offset).

While here drop the check that each stats' offset is less than size_data, as that is now always true by construction.

Fixes 0b45d58738cd ("KVM: selftests: Add selftest for KVM statistics data binary interface")
[Re-worded the commit message.]
---
 tools/testing/selftests/kvm/kvm_binary_stats_test.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -9
index 894417c96f70..a7001e29dc06 100644
@@ -134,7 +134,7 @@ static void stats_test(int stats_fd)
 				    "Bucket size of stats (%s) is not zero",
 				    pdesc->name);
 		}
-		size_data += pdesc->size * sizeof(*stats_data);
+		size_data = max(size_data, pdesc->offset + pdesc->size * sizeof(*stats_data));
 	}
 
 	/*
@@ -149,14 +149,6 @@ static void stats_test(int stats_fd)
 	TEST_ASSERT(size_data >= header.num_desc * sizeof(*stats_data),
 		    "Data size is not correct");
 
-	/* Check stats offset */
-	for (i = 0; i < header.num_desc; ++i) {
-		pdesc = get_stats_descriptor(stats_desc, i, &header);
-		TEST_ASSERT(pdesc->offset < size_data,
-			    "Invalid offset (%u) for stats: %s",
-			    pdesc->offset, pdesc->name);
-	}
-
 	/* Allocate memory for stats data */
 	stats_data = malloc(size_data);
 	TEST_ASSERT(stats_data, "Allocate memory for stats data");

base-commit: de60733246ff4545a0483140c1f21426b8d7cb7f
prerequisite-patch-id: 42a76ce7cec240776c21f674e99e893a3a6bee58

Signature · 1 line
2.39.0.246.g2a6d74b583-goog
#1 lore raw
Quoted 10 lines · David Matlack

Remove the assumption from kvm_binary_stats_test that all stats are laid out contiguously in memory. The current stats in KVM are contiguously laid out in memory, but that may change in the future and the ABI specifically allows holes in the stats data (since each stat exposes its own offset).

While here drop the check that each stats' offset is less than size_data, as that is now always true by construction.

[...]

Applied to kvm-x86 selftests, thanks!

[1/1] KVM: selftests: Stop assuming stats are contiguous in kvm_binary_stats_test

      https://github.com/kvm-x86/linux/commit/d9e552858fab

--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes