KVM: selftests: Run clocksource dependent tests with hyperv_clocksource_tsc_page too
KVM's 'gtod_is_based_on_tsc()' recognizes two clocksources: 'tsc' and 'hyperv_clocksource_tsc_page' and enables kvmclock in 'masterclock' mode when either is in use. Transform 'sys_clocksource_is_tsc()' into 'sys_clocksource_is_based_on_tsc()' to support the later. This affects two tests: kvm_clock_test and vmx_nested_tsc_scaling_test, both seem to work well when system clocksource is 'hyperv_clocksource_tsc_page'. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Link: https://lore.kernel.org/r/20240109141121.1619463-4-vkuznets@redhat.com Signed-off-by: Sean Christopherson <seanjc@google.com>
This commit is contained in:
parent
410cb01ead
commit
09951bf2cb
@ -1271,6 +1271,6 @@ void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
|
||||
#define PFERR_GUEST_PAGE_MASK BIT_ULL(PFERR_GUEST_PAGE_BIT)
|
||||
#define PFERR_IMPLICIT_ACCESS BIT_ULL(PFERR_IMPLICIT_ACCESS_BIT)
|
||||
|
||||
bool sys_clocksource_is_tsc(void);
|
||||
bool sys_clocksource_is_based_on_tsc(void);
|
||||
|
||||
#endif /* SELFTEST_KVM_PROCESSOR_H */
|
||||
|
@ -1300,10 +1300,11 @@ void kvm_selftest_arch_init(void)
|
||||
host_cpu_is_amd = this_cpu_is_amd();
|
||||
}
|
||||
|
||||
bool sys_clocksource_is_tsc(void)
|
||||
bool sys_clocksource_is_based_on_tsc(void)
|
||||
{
|
||||
char *clk_name = sys_get_cur_clocksource();
|
||||
bool ret = !strcmp(clk_name, "tsc\n");
|
||||
bool ret = !strcmp(clk_name, "tsc\n") ||
|
||||
!strcmp(clk_name, "hyperv_clocksource_tsc_page\n");
|
||||
|
||||
free(clk_name);
|
||||
|
||||
|
@ -143,7 +143,7 @@ int main(void)
|
||||
flags = kvm_check_cap(KVM_CAP_ADJUST_CLOCK);
|
||||
TEST_REQUIRE(flags & KVM_CLOCK_REALTIME);
|
||||
|
||||
TEST_REQUIRE(sys_clocksource_is_tsc());
|
||||
TEST_REQUIRE(sys_clocksource_is_based_on_tsc());
|
||||
|
||||
vm = vm_create_with_one_vcpu(&vcpu, guest_main);
|
||||
|
||||
|
@ -131,7 +131,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));
|
||||
TEST_REQUIRE(kvm_has_cap(KVM_CAP_TSC_CONTROL));
|
||||
TEST_REQUIRE(sys_clocksource_is_tsc());
|
||||
TEST_REQUIRE(sys_clocksource_is_based_on_tsc());
|
||||
|
||||
/*
|
||||
* We set L1's scale factor to be a random number from 2 to 10.
|
||||
|
Loading…
x
Reference in New Issue
Block a user