mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-07 20:56:39 +07:00
KVM: x86: new irqchip mode KVM_IRQCHIP_INIT_IN_PROGRESS
Let's add a new mode and set it while we create the irqchip via KVM_CREATE_IRQCHIP and KVM_CAP_SPLIT_IRQCHIP. This mode will be used later to test if adding routes (in kvm_set_routing_entry()) is already allowed. Signed-off-by: David Hildenbrand <david@redhat.com> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
This commit is contained in:
parent
1df6ddede1
commit
637e3f86fa
@ -726,6 +726,7 @@ struct kvm_hv {
|
||||
|
||||
enum kvm_irqchip_mode {
|
||||
KVM_IRQCHIP_NONE,
|
||||
KVM_IRQCHIP_INIT_IN_PROGRESS, /* temporarily set during creation */
|
||||
KVM_IRQCHIP_KERNEL, /* created with KVM_CREATE_IRQCHIP */
|
||||
KVM_IRQCHIP_SPLIT, /* created with KVM_CAP_SPLIT_IRQCHIP */
|
||||
};
|
||||
|
@ -93,21 +93,29 @@ static inline int pic_in_kernel(struct kvm *kvm)
|
||||
|
||||
static inline int irqchip_split(struct kvm *kvm)
|
||||
{
|
||||
return kvm->arch.irqchip_mode == KVM_IRQCHIP_SPLIT;
|
||||
int mode = kvm->arch.irqchip_mode;
|
||||
|
||||
/* Matches smp_wmb() when setting irqchip_mode */
|
||||
smp_rmb();
|
||||
return mode == KVM_IRQCHIP_SPLIT;
|
||||
}
|
||||
|
||||
static inline int irqchip_kernel(struct kvm *kvm)
|
||||
{
|
||||
return kvm->arch.irqchip_mode == KVM_IRQCHIP_KERNEL;
|
||||
int mode = kvm->arch.irqchip_mode;
|
||||
|
||||
/* Matches smp_wmb() when setting irqchip_mode */
|
||||
smp_rmb();
|
||||
return mode == KVM_IRQCHIP_KERNEL;
|
||||
}
|
||||
|
||||
static inline int irqchip_in_kernel(struct kvm *kvm)
|
||||
{
|
||||
bool ret = kvm->arch.irqchip_mode != KVM_IRQCHIP_NONE;
|
||||
int mode = kvm->arch.irqchip_mode;
|
||||
|
||||
/* Matches with wmb after initializing kvm->irq_routing. */
|
||||
/* Matches smp_wmb() when setting irqchip_mode */
|
||||
smp_rmb();
|
||||
return ret;
|
||||
return mode > KVM_IRQCHIP_INIT_IN_PROGRESS;
|
||||
}
|
||||
|
||||
void kvm_pic_reset(struct kvm_kpic_state *s);
|
||||
|
@ -3928,9 +3928,14 @@ static int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
|
||||
goto split_irqchip_unlock;
|
||||
if (kvm->created_vcpus)
|
||||
goto split_irqchip_unlock;
|
||||
kvm->arch.irqchip_mode = KVM_IRQCHIP_INIT_IN_PROGRESS;
|
||||
r = kvm_setup_empty_irq_routing(kvm);
|
||||
if (r)
|
||||
if (r) {
|
||||
kvm->arch.irqchip_mode = KVM_IRQCHIP_NONE;
|
||||
/* Pairs with smp_rmb() when reading irqchip_mode */
|
||||
smp_wmb();
|
||||
goto split_irqchip_unlock;
|
||||
}
|
||||
/* Pairs with irqchip_in_kernel. */
|
||||
smp_wmb();
|
||||
kvm->arch.irqchip_mode = KVM_IRQCHIP_SPLIT;
|
||||
@ -4018,8 +4023,12 @@ long kvm_arch_vm_ioctl(struct file *filp,
|
||||
goto create_irqchip_unlock;
|
||||
}
|
||||
|
||||
kvm->arch.irqchip_mode = KVM_IRQCHIP_INIT_IN_PROGRESS;
|
||||
r = kvm_setup_default_irq_routing(kvm);
|
||||
if (r) {
|
||||
kvm->arch.irqchip_mode = KVM_IRQCHIP_NONE;
|
||||
/* Pairs with smp_rmb() when reading irqchip_mode */
|
||||
smp_wmb();
|
||||
mutex_lock(&kvm->slots_lock);
|
||||
mutex_lock(&kvm->irq_lock);
|
||||
kvm_ioapic_destroy(kvm);
|
||||
|
Loading…
Reference in New Issue
Block a user