lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Disable interrupts around get_kernel_ns()

Browse Source 
get_kernel_ns() wants preemption disabled.  It doesn't make a lot of sense
during the get/set ioctls (no way to make them non-racy) but the callee wants
it.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity
2010-10-04 12:55:49 +02:00
parent 7ebaf15eef
commit 395c6b0a9d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kvm/x86.c
View File

@@ -3469,8 +3469,10 @@ long kvm_arch_vm_ioctl(struct file *filp,
goto out; goto out;
r = 0; r = 0;
local_irq_disable();
now_ns = get_kernel_ns(); now_ns = get_kernel_ns();
delta = user_ns.clock - now_ns; delta = user_ns.clock - now_ns;
local_irq_enable();
kvm->arch.kvmclock_offset = delta; kvm->arch.kvmclock_offset = delta;
break; break;
} }
@@ -3478,8 +3480,10 @@ long kvm_arch_vm_ioctl(struct file *filp,
struct kvm_clock_data user_ns; struct kvm_clock_data user_ns;
u64 now_ns; u64 now_ns;
local_irq_disable();
now_ns = get_kernel_ns(); now_ns = get_kernel_ns();
user_ns.clock = kvm->arch.kvmclock_offset + now_ns; user_ns.clock = kvm->arch.kvmclock_offset + now_ns;
local_irq_enable();
user_ns.flags = 0; user_ns.flags = 0;
r = -EFAULT; r = -EFAULT;