On Tue, Dec 17, 2024, Maxim Levitsky wrote:
> On Fri, 2024-12-13 at 17:07 -0800, Sean Christopherson wrote:
> > Now that the vCPU doesn't dirty every page on the first iteration for
> > architectures that support the dirty ring, honor vcpu_stop in the dirty
> > ring's vCPU worker, i.e. stop when the main thread says "stop". This will
> > allow plumbing vcpu_stop into the guest so that the vCPU doesn't need to
> > periodically exit to userspace just to see if it should stop.
>
> This is very misleading - by the very nature of this test it all runs in
> userspace, so every time KVM_RUN ioctl exits, it is by definition an
> userspace VM exit.
I honestly don't see how being more precise is misleading. I'm happy to reword
the changelog, but IMO just saying "exit" doesn't make it clear that the goal is
to avoid the deliberate exit to the selftest's userspace side of things. The
vCPU is constantly exiting to KVM for dirty logging, so to me, "periodically exit
just to see if it should stop" is confusing and ambiguous.
> > Add a comment explaining that marking all pages as dirty is problematic
> > for the dirty ring, as it results in the guest getting stuck on "ring
> > full". This could be addressed by adding a GUEST_SYNC() in that initial
> > loop, but it's not clear how that would interact with s390's behavior.
>
> I think that this commit description should be reworked to state that s390
> doesn't support dirty ring currently so the test doesn't introduce a regression.
Can do.
> > Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
> > ---
> > tools/testing/selftests/kvm/dirty_log_test.c | 12 ++++++++++--
> > 1 file changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
> > index 55a385499434..8d31e275a23d 100644
> > --- a/tools/testing/selftests/kvm/dirty_log_test.c
> > +++ b/tools/testing/selftests/kvm/dirty_log_test.c
> > @@ -387,8 +387,7 @@ static void dirty_ring_after_vcpu_run(struct kvm_vcpu *vcpu)
> >
> > /* A ucall-sync or ring-full event is allowed */
> > if (get_ucall(vcpu, NULL) == UCALL_SYNC) {
> > - /* We should allow this to continue */
> > - ;
> > + vcpu_handle_sync_stop();
> > } else if (run->exit_reason == KVM_EXIT_DIRTY_RING_FULL) {
> > /* Update the flag first before pause */
> > WRITE_ONCE(dirty_ring_vcpu_ring_full, true);
> > @@ -697,6 +696,15 @@ static void run_test(enum vm_guest_mode mode, void *arg)
> > #ifdef __s390x__
> > /* Align to 1M (segment size) */
> > guest_test_phys_mem = align_down(guest_test_phys_mem, 1 << 20);
> > +
> > + /*
> > + * The workaround in guest_code() to write all pages prior to the first
> > + * iteration isn't compatible with the dirty ring, as the dirty ring
> > + * support relies on the vCPU to actually stop when vcpu_stop is set so
> > + * that the vCPU doesn't hang waiting for the dirty ring to be emptied.
> > + */
> > + TEST_ASSERT(host_log_mode != LOG_MODE_DIRTY_RING,
> > + "Test needs to be updated to support s390 dirty ring");
>
> This not clear either, the message makes me think that s390 does support dirty ring.
> The comment above should state stat since s390 doesn't support dirty ring,
> this is fine, and when/if the support is added,then the test will need to be updated.
How about this?
/*
* The s390 workaround in guest_code() to write all pages prior to the
* first iteration isn't compatible with the dirty ring test, as dirty
* ring testing relies on the vCPU to actually stop when vcpu_stop is
* set. If the vCPU doesn't stop, it will hang waiting for the dirty
* ring to be emptied. s390 doesn't currently support the dirty ring,
* and it's not clear how best to resolve the situation, so punt the
* problem to the future.
*/
TEST_ASSERT(host_log_mode != LOG_MODE_DIRTY_RING,
"Test needs to be updated to support dirty ring on s390; see comment for details");
