From: Marcelo Tosatti <mtosatti@redhat.com>
To: Avi Kivity <avi@redhat.com>
Cc: kvm@vger.kernel.org
Subject: Re: [patch 07/10] KVM: introduce kvm->srcu and convert kvm_set_memory_region to SRCU update
Date: Tue, 22 Sep 2009 13:16:26 -0300 [thread overview]
Message-ID: <20090922161626.GA12506@amt.cnet> (raw)
In-Reply-To: <4AB875B8.80904@redhat.com>
On Tue, Sep 22, 2009 at 09:59:04AM +0300, Avi Kivity wrote:
> On 09/22/2009 02:37 AM, Marcelo Tosatti wrote:
>> Use two steps for memslot deletion: mark the slot invalid (which stops
>> instantiation of new shadow pages for that slot, but allows destruction),
>> then instantiate the new empty slot.
>>
>> Also simplifies kvm_handle_hva locking.
>>
>> unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm)
>> {
>> - int i;
>> + int i, idx;
>> unsigned int nr_mmu_pages;
>> unsigned int nr_pages = 0;
>> + struct kvm_memslots *slots;
>>
>> - for (i = 0; i< kvm->memslots->nmemslots; i++)
>> - nr_pages += kvm->memslots->memslots[i].npages;
>> + idx = srcu_read_lock(&kvm->srcu);
>>
>
> Doesn't the caller hold the srcu_read_lock() here?
No:
kvm_vm_ioctl_set_nr_mmu_pages -> kvm_mmu_change_mmu_pages
And even if the caller did, recursive "locking" is tolerated.
>> Index: kvm-slotslock/arch/x86/kvm/vmx.c
>> ===================================================================
>> --- kvm-slotslock.orig/arch/x86/kvm/vmx.c
>> +++ kvm-slotslock/arch/x86/kvm/vmx.c
>> @@ -24,6 +24,7 @@
>> #include<linux/mm.h>
>> #include<linux/highmem.h>
>> #include<linux/sched.h>
>> +#include<linux/srcu.h>
>> #include<linux/moduleparam.h>
>> #include<linux/ftrace_event.h>
>> #include "kvm_cache_regs.h"
>> @@ -1465,10 +1466,18 @@ static void enter_pmode(struct kvm_vcpu
>> static gva_t rmode_tss_base(struct kvm *kvm)
>> {
>> if (!kvm->arch.tss_addr) {
>> - gfn_t base_gfn = kvm->memslots->memslots[0].base_gfn +
>> - kvm->memslots->memslots[0].npages - 3;
>> + struct kvm_memslots *slots;
>> + gfn_t base_gfn;
>> + int idx;
>> +
>> + idx = srcu_read_lock(&kvm->srcu);
>> + slots = rcu_dereference(kvm->memslots);
>> + base_gfn = slots->memslots[0].base_gfn +
>> + slots->memslots[0].npages - 3;
>> + srcu_read_unlock(&kvm->srcu, idx);
>> return base_gfn<< PAGE_SHIFT;
>> }
>> +
>>
>
> And here?
kvm_arch_vcpu_ioctl_set_sregs -> kvm_x86_ops->set_cr0.
> Maybe we should take the srcu_lock in vcpu_load/put and only
> drop in when going into vcpu context or explicitly sleeping, just to
> simplify things.
Hum, possible, but i'd rather leave it for later.
next prev parent reply other threads:[~2009-09-22 16:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-21 23:37 [patch 00/10] RFC: switch vcpu context to use SRCU Marcelo Tosatti
2009-09-21 23:37 ` [patch 01/10] KVM: modify memslots layout in struct kvm Marcelo Tosatti
2009-09-21 23:37 ` [patch 02/10] KVM: modify alias layout in x86s struct kvm_arch Marcelo Tosatti
2009-09-21 23:37 ` [patch 03/10] KVM: switch dirty_log to mmu_lock protection Marcelo Tosatti
2009-09-22 6:37 ` Avi Kivity
2009-09-22 12:44 ` Marcelo Tosatti
2009-09-22 12:52 ` Avi Kivity
2009-09-21 23:37 ` [patch 04/10] KVM: split kvm_arch_set_memory_region into prepare and commit Marcelo Tosatti
2009-09-22 6:40 ` Avi Kivity
2009-09-21 23:37 ` [patch 05/10] KVM: introduce gfn_to_pfn_memslot Marcelo Tosatti
2009-09-21 23:37 ` [patch 06/10] KVM: use gfn_to_pfn_memslot in kvm_iommu_map_pages Marcelo Tosatti
2009-09-21 23:37 ` [patch 07/10] KVM: introduce kvm->srcu and convert kvm_set_memory_region to SRCU update Marcelo Tosatti
2009-09-22 6:59 ` Avi Kivity
2009-09-22 16:16 ` Marcelo Tosatti [this message]
2009-09-22 10:40 ` Fernando Carrijo
2009-09-22 12:55 ` Marcelo Tosatti
2009-09-24 14:06 ` Marcelo Tosatti
2009-09-24 17:28 ` Paul E. McKenney
2009-09-24 18:05 ` Marcelo Tosatti
2009-09-25 15:05 ` Avi Kivity
2009-09-21 23:37 ` [patch 08/10] KVM: x86: switch kvm_set_memory_alias " Marcelo Tosatti
2009-09-22 7:04 ` Avi Kivity
2009-09-21 23:37 ` [patch 09/10] KVM: convert io_bus to SRCU Marcelo Tosatti
2009-09-21 23:37 ` [patch 10/10] KVM: switch vcpu context to use SRCU Marcelo Tosatti
2009-09-22 7:07 ` Avi Kivity
2009-09-22 7:09 ` [patch 00/10] RFC: " Avi Kivity
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=20090922161626.GA12506@amt.cnet \
--to=mtosatti@redhat.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
/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).