Skip to contentSkip to conversation

selftests: kvm: make hardware_disable_test less verbose

PATCH Applied Vitaly Kuznetsov 2 participants 2 messages Mar 23, 2021 – Mar 26, 2021

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

PATCH v2 1/1 selftests: kvm: make hardware_disable_test less verbose

hardware_disable_test produces 512 snippets like
...
main: [511] waiting semaphore
run_test: [511] start vcpus
run_test: [511] all threads launched
main: [511] waiting 368us
main: [511] killing child

and this doesn't have much value, let's print this info with pr_debug().

---
 tools/testing/selftests/kvm/hardware_disable_test.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/hardware_disable_test.c +5 -5
index 2f2eeb8a1d86..5aadf84c91c0 100644
@@ -108,7 +108,7 @@ static void run_test(uint32_t run)
 	kvm_vm_elf_load(vm, program_invocation_name, 0, 0);
 	vm_create_irqchip(vm);
 
-	fprintf(stderr, "%s: [%d] start vcpus\n", __func__, run);
+	pr_debug("%s: [%d] start vcpus\n", __func__, run);
 	for (i = 0; i < VCPU_NUM; ++i) {
 		vm_vcpu_add_default(vm, i, guest_code);
 		payloads[i].vm = vm;
@@ -124,7 +124,7 @@ static void run_test(uint32_t run)
 			check_set_affinity(throw_away, &cpu_set);
 		}
 	}
-	fprintf(stderr, "%s: [%d] all threads launched\n", __func__, run);
+	pr_debug("%s: [%d] all threads launched\n", __func__, run);
 	sem_post(sem);
 	for (i = 0; i < VCPU_NUM; ++i)
 		check_join(threads[i], &b);
@@ -147,16 +147,16 @@ int main(int argc, char **argv)
 		if (pid == 0)
 			run_test(i); /* This function always exits */
 
-		fprintf(stderr, "%s: [%d] waiting semaphore\n", __func__, i);
+		pr_debug("%s: [%d] waiting semaphore\n", __func__, i);
 		sem_wait(sem);
 		r = (rand() % DELAY_US_MAX) + 1;
-		fprintf(stderr, "%s: [%d] waiting %dus\n", __func__, i, r);
+		pr_debug("%s: [%d] waiting %dus\n", __func__, i, r);
 		usleep(r);
 		r = waitpid(pid, &s, WNOHANG);
 		TEST_ASSERT(r != pid,
 			    "%s: [%d] child exited unexpectedly status: [%d]",
 			    __func__, i, s);
-		fprintf(stderr, "%s: [%d] killing child\n", __func__, i);
+		pr_debug("%s: [%d] killing child\n", __func__, i);
 		kill(pid, SIGKILL);
 	}
 
Signature · 1 line
2.30.2
maintainer Applied
#1 lore raw
Quoted 48 lines · Vitaly Kuznetsov

hardware_disable_test produces 512 snippets like
...
main: [511] waiting semaphore
run_test: [511] start vcpus
run_test: [511] all threads launched
main: [511] waiting 368us
main: [511] killing child

and this doesn't have much value, let's print this info with pr_debug().

---
  tools/testing/selftests/kvm/hardware_disable_test.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/hardware_disable_test.c +4 -4
index 2f2eeb8a1d86..5aadf84c91c0 100644
@@ -108,7 +108,7 @@ static void run_test(uint32_t run)
  	kvm_vm_elf_load(vm, program_invocation_name, 0, 0);
  	vm_create_irqchip(vm);
 
-	fprintf(stderr, "%s: [%d] start vcpus\n", __func__, run);
+	pr_debug("%s: [%d] start vcpus\n", __func__, run);
  	for (i = 0; i < VCPU_NUM; ++i) {
  		vm_vcpu_add_default(vm, i, guest_code);
  		payloads[i].vm = vm;
@@ -124,7 +124,7 @@ static void run_test(uint32_t run)
  			check_set_affinity(throw_away, &cpu_set);
  		}
  	}
-	fprintf(stderr, "%s: [%d] all threads launched\n", __func__, run);
+	pr_debug("%s: [%d] all threads launched\n", __func__, run);
  	sem_post(sem);
  	for (i = 0; i < VCPU_NUM; ++i)
  		check_join(threads[i], &b);
@@ -147,16 +147,16 @@ int main(int argc, char **argv)
  		if (pid == 0)
  			run_test(i); /* This function always exits */
 
-		fprintf(stderr, "%s: [%d] waiting semaphore\n", __func__, i);
+		pr_debug("%s: [%d] waiting semaphore\n", __func__, i);
  		sem_wait(sem);
  		r = (rand() % DELAY_US_MAX) + 1;
-		fprintf(stderr, "%s: [%d] waiting %dus\n", __func__, i, r);
+		pr_debug("%s: [%d] waiting %dus\n", __func__, i, r);

tools/testing/selftests/kvm/hardware_disable_test.c int main(int argc, char **argv) · line 162

Quoted 10 lines
tools/testing/selftests/kvm/hardware_disable_test.c +1 -1
  		usleep(r);
  		r = waitpid(pid, &s, WNOHANG);
  		TEST_ASSERT(r != pid,
  			    "%s: [%d] child exited unexpectedly status: [%d]",
  			    __func__, i, s);
-		fprintf(stderr, "%s: [%d] killing child\n", __func__, i);
+		pr_debug("%s: [%d] killing child\n", __func__, i);
  		kill(pid, SIGKILL);
  	}
 

Queued, thanks.

Paolo