@@ -1582,6 +1582,9 @@ long kvm_arch_vm_ioctl(struct file *filp,
break;
}
case KVM_CREATE_IRQCHIP:
+ r = -EINVAL;
+ if (atomic_read(&kvm->online_vcpus))
+ goto out;
r = -ENOMEM;
kvm->arch.vpic = kvm_create_pic(kvm);
if (kvm->arch.vpic) {
@@ -3350,6 +3353,11 @@ void kvm_arch_check_processor_compat(void *rtn)
kvm_x86_ops->check_processor_compatibility(rtn);
}
+bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu)
+{
+ return irqchip_in_kernel(vcpu->kvm) == (vcpu->arch.apic != NULL);
+}
+
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
{
struct page *page;
@@ -3435,6 +3443,7 @@ static void kvm_free_vcpus(struct kvm *kvm)
}
}
+ atomic_set(&kvm->online_vcpus, 0);
}
void kvm_arch_destroy_vm(struct kvm *kvm)
@@ -1582,6 +1582,9 @@ long kvm_arch_vm_ioctl(struct file *filp,
break;
}
case KVM_CREATE_IRQCHIP:
+ r = -EINVAL;
+ if (atomic_read(&kvm->online_vcpus))
+ goto out;
r = -ENOMEM;
kvm->arch.vpic = kvm_create_pic(kvm);
if (kvm->arch.vpic) {
@@ -3350,6 +3353,11 @@ void kvm_arch_check_processor_compat(void *rtn)
kvm_x86_ops->check_processor_compatibility(rtn);
}
+bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu)
+{
+ return irqchip_in_kernel(vcpu->kvm) == (vcpu->arch.apic != NULL);
+}
+
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
{
struct page *page;
@@ -3435,6 +3443,7 @@ static void kvm_free_vcpus(struct kvm *kvm)
}
}
+ atomic_set(&kvm->online_vcpus, 0);
}
void kvm_arch_destroy_vm(struct kvm *kvm)
@@ -121,6 +121,7 @@ struct kvm {
struct kvm_memory_slot memslots[KVM_MEMORY_SLOTS +
KVM_PRIVATE_MEM_SLOTS];
struct kvm_vcpu *vcpus[KVM_MAX_VCPUS];
+ atomic_t online_vcpus;
struct list_head vm_list;
struct file *filp;
struct kvm_io_bus mmio_bus;
@@ -307,5 +308,6 @@ struct kvm_stats_debugfs_item {
struct dentry *dentry;
};
extern struct kvm_stats_debugfs_item debugfs_entries[];
+bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu);
#endif
@@ -802,11 +802,16 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n)
return r;
mutex_lock(&kvm->lock);
+ if (!kvm_vcpu_compatible(vcpu)) {
+ r = -EINVAL;
+ goto vcpu_destroy;
+ }
if (kvm->vcpus[n]) {
r = -EEXIST;
goto vcpu_destroy;
}
kvm->vcpus[n] = vcpu;
+ atomic_inc(&kvm->online_vcpus);
mutex_unlock(&kvm->lock);
/* Now it's all set up, let userspace reach it */
@@ -1582,6 +1582,9 @@ long kvm_arch_vm_ioctl(struct file *filp,
break;
}
case KVM_CREATE_IRQCHIP:
+ r = -EINVAL;
+ if (atomic_read(&kvm->online_vcpus))
+ goto out;
r = -ENOMEM;
kvm->arch.vpic = kvm_create_pic(kvm);
if (kvm->arch.vpic) {
@@ -3350,6 +3353,11 @@ void kvm_arch_check_processor_compat(void *rtn)
kvm_x86_ops->check_processor_compatibility(rtn);
}
+bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu)
+{
+ return irqchip_in_kernel(vcpu->kvm) == (vcpu->arch.apic != NULL);
+}
+
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
{
struct page *page;
@@ -3435,6 +3443,7 @@ static void kvm_free_vcpus(struct kvm *kvm)
}
}
+ atomic_set(&kvm->online_vcpus, 0);
}
void kvm_arch_destroy_vm(struct kvm *kvm)
@@ -121,6 +121,7 @@ struct kvm {
struct kvm_memory_slot memslots[KVM_MEMORY_SLOTS +
KVM_PRIVATE_MEM_SLOTS];
struct kvm_vcpu *vcpus[KVM_MAX_VCPUS];
+ atomic_t online_vcpus;
struct list_head vm_list;
struct file *filp;
struct kvm_io_bus mmio_bus;
@@ -307,5 +308,6 @@ struct kvm_stats_debugfs_item {
struct dentry *dentry;
};
extern struct kvm_stats_debugfs_item debugfs_entries[];
+bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu);
#endif
@@ -802,11 +802,16 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n)
return r;
mutex_lock(&kvm->lock);
+ if (!kvm_vcpu_compatible(vcpu)) {
+ r = -EINVAL;
+ goto vcpu_destroy;
+ }
if (kvm->vcpus[n]) {
r = -EEXIST;
goto vcpu_destroy;
}
kvm->vcpus[n] = vcpu;
+ atomic_inc(&kvm->online_vcpus);
mutex_unlock(&kvm->lock);
/* Now it's all set up, let userspace reach it */
@@ -121,6 +121,7 @@ struct kvm {
struct kvm_memory_slot memslots[KVM_MEMORY_SLOTS +
KVM_PRIVATE_MEM_SLOTS];
struct kvm_vcpu *vcpus[KVM_MAX_VCPUS];
+ atomic_t online_vcpus;
struct list_head vm_list;
struct file *filp;
struct kvm_io_bus mmio_bus;
@@ -307,5 +308,6 @@ struct kvm_stats_debugfs_item {
struct dentry *dentry;
};
extern struct kvm_stats_debugfs_item debugfs_entries[];
+bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu);
#endif
@@ -802,11 +802,16 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n)
return r;
mutex_lock(&kvm->lock);
+ if (!kvm_vcpu_compatible(vcpu)) {
+ r = -EINVAL;
+ goto vcpu_destroy;
+ }
if (kvm->vcpus[n]) {
r = -EEXIST;
goto vcpu_destroy;
}
kvm->vcpus[n] = vcpu;
+ atomic_inc(&kvm->online_vcpus);
mutex_unlock(&kvm->lock);
/* Now it's all set up, let userspace reach it */