dirty_log_perf_test vCPU pinning
v8 cover dirty_log_perf_test vCPU pinning
Pin vCPUs to a host physical CPUs (pCPUs) in dirty_log_perf_test and optionally pin the main application thread to a physical cpu if provided. All tests based on perf_test_util framework can take advantage of it if needed.
While at it, I changed atoi() to atoi_paranoid(), atoi_positive, atoi_non_negative() in other tests, sorted command line options alphabetically in dirty_log_perf_test, and added break between -e and -g which was missed in original commit when -e was introduced.
v8:
- Changed atoi_positive() and atoi_non_negative() to accept variable name also.
- Moved atoi_positive() and atoi_non_negative() definition to test_util.h
- Removed new line character from TEST_ASSERT() statements.
- Using official SZ_1G from sizes.h header file in max_guest_memory_test.c
- Shortened test args name in memslot_modification_stress_test.c
v7: https://lore.kernel.org/lkml/[email protected]/
- Moved pinning APIs from perf_test_util.c to kvm_util.c.
- Missed one atoi() call in aarch64/debug-exceptions.c, changed it to atoi_positive().
v6: https://lore.kernel.org/lkml/[email protected]/
- Updated the shortlog of Patch 5.
- Changed formatting of help text of -c in dirty_log_perf_test
v5: https://lore.kernel.org/lkml/[email protected]/
- Added atoi_postive() and atoi_non_negative() APIs for string parsing.
- Using sched_getaffinity() to verify if a pCPU is allowed or not.
- Changed Suggested-by to add only person came up with original idea of pinning.
- Updated strings and commit messages.
v4: https://lore.kernel.org/lkml/[email protected]/
- Moved boolean to check vCPUs pinning from perf_test_vcpu_args to perf_test_args.
- Changed assert statements to make error more descriptive.
- Modified break statement between 'e' and 'g' option in v3 by not copying dirty_log_manual_caps = 0 to 'e'.
v3: https://lore.kernel.org/lkml/[email protected]
- Moved atoi_paranoid() to test_util.c and replaced all atoi() usage with atoi_paranoid()
- Sorted command line options alphabetically.
- Instead of creating a vcpu thread on a specific pcpu the thread will migrate to the provided pcpu after its creation.
- Decoupled -e and -g option.
v2: https://lore.kernel.org/lkml/[email protected]/
- Removed -d option.
- One cpu list passed as option, cpus for vcpus, followed by application thread cpu.
- Added paranoid cousin of atoi().
v1: https://lore.kernel.org/lkml/[email protected]
Vipin Sharma (7):
KVM: selftests: Add missing break between -e and -g option in
dirty_log_perf_test
KVM: selftests: Put command line options in alphabetical order in
dirty_log_perf_test
KVM: selftests: Add atoi_paranoid() to catch errors missed by atoi()
KVM: selftests: Use SZ_1G from sizes.h in max_guest_memory_test.c
KVM: selftests: Shorten the test args in
memslot_modification_stress_test.c
KVM: selftests: Add atoi_positive() and atoi_non_negative() for input
validation
KVM: selftests: Allowing running dirty_log_perf_test on specific CPUs
.../selftests/kvm/aarch64/arch_timer.c | 25 ++------ .../selftests/kvm/aarch64/debug-exceptions.c | 2 +- .../testing/selftests/kvm/aarch64/vgic_irq.c | 6 +- .../selftests/kvm/access_tracking_perf_test.c | 2 +- .../selftests/kvm/demand_paging_test.c | 4 +- .../selftests/kvm/dirty_log_perf_test.c | 64 +++++++++++++------ .../selftests/kvm/include/kvm_util_base.h | 4 ++ .../selftests/kvm/include/perf_test_util.h | 4 ++ .../testing/selftests/kvm/include/test_util.h | 18 ++++++ .../selftests/kvm/kvm_page_table_test.c | 4 +- tools/testing/selftests/kvm/lib/kvm_util.c | 54 ++++++++++++++++ .../selftests/kvm/lib/perf_test_util.c | 8 ++- tools/testing/selftests/kvm/lib/test_util.c | 19 ++++++ .../selftests/kvm/max_guest_memory_test.c | 21 +++--- .../kvm/memslot_modification_stress_test.c | 22 +++---- .../testing/selftests/kvm/memslot_perf_test.c | 24 ++----- .../selftests/kvm/set_memory_region_test.c | 2 +- .../selftests/kvm/x86_64/nx_huge_pages_test.c | 5 +- 18 files changed, 191 insertions(+), 97 deletions(-)
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
PATCH v8 1/7 KVM: selftests: Add missing break between -e and -g option in dirty_log_perf_test
Passing -e option (Run VCPUs while dirty logging is being disabled) in dirty_log_perf_test also unintentionally enables -g (Do not enable KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2). Add break between two switch case logic.
--- tools/testing/selftests/kvm/dirty_log_perf_test.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/kvm/dirty_log_perf_test.c +1 -0
@@ -411,6 +411,7 @@ int main(int argc, char *argv[])case 'e' :/* 'e' is for evil. */ run_vcpus_while_disabling_dirty_logging = true; +break ;case 'g' : dirty_log_manual_caps =0 ;break ;
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
PATCH v8 2/7 KVM: selftests: Put command line options in alphabetical order in dirty_log_perf_test
In reply to Vipin SharmaThere are 13 command line options and they are not in any order. Put them in alphabetical order to make it easy to add new options.
No functional change intended.
--- .../selftests/kvm/dirty_log_perf_test.c | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-)
tools/testing/selftests/kvm/dirty_log_perf_test.c +19 -17
@@ -406,50 +406,52 @@ int main(int argc, char *argv[])guest_modes_append_default (); -while ((opt =getopt (argc, argv,"eghi:p:m:nb:f:v:os:x:" )) !=-1 ) { +while ((opt =getopt (argc, argv,"b:ef:ghi:m:nop:s:v:x:" )) !=-1 ) {switch (opt) { +case 'b' : + guest_percpu_mem_size =parse_size (optarg); +break ;case 'e' :/* 'e' is for evil. */ run_vcpus_while_disabling_dirty_logging = true;break ; +case 'f' : + p.wr_fract =atoi (optarg); +TEST_ASSERT (p.wr_fract >=1 , +"Write fraction cannot be less than one" ); +break ;case 'g' : dirty_log_manual_caps =0 ;break ; +case 'h' : +help (argv[0 ]); +break ;case 'i' : p.iterations =atoi (optarg);break ; -case 'p' : - p.phys_offset =strtoull (optarg,NULL ,0 ); -break ;case 'm' :guest_modes_cmdline (optarg);break ;case 'n' : perf_test_args.nested = true;break ; -case 'b' : - guest_percpu_mem_size =parse_size (optarg); +case 'o' : + p.partition_vcpu_memory_access = false;break ; -case 'f' : - p.wr_fract =atoi (optarg); -TEST_ASSERT (p.wr_fract >=1 , -"Write fraction cannot be less than one" ); +case 'p' : + p.phys_offset =strtoull (optarg,NULL ,0 ); +break ; +case 's' : + p.backing_src =parse_backing_src_type (optarg);break ;case 'v' : nr_vcpus =atoi (optarg);TEST_ASSERT (nr_vcpus >0 && nr_vcpus <= max_vcpus,"Invalid number of vcpus, must be between 1 and %d" , max_vcpus);break ; -case 'o' : - p.partition_vcpu_memory_access = false; -break ; -case 's' : - p.backing_src =parse_backing_src_type (optarg); -break ;case 'x' : p.slots =atoi (optarg);break ; -case 'h' :default :help (argv[0 ]);break ;
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
PATCH v8 3/7 KVM: selftests: Add atoi_paranoid() to catch errors missed by atoi()
In reply to Vipin Sharmaatoi() doesn't detect errors. There is no way to know that a 0 return is correct conversion or due to an error.
Introduce atoi_paranoid() to detect errors and provide correct conversion. Replace all atoi() calls with atoi_paranoid().
--- .../selftests/kvm/aarch64/arch_timer.c | 8 ++++---- .../selftests/kvm/aarch64/debug-exceptions.c | 2 +- .../testing/selftests/kvm/aarch64/vgic_irq.c | 6 +++--- .../selftests/kvm/access_tracking_perf_test.c | 2 +- .../selftests/kvm/demand_paging_test.c | 2 +- .../selftests/kvm/dirty_log_perf_test.c | 8 ++++---- .../testing/selftests/kvm/include/test_util.h | 2 ++ .../selftests/kvm/kvm_page_table_test.c | 2 +- tools/testing/selftests/kvm/lib/test_util.c | 19 +++++++++++++++++++ .../selftests/kvm/max_guest_memory_test.c | 6 +++--- .../kvm/memslot_modification_stress_test.c | 6 +++--- .../testing/selftests/kvm/memslot_perf_test.c | 10 +++++----- .../selftests/kvm/set_memory_region_test.c | 2 +- .../selftests/kvm/x86_64/nx_huge_pages_test.c | 4 ++-- 14 files changed, 50 insertions(+), 29 deletions(-)
tools/testing/selftests/kvm/aarch64/arch_timer.c +4 -4
@@ -414,7 +414,7 @@ static bool parse_args(int argc, char *argv[])while ((opt =getopt (argc, argv,"hn:i:p:m:" )) !=-1 ) {switch (opt) {case 'n' : - test_args.nr_vcpus =atoi (optarg); + test_args.nr_vcpus =atoi_paranoid (optarg);if (test_args.nr_vcpus <=0 ) {pr_info ("Positive value needed for -n\n" ); goto err;
@@ -425,21 +425,21 @@ static bool parse_args(int argc, char *argv[]) }break ;case 'i' : - test_args.nr_iter =atoi (optarg); + test_args.nr_iter =atoi_paranoid (optarg);if (test_args.nr_iter <=0 ) {pr_info ("Positive value needed for -i\n" ); goto err; }break ;case 'p' : - test_args.timer_period_ms =atoi (optarg); + test_args.timer_period_ms =atoi_paranoid (optarg);if (test_args.timer_period_ms <=0 ) {pr_info ("Positive value needed for -p\n" ); goto err; }break ;case 'm' : - test_args.migration_freq_ms =atoi (optarg); + test_args.migration_freq_ms =atoi_paranoid (optarg);if (test_args.migration_freq_ms <0 ) {pr_info ("0 or positive value needed for -m\n" ); goto err;
tools/testing/selftests/kvm/aarch64/debug-exceptions.c +1 -1
@@ -423,7 +423,7 @@ int main(int argc, char *argv[])while ((opt =getopt (argc, argv,"i:" )) !=-1 ) {switch (opt) {case 'i' : - ss_iteration =atoi (optarg); + ss_iteration =atoi_paranoid (optarg);break ;case 'h' :default :
tools/testing/selftests/kvm/aarch64/vgic_irq.c +3 -3
@@ -824,16 +824,16 @@ int main(int argc, char **argv)while ((opt =getopt (argc, argv,"hn:e:l:" )) !=-1 ) {switch (opt) {case 'n' : - nr_irqs =atoi (optarg); + nr_irqs =atoi_paranoid (optarg);if (nr_irqs >1024 || nr_irqs %32 )help (argv[0 ]);break ;case 'e' : - eoi_split = (bool )atoi (optarg); + eoi_split = (bool )atoi_paranoid (optarg); default_args = false;break ;case 'l' : - level_sensitive = (bool )atoi (optarg); + level_sensitive = (bool )atoi_paranoid (optarg); default_args = false;break ;case 'h' :
tools/testing/selftests/kvm/access_tracking_perf_test.c +1 -1
@@ -368,7 +368,7 @@ int main(int argc, char *argv[]) params.vcpu_memory_bytes =parse_size (optarg);break ;case 'v' : - params.nr_vcpus =atoi (optarg); + params.nr_vcpus =atoi_paranoid (optarg);break ;case 'o' : overlap_memory_access = true;
tools/testing/selftests/kvm/demand_paging_test.c +1 -1
@@ -427,7 +427,7 @@ int main(int argc, char *argv[]) p.src_type =parse_backing_src_type (optarg);break ;case 'v' : - nr_vcpus =atoi (optarg); + nr_vcpus =atoi_paranoid (optarg);TEST_ASSERT (nr_vcpus >0 && nr_vcpus <= max_vcpus,"Invalid number of vcpus, must be between 1 and %d" , max_vcpus);break ;
tools/testing/selftests/kvm/dirty_log_perf_test.c +4 -4
@@ -416,7 +416,7 @@ int main(int argc, char *argv[]) run_vcpus_while_disabling_dirty_logging = true;break ;case 'f' : - p.wr_fract =atoi (optarg); + p.wr_fract =atoi_paranoid (optarg);TEST_ASSERT (p.wr_fract >=1 ,"Write fraction cannot be less than one" );break ;
@@ -427,7 +427,7 @@ int main(int argc, char *argv[])help (argv[0 ]);break ;case 'i' : - p.iterations =atoi (optarg); + p.iterations =atoi_paranoid (optarg);break ;case 'm' :guest_modes_cmdline (optarg);
@@ -445,12 +445,12 @@ int main(int argc, char *argv[]) p.backing_src =parse_backing_src_type (optarg);break ;case 'v' : - nr_vcpus =atoi (optarg); + nr_vcpus =atoi_paranoid (optarg);TEST_ASSERT (nr_vcpus >0 && nr_vcpus <= max_vcpus,"Invalid number of vcpus, must be between 1 and %d" , max_vcpus);break ;case 'x' : - p.slots =atoi (optarg); + p.slots =atoi_paranoid (optarg);break ;default :help (argv[0 ]);
tools/testing/selftests/kvm/include/test_util.h +2 -0
@@ -152,4 +152,6 @@ static inline void *align_ptr_up(void *x, size_t size) return (void *)align_up((unsigned long)x, size); } +int atoi_paranoid (const char *num_str); +#endif /* SELFTEST_KVM_TEST_UTIL_H */
tools/testing/selftests/kvm/kvm_page_table_test.c +1 -1
@@ -461,7 +461,7 @@ int main(int argc, char *argv[]) p.test_mem_size =parse_size (optarg);break ;case 'v' : - nr_vcpus =atoi (optarg); + nr_vcpus =atoi_paranoid (optarg);TEST_ASSERT (nr_vcpus >0 && nr_vcpus <= max_vcpus,"Invalid number of vcpus, must be between 1 and %d" , max_vcpus);break ;
tools/testing/selftests/kvm/lib/test_util.c +19 -0
@@ -334,3 +334,22 @@ long get_run_delay(void)return val[1 ]; } + +int atoi_paranoid (const char *num_str) +{ +char *end_ptr; +long num; + + errno =0 ; + num =strtol (num_str, &end_ptr,0 ); +TEST_ASSERT (!errno,"strtol(\"%s\") failed" , num_str); +TEST_ASSERT (num_str != end_ptr, +"strtol(\"%s\") didn't find a valid integer." , num_str); +TEST_ASSERT (*end_ptr =='\0' , +"strtol(\"%s\") failed to parse trailing characters \"%s\"." , + num_str, end_ptr); +TEST_ASSERT (num >=INT_MIN && num <=INT_MAX , +"%ld not in range of [%d, %d]" , num,INT_MIN ,INT_MAX ); + +return num; +}
tools/testing/selftests/kvm/max_guest_memory_test.c +3 -3
@@ -193,15 +193,15 @@ int main(int argc, char *argv[])while ((opt =getopt (argc, argv,"c:h:m:s:H" )) !=-1 ) {switch (opt) {case 'c' : - nr_vcpus =atoi (optarg); + nr_vcpus =atoi_paranoid (optarg);TEST_ASSERT (nr_vcpus >0 ,"number of vcpus must be >0" );break ;case 'm' : - max_mem =atoi (optarg) * size_1gb; + max_mem =atoi_paranoid (optarg) * size_1gb;TEST_ASSERT (max_mem >0 ,"memory size must be >0" );break ;case 's' : - slot_size =atoi (optarg) * size_1gb; + slot_size =atoi_paranoid (optarg) * size_1gb;TEST_ASSERT (slot_size >0 ,"slot size must be >0" );break ;case 'H' :
tools/testing/selftests/kvm/memslot_modification_stress_test.c +3 -3
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])guest_modes_cmdline (optarg);break ;case 'd' : - p.memslot_modification_delay =strtoul (optarg,NULL ,0 ); + p.memslot_modification_delay =atoi_paranoid (optarg);TEST_ASSERT (p.memslot_modification_delay >=0 ,"A negative delay is not supported." );break ;
@@ -166,7 +166,7 @@ int main(int argc, char *argv[]) guest_percpu_mem_size =parse_size (optarg);break ;case 'v' : - nr_vcpus =atoi (optarg); + nr_vcpus =atoi_paranoid (optarg);TEST_ASSERT (nr_vcpus >0 && nr_vcpus <= max_vcpus,"Invalid number of vcpus, must be between 1 and %d" , max_vcpus);
@@ -175,7 +175,7 @@ int main(int argc, char *argv[]) p.partition_vcpu_memory_access = false;break ;case 'i' : - p.nr_memslot_modifications =atoi (optarg); + p.nr_memslot_modifications =atoi_paranoid (optarg);break ;case 'h' :default :
tools/testing/selftests/kvm/memslot_perf_test.c +5 -5
@@ -885,21 +885,21 @@ static bool parse_args(int argc, char *argv[], map_unmap_verify = true;break ;case 's' : - targs->nslots =atoi (optarg); + targs->nslots =atoi_paranoid (optarg);if (targs->nslots <=0 && targs->nslots !=-1 ) {pr_info ("Slot count cap has to be positive or -1 for no cap\n" );return false; }break ;case 'f' : - targs->tfirst =atoi (optarg); + targs->tfirst =atoi_paranoid (optarg);if (targs->tfirst <0 ) {pr_info ("First test to run has to be non-negative\n" );return false; }break ;case 'e' : - targs->tlast =atoi (optarg); + targs->tlast =atoi_paranoid (optarg);if (targs->tlast <0 || targs->tlast >=NTESTS ) {pr_info ("Last test to run has to be non-negative and less than %zu\n" ,NTESTS );
@@ -907,14 +907,14 @@ static bool parse_args(int argc, char *argv[], }break ;case 'l' : - targs->seconds =atoi (optarg); + targs->seconds =atoi_paranoid (optarg);if (targs->seconds <0 ) {pr_info ("Test length in seconds has to be non-negative\n" );return false; }break ;case 'r' : - targs->runs =atoi (optarg); + targs->runs =atoi_paranoid (optarg);if (targs->runs <=0 ) {pr_info ("Runs per test has to be positive\n" );return false;
tools/testing/selftests/kvm/set_memory_region_test.c +1 -1
@@ -407,7 +407,7 @@ int main(int argc, char *argv[])#ifdef __x86_64__if (argc >1 ) - loops =atoi (argv[1 ]); + loops =atoi_paranoid (argv[1 ]);else loops =10 ;
tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c +2 -2
@@ -241,10 +241,10 @@ int main(int argc, char **argv)while ((opt =getopt (argc, argv,"hp:t:r" )) !=-1 ) {switch (opt) {case 'p' : - reclaim_period_ms =atoi (optarg); + reclaim_period_ms =atoi_paranoid (optarg);break ;case 't' : - token =atoi (optarg); + token =atoi_paranoid (optarg);break ;case 'r' : reboot_permissions = true;
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
Re: [PATCH v8 3/7] KVM: selftests: Add atoi_paranoid() to catch errors missed by atoi()
Quoted 10 lines · Vipin Sharma
atoi()doesn't detect errors. There is no way to know that a 0 return is correct conversion or due to an error.Introduce
atoi_paranoid()to detect errors and provide correct conversion. Replace allatoi()calls withatoi_paranoid().Signed-off-by Vipin Sharma <[email protected]>Suggested-by David Matlack <[email protected]>Suggested-by Sean Christopherson <[email protected]>---
PATCH v8 4/7 KVM: selftests: Use SZ_1G from sizes.h in max_guest_memory_test.c
In reply to Vipin SharmaReplace size_1gb defined in max_guest_memory_test.c with the SZ_1G from linux/sizes.h header file.
--- .../selftests/kvm/max_guest_memory_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
tools/testing/selftests/kvm/max_guest_memory_test.c +8 -8
@@ -11,6 +11,7 @@#include <linux/bitmap.h> #include <linux/bitops.h> #include <linux/atomic.h> +#include <linux/sizes.h> #include "kvm_util.h" #include "test_util.h"
@@ -162,8 +163,7 @@ int main(int argc, char *argv[])* just below the 4gb boundary. This test could create memory at * 1gb-3gb,but it's simpler to skip straight to 4gb. */ -const uint64_t size_1gb = (1 <<30 ); -const uint64_t start_gpa = (4ull * size_1gb); +const uint64_t start_gpa =SZ_4G ;const int first_slot =1 ;struct timespec time_start, time_run1, time_reset, time_run2;
@@ -180,13 +180,13 @@ int main(int argc, char *argv[])* are quite common for x86, requires changing only max_mem (KVM allows * 32k memslots, 32k * 2gb == ~64tb of guest memory). */ - slot_size =2 * size_1gb; + slot_size =SZ_2G ; max_slots =kvm_check_cap (KVM_CAP_NR_MEMSLOTS );TEST_ASSERT (max_slots > first_slot,"KVM is broken" );/* All KVM MMUs should be able to survive a 128gb guest. */ - max_mem =128 * size_1gb; + max_mem =128ull *SZ_1G ;calc_default_nr_vcpus ();
@@ -197,11 +197,11 @@ int main(int argc, char *argv[])TEST_ASSERT (nr_vcpus >0 ,"number of vcpus must be >0" );break ;case 'm' : - max_mem =atoi_paranoid (optarg) * size_1gb; + max_mem =1ull *atoi_paranoid (optarg) *SZ_1G ;TEST_ASSERT (max_mem >0 ,"memory size must be >0" );break ;case 's' : - slot_size =atoi_paranoid (optarg) * size_1gb; + slot_size =1ull *atoi_paranoid (optarg) *SZ_1G ;TEST_ASSERT (slot_size >0 ,"slot size must be >0" );break ;case 'H' :
@@ -245,7 +245,7 @@ int main(int argc, char *argv[])#ifdef __x86_64__/* Identity map memory in the guest using 1gb pages. */ -for (i =0 ; i < slot_size; i += size_1gb) +for (i =0 ; i < slot_size; i +=SZ_1G )__virt_pg_map (vm, gpa + i, gpa + i,PG_LEVEL_1G );#else for (i =0 ; i < slot_size; i += vm->page_size)
@@ -260,7 +260,7 @@ int main(int argc, char *argv[]) vcpus =NULL ;pr_info ("Running with %lugb of guest memory and %u vCPUs\n" , - (gpa - start_gpa) / size_1gb, nr_vcpus); + (gpa - start_gpa) /SZ_1G , nr_vcpus);rendezvous_with_vcpus (&time_start,"spawning" );rendezvous_with_vcpus (&time_run1,"run 1" );
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
Re: [PATCH v8 4/7] KVM: selftests: Use SZ_1G from sizes.h in max_guest_memory_test.c
Quoted 5 lines · Vipin Sharma
Replace
size_1gbdefined inmax_guest_memory_test.cwith theSZ_1Gfromlinux/sizes.hheader file.Signed-off-by Vipin Sharma <[email protected]>---
PATCH v8 5/7 KVM: selftests: Shorten the test args in memslot_modification_stress_test.c
In reply to Vipin SharmaChange test args memslot_modification_delay and nr_memslot_modifications to delay and nr_iterations for simplicity.
--- .../kvm/memslot_modification_stress_test.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
tools/testing/selftests/kvm/memslot_modification_stress_test.c +9 -9
@@ -87,8 +87,8 @@ static void add_remove_memslot(struct kvm_vm *vm, useconds_t delay, }struct test_params { -useconds_t memslot_modification_delay; -uint64_t nr_memslot_modifications; +useconds_t delay; +uint64_t nr_iterations;bool partition_vcpu_memory_access; };
@@ -107,8 +107,8 @@ static void run_test(enum vm_guest_mode mode, void *arg)pr_info ("Started all vCPUs\n" ); -add_remove_memslot (vm, p->memslot_modification_delay, - p->nr_memslot_modifications); +add_remove_memslot (vm, p->delay, + p->nr_iterations); run_vcpus = false;
@@ -144,8 +144,8 @@ int main(int argc, char *argv[])int max_vcpus =kvm_check_cap (KVM_CAP_MAX_VCPUS );int opt;struct test_params p = { - .memslot_modification_delay =0 , - .nr_memslot_modifications = + .delay =0 , + .nr_iterations =DEFAULT_MEMSLOT_MODIFICATION_ITERATIONS , .partition_vcpu_memory_access = true };
@@ -158,8 +158,8 @@ int main(int argc, char *argv[])guest_modes_cmdline (optarg);break ;case 'd' : - p.memslot_modification_delay =atoi_paranoid (optarg); -TEST_ASSERT (p.memslot_modification_delay >=0 , + p.delay =atoi_paranoid (optarg); +TEST_ASSERT (p.delay >=0 ,"A negative delay is not supported." );break ;case 'b' :
@@ -175,7 +175,7 @@ int main(int argc, char *argv[]) p.partition_vcpu_memory_access = false;break ;case 'i' : - p.nr_memslot_modifications =atoi_paranoid (optarg); + p.nr_iterations =atoi_paranoid (optarg);break ;case 'h' :default :
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
Sean Christopherson
reviewerRe: [PATCH v8 5/7] KVM: selftests: Shorten the test args in memslot_modification_stress_test.c
Quoted 2 lines · Vipin Sharma
Change test args
memslot_modification_delayandnr_memslot_modificationsto delay andnr_iterationsfor simplicity.
I don't care about the credit so much as I don't want you getting yelled at for one of my random ideas :-)
Quoted 21 lines
Signed-off-by Vipin Sharma <[email protected]>--- .../kvm/memslot_modification_stress_test.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)tools/testing/selftests/kvm/memslot_modification_stress_test.c +2
-2@@ -87,8 +87,8 @@ static void add_remove_memslot(struct kvm_vm *vm, useconds_t delay, }struct test_params { -useconds_t memslot_modification_delay; -uint64_t nr_memslot_modifications; +useconds_t delay; +uint64_t nr_iterations;bool partition_vcpu_memory_access; };
tools/testing/selftests/kvm/memslot_modification_stress_test.c static void run_test(enum vm_guest_mode mode, void *arg) · line 111
Quoted 7 lines
tools/testing/selftests/kvm/memslot_modification_stress_test.c +2
-2@@ -107,8 +107,8 @@ static void run_test(enum vm_guest_mode mode, void *arg)pr_info ("Started all vCPUs\n" ); -add_remove_memslot (vm, p->memslot_modification_delay, - p->nr_memslot_modifications); +add_remove_memslot (vm, p->delay, + p->nr_iterations);
This wrap is no longer necessary (which was part of the motivation for the rename).
Quoted 36 lines
tools/testing/selftests/kvm/memslot_modification_stress_test.c +5
-5run_vcpus = false;@@ -144,8 +144,8 @@ int main(int argc, char *argv[])int max_vcpus =kvm_check_cap (KVM_CAP_MAX_VCPUS );int opt;struct test_params p = { - .memslot_modification_delay =0 , - .nr_memslot_modifications = + .delay =0 , + .nr_iterations =DEFAULT_MEMSLOT_MODIFICATION_ITERATIONS , .partition_vcpu_memory_access = true };@@ -158,8 +158,8 @@ int main(int argc, char *argv[])guest_modes_cmdline (optarg);break ;case 'd' : - p.memslot_modification_delay =atoi_paranoid (optarg); -TEST_ASSERT (p.memslot_modification_delay >=0 , + p.delay =atoi_paranoid (optarg); +TEST_ASSERT (p.delay >=0 ,"A negative delay is not supported." );break ;case 'b' :@@ -175,7 +175,7 @@ int main(int argc, char *argv[]) p.partition_vcpu_memory_access = false;break ;case 'i' : - p.nr_memslot_modifications =atoi_paranoid (optarg); + p.nr_iterations =atoi_paranoid (optarg);break ;case 'h' :default :Signature · 1 line
2.38.1.273.g43a17bfeac-goog
Re: [PATCH v8 5/7] KVM: selftests: Shorten the test args in memslot_modification_stress_test.c
Quoted 33 lines · Sean Christopherson
Quoted 2 lines · Vipin Sharma
Change test args
memslot_modification_delayandnr_memslot_modificationsto delay andnr_iterationsfor simplicity.Suggested-by Sean Christopherson <[email protected]>I don't care about the credit so much as I don't want you getting yelled at for one of my random ideas :-)
Quoted 24 lines
Signed-off-by Vipin Sharma <[email protected]>--- .../kvm/memslot_modification_stress_test.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)tools/testing/selftests/kvm/memslot_modification_stress_test.c +2
-2@@ -87,8 +87,8 @@ static void add_remove_memslot(struct kvm_vm *vm, useconds_t delay, }struct test_params { -useconds_t memslot_modification_delay; -uint64_t nr_memslot_modifications; +useconds_t delay; +uint64_t nr_iterations;bool partition_vcpu_memory_access; };@@ -107,8 +107,8 @@ static void run_test(enum vm_guest_mode mode, void *arg)pr_info ("Started all vCPUs\n" );
Quoted 7 lines
tools/testing/selftests/kvm/memslot_modification_stress_test.c static void run_test(enum vm_guest_mode mode, void *arg) · line 111
Quoted 4 lines
tools/testing/selftests/kvm/memslot_modification_stress_test.c +2
-2-add_remove_memslot (vm, p->memslot_modification_delay, - p->nr_memslot_modifications); +add_remove_memslot (vm, p->delay, + p->nr_iterations);This wrap is no longer necessary (which was part of the motivation for the rename).
Almost forgot. Nit aside,
Re: [PATCH v8 5/7] KVM: selftests: Shorten the test args in memslot_modification_stress_test.c
Quoted 43 lines · Sean Christopherson
Quoted 33 lines · Sean Christopherson
Quoted 2 lines · Vipin Sharma
Change test args
memslot_modification_delayandnr_memslot_modificationsto delay andnr_iterationsfor simplicity.Suggested-by Sean Christopherson <[email protected]>I don't care about the credit so much as I don't want you getting yelled at for one of my random ideas :-)
Quoted 24 lines
Signed-off-by Vipin Sharma <[email protected]>--- .../kvm/memslot_modification_stress_test.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)tools/testing/selftests/kvm/memslot_modification_stress_test.c +2
-2@@ -87,8 +87,8 @@ static void add_remove_memslot(struct kvm_vm *vm, useconds_t delay, }struct test_params { -useconds_t memslot_modification_delay; -uint64_t nr_memslot_modifications; +useconds_t delay; +uint64_t nr_iterations;bool partition_vcpu_memory_access; };@@ -107,8 +107,8 @@ static void run_test(enum vm_guest_mode mode, void *arg)pr_info ("Started all vCPUs\n" );Quoted 7 lines
tools/testing/selftests/kvm/memslot_modification_stress_test.c static void run_test(enum vm_guest_mode mode, void *arg) · line 111
Quoted 4 lines
tools/testing/selftests/kvm/memslot_modification_stress_test.c +2
-2-add_remove_memslot (vm, p->memslot_modification_delay, - p->nr_memslot_modifications); +add_remove_memslot (vm, p->delay, + p->nr_iterations);This wrap is no longer necessary (which was part of the motivation for the rename).
Quoted 3 lines
Almost forgot. Nit aside,
Reviewed-by Sean Christopherson <[email protected]>
I will update in v9.
Thanks
PATCH v8 6/7 KVM: selftests: Add atoi_positive() and atoi_non_negative() for input validation
In reply to Vipin SharmaMany KVM selftests take command line arguments which are supposed to be positive (>0) or non-negative (>=0). Some tests do these validation and some missed adding the check.
Add atoi_positive() and atoi_non_negative() to validate inputs in selftests before proceeding to use those values.
--- .../selftests/kvm/aarch64/arch_timer.c | 25 ++++--------------- .../selftests/kvm/aarch64/debug-exceptions.c | 2 +- .../testing/selftests/kvm/aarch64/vgic_irq.c | 2 +- .../selftests/kvm/access_tracking_perf_test.c | 2 +- .../selftests/kvm/demand_paging_test.c | 4 +-- .../selftests/kvm/dirty_log_perf_test.c | 12 ++++----- .../testing/selftests/kvm/include/test_util.h | 16 ++++++++++++ .../selftests/kvm/kvm_page_table_test.c | 4 +-- .../selftests/kvm/max_guest_memory_test.c | 9 +++---- .../kvm/memslot_modification_stress_test.c | 10 +++----- .../testing/selftests/kvm/memslot_perf_test.c | 22 ++++------------ .../selftests/kvm/set_memory_region_test.c | 2 +- .../selftests/kvm/x86_64/nx_huge_pages_test.c | 3 +-- 13 files changed, 47 insertions(+), 66 deletions(-)
tools/testing/selftests/kvm/aarch64/arch_timer.c +5 -20
@@ -414,36 +414,21 @@ static bool parse_args(int argc, char *argv[])while ((opt =getopt (argc, argv,"hn:i:p:m:" )) !=-1 ) {switch (opt) {case 'n' : - test_args.nr_vcpus =atoi_paranoid (optarg); -if (test_args.nr_vcpus <=0 ) { -pr_info ("Positive value needed for -n\n" ); - goto err; - }else if (test_args.nr_vcpus >KVM_MAX_VCPUS ) { + test_args.nr_vcpus =atoi_positive ("Number of vCPUs" , optarg); +if (test_args.nr_vcpus >KVM_MAX_VCPUS ) {pr_info ("Max allowed vCPUs: %u\n" ,KVM_MAX_VCPUS ); goto err; }break ;case 'i' : - test_args.nr_iter =atoi_paranoid (optarg); -if (test_args.nr_iter <=0 ) { -pr_info ("Positive value needed for -i\n" ); - goto err; - } + test_args.nr_iter =atoi_positive ("Number of iterations" , optarg);break ;case 'p' : - test_args.timer_period_ms =atoi_paranoid (optarg); -if (test_args.timer_period_ms <=0 ) { -pr_info ("Positive value needed for -p\n" ); - goto err; - } + test_args.timer_period_ms =atoi_positive ("Periodicity" , optarg);break ;case 'm' : - test_args.migration_freq_ms =atoi_paranoid (optarg); -if (test_args.migration_freq_ms <0 ) { -pr_info ("0 or positive value needed for -m\n" ); - goto err; - } + test_args.migration_freq_ms =atoi_non_negative ("Frequency" , optarg);break ;case 'h' :default :
tools/testing/selftests/kvm/aarch64/debug-exceptions.c +1 -1
@@ -423,7 +423,7 @@ int main(int argc, char *argv[])while ((opt =getopt (argc, argv,"i:" )) !=-1 ) {switch (opt) {case 'i' : - ss_iteration =atoi_paranoid (optarg); + ss_iteration =atoi_positive ("Number of iterations" , optarg);break ;case 'h' :default :
tools/testing/selftests/kvm/aarch64/vgic_irq.c +1 -1
@@ -824,7 +824,7 @@ int main(int argc, char **argv)while ((opt =getopt (argc, argv,"hn:e:l:" )) !=-1 ) {switch (opt) {case 'n' : - nr_irqs =atoi_paranoid (optarg); + nr_irqs =atoi_non_negative ("Number of IRQs" , optarg);if (nr_irqs >1024 || nr_irqs %32 )help (argv[0 ]);break ;
tools/testing/selftests/kvm/access_tracking_perf_test.c +1 -1
@@ -368,7 +368,7 @@ int main(int argc, char *argv[]) params.vcpu_memory_bytes =parse_size (optarg);break ;case 'v' : - params.nr_vcpus =atoi_paranoid (optarg); + params.nr_vcpus =atoi_positive ("Number of vCPUs" , optarg);break ;case 'o' : overlap_memory_access = true;
tools/testing/selftests/kvm/demand_paging_test.c +2 -2
@@ -427,8 +427,8 @@ int main(int argc, char *argv[]) p.src_type =parse_backing_src_type (optarg);break ;case 'v' : - nr_vcpus =atoi_paranoid (optarg); -TEST_ASSERT (nr_vcpus >0 && nr_vcpus <= max_vcpus, + nr_vcpus =atoi_positive ("Number of vCPUs" , optarg); +TEST_ASSERT (nr_vcpus <= max_vcpus,"Invalid number of vcpus, must be between 1 and %d" , max_vcpus);break ;case 'o' :
tools/testing/selftests/kvm/dirty_log_perf_test.c +5 -7
@@ -416,9 +416,7 @@ int main(int argc, char *argv[]) run_vcpus_while_disabling_dirty_logging = true;break ;case 'f' : - p.wr_fract =atoi_paranoid (optarg); -TEST_ASSERT (p.wr_fract >=1 , -"Write fraction cannot be less than one" ); + p.wr_fract =atoi_positive ("Write fraction" , optarg);break ;case 'g' : dirty_log_manual_caps =0 ;
@@ -427,7 +425,7 @@ int main(int argc, char *argv[])help (argv[0 ]);break ;case 'i' : - p.iterations =atoi_paranoid (optarg); + p.iterations =atoi_positive ("Number of iterations" , optarg);break ;case 'm' :guest_modes_cmdline (optarg);
@@ -445,12 +443,12 @@ int main(int argc, char *argv[]) p.backing_src =parse_backing_src_type (optarg);break ;case 'v' : - nr_vcpus =atoi_paranoid (optarg); -TEST_ASSERT (nr_vcpus >0 && nr_vcpus <= max_vcpus, + nr_vcpus =atoi_positive ("Number of vCPUs" , optarg); +TEST_ASSERT (nr_vcpus <= max_vcpus,"Invalid number of vcpus, must be between 1 and %d" , max_vcpus);break ;case 'x' : - p.slots =atoi_paranoid (optarg); + p.slots =atoi_positive ("Number of slots" , optarg);break ;default :help (argv[0 ]);
tools/testing/selftests/kvm/include/test_util.h +16 -0
@@ -154,4 +154,20 @@ static inline void *align_ptr_up(void *x, size_t size)int atoi_paranoid (const char *num_str); +static inline uint32_t atoi_positive (const char *name,const char *num_str) +{ +int num =atoi_paranoid (num_str); + +TEST_ASSERT (num >0 ,"%s must be greater than 0, got '%s'" , name, num_str); +return num; +} + +static inline uint32_t atoi_non_negative (const char *name,const char *num_str) +{ +int num =atoi_paranoid (num_str); + +TEST_ASSERT (num >=0 ,"%s must be non-negative, got '%s'" , name, num_str); +return num; +} +#endif /* SELFTEST_KVM_TEST_UTIL_H */
tools/testing/selftests/kvm/kvm_page_table_test.c +2 -2
@@ -461,8 +461,8 @@ int main(int argc, char *argv[]) p.test_mem_size =parse_size (optarg);break ;case 'v' : - nr_vcpus =atoi_paranoid (optarg); -TEST_ASSERT (nr_vcpus >0 && nr_vcpus <= max_vcpus, + nr_vcpus =atoi_positive ("Number of vCPUs" , optarg); +TEST_ASSERT (nr_vcpus <= max_vcpus,"Invalid number of vcpus, must be between 1 and %d" , max_vcpus);break ;case 's' :
tools/testing/selftests/kvm/max_guest_memory_test.c +3 -6
@@ -193,16 +193,13 @@ int main(int argc, char *argv[])while ((opt =getopt (argc, argv,"c:h:m:s:H" )) !=-1 ) {switch (opt) {case 'c' : - nr_vcpus =atoi_paranoid (optarg); -TEST_ASSERT (nr_vcpus >0 ,"number of vcpus must be >0" ); + nr_vcpus =atoi_positive ("Number of vCPUs" , optarg);break ;case 'm' : - max_mem =1ull *atoi_paranoid (optarg) *SZ_1G ; -TEST_ASSERT (max_mem >0 ,"memory size must be >0" ); + max_mem =1ull *atoi_positive ("Memory size" , optarg) *SZ_1G ;break ;case 's' : - slot_size =1ull *atoi_paranoid (optarg) *SZ_1G ; -TEST_ASSERT (slot_size >0 ,"slot size must be >0" ); + slot_size =1ull *atoi_positive ("Slot size" , optarg) *SZ_1G ;break ;case 'H' : hugepages = true;
tools/testing/selftests/kvm/memslot_modification_stress_test.c +4 -6
@@ -158,16 +158,14 @@ int main(int argc, char *argv[])guest_modes_cmdline (optarg);break ;case 'd' : - p.delay =atoi_paranoid (optarg); -TEST_ASSERT (p.delay >=0 , -"A negative delay is not supported." ); + p.delay =atoi_non_negative ("Delay" , optarg);break ;case 'b' : guest_percpu_mem_size =parse_size (optarg);break ;case 'v' : - nr_vcpus =atoi_paranoid (optarg); -TEST_ASSERT (nr_vcpus >0 && nr_vcpus <= max_vcpus, + nr_vcpus =atoi_positive ("Number of vCPUs" , optarg); +TEST_ASSERT (nr_vcpus <= max_vcpus,"Invalid number of vcpus, must be between 1 and %d" , max_vcpus);break ;
@@ -175,7 +173,7 @@ int main(int argc, char *argv[]) p.partition_vcpu_memory_access = false;break ;case 'i' : - p.nr_iterations =atoi_paranoid (optarg); + p.nr_iterations =atoi_positive ("Number of iterations" , optarg);break ;case 'h' :default :
tools/testing/selftests/kvm/memslot_perf_test.c +5 -17
@@ -892,33 +892,21 @@ static bool parse_args(int argc, char *argv[], }break ;case 'f' : - targs->tfirst =atoi_paranoid (optarg); -if (targs->tfirst <0 ) { -pr_info ("First test to run has to be non-negative\n" ); -return false; - } + targs->tfirst =atoi_non_negative ("First test" , optarg);break ;case 'e' : - targs->tlast =atoi_paranoid (optarg); -if (targs->tlast <0 || targs->tlast >=NTESTS ) { + targs->tlast =atoi_non_negative ("Last test" , optarg); +if (targs->tlast >=NTESTS ) {pr_info ("Last test to run has to be non-negative and less than %zu\n" ,NTESTS );return false; }break ;case 'l' : - targs->seconds =atoi_paranoid (optarg); -if (targs->seconds <0 ) { -pr_info ("Test length in seconds has to be non-negative\n" ); -return false; - } + targs->seconds =atoi_non_negative ("Test length" , optarg);break ;case 'r' : - targs->runs =atoi_paranoid (optarg); -if (targs->runs <=0 ) { -pr_info ("Runs per test has to be positive\n" ); -return false; - } + targs->runs =atoi_positive ("Runs per test" , optarg);break ; } }
tools/testing/selftests/kvm/set_memory_region_test.c +1 -1
@@ -407,7 +407,7 @@ int main(int argc, char *argv[])#ifdef __x86_64__if (argc >1 ) - loops =atoi_paranoid (argv[1 ]); + loops =atoi_positive ("Number of iterations" , argv[1 ]);else loops =10 ;
tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c +1 -2
@@ -241,7 +241,7 @@ int main(int argc, char **argv)while ((opt =getopt (argc, argv,"hp:t:r" )) !=-1 ) {switch (opt) {case 'p' : - reclaim_period_ms =atoi_paranoid (optarg); + reclaim_period_ms =atoi_non_negative ("Reclaim period" , optarg);break ;case 't' : token =atoi_paranoid (optarg);
@@ -257,7 +257,6 @@ int main(int argc, char **argv) }TEST_REQUIRE (kvm_has_cap (KVM_CAP_VM_DISABLE_NX_HUGE_PAGES )); -TEST_REQUIRE (reclaim_period_ms >0 );__TEST_REQUIRE (token ==MAGIC_TOKEN , "This test must be run with the magic token %d.\n"
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
Re: [PATCH v8 6/7] KVM: selftests: Add atoi_positive() and atoi_non_negative() for input validation
Quoted 9 lines · Vipin Sharma
Many KVM selftests take command line arguments which are supposed to be positive (>0) or non-negative (>=0). Some tests do these validation and some missed adding the check.
Add
atoi_positive()andatoi_non_negative()to validate inputs in selftests before proceeding to use those values.Signed-off-by Vipin Sharma <[email protected]>---
PATCH v8 7/7 KVM: selftests: Allowing running dirty_log_perf_test on specific CPUs
In reply to Vipin SharmaAdd a command line option, -c, to pin vCPUs to physical CPUs (pCPUs), i.e. to force vCPUs to run on specific pCPUs.
Requirement to implement this feature came in discussion on the patch "Make page tables for eager page splitting NUMA aware"
https://lore.kernel.org/lkml/[email protected]/
This feature is useful as it provides a way to analyze performance based on the vCPUs and dirty log worker locations, like on the different NUMA nodes or on the same NUMA nodes.
To keep things simple, implementation is intentionally very limited, either all of the vCPUs will be pinned followed by an optional main thread or nothing will be pinned.
--- .../selftests/kvm/dirty_log_perf_test.c | 25 ++++++++- .../selftests/kvm/include/kvm_util_base.h | 4 ++ .../selftests/kvm/include/perf_test_util.h | 4 ++ tools/testing/selftests/kvm/lib/kvm_util.c | 54 +++++++++++++++++++ .../selftests/kvm/lib/perf_test_util.c | 8 ++- 5 files changed, 92 insertions(+), 3 deletions(-)
tools/testing/selftests/kvm/dirty_log_perf_test.c +23 -2
@@ -353,7 +353,7 @@ static void help(char *name)puts ("" );printf ("usage: %s [-h] [-i iterations] [-p offset] [-g] " "[-m mode] [-n] [-b vcpu bytes] [-v vcpus] [-o] [-s mem type]" -"[-x memslots]\n" , name); +"[-x memslots] [-c physical cpus to run test on]\n" , name);puts ("" );printf (" -i: specify iteration counts (default: %" PRIu64")\n" ,TEST_HOST_LOOP_N );
@@ -383,6 +383,17 @@ static void help(char *name)backing_src_help ("-s" );printf (" -x: Split the memory region into this number of memslots.\n" " (default: 1)\n" ); +printf (" -c: Pin tasks to physical CPUs. Takes a list of comma separated\n" +" values (target pCPU), one for each vCPU, plus an optional\n" +" entry for the main application task (specified via entry\n" +" <nr_vcpus + 1>). If used, entries must be provided for all\n" +" vCPUs, i.e. pinning vCPUs is all or nothing.\n\n" +" E.g. to create 3 vCPUs, pin vCPU0=>pCPU22, vCPU1=>pCPU23,\n" +" vCPU2=>pCPU24, and pin the application task to pCPU50:\n\n" +" ./dirty_log_perf_test -v 3 -c 22,23,24,50\n\n" +" To leave the application task unpinned, drop the final entry:\n\n" +" ./dirty_log_perf_test -v 3 -c 22,23,24\n\n" +" (default: no pinning)\n" );puts ("" );exit (0 ); }
@@ -390,6 +401,7 @@ static void help(char *name)int main (int argc,char *argv[]) {int max_vcpus =kvm_check_cap (KVM_CAP_MAX_VCPUS ); +const char *pcpu_list =NULL ;struct test_params p = { .iterations =TEST_HOST_LOOP_N , .wr_fract =1 ,
@@ -406,11 +418,14 @@ int main(int argc, char *argv[])guest_modes_append_default (); -while ((opt =getopt (argc, argv,"b:ef:ghi:m:nop:s:v:x:" )) !=-1 ) { +while ((opt =getopt (argc, argv,"b:c:ef:ghi:m:nop:s:v:x:" )) !=-1 ) {switch (opt) {case 'b' : guest_percpu_mem_size =parse_size (optarg);break ; +case 'c' : + pcpu_list = optarg; +break ;case 'e' :/* 'e' is for evil. */ run_vcpus_while_disabling_dirty_logging = true;
@@ -456,6 +471,12 @@ int main(int argc, char *argv[]) } } +if (pcpu_list) { +kvm_parse_vcpu_pinning (pcpu_list, perf_test_args.vcpu_to_pcpu, + nr_vcpus); + perf_test_args.pin_vcpus = true; + } +TEST_ASSERT (p.iterations >=2 ,"The test should have at least two iterations" );pr_info ("Test iterations: %" PRIu64"\n" , p.iterations);
tools/testing/selftests/kvm/include/kvm_util_base.h +4 -0
@@ -688,6 +688,10 @@ static inline struct kvm_vm *vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,struct kvm_vcpu *vm_recreate_with_one_vcpu (struct kvm_vm *vm); +void kvm_pin_this_task_to_pcpu (uint32_t pcpu); +void kvm_parse_vcpu_pinning (const char *pcpus_string,uint32_t vcpu_to_pcpu[], +int nr_vcpus); +unsigned long vm_compute_max_gfn (struct kvm_vm *vm);unsigned int vm_calc_num_guest_pages (enum vm_guest_mode mode,size_t size);unsigned int vm_num_host_pages (enum vm_guest_mode mode,unsigned int num_guest_pages);
tools/testing/selftests/kvm/include/perf_test_util.h +4 -0
@@ -39,6 +39,10 @@ struct perf_test_args {/* Run vCPUs in L2 instead of L1, if the architecture supports it. */ bool nested; +/* True if all vCPUs are pinned to pCPUs */ +bool pin_vcpus; +/* The vCPU=>pCPU pinning map. Only valid if pin_vcpus is true. */ +uint32_t vcpu_to_pcpu[KVM_MAX_VCPUS ];struct perf_test_vcpu_args vcpu_args[KVM_MAX_VCPUS ]; };
tools/testing/selftests/kvm/lib/kvm_util.c +54 -0
66 lines not on this page · raw message
tools/testing/selftests/kvm/lib/perf_test_util.c +7 -1
@@ -2,6 +2,8 @@/* * Copyright (C) 2020, Google LLC. */ +#define _GNU_SOURCE +#include <inttypes.h> #include "kvm_util.h"
@@ -243,6 +245,10 @@ void __weak perf_test_setup_nested(struct kvm_vm *vm, int nr_vcpus, struct kvm_vstatic void *vcpu_thread_main (void *data) {struct vcpu_thread *vcpu = data; +int vcpu_idx = vcpu->vcpu_idx; + +if (perf_test_args.pin_vcpus) +kvm_pin_this_task_to_pcpu (perf_test_args.vcpu_to_pcpu[vcpu_idx]);WRITE_ONCE (vcpu->running, true);
@@ -255,7 +261,7 @@ static void *vcpu_thread_main(void *data)while (!READ_ONCE (all_vcpu_threads_running)) ; -vcpu_thread_fn (&perf_test_args.vcpu_args[vcpu->vcpu_idx]); +vcpu_thread_fn (&perf_test_args.vcpu_args[vcpu_idx]);return NULL ; }
Signature · 1 line
2.38.1.273.g43a17bfeac-goog