iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: selftests: Clean up stats fd in common stats_test() helper

Browse Source 
Move the stats fd cleanup code into stats_test() and drop the
superfluous vm_stats_test() and vcpu_stats_test() helpers in order to
decouple creation of the stats file from consuming/testing the file
(deduping code is a bonus).  This will make it easier to test various
edge cases related to stats, e.g. that userspace can dup() a stats fd,
that userspace can have multiple stats files for a singleVM/vCPU, etc.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20230711230131.648752-4-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2023-07-11 16:01:27 -07:00 committed by Paolo Bonzini
parent 625646aede
commit 87d53582bc
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/testing/selftests/kvm/kvm_binary_stats_test.c
View File

@ -167,23 +167,7 @@ static void stats_test(int stats_fd)
free(stats_data); free(stats_data);
free(stats_desc); free(stats_desc);
free(id); free(id);
}
static void vm_stats_test(struct kvm_vm *vm)
{
int stats_fd = vm_get_stats_fd(vm);
stats_test(stats_fd);
close(stats_fd);
TEST_ASSERT(fcntl(stats_fd, F_GETFD) == -1, "Stats fd not freed");
}
static void vcpu_stats_test(struct kvm_vcpu *vcpu)
{
int stats_fd = vcpu_get_stats_fd(vcpu);
stats_test(stats_fd);
close(stats_fd); close(stats_fd);
TEST_ASSERT(fcntl(stats_fd, F_GETFD) == -1, "Stats fd not freed"); TEST_ASSERT(fcntl(stats_fd, F_GETFD) == -1, "Stats fd not freed");
} }
@ -241,9 +225,11 @@ int main(int argc, char *argv[])
/* Check stats read for every VM and VCPU */ /* Check stats read for every VM and VCPU */
for (i = 0; i < max_vm; ++i) { for (i = 0; i < max_vm; ++i) {
vm_stats_test(vms[i]); stats_test(vm_get_stats_fd(vms[i]));
for (j = 0; j < max_vcpu; ++j) for (j = 0; j < max_vcpu; ++j)
vcpu_stats_test(vcpus[i * max_vcpu + j]); stats_test(vcpu_get_stats_fd(vcpus[i * max_vcpu + j]));
ksft_test_result_pass("vm%i\n", i); ksft_test_result_pass("vm%i\n", i);
} }