From: Gavin Shan <gshan@redhat.com>
To: Peter Xu <peterx@redhat.com>, qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>, Xiaohui Li <xiaohli@redhat.com>
Subject: Re: [PATCH] kvm: dirty-ring: Fix race with vcpu creation
Date: Wed, 22 Feb 2023 09:39:04 +1100 [thread overview]
Message-ID: <67c44f3b-8aeb-878c-298b-d441f4a578ba@redhat.com> (raw)
In-Reply-To: <Y+A1DNtDVExAkCR1@x1n>
On 2/6/23 10:00 AM, Peter Xu wrote:
> On Tue, Sep 27, 2022 at 11:46:53AM -0400, Peter Xu wrote:
>> It's possible that we want to reap a dirty ring on a vcpu that is during
>> creation, because the vcpu is put onto list (CPU_FOREACH visible) before
>> initialization of the structures. In this case:
>>
>> qemu_init_vcpu
>> x86_cpu_realizefn
>> cpu_exec_realizefn
>> cpu_list_add <---- can be probed by CPU_FOREACH
>> qemu_init_vcpu
>> cpus_accel->create_vcpu_thread(cpu);
>> kvm_init_vcpu
>> map kvm_dirty_gfns <--- kvm_dirty_gfns valid
>>
>> Don't try to reap dirty ring on vcpus during creation or it'll crash.
>>
>> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2124756
>> Reported-by: Xiaohui Li <xiaohli@redhat.com>
>> Signed-off-by: Peter Xu <peterx@redhat.com>
>> ---
>> accel/kvm/kvm-all.c | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
>> index 5acab1767f..df5fabd3a8 100644
>> --- a/accel/kvm/kvm-all.c
>> +++ b/accel/kvm/kvm-all.c
>> @@ -757,6 +757,15 @@ static uint32_t kvm_dirty_ring_reap_one(KVMState *s, CPUState *cpu)
>> uint32_t ring_size = s->kvm_dirty_ring_size;
>> uint32_t count = 0, fetch = cpu->kvm_fetch_index;
>>
>> + /*
>> + * It's possible that we race with vcpu creation code where the vcpu is
>> + * put onto the vcpus list but not yet initialized the dirty ring
>> + * structures. If so, skip it.
>> + */
>> + if (!cpu->created) {
>> + return 0;
>> + }
>> +
>> assert(dirty_gfns && ring_size);
>> trace_kvm_dirty_ring_reap_vcpu(cpu->cpu_index);
>>
Reviewed-by: Gavin Shan <gshan@redhat.com>
prev parent reply other threads:[~2023-02-21 22:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 15:46 [PATCH] kvm: dirty-ring: Fix race with vcpu creation Peter Xu
2022-10-14 16:33 ` Peter Xu
2023-02-05 23:00 ` Peter Xu
2023-02-21 22:39 ` Gavin Shan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=67c44f3b-8aeb-878c-298b-d441f4a578ba@redhat.com \
--to=gshan@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=xiaohli@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).