Commit 9f2fc555 authored by David Matlack's avatar David Matlack Committed by Paolo Bonzini
Browse files

KVM: selftests: Refactor help message for -s backing_src 



All selftests that support the backing_src option were printing their
own description of the flag and then calling backing_src_help() to dump
the list of available backing sources. Consolidate the flag printing in
backing_src_help() to align indentation, reduce duplicated strings, and
improve consistency across tests.

Note: Passing "-s" to backing_src_help is unnecessary since every test
uses the same flag. However I decided to keep it for code readability
at the call sites.

While here this opportunistically fixes the incorrectly interleaved
printing -x help message and list of backing source types in
dirty_log_perf_test.

Fixes: 609e6202 ("KVM: selftests: Support multiple slots in dirty_log_perf_test")
Reviewed-by: default avatarBen Gardon <bgardon@google.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Message-Id: <20210917173657.44011-3-dmatlack@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a1e638da

tools/testing/selftests/kvm/access_tracking_perf_test.c

+2 −4
Original line number Diff line number Diff line
@@ -371,9 +371,7 @@ static void help(char *name) 
	printf(" -v: specify the number of vCPUs to run.\n");

	printf(" -o: Overlap guest memory accesses instead of partitioning\n"

	       "     them into a separate region of memory for each vCPU.\n");

	printf(" -s: specify the type of memory that should be used to\n"

	       "     back the guest data region.\n\n");

	backing_src_help();

	backing_src_help("-s");

	puts("");

	exit(0);

}
@@ -381,7 +379,7 @@ static void help(char *name) 
int main(int argc, char *argv[])

{

	struct test_params params = {

		.backing_src = VM_MEM_SRC_ANONYMOUS,

		.backing_src = DEFAULT_VM_MEM_SRC,

		.vcpu_memory_bytes = DEFAULT_PER_VCPU_MEM_SIZE,

		.vcpus = 1,

	};

tools/testing/selftests/kvm/demand_paging_test.c

+2 −3
Original line number Diff line number Diff line
@@ -426,8 +426,7 @@ static void help(char *name) 
	printf(" -b: specify the size of the memory region which should be\n"

	       "     demand paged by each vCPU. e.g. 10M or 3G.\n"

	       "     Default: 1G\n");

	printf(" -s: The type of backing memory to use. Default: anonymous\n");

	backing_src_help();

	backing_src_help("-s");

	printf(" -v: specify the number of vCPUs to run.\n");

	printf(" -o: Overlap guest memory accesses instead of partitioning\n"

	       "     them into a separate region of memory for each vCPU.\n");
@@ -439,7 +438,7 @@ int main(int argc, char *argv[]) 
{

	int max_vcpus = kvm_check_cap(KVM_CAP_MAX_VCPUS);

	struct test_params p = {

		.src_type = VM_MEM_SRC_ANONYMOUS,

		.src_type = DEFAULT_VM_MEM_SRC,

		.partition_vcpu_memory_access = true,

	};

	int opt;

tools/testing/selftests/kvm/dirty_log_perf_test.c

+3 −5
Original line number Diff line number Diff line
@@ -308,11 +308,9 @@ static void help(char *name) 
	printf(" -v: specify the number of vCPUs to run.\n");

	printf(" -o: Overlap guest memory accesses instead of partitioning\n"

	       "     them into a separate region of memory for each vCPU.\n");

	printf(" -s: specify the type of memory that should be used to\n"

	       "     back the guest data region.\n\n");

	backing_src_help("-s");

	printf(" -x: Split the memory region into this number of memslots.\n"

	       "     (default: 1)");

	backing_src_help();

	       "     (default: 1)\n");

	puts("");

	exit(0);

}
@@ -324,7 +322,7 @@ int main(int argc, char *argv[]) 
		.iterations = TEST_HOST_LOOP_N,

		.wr_fract = 1,

		.partition_vcpu_memory_access = true,

		.backing_src = VM_MEM_SRC_ANONYMOUS,

		.backing_src = DEFAULT_VM_MEM_SRC,

		.slots = 1,

	};

	int opt;

tools/testing/selftests/kvm/include/test_util.h

+3 −1
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ enum vm_mem_backing_src_type { 
	NUM_SRC_TYPES,

};



#define DEFAULT_VM_MEM_SRC VM_MEM_SRC_ANONYMOUS



struct vm_mem_backing_src_alias {

	const char *name;

	uint32_t flag;
@@ -100,7 +102,7 @@ size_t get_trans_hugepagesz(void); 
size_t get_def_hugetlb_pagesz(void);

const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias(uint32_t i);

size_t get_backing_src_pagesz(uint32_t i);

void backing_src_help(void);

void backing_src_help(const char *flag);

enum vm_mem_backing_src_type parse_backing_src_type(const char *type_name);



/*

tools/testing/selftests/kvm/kvm_page_table_test.c

+2 −5
Original line number Diff line number Diff line
@@ -456,10 +456,7 @@ static void help(char *name) 
	       "     (default: 1G)\n");

	printf(" -v: specify the number of vCPUs to run\n"

	       "     (default: 1)\n");

	printf(" -s: specify the type of memory that should be used to\n"

	       "     back the guest data region.\n"

	       "     (default: anonymous)\n\n");

	backing_src_help();

	backing_src_help("-s");

	puts("");

}
@@ -468,7 +465,7 @@ int main(int argc, char *argv[]) 
	int max_vcpus = kvm_check_cap(KVM_CAP_MAX_VCPUS);

	struct test_params p = {

		.test_mem_size = DEFAULT_TEST_MEM_SIZE,

		.src_type = VM_MEM_SRC_ANONYMOUS,

		.src_type = DEFAULT_VM_MEM_SRC,

	};

	int opt;