From: Marcelo Tosatti <mtosatti@redhat.com>
To: kvm@vger.kernel.org
Cc: avi@redhat.com, Marcelo Tosatti <mtosatti@redhat.com>
Subject: [patch 03/10] KVM: switch dirty_log to mmu_lock protection
Date: Mon, 21 Sep 2009 20:37:14 -0300 [thread overview]
Message-ID: <20090921234124.205345161@amt.cnet> (raw)
In-Reply-To: 20090921233711.213665413@amt.cnet
[-- Attachment #1: get-dirty-log --]
[-- Type: text/plain, Size: 3795 bytes --]
get_dirty_log vs mark_page_dirty need to be mutually exclusive. Switch
to mmu_lock protection.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Index: kvm-slotslock/arch/x86/kvm/paging_tmpl.h
===================================================================
--- kvm-slotslock.orig/arch/x86/kvm/paging_tmpl.h
+++ kvm-slotslock/arch/x86/kvm/paging_tmpl.h
@@ -175,7 +175,9 @@ walk:
if (!(pte & PT_ACCESSED_MASK)) {
trace_kvm_mmu_set_accessed_bit(table_gfn, index,
sizeof(pte));
+ spin_lock(&vcpu->kvm->mmu_lock);
mark_page_dirty(vcpu->kvm, table_gfn);
+ spin_unlock(&vcpu->kvm->mmu_lock);
if (FNAME(cmpxchg_gpte)(vcpu->kvm, table_gfn,
index, pte, pte|PT_ACCESSED_MASK))
goto walk;
@@ -215,7 +217,9 @@ walk:
bool ret;
trace_kvm_mmu_set_dirty_bit(table_gfn, index, sizeof(pte));
+ spin_lock(&vcpu->kvm->mmu_lock);
mark_page_dirty(vcpu->kvm, table_gfn);
+ spin_unlock(&vcpu->kvm->mmu_lock);
ret = FNAME(cmpxchg_gpte)(vcpu->kvm, table_gfn, index, pte,
pte|PT_DIRTY_MASK);
if (ret)
Index: kvm-slotslock/arch/x86/kvm/x86.c
===================================================================
--- kvm-slotslock.orig/arch/x86/kvm/x86.c
+++ kvm-slotslock/arch/x86/kvm/x86.c
@@ -692,7 +692,9 @@ static void kvm_write_guest_time(struct
kunmap_atomic(shared_kaddr, KM_USER0);
+ spin_lock(&v->kvm->mmu_lock);
mark_page_dirty(v->kvm, vcpu->time >> PAGE_SHIFT);
+ spin_unlock(&v->kvm->mmu_lock);
}
static int kvm_request_guest_time_update(struct kvm_vcpu *v)
@@ -2147,27 +2149,45 @@ static int kvm_vm_ioctl_reinject(struct
int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
struct kvm_dirty_log *log)
{
- int r;
- int n;
+ int r, n, i;
struct kvm_memory_slot *memslot;
- int is_dirty = 0;
+ unsigned long is_dirty = 0;
+ unsigned long *dirty_bitmap;
down_write(&kvm->slots_lock);
- r = kvm_get_dirty_log(kvm, log, &is_dirty);
- if (r)
+ r = -EINVAL;
+ if (log->slot >= KVM_MEMORY_SLOTS)
+ goto out;
+
+ memslot = &kvm->memslots->memslots[log->slot];
+ r = -ENOENT;
+ if (!memslot->dirty_bitmap)
+ goto out;
+
+ n = ALIGN(memslot->npages, BITS_PER_LONG) / 8;
+ r = -ENOMEM;
+ dirty_bitmap = vmalloc(n);
+ if (!dirty_bitmap)
goto out;
+ memset(dirty_bitmap, 0, n);
+
+ spin_lock(&kvm->mmu_lock);
+ for (i = 0; !is_dirty && i < n/sizeof(long); ++i)
+ is_dirty = memslot->dirty_bitmap[i];
/* If nothing is dirty, don't bother messing with page tables. */
if (is_dirty) {
- spin_lock(&kvm->mmu_lock);
+ memcpy(dirty_bitmap, memslot->dirty_bitmap, n);
+ memset(memslot->dirty_bitmap, 0, n);
kvm_mmu_slot_remove_write_access(kvm, log->slot);
- spin_unlock(&kvm->mmu_lock);
memslot = &kvm->memslots->memslots[log->slot];
- n = ALIGN(memslot->npages, BITS_PER_LONG) / 8;
- memset(memslot->dirty_bitmap, 0, n);
}
+ spin_unlock(&kvm->mmu_lock);
+
r = 0;
+ if (copy_to_user(log->dirty_bitmap, dirty_bitmap, n))
+ r = -EFAULT;
out:
up_write(&kvm->slots_lock);
return r;
@@ -3491,7 +3511,9 @@ static void vapic_exit(struct kvm_vcpu *
down_read(&vcpu->kvm->slots_lock);
kvm_release_page_dirty(apic->vapic_page);
+ spin_lock(&vcpu->kvm->mmu_lock);
mark_page_dirty(vcpu->kvm, apic->vapic_addr >> PAGE_SHIFT);
+ spin_unlock(&vcpu->kvm->mmu_lock);
up_read(&vcpu->kvm->slots_lock);
}
Index: kvm-slotslock/virt/kvm/kvm_main.c
===================================================================
--- kvm-slotslock.orig/virt/kvm/kvm_main.c
+++ kvm-slotslock/virt/kvm/kvm_main.c
@@ -1007,7 +1007,9 @@ int kvm_write_guest_page(struct kvm *kvm
r = copy_to_user((void __user *)addr + offset, data, len);
if (r)
return -EFAULT;
+ spin_lock(&kvm->mmu_lock);
mark_page_dirty(kvm, gfn);
+ spin_unlock(&kvm->mmu_lock);
return 0;
}
EXPORT_SYMBOL_GPL(kvm_write_guest_page);
next prev parent reply other threads:[~2009-09-21 23:42 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 ` Marcelo Tosatti [this message]
2009-09-22 6:37 ` [patch 03/10] KVM: switch dirty_log to mmu_lock protection 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
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=20090921234124.205345161@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).