adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

KVM: Change kvm_{read,write}_guest() to use copy_{from,to}_user()

Browse source 
This changes kvm_write_guest_page/kvm_read_guest_page to use
copy_to_user/read_from_user, as a result we get better speed
and better dirty bit tracking.

Signed-off-by: Izik Eidus <izike@qumranet.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Izik Eidus 2007-11-11 22:10:22 +02:00 committed by Avi Kivity
parent 539cb6608c
commit e0506bcba5
1 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/kvm/kvm_main.c
View file

@ -630,20 +630,15 @@ static int next_segment(unsigned long len, int offset)
int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset, int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
int len) int len)
{ {
void *page_virt; int r;
struct page *page; unsigned long addr;
page = gfn_to_page(kvm, gfn); addr = gfn_to_hva(kvm, gfn);
if (is_error_page(page)) { if (kvm_is_error_hva(addr))
kvm_release_page(page); return -EFAULT;
r = copy_from_user(data, (void __user *)addr + offset, len);
if (r)
return -EFAULT; return -EFAULT;
}
page_virt = kmap_atomic(page, KM_USER0);
memcpy(data, page_virt + offset, len);
kunmap_atomic(page_virt, KM_USER0);
kvm_release_page(page);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(kvm_read_guest_page); EXPORT_SYMBOL_GPL(kvm_read_guest_page);
@ -671,21 +666,16 @@ EXPORT_SYMBOL_GPL(kvm_read_guest);
int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn, const void *data, int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn, const void *data,
int offset, int len) int offset, int len)
{ {
void *page_virt; int r;
struct page *page; unsigned long addr;
page = gfn_to_page(kvm, gfn); addr = gfn_to_hva(kvm, gfn);
if (is_error_page(page)) { if (kvm_is_error_hva(addr))
kvm_release_page(page); return -EFAULT;
r = copy_to_user((void __user *)addr + offset, data, len);
if (r)
return -EFAULT; return -EFAULT;
}
page_virt = kmap_atomic(page, KM_USER0);
memcpy(page_virt + offset, data, len);
kunmap_atomic(page_virt, KM_USER0);
mark_page_dirty(kvm, gfn); mark_page_dirty(kvm, gfn);
kvm_release_page(page);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(kvm_write_guest_page); EXPORT_SYMBOL_GPL(kvm_write_guest_page);