diff mbox series

KVM: selftests: Refactor stable TSC check to use TEST_REQUIRE()

Message ID 20230406001724.706668-1-seanjc@google.com
State New
Headers
Series KVM: selftests: Refactor stable TSC check to use TEST_REQUIRE() |

Commit Message

Sean Christopherson April 6, 2023, 12:17 a.m. UTC 
  Refactor the nested TSC scaling test's check on a stable system TSC to
use TEST_REQUIRE() to do the heavy lifting when the system doesn't have
a stable TSC.  Using a helper+TEST_REQUIRE() eliminates the need for
gotos and a custom message.

Cc: Hao Ge <gehao@kylinos.cn>
Cc: Vipin Sharma <vipinsh@google.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 .../kvm/x86_64/vmx_nested_tsc_scaling_test.c  | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)


base-commit: 7712145073876092e9aa81f0b836fef8b5694b14

Comments

Sean Christopherson June 2, 2023, 1:23 a.m. UTC | #1 
On Wed, 05 Apr 2023 17:17:24 -0700, Sean Christopherson wrote:
> Refactor the nested TSC scaling test's check on a stable system TSC to
> use TEST_REQUIRE() to do the heavy lifting when the system doesn't have
> a stable TSC.  Using a helper+TEST_REQUIRE() eliminates the need for
> gotos and a custom message.
> 
> 

Applied to kvm-x86 selftests, thanks!

[1/1] KVM: selftests: Refactor stable TSC check to use TEST_REQUIRE()
      https://github.com/kvm-x86/linux/commit/5efde6d73d58

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

Patch

diff --git a/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c b/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c
index fa03c8d1ce4e..e710b6e7fb38 100644
--- a/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c
@@ -116,29 +116,21 @@  static void l1_guest_code(struct vmx_pages *vmx_pages)
 	GUEST_DONE();
 }
 
-static void stable_tsc_check_supported(void)
+static bool system_has_stable_tsc(void)
 {
+	bool tsc_is_stable;
 	FILE *fp;
 	char buf[4];
 
 	fp = fopen("/sys/devices/system/clocksource/clocksource0/current_clocksource", "r");
 	if (fp == NULL)
-		goto skip_test;
+		return false;
 
-	if (fgets(buf, sizeof(buf), fp) == NULL)
-		goto close_fp;
+	tsc_is_stable = fgets(buf, sizeof(buf), fp) &&
+			!strncmp(buf, "tsc", sizeof(buf));
 
-	if (strncmp(buf, "tsc", sizeof(buf)))
-		goto close_fp;
-
-	fclose(fp);
-	return;
-
-close_fp:
 	fclose(fp);
-skip_test:
-	print_skip("Kernel does not use TSC clocksource - assuming that host TSC is not stable");
-	exit(KSFT_SKIP);
+	return tsc_is_stable;
 }
 
 int main(int argc, char *argv[])
@@ -156,7 +148,7 @@  int main(int argc, char *argv[])
 
 	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));
 	TEST_REQUIRE(kvm_has_cap(KVM_CAP_TSC_CONTROL));
-	stable_tsc_check_supported();
+	TEST_REQUIRE(system_has_stable_tsc());
 
 	/*
 	 * We set L1's scale factor to be a random number from 2 to 10.