KVM: selftests: Rework debug message printing
cover KVM: selftests: Rework debug message printing
Fix some issues with how we output debug and info messages.
Andrew Jones (2):
KVM: selftests: Rework debug message printing
KVM: selftests: Convert some printf's to pr_info's
tools/testing/selftests/kvm/dirty_log_test.c | 16 +++++++++------- tools/testing/selftests/kvm/include/kvm_util.h | 13 ++++++++++--- .../testing/selftests/kvm/kvm_create_max_vcpus.c | 8 ++++---- .../selftests/kvm/lib/aarch64/processor.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 7 ++++--- .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 2 +- tools/testing/selftests/kvm/x86_64/state_test.c | 2 +- .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 4 ++-- .../testing/selftests/kvm/x86_64/xss_msr_test.c | 2 +- 10 files changed, 34 insertions(+), 24 deletions(-)
Signature · 1 line
2.21.1
PATCH 1/2 KVM: selftests: Rework debug message printing
There were a few problems with the way we output "debug" messages. The first is that we used DEBUG() which is defined when NDEBUG is not defined, but NDEBUG will never be defined for kselftests because it relies too much on assert(). The next is that most of the DEBUG() messages were actually "info" messages, which users may want to turn off if they just want a silent test that either completes or asserts. Finally, a debug message output from a library function, and thus for all tests, was annoying when its information wasn't interesting for a test.
Rework these messages so debug messages only output when DEBUG is defined and info messages output unless QUIET is defined. Also name the functions pr_debug and pr_info and make sure that when they're disabled we eat all the inputs. The later avoids unused variable warnings when the variables were only defined for the purpose of printing.
--- tools/testing/selftests/kvm/dirty_log_test.c | 16 +++++++++------- tools/testing/selftests/kvm/include/kvm_util.h | 13 ++++++++++--- .../selftests/kvm/lib/aarch64/processor.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 7 ++++--- 4 files changed, 24 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/dirty_log_test.c +9 -7
@@ -173,7 +173,7 @@ static void *vcpu_worker(void *data) } } -DEBUG ("Dirtied %" PRIu64" pages\n" , pages_count); +pr_info ("Dirtied %" PRIu64" pages\n" , pages_count);return NULL ; }
@@ -252,6 +252,8 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid,struct kvm_vm *vm;uint64_t extra_pg_pages = extra_mem_pages /512 *2 ; +pr_info ("Testing guest mode: %s\n" ,vm_guest_mode_string (mode)); + vm =_vm_create (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages,O_RDWR );kvm_vm_elf_load (vm, program_invocation_name,0 ,0 );#ifdef __x86_64__
@@ -311,7 +313,7 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, guest_test_phys_mem &= ~((1 <<20 ) -1 );#endif -DEBUG ("guest physical test memory offset: 0x%lx\n" , guest_test_phys_mem); +pr_info ("guest physical test memory offset: 0x%lx\n" , guest_test_phys_mem); bmap =bitmap_alloc (host_num_pages); host_bmap_track =bitmap_alloc (host_num_pages);
@@ -378,9 +380,9 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, host_quit = true;pthread_join (vcpu_thread,NULL ); -DEBUG ("Total bits checked: dirty (%" PRIu64"), clear (%" PRIu64"), " -"track_next (%" PRIu64")\n" , host_dirty_count, host_clear_count, - host_track_next_count); +pr_info ("Total bits checked: dirty (%" PRIu64"), clear (%" PRIu64"), " +"track_next (%" PRIu64")\n" , host_dirty_count, host_clear_count, + host_track_next_count);free (bmap);free (host_bmap_track);
@@ -495,8 +497,8 @@ int main(int argc, char *argv[])TEST_ASSERT (iterations >2 ,"Iterations must be greater than two" );TEST_ASSERT (interval >0 ,"Interval must be greater than zero" ); -DEBUG ("Test iterations: %" PRIu64", interval: %" PRIu64" (ms)\n" , - iterations, interval); +pr_info ("Test iterations: %" PRIu64", interval: %" PRIu64" (ms)\n" , + iterations, interval);srandom (time (0 ));
tools/testing/selftests/kvm/include/kvm_util.h +10 -3
@@ -24,10 +24,17 @@ struct kvm_vm;typedef uint64_t vm_paddr_t ;/* Virtual Machine (Guest) physical address */ typedef uint64_t vm_vaddr_t ;/* Virtual Machine (Guest) virtual address */ -#ifndef NDEBUG -#define DEBUG (...) printf(__VA_ARGS__); +static inline int _no_printf (const char *format, ...) {return 0 ; } + +#ifdef DEBUG +#define pr_debug (...) printf(__VA_ARGS__) +#else +#define pr_debug (...) _no_printf(__VA_ARGS__) +#endif +#ifndef QUIET +#define pr_info (...) printf(__VA_ARGS__)#else -#define DEBUG (...) +#define pr_info (...) _no_printf(__VA_ARGS__)#endif /* Minimum allocated guest virtual and physical addresses */
tools/testing/selftests/kvm/lib/aarch64/processor.c +1 -1
@@ -186,7 +186,7 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)static void pte_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent,uint64_t page,int level) { -#ifdef DEBUG_VM +#ifdef DEBUG static const char *const type[] = {"" ,"pud" ,"pmd" ,"pte" };uint64_t pte, *ptep;
tools/testing/selftests/kvm/lib/kvm_util.c +4 -3
@@ -136,7 +136,8 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) {struct kvm_vm *vm; -DEBUG ("Testing guest mode: %s\n" ,vm_guest_mode_string (mode)); +pr_debug ("%s: mode='%s' pages='%ld' perm='%d'\n" , __func__, +vm_guest_mode_string (mode), phy_pages, perm); vm =calloc (1 ,sizeof (*vm));TEST_ASSERT (vm !=NULL ,"Insufficient Memory" );
@@ -196,8 +197,8 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) vm->pgtable_levels =4 ; vm->page_size =0x1000 ; vm->page_shift =12 ; -DEBUG ("Guest physical address width detected: %d\n" , - vm->pa_bits); +pr_debug ("Guest physical address width detected: %d\n" , + vm->pa_bits);#else TEST_ASSERT (false,"VM_MODE_PXXV48_4K not supported on " "non-x86 platforms" );
Signature · 1 line
2.21.1
PATCH 2/2 KVM: selftests: Convert some printf's to pr_info's
In reply to Andrew JonesWe leave some printf's because they inform the user the test is being skipped. QUIET shouldn't disable those. We also leave the printf's in "dump" calls used for debug and in help text.
--- tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 8 ++++---- tools/testing/selftests/kvm/x86_64/mmio_warning_test.c | 2 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 2 +- tools/testing/selftests/kvm/x86_64/state_test.c | 2 +- tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 4 ++-- tools/testing/selftests/kvm/x86_64/xss_msr_test.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/kvm_create_max_vcpus.c +4 -4
@@ -24,8 +24,8 @@ void test_vcpu_creation(int first_vcpu_id, int num_vcpus)struct kvm_vm *vm;int i; -printf ("Testing creating %d vCPUs, with IDs %d...%d.\n" , - num_vcpus, first_vcpu_id, first_vcpu_id + num_vcpus -1 ); +pr_info ("Testing creating %d vCPUs, with IDs %d...%d.\n" , + num_vcpus, first_vcpu_id, first_vcpu_id + num_vcpus -1 ); vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ,O_RDWR );
@@ -41,8 +41,8 @@ int main(int argc, char *argv[])int kvm_max_vcpu_id =kvm_check_cap (KVM_CAP_MAX_VCPU_ID );int kvm_max_vcpus =kvm_check_cap (KVM_CAP_MAX_VCPUS ); -printf ("KVM_CAP_MAX_VCPU_ID: %d\n" , kvm_max_vcpu_id); -printf ("KVM_CAP_MAX_VCPUS: %d\n" , kvm_max_vcpus); +pr_info ("KVM_CAP_MAX_VCPU_ID: %d\n" , kvm_max_vcpu_id); +pr_info ("KVM_CAP_MAX_VCPUS: %d\n" , kvm_max_vcpus);/* * Upstream KVM prior to 4.8 does not support KVM_CAP_MAX_VCPU_ID.
tools/testing/selftests/kvm/x86_64/mmio_warning_test.c +1 -1
@@ -44,7 +44,7 @@ void *thr(void *arg)struct kvm_run *run = tc->run; res =ioctl (kvmcpu,KVM_RUN ,0 ); -printf ("ret1=%d exit_reason=%d suberror=%d\n" , +pr_info ("ret1=%d exit_reason=%d suberror=%d\n" , res, run->exit_reason, run->internal.suberror);return 0 ;
tools/testing/selftests/kvm/x86_64/smm_test.c +1 -1
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])vcpu_alloc_vmx (vm, &vmx_pages_gva);vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); }else { -printf ("will skip SMM test with VMX enabled\n" ); +pr_info ("will skip SMM test with VMX enabled\n" );vcpu_args_set (vm,VCPU_ID ,1 ,0 ); }
tools/testing/selftests/kvm/x86_64/state_test.c +1 -1
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])vcpu_alloc_vmx (vm, &vmx_pages_gva);vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); }else { -printf ("will skip nested state checks\n" ); +pr_info ("will skip nested state checks\n" );vcpu_args_set (vm,VCPU_ID ,1 ,0 ); }
tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c +2 -2
@@ -121,8 +121,8 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)static void report (int64_t val) { -printf ("IA32_TSC_ADJUST is %ld (%lld * TSC_ADJUST_VALUE + %lld).\n" , - val, val /TSC_ADJUST_VALUE , val %TSC_ADJUST_VALUE ); +pr_info ("IA32_TSC_ADJUST is %ld (%lld * TSC_ADJUST_VALUE + %lld).\n" , + val, val /TSC_ADJUST_VALUE , val %TSC_ADJUST_VALUE ); }int main (int argc,char *argv[])
tools/testing/selftests/kvm/x86_64/xss_msr_test.c +1 -1
@@ -51,7 +51,7 @@ int main(int argc, char *argv[]) xss_supported = entry && !!(entry->eax &X86_FEATURE_XSAVES ); }if (!xss_supported) { -printf ("IA32_XSS is not supported by the vCPU.\n" ); +printf ("IA32_XSS is not supported by the vCPU, skipping test\n" );exit (KSFT_SKIP ); }
Signature · 1 line
2.21.1