diff options
| author | Andrea Arcangeli <andrea@qumranet.com> | 2008-01-30 19:57:35 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-31 12:36:38 +0200 |
| commit | 6ac0eb9e4614ddaf459d054434a4752167d904d5 (patch) | |
| tree | 568976ddc303c69e98289c198b0ee435f1f83e1c /virt | |
| parent | 1d59f5a241eee56ca761a3e8f87b8603c49a3dc8 (diff) | |
KVM: Disable pagefaults during copy_from_user_inatomic()
With CONFIG_PREEMPT=n, this is needed in order to disable the fault-in
code from sleeping.
Signed-off-by: Andrea Arcangeli <andrea@qumranet.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 8fc12dc0e9a9..dbf5fa716f86 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -553,7 +553,9 @@ int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data, addr = gfn_to_hva(kvm, gfn); if (kvm_is_error_hva(addr)) return -EFAULT; + pagefault_disable(); r = __copy_from_user_inatomic(data, (void __user *)addr + offset, len); + pagefault_enable(); if (r) return -EFAULT; return 0; |