From patchwork Tue Apr 20 15:39:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12214517 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 504EAC43460 for ; Tue, 20 Apr 2021 15:39:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0958F613CA for ; Tue, 20 Apr 2021 15:39:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232951AbhDTPkI (ORCPT ); Tue, 20 Apr 2021 11:40:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42999 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232174AbhDTPkH (ORCPT ); Tue, 20 Apr 2021 11:40:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618933175; 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=VQROlc+OeyGZWexjfeI5DkN1h4it7ZtOPD/Y6S64EkE=; b=XdCH2nOmzfcIGVHIFV0Wu+TDv0LBkima316eKfoIOgp9Fa5HXs2kdJvo3r12sfTLvC3F1X 4XxdOsxNmCFycLAi/XtIwEH8y6al0aigOTdWMO5va+i6AUgB7BPetrfzvlryUMwKl9g/N/ AlkSe4gPU32yYssI2OGqdcWgyndRnn8= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-160-fFXheLrRPjOuujDK-P_dqg-1; Tue, 20 Apr 2021 11:39:34 -0400 X-MC-Unique: fFXheLrRPjOuujDK-P_dqg-1 Received: by mail-qv1-f69.google.com with SMTP id f7-20020a0562141d27b029019a6fd0a183so11695287qvd.23 for ; Tue, 20 Apr 2021 08:39:34 -0700 (PDT) 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=VQROlc+OeyGZWexjfeI5DkN1h4it7ZtOPD/Y6S64EkE=; b=erj2HYedpLXd/WGQZTybALYoBe+stmDvonN+JAkbRQ+BelNwF6PWbq6Hp+YsEFaT7w V92boF7x1rl9KyhV3omNlpaF6t5MooFPJruNnCvVJh80nmd73kmPO1ZJZ/Q4GLpyNaDf vEO0d+q6ZJuuzEovGNNnQb9qv+/jQJYmyJ58JptMszY2/7Feg8yja8UHnfPEpV2rVwPZ vpDR5cgKqht7vViYp/40yEb45NHvGKaBhaYd1PTZFplAj5cZSYdQhxr6uHdfP6naN5Hq +xTygKgh/lKmUvswITNcIvJp85vzvxfuEb3XvMYvTfrjUXp6/SU8T031j561yd3o7Mth EGrg== X-Gm-Message-State: AOAM5327p42JdOoN1H4QSEgX0eIwjzw3nBFVyh/JgsKItfmvvE46ERuh 8ULNlMZSqaKtn4FUbGjretqaX9sryecyr3GhGtSlqbfKYr5Xdpj7kr05ZRSvjWG4jNbXOjGA4KG 2q9/6CelKsXdHkOZkXvSGcjsyisn+0Uu74BbGwn40LkzdgwmGZRSRXRGbxxkNWA== X-Received: by 2002:ac8:5211:: with SMTP id r17mr13144775qtn.179.1618933173624; Tue, 20 Apr 2021 08:39:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyx788RWtu3yNEcSOoXG9InX91GFPv3sAMNKtitjKsZi6xwq4T0JutImzI2/i7wU4um1ng7PA== X-Received: by 2002:ac8:5211:: with SMTP id r17mr13144748qtn.179.1618933173297; Tue, 20 Apr 2021 08:39:33 -0700 (PDT) Received: from xz-x1.redhat.com (bras-base-toroon474qw-grc-88-174-93-75-154.dsl.bell.ca. [174.93.75.154]) by smtp.gmail.com with ESMTPSA id f12sm11633325qtq.84.2021.04.20.08.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:39:32 -0700 (PDT) From: Peter Xu To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paolo Bonzini , peterx@redhat.com, Sean Christopherson , Andrew Jones Subject: [PATCH v4 1/2] KVM: selftests: Sync data verify of dirty logging with guest sync Date: Tue, 20 Apr 2021 11:39:28 -0400 Message-Id: <20210420153929.482810-2-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210420153929.482810-1-peterx@redhat.com> References: <20210420153929.482810-1-peterx@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This fixes a bug that can trigger with e.g. "taskset -c 0 ./dirty_log_test" or when the testing host is very busy. A similar previous attempt is done [1] but that is not enough, the reason is stated in the reply [2]. As a summary (partly quotting from [2]): The problem is I think one guest memory write operation (of this specific test) contains a few micro-steps when page is during kvm dirty tracking (here I'm only considering write-protect rather than pml but pml should be similar at least when the log buffer is full): (1) Guest read 'iteration' number into register, prepare to write, page fault (2) Set dirty bit in either dirty bitmap or dirty ring (3) Return to guest, data written When we verify the data, we assumed that all these steps are "atomic", say, when (1) happened for this page, we assume (2) & (3) must have happened. We had some trick to workaround "un-atomicity" of above three steps, as previous version of this patch wanted to fix atomicity of step (2)+(3) by explicitly letting the main thread wait for at least one vmenter of vcpu thread, which should work. However what I overlooked is probably that we still have race when (1) and (2) can be interrupted. One example calltrace when it could happen that we read an old interation, got interrupted before even setting the dirty bit and flushing data: __schedule+1742 __cond_resched+52 __get_user_pages+530 get_user_pages_unlocked+197 hva_to_pfn+206 try_async_pf+132 direct_page_fault+320 kvm_mmu_page_fault+103 vmx_handle_exit+288 vcpu_enter_guest+2460 kvm_arch_vcpu_ioctl_run+325 kvm_vcpu_ioctl+526 __x64_sys_ioctl+131 do_syscall_64+51 entry_SYSCALL_64_after_hwframe+68 It means iteration number cached in vcpu register can be very old when dirty bit set and data flushed. So far I don't see an easy way to guarantee all steps 1-3 atomicity but to sync at the GUEST_SYNC() point of guest code when we do verification of the dirty bits as what this patch does. [1] https://lore.kernel.org/lkml/20210413213641.23742-1-peterx@redhat.com/ [2] https://lore.kernel.org/lkml/20210417140956.GV4440@xz-x1/ Cc: Paolo Bonzini Cc: Sean Christopherson Cc: Andrew Jones Signed-off-by: Peter Xu --- tools/testing/selftests/kvm/dirty_log_test.c | 62 ++++++++++++++++---- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c index bb2752d78fe3..fc87e2f11d3d 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "kvm_util.h" #include "test_util.h" @@ -137,12 +138,20 @@ static uint64_t host_clear_count; static uint64_t host_track_next_count; /* Whether dirty ring reset is requested, or finished */ -static sem_t dirty_ring_vcpu_stop; -static sem_t dirty_ring_vcpu_cont; +static sem_t sem_vcpu_stop; +static sem_t sem_vcpu_cont; +/* + * This is only set by main thread, and only cleared by vcpu thread. It is + * used to request vcpu thread to stop at the next GUEST_SYNC, since GUEST_SYNC + * is the only place that we'll guarantee both "dirty bit" and "dirty data" + * will match. E.g., SIG_IPI won't guarantee that (e.g., when vcpu interrupted + * after setting dirty bit but before data flushed). + */ +static atomic_t vcpu_sync_stop_requested; /* * This is updated by the vcpu thread to tell the host whether it's a * ring-full event. It should only be read until a sem_wait() of - * dirty_ring_vcpu_stop and before vcpu continues to run. + * sem_vcpu_stop and before vcpu continues to run. */ static bool dirty_ring_vcpu_ring_full; /* @@ -234,6 +243,17 @@ static void clear_log_collect_dirty_pages(struct kvm_vm *vm, int slot, kvm_vm_clear_dirty_log(vm, slot, bitmap, 0, num_pages); } +/* Should only be called after a GUEST_SYNC */ +static void vcpu_handle_sync_stop(void) +{ + if (atomic_read(&vcpu_sync_stop_requested)) { + /* It means main thread is sleeping waiting */ + atomic_set(&vcpu_sync_stop_requested, false); + sem_post(&sem_vcpu_stop); + sem_wait_until(&sem_vcpu_cont); + } +} + static void default_after_vcpu_run(struct kvm_vm *vm, int ret, int err) { struct kvm_run *run = vcpu_state(vm, VCPU_ID); @@ -244,6 +264,8 @@ static void default_after_vcpu_run(struct kvm_vm *vm, int ret, int err) TEST_ASSERT(get_ucall(vm, VCPU_ID, NULL) == UCALL_SYNC, "Invalid guest sync status: exit_reason=%s\n", exit_reason_str(run->exit_reason)); + + vcpu_handle_sync_stop(); } static bool dirty_ring_supported(void) @@ -301,13 +323,13 @@ static void dirty_ring_wait_vcpu(void) { /* This makes sure that hardware PML cache flushed */ vcpu_kick(); - sem_wait_until(&dirty_ring_vcpu_stop); + sem_wait_until(&sem_vcpu_stop); } static void dirty_ring_continue_vcpu(void) { pr_info("Notifying vcpu to continue\n"); - sem_post(&dirty_ring_vcpu_cont); + sem_post(&sem_vcpu_cont); } static void dirty_ring_collect_dirty_pages(struct kvm_vm *vm, int slot, @@ -355,17 +377,17 @@ static void dirty_ring_after_vcpu_run(struct kvm_vm *vm, int ret, int err) /* A ucall-sync or ring-full event is allowed */ if (get_ucall(vm, VCPU_ID, NULL) == UCALL_SYNC) { /* We should allow this to continue */ - ; + vcpu_handle_sync_stop(); } else if (run->exit_reason == KVM_EXIT_DIRTY_RING_FULL || (ret == -1 && err == EINTR)) { /* Update the flag first before pause */ WRITE_ONCE(dirty_ring_vcpu_ring_full, run->exit_reason == KVM_EXIT_DIRTY_RING_FULL); - sem_post(&dirty_ring_vcpu_stop); + sem_post(&sem_vcpu_stop); pr_info("vcpu stops because %s...\n", dirty_ring_vcpu_ring_full ? "dirty ring is full" : "vcpu is kicked out"); - sem_wait_until(&dirty_ring_vcpu_cont); + sem_wait_until(&sem_vcpu_cont); pr_info("vcpu continues now.\n"); } else { TEST_ASSERT(false, "Invalid guest sync status: " @@ -377,7 +399,7 @@ static void dirty_ring_after_vcpu_run(struct kvm_vm *vm, int ret, int err) static void dirty_ring_before_vcpu_join(void) { /* Kick another round of vcpu just to make sure it will quit */ - sem_post(&dirty_ring_vcpu_cont); + sem_post(&sem_vcpu_cont); } struct log_mode { @@ -768,7 +790,25 @@ static void run_test(enum vm_guest_mode mode, void *arg) usleep(p->interval * 1000); log_mode_collect_dirty_pages(vm, TEST_MEM_SLOT_INDEX, bmap, host_num_pages); + + /* + * See vcpu_sync_stop_requested definition for details on why + * we need to stop vcpu when verify data. + */ + atomic_set(&vcpu_sync_stop_requested, true); + sem_wait_until(&sem_vcpu_stop); + /* + * NOTE: for dirty ring, it's possible that we didn't stop at + * GUEST_SYNC but instead we stopped because ring is full; + * that's okay too because ring full means we're only missing + * the flush of the last page, and since we handle dirty ring + * last page specifically, so verify will still pass. + */ + assert(host_log_mode == LOG_MODE_DIRTY_RING || + atomic_read(&vcpu_sync_stop_requested) == false); vm_dirty_log_verify(mode, bmap); + sem_post(&sem_vcpu_cont); + iteration++; sync_global_to_guest(vm, iteration); } @@ -819,8 +859,8 @@ int main(int argc, char *argv[]) }; int opt, i; - sem_init(&dirty_ring_vcpu_stop, 0, 0); - sem_init(&dirty_ring_vcpu_cont, 0, 0); + sem_init(&sem_vcpu_stop, 0, 0); + sem_init(&sem_vcpu_cont, 0, 0); guest_modes_append_default(); From patchwork Tue Apr 20 15:39:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12214519 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 6F3CBC43460 for ; Tue, 20 Apr 2021 15:39:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 365CC613CF for ; Tue, 20 Apr 2021 15:39:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232174AbhDTPkL (ORCPT ); Tue, 20 Apr 2021 11:40:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46737 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232940AbhDTPkK (ORCPT ); Tue, 20 Apr 2021 11:40:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618933178; 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=v0hTcWbX3BCC9ZUFjKu3oL9Qk+b2NyA6y6oL3gT9PjE=; b=Q43JsS5bbhjrFLbtH6eF7AUmxlx4GackLjYhuen5hhdBPGjoEteqg5PKJVVkWyRWbwBriP jMMsMoe35Kzy1xEeEs+wRzLkiVJN6EJjzzt9o6tqXbul91mGpf/+tP3uFmYoSdWSD8iWSG YuShInf5Ei2p27LtKegEOgSFNzPtW8U= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-320-EKXF2ZStMbyq9hCeO0l0IQ-1; Tue, 20 Apr 2021 11:39:37 -0400 X-MC-Unique: EKXF2ZStMbyq9hCeO0l0IQ-1 Received: by mail-qk1-f200.google.com with SMTP id h22-20020a05620a13f6b02902e3e9aad4bdso3265427qkl.14 for ; Tue, 20 Apr 2021 08:39:35 -0700 (PDT) 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=v0hTcWbX3BCC9ZUFjKu3oL9Qk+b2NyA6y6oL3gT9PjE=; b=egeinBuGVjmPxXy5mZOTP16Hi+10LLGtve4r36M76s+pAYhLFCpnkQQdqjtdFreApe zkOOuw17VNwUdougN3ni8Yzc9OnnIZX2a4yVsXawzH/j2MPruUAb7oR6VWKTcrxT340J CZfqwYAb3AqwM+tX7dna7jL1n1KZYRbHPOGnAizthNONv9L/MxvPWggPssgMwm6Vp6ih IQPT71NlBnV8ppdHXgUiYEk/fudV7O2RIQPw+/ldsiLlJcdqif6EoGqnNwfV6lcKgHMX kp75/lx/kL0wkhONUGuSg0uH9EqQ2ui8Slv8s5w+FbUFL50vRw1g0eWbPqzm90ruawpr k9aQ== X-Gm-Message-State: AOAM533x4RzWaOXYHnWKbYo3poc1M+keEE4+auZ7YFos0BCjg0MO0R+I XBUyEmAR203OlsOqLtdcmrRmDXGh7PtpvycS9fTQqMhNoG3jejJNMppKM75qvGuKjbNADfYYi83 JeFrCiQVfKojvMI1+u58iUetVfVEQS/xnq6kz1iDqfyQim1j0dv0kvCBRtzyzQA== X-Received: by 2002:ac8:6703:: with SMTP id e3mr2290924qtp.247.1618933174939; Tue, 20 Apr 2021 08:39:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyn0RU8rrRtvS0aT44DO1pxylQ0/+NBEAMy1jGC/Bhuc46/VKsZuFkoMeQ5x5S9cCioVtWTXw== X-Received: by 2002:ac8:6703:: with SMTP id e3mr2290900qtp.247.1618933174663; Tue, 20 Apr 2021 08:39:34 -0700 (PDT) Received: from xz-x1.redhat.com (bras-base-toroon474qw-grc-88-174-93-75-154.dsl.bell.ca. [174.93.75.154]) by smtp.gmail.com with ESMTPSA id f12sm11633325qtq.84.2021.04.20.08.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:39:34 -0700 (PDT) From: Peter Xu To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paolo Bonzini , peterx@redhat.com, Sean Christopherson , Andrew Jones Subject: [PATCH v4 2/2] KVM: selftests: Wait for vcpu thread before signal setup Date: Tue, 20 Apr 2021 11:39:29 -0400 Message-Id: <20210420153929.482810-3-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210420153929.482810-1-peterx@redhat.com> References: <20210420153929.482810-1-peterx@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The main thread could start to send SIG_IPI at any time, even before signal blocked on vcpu thread. Reuse the sem_vcpu_stop to sync on that, so when SIG_IPI is sent the signal will always land correctly as an -EINTR. Without this patch, on very busy cores the dirty_log_test could fail directly on receiving a SIG_USR1 without a handler (when vcpu runs far slower than main). Signed-off-by: Peter Xu --- tools/testing/selftests/kvm/dirty_log_test.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c index fc87e2f11d3d..d3050d1c2cd0 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -534,6 +534,12 @@ static void *vcpu_worker(void *data) sigemptyset(sigset); sigaddset(sigset, SIG_IPI); + /* + * Tell the main thread that signals are setup already; let's borrow + * sem_vcpu_stop even if it's not for it. + */ + sem_post(&sem_vcpu_stop); + guest_array = addr_gva2hva(vm, (vm_vaddr_t)random_array); while (!READ_ONCE(host_quit)) { @@ -785,6 +791,8 @@ static void run_test(enum vm_guest_mode mode, void *arg) pthread_create(&vcpu_thread, NULL, vcpu_worker, vm); + sem_wait_until(&sem_vcpu_stop); + while (iteration < p->iterations) { /* Give the vcpu thread some time to dirty some pages */ usleep(p->interval * 1000);