On Mon, Sep 12, 2022, Colton Lewis wrote:
> @@ -393,7 +403,7 @@ int main(int argc, char *argv[])
>
> guest_modes_append_default();
>
> - while ((opt = getopt(argc, argv, "ghi:p:m:nb:f:v:or:s:x:")) != -1) {
> + while ((opt = getopt(argc, argv, "ghi:p:m:nb:v:or:s:x:w:")) != -1) {
This string is getting quite annoying to maintain, e.g. all of these patches
conflict with recent upstream changes, and IIRC will conflict again with Vipin's
changes. AFAICT, the string passed to getopt() doesn't need to be constant, i.e.
can be built programmatically. Not in this series, but as future cleanup we should
at least consider a way to make this slightly less painful to maintain.
> switch (opt) {
> case 'g':
> dirty_log_manual_caps = 0;
> @@ -413,10 +423,11 @@ int main(int argc, char *argv[])
> case 'b':
> guest_percpu_mem_size = parse_size(optarg);
> break;
> - case 'f':
> - p.wr_fract = atoi(optarg);
> - TEST_ASSERT(p.wr_fract >= 1,
> - "Write fraction cannot be less than one");
> + case 'w':
> + p.write_percent = atoi(optarg);
> + TEST_ASSERT(p.write_percent >= 0
> + && p.write_percent <= 100,
&&, ||, etc... go on the previous line. But in this case, I'd say don't wrap at all,
it's only a few chars over the soft limit.
TEST_ASSERT(p.write_percent >= 0 && p.write_percent <= 100,
or
TEST_ASSERT(p.write_percent >= 0 &&
p.write_percent <= 100,
And after Vipin's cleanup lands[*], this can be:
p.write_percent = atoi_positive(optarg);
TEST_ASSERT(p.write_percent <= 100,
[*] https://lore.kernel.org/all/CAHVum0cD5R9ej09VNvkkqcQsz7PGrxnMqi1E4kqLv+1d63Rg6A@xxxxxxxxxxxxxx
> + "Write percentage must be between 0 and 100");
> break;
> case 'v':
> nr_vcpus = atoi(optarg);
> diff --git a/tools/testing/selftests/kvm/include/perf_test_util.h b/tools/testing/selftests/kvm/include/perf_test_util.h
> index f18530984b42..f93f2ea7c6a3 100644
> --- a/tools/testing/selftests/kvm/include/perf_test_util.h
> +++ b/tools/testing/selftests/kvm/include/perf_test_util.h
> @@ -35,7 +35,7 @@ struct perf_test_args {
> uint64_t size;
> uint64_t guest_page_size;
> uint32_t random_seed;
> - int wr_fract;
> + uint32_t write_percent;
>
> /* Run vCPUs in L2 instead of L1, if the architecture supports it. */
> bool nested;
> @@ -51,7 +51,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus,
> bool partition_vcpu_memory_access);
> void perf_test_destroy_vm(struct kvm_vm *vm);
>
> -void perf_test_set_wr_fract(struct kvm_vm *vm, int wr_fract);
> +void perf_test_set_write_percent(struct kvm_vm *vm, uint32_t write_percent);
> void perf_test_set_random_seed(struct kvm_vm *vm, uint32_t random_seed);
>
> void perf_test_start_vcpu_threads(int vcpus, void (*vcpu_fn)(struct perf_test_vcpu_args *));
> diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c
> index b1e731de0966..9effd229b75d 100644
> --- a/tools/testing/selftests/kvm/lib/perf_test_util.c
> +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c
> @@ -60,7 +60,7 @@ void perf_test_guest_code(uint32_t vcpu_id)
> uint64_t addr = gva + (i * pta->guest_page_size);
> guest_random(&rand);
>
> - if (i % pta->wr_fract == 0)
> + if (rand % 100 < pta->write_percent)
Aha! Random bools with a percentage is exactly the type of thing the common RNG
helpers can and should provide. E.g. this should look something like:
if (random_bool(rng, pta->write_percent))
As a bonus, if someone wants to implement a more sophisticated percentage system,
then all users of random_bool() will benefit, again without needing to update
users.
