From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 831C3C3F2D7 for ; Wed, 4 Mar 2020 17:50:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D6B4217F4 for ; Wed, 4 Mar 2020 17:50:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XEmynl+J" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388449AbgCDRul (ORCPT ); Wed, 4 Mar 2020 12:50:41 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:47231 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730065AbgCDRuc (ORCPT ); Wed, 4 Mar 2020 12:50:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583344231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NW1AcDQfFoZ1CPYH/WHL25mucE4+tV4MUo1O0BQYlPA=; b=XEmynl+JQAPc7SK+DG8HQi6PpyKg1YUwKHK/7lN9U1Zg4Wza3mGrsCPt25b+WQSR7u6b8a LLAMFbuvFn2Nk3snLjFZ7yj+Se+fO3PaNowZZ5JZqJVwbQzDNpvMKRVh+y8/e2++eegGDj c9rq4SmGJAYixrb8WNxsDBo/JFtLT/o= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-363-QHdk0nVtOO23bdOepwzzOQ-1; Wed, 04 Mar 2020 12:50:29 -0500 X-MC-Unique: QHdk0nVtOO23bdOepwzzOQ-1 Received: by mail-qk1-f197.google.com with SMTP id d64so1844678qke.12 for ; Wed, 04 Mar 2020 09:50:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NW1AcDQfFoZ1CPYH/WHL25mucE4+tV4MUo1O0BQYlPA=; b=pg3nV+174tT/ATZ4NvsVOS8pWNDhgXDvSmYXxTUd7F6qqPTa5ilpi7V2XmD0ysapdf /vBaw5CxT0Ya/r+RwxoebfE9JZe3VDkVHRFUpSgeyyzHiVKaftXdVydV/wcAadLBLdWd C/Ac2Ica2exGaJrVTsQfDr7+RYXQp5VHBZ7mQyfLjx9X2WXcmrKVfQPxkCmGBJQLEcin 1YDmwmp+TSjI8yBL5u7UO9vlMKoVCALJ+t1lMUHeFvcrAkT7wITsFgd3pTtz5qpnBWhf dlbdhIMzesyp/0yk11lGIr3cd6JDqrV13kZR4UyQ0+/Io5DCdt+01HYL4BAs7+pLOSQf g8gQ== X-Gm-Message-State: ANhLgQ2758j1Zy/46P/jyEOb0vzPiRUi2aNwXyXaV7dK6tqE/nQZadzf bmxCC1GHud2r5W8vAkoC7A9O5pNSdCNZColo9/pkRf4xIWaYlSzdm5/OMBsvfCcSzmpZpke7SxA 3MJA9GJl3+ekDCbXiWGuCGYsh X-Received: by 2002:ac8:7302:: with SMTP id x2mr3622994qto.62.1583344229038; Wed, 04 Mar 2020 09:50:29 -0800 (PST) X-Google-Smtp-Source: ADFU+vv4UsKzSsFiMNr3qwjtSUDN0+s9VsHoUhtbC4/r5iPOuRtYdDABU6Uaw5t1VrZZ3UJ+989j2Q== X-Received: by 2002:ac8:7302:: with SMTP id x2mr3622907qto.62.1583344227777; Wed, 04 Mar 2020 09:50:27 -0800 (PST) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id n4sm1116771qkk.88.2020.03.04.09.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 09:50:27 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Yan Zhao , peterx@redhat.com, Vitaly Kuznetsov , "Michael S . Tsirkin" , Alex Williamson , Sean Christopherson , "Dr . David Alan Gilbert" , Jason Wang , Kevin Tian , Paolo Bonzini , Christophe de Dinechin Subject: [PATCH v5 11/14] KVM: selftests: Introduce after_vcpu_run hook for dirty log test Date: Wed, 4 Mar 2020 12:49:44 -0500 Message-Id: <20200304174947.69595-12-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200304174947.69595-1-peterx@redhat.com> References: <20200304174947.69595-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide a hook for the checks after vcpu_run() completes. Preparation for the dirty ring test because we'll need to take care of another exit reason. Since at it, drop the pages_count because after all we have a better summary right now with statistics, and clean it up a bit. Signed-off-by: Peter Xu --- tools/testing/selftests/kvm/dirty_log_test.c | 39 ++++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c index 2d53c89bf0bd..798f7bad00bc 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -173,6 +173,15 @@ static void clear_log_collect_dirty_pages(struct kvm_vm *vm, int slot, kvm_vm_clear_dirty_log(vm, slot, bitmap, 0, num_pages); } +static void default_after_vcpu_run(struct kvm_vm *vm) +{ + struct kvm_run *run = vcpu_state(vm, VCPU_ID); + + TEST_ASSERT(get_ucall(vm, VCPU_ID, NULL) == UCALL_SYNC, + "Invalid guest sync status: exit_reason=%s\n", + exit_reason_str(run->exit_reason)); +} + struct log_mode { const char *name; /* Return true if this mode is supported, otherwise false */ @@ -182,16 +191,20 @@ struct log_mode { /* Hook to collect the dirty pages into the bitmap provided */ void (*collect_dirty_pages) (struct kvm_vm *vm, int slot, void *bitmap, uint32_t num_pages); + /* Hook to call when after each vcpu run */ + void (*after_vcpu_run)(struct kvm_vm *vm); } log_modes[LOG_MODE_NUM] = { { .name = "dirty-log", .collect_dirty_pages = dirty_log_collect_dirty_pages, + .after_vcpu_run = default_after_vcpu_run, }, { .name = "clear-log", .supported = clear_log_supported, .create_vm_done = clear_log_create_vm_done, .collect_dirty_pages = clear_log_collect_dirty_pages, + .after_vcpu_run = default_after_vcpu_run, }, }; @@ -241,6 +254,14 @@ static void log_mode_collect_dirty_pages(struct kvm_vm *vm, int slot, mode->collect_dirty_pages(vm, slot, bitmap, num_pages); } +static void log_mode_after_vcpu_run(struct kvm_vm *vm) +{ + struct log_mode *mode = &log_modes[host_log_mode]; + + if (mode->after_vcpu_run) + mode->after_vcpu_run(vm); +} + static void generate_random_array(uint64_t *guest_array, uint64_t size) { uint64_t i; @@ -254,31 +275,17 @@ static void *vcpu_worker(void *data) int ret; struct kvm_vm *vm = data; uint64_t *guest_array; - uint64_t pages_count = 0; - struct kvm_run *run; - - run = vcpu_state(vm, VCPU_ID); guest_array = addr_gva2hva(vm, (vm_vaddr_t)random_array); - generate_random_array(guest_array, TEST_PAGES_PER_LOOP); while (!READ_ONCE(host_quit)) { + generate_random_array(guest_array, TEST_PAGES_PER_LOOP); /* Let the guest dirty the random pages */ ret = _vcpu_run(vm, VCPU_ID); TEST_ASSERT(ret == 0, "vcpu_run failed: %d\n", ret); - if (get_ucall(vm, VCPU_ID, NULL) == UCALL_SYNC) { - pages_count += TEST_PAGES_PER_LOOP; - generate_random_array(guest_array, TEST_PAGES_PER_LOOP); - } else { - TEST_ASSERT(false, - "Invalid guest sync status: " - "exit_reason=%s\n", - exit_reason_str(run->exit_reason)); - } + log_mode_after_vcpu_run(vm); } - DEBUG("Dirtied %"PRIu64" pages\n", pages_count); - return NULL; } -- 2.24.1