KVM: device: add simple registration mechanism for kvm_device_ops
PATCH v2 1/4 KVM: device: add simple registration mechanism for kvm_device_ops
kvm_ioctl_create_device currently has knowledge of all the device types and their associated ops. This is fairly inflexible when adding support for new in-kernel device emulations, so move what we currently have out into a table, which can support dynamic registration of ops by new drivers for virtual hardware.
I didn't try to port all current drivers over, as it's not always clear which initialisation hook the ops should be registered from.
---
v1 -> v2: Added enum for KVM_DEV_TYPE* IDs, changed limits to ARRAY_SIZE,
removed stray semicolon, had a crack at porting VFIO, included Cornelia's s390 FLIC patch.
include/linux/kvm_host.h | 1 + include/uapi/linux/kvm.h | 22 +++++++++++----- virt/kvm/kvm_main.c | 65 ++++++++++++++++++++++++++++-------------------- 3 files changed, 55 insertions(+), 33 deletions(-)
include/linux/kvm_host.h +1 -0
@@ -1083,6 +1083,7 @@ struct kvm_device_ops {void kvm_device_get (struct kvm_device *dev);void kvm_device_put (struct kvm_device *dev);struct kvm_device *kvm_device_from_filp (struct file *filp); +int kvm_register_device_ops (struct kvm_device_ops *ops,u32 type);extern struct kvm_device_ops kvm_mpic_ops;extern struct kvm_device_ops kvm_xics_ops;
include/uapi/linux/kvm.h +16 -6
@@ -940,15 +940,25 @@ struct kvm_device_attr {__u64 addr;/* userspace address of attr data */ }; -#define KVM_DEV_TYPE_FSL_MPIC_20 1 -#define KVM_DEV_TYPE_FSL_MPIC_42 2 -#define KVM_DEV_TYPE_XICS 3 -#define KVM_DEV_TYPE_VFIO 4#define KVM_DEV_VFIO_GROUP 1#define KVM_DEV_VFIO_GROUP_ADD 1#define KVM_DEV_VFIO_GROUP_DEL 2 -#define KVM_DEV_TYPE_ARM_VGIC_V2 5 -#define KVM_DEV_TYPE_FLIC 6 + +enum kvm_device_type { +KVM_DEV_TYPE_FSL_MPIC_20 =1 , +#define KVM_DEV_TYPE_FSL_MPIC_20 KVM_DEV_TYPE_FSL_MPIC_20 + KVM_DEV_TYPE_FSL_MPIC_42, +#define KVM_DEV_TYPE_FSL_MPIC_42 KVM_DEV_TYPE_FSL_MPIC_42 + KVM_DEV_TYPE_XICS, +#define KVM_DEV_TYPE_XICS KVM_DEV_TYPE_XICS + KVM_DEV_TYPE_VFIO, +#define KVM_DEV_TYPE_VFIO KVM_DEV_TYPE_VFIO + KVM_DEV_TYPE_ARM_VGIC_V2, +#define KVM_DEV_TYPE_ARM_VGIC_V2 KVM_DEV_TYPE_ARM_VGIC_V2 + KVM_DEV_TYPE_FLIC, +#define KVM_DEV_TYPE_FLIC KVM_DEV_TYPE_FLIC + KVM_DEV_TYPE_MAX, +};/* * ioctls for VM fds
virt/kvm/kvm_main.c +38 -27
82 lines not on this page · raw message
Signature · 1 line
2.0.0
PATCH v2 2/4 KVM: ARM: vgic: register kvm_device_ops dynamically
Now that we have a dynamic means to register kvm_device_ops, use that for the ARM VGIC, instead of relying on the static table.
--- include/linux/kvm_host.h | 1 - virt/kvm/arm/vgic.c | 156 +++++++++++++++++++++++------------------------ virt/kvm/kvm_main.c | 4 -- 3 files changed, 78 insertions(+), 83 deletions(-)
include/linux/kvm_host.h +0 -1
@@ -1088,7 +1088,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);extern struct kvm_device_ops kvm_mpic_ops;extern struct kvm_device_ops kvm_xics_ops;extern struct kvm_device_ops kvm_vfio_ops; -extern struct kvm_device_ops kvm_arm_vgic_v2_ops;extern struct kvm_device_ops kvm_flic_ops;#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
virt/kvm/arm/vgic.c +78 -78
171 lines not on this page · raw message
virt/kvm/kvm_main.c +0 -4
@@ -2271,10 +2271,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { [KVM_DEV_TYPE_VFIO] = &kvm_vfio_ops,#endif -#ifdef CONFIG_KVM_ARM_VGIC - [KVM_DEV_TYPE_ARM_VGIC_V2 ] = &kvm_arm_vgic_v2_ops, -#endif - #ifdef CONFIG_S390 [KVM_DEV_TYPE_FLIC] = &kvm_flic_ops,#endif
Signature · 1 line
2.0.0
Paolo Bonzini
maintainerRe: [PATCH v2 2/4] KVM: ARM: vgic: register kvm_device_ops dynamically
Il 01/07/2014 16:45, Will Deacon ha scritto:
Quoted 210 lines
Now that we have a dynamic means to register
kvm_device_ops, use that for the ARM VGIC, instead of relying on the static table.Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Marc Zyngier <[email protected]>Cc Christoffer Dall <[email protected]>Signed-off-by Will Deacon <[email protected]>--- include/linux/kvm_host.h | 1 - virt/kvm/arm/vgic.c | 156 +++++++++++++++++++++++------------------------ virt/kvm/kvm_main.c | 4 -- 3 files changed, 78 insertions(+), 83 deletions(-)include/linux/kvm_host.h +0
-1@@ -1088,7 +1088,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);extern struct kvm_device_ops kvm_mpic_ops;extern struct kvm_device_ops kvm_xics_ops;extern struct kvm_device_ops kvm_vfio_ops; -extern struct kvm_device_ops kvm_arm_vgic_v2_ops;extern struct kvm_device_ops kvm_flic_ops;#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT virt/kvm/arm/vgic.c +78
-78@@ -1502,83 +1502,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)return 0 ; } -static void vgic_init_maintenance_interrupt (void *info) -{ -enable_percpu_irq (vgic->maint_irq,0 ); -} - -static int vgic_cpu_notify (struct notifier_block *self, -unsigned long action,void *cpu) -{ -switch (action) { -case CPU_STARTING : -case CPU_STARTING_FROZEN : -vgic_init_maintenance_interrupt (NULL ); -break ; -case CPU_DYING : -case CPU_DYING_FROZEN : -disable_percpu_irq (vgic->maint_irq); -break ; - } - -return NOTIFY_OK ; -} - -static struct notifier_block vgic_cpu_nb = { - .notifier_call = vgic_cpu_notify, -}; - -static const struct of_device_id vgic_ids[] = { - { .compatible ="arm,cortex-a15-gic" , .data = vgic_v2_probe, }, - { .compatible ="arm,gic-v3" , .data = vgic_v3_probe, }, - {}, -}; - -int kvm_vgic_hyp_init (void ) -{ -const struct of_device_id *matched_id; -int (*vgic_probe)(struct device_node *,const struct vgic_ops **, -const struct vgic_params **); -struct device_node *vgic_node; -int ret; - - vgic_node =of_find_matching_node_and_match (NULL , - vgic_ids, &matched_id); -if (!vgic_node) { -kvm_err ("error: no compatible GIC node found\n" ); -return -ENODEV ; - } - - vgic_probe = matched_id->data; - ret =vgic_probe (vgic_node, &vgic_ops, &vgic); -if (ret) -return ret; - - ret =request_percpu_irq (vgic->maint_irq, vgic_maintenance_handler, -"vgic" ,kvm_get_running_vcpus ()); -if (ret) { -kvm_err ("Cannot register interrupt %d\n" , vgic->maint_irq); -return ret; - } - - ret =__register_cpu_notifier (&vgic_cpu_nb); -if (ret) { -kvm_err ("Cannot register vgic CPU notifier\n" ); - goto out_free_irq; - } - -on_each_cpu (vgic_init_maintenance_interrupt,NULL ,1 ); - -/* Callback into for arch code for setup */ -vgic_arch_setup (vgic); - -return 0 ; - -out_free_irq: -free_percpu_irq (vgic->maint_irq,kvm_get_running_vcpus ()); -return ret; -} -/** * kvm_vgic_init - Initialize global VGIC state before running any VCPUs * @kvm: pointer to the kvm struct @@ -2042,7 +1965,7 @@ static int vgic_create(struct kvm_device *dev, u32 type)return kvm_vgic_create (dev->kvm); } -struct kvm_device_ops kvm_arm_vgic_v2_ops = { +static struct kvm_device_ops kvm_arm_vgic_v2_ops = { .name ="kvm-arm-vgic" , .create = vgic_create, .destroy = vgic_destroy,@@ -2050,3 +1973,80 @@ struct kvm_device_ops kvm_arm_vgic_v2_ops = { .get_attr = vgic_get_attr, .has_attr = vgic_has_attr, }; + +static void vgic_init_maintenance_interrupt (void *info) +{ +enable_percpu_irq (vgic->maint_irq,0 ); +} + +static int vgic_cpu_notify (struct notifier_block *self, +unsigned long action,void *cpu) +{ +switch (action) { +case CPU_STARTING : +case CPU_STARTING_FROZEN : +vgic_init_maintenance_interrupt (NULL ); +break ; +case CPU_DYING : +case CPU_DYING_FROZEN : +disable_percpu_irq (vgic->maint_irq); +break ; + } + +return NOTIFY_OK ; +} + +static struct notifier_block vgic_cpu_nb = { + .notifier_call = vgic_cpu_notify, +}; + +static const struct of_device_id vgic_ids[] = { + { .compatible ="arm,cortex-a15-gic" , .data = vgic_v2_probe, }, + { .compatible ="arm,gic-v3" , .data = vgic_v3_probe, }, + {}, +}; + +int kvm_vgic_hyp_init (void ) +{ +const struct of_device_id *matched_id; +int (*vgic_probe)(struct device_node *,const struct vgic_ops **, +const struct vgic_params **); +struct device_node *vgic_node; +int ret; + + vgic_node =of_find_matching_node_and_match (NULL , + vgic_ids, &matched_id); +if (!vgic_node) { +kvm_err ("error: no compatible GIC node found\n" ); +return -ENODEV ; + } + + vgic_probe = matched_id->data; + ret =vgic_probe (vgic_node, &vgic_ops, &vgic); +if (ret) +return ret; + + ret =request_percpu_irq (vgic->maint_irq, vgic_maintenance_handler, +"vgic" ,kvm_get_running_vcpus ()); +if (ret) { +kvm_err ("Cannot register interrupt %d\n" , vgic->maint_irq); +return ret; + } + + ret =__register_cpu_notifier (&vgic_cpu_nb); +if (ret) { +kvm_err ("Cannot register vgic CPU notifier\n" ); + goto out_free_irq; + } + +on_each_cpu (vgic_init_maintenance_interrupt,NULL ,1 ); + +/* Callback into for arch code for setup */ +vgic_arch_setup (vgic); +return kvm_register_device_ops (&kvm_arm_vgic_v2_ops, +KVM_DEV_TYPE_ARM_VGIC_V2 ); + +out_free_irq: +free_percpu_irq (vgic->maint_irq,kvm_get_running_vcpus ()); +return ret; +}virt/kvm/kvm_main.c +0
-0
virt/kvm/kvm_main.c static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { · line 2276
Quoted 10 lines
virt/kvm/kvm_main.c +0
-4@@ -2271,10 +2271,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { [KVM_DEV_TYPE_VFIO] = &kvm_vfio_ops,#endif -#ifdef CONFIG_KVM_ARM_VGIC - [KVM_DEV_TYPE_ARM_VGIC_V2 ] = &kvm_arm_vgic_v2_ops, -#endif - #ifdef CONFIG_S390 [KVM_DEV_TYPE_FLIC] = &kvm_flic_ops,#endif
Christopher, Marc, can you review/ack this?
Paolo
Marc Zyngier
Acked-byRe: [PATCH v2 2/4] KVM: ARM: vgic: register kvm_device_ops dynamically
Quoted 213 lines · Paolo Bonzini
Il 01/07/2014 16:45, Will Deacon ha scritto:
Quoted 212 lines
Now that we have a dynamic means to register
kvm_device_ops, use that for the ARM VGIC, instead of relying on the static table.Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Marc Zyngier <[email protected]>Cc Christoffer Dall <[email protected]>Signed-off-by Will Deacon <[email protected]>--- include/linux/kvm_host.h | 1 - virt/kvm/arm/vgic.c | 156 +++++++++++++++++++++++------------------------ virt/kvm/kvm_main.c | 4 -- 3 files changed, 78 insertions(+), 83 deletions(-)include/linux/kvm_host.h +0
-1@@ -1088,7 +1088,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);extern struct kvm_device_ops kvm_mpic_ops;extern struct kvm_device_ops kvm_xics_ops;extern struct kvm_device_ops kvm_vfio_ops; -extern struct kvm_device_ops kvm_arm_vgic_v2_ops;extern struct kvm_device_ops kvm_flic_ops;#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT virt/kvm/arm/vgic.c +78
-78@@ -1502,83 +1502,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)return 0 ; } -static void vgic_init_maintenance_interrupt (void *info) -{ -enable_percpu_irq (vgic->maint_irq,0 ); -} - -static int vgic_cpu_notify (struct notifier_block *self, -unsigned long action,void *cpu) -{ -switch (action) { -case CPU_STARTING : -case CPU_STARTING_FROZEN : -vgic_init_maintenance_interrupt (NULL ); -break ; -case CPU_DYING : -case CPU_DYING_FROZEN : -disable_percpu_irq (vgic->maint_irq); -break ; - } - -return NOTIFY_OK ; -} - -static struct notifier_block vgic_cpu_nb = { - .notifier_call = vgic_cpu_notify, -}; - -static const struct of_device_id vgic_ids[] = { - { .compatible ="arm,cortex-a15-gic" , .data = vgic_v2_probe, }, - { .compatible ="arm,gic-v3" , .data = vgic_v3_probe, }, - {}, -}; - -int kvm_vgic_hyp_init (void ) -{ -const struct of_device_id *matched_id; -int (*vgic_probe)(struct device_node *,const struct vgic_ops **, -const struct vgic_params **); -struct device_node *vgic_node; -int ret; - - vgic_node =of_find_matching_node_and_match (NULL , - vgic_ids, &matched_id); -if (!vgic_node) { -kvm_err ("error: no compatible GIC node found\n" ); -return -ENODEV ; - } - - vgic_probe = matched_id->data; - ret =vgic_probe (vgic_node, &vgic_ops, &vgic); -if (ret) -return ret; - - ret =request_percpu_irq (vgic->maint_irq, vgic_maintenance_handler, -"vgic" ,kvm_get_running_vcpus ()); -if (ret) { -kvm_err ("Cannot register interrupt %d\n" , vgic->maint_irq); -return ret; - } - - ret =__register_cpu_notifier (&vgic_cpu_nb); -if (ret) { -kvm_err ("Cannot register vgic CPU notifier\n" ); - goto out_free_irq; - } - -on_each_cpu (vgic_init_maintenance_interrupt,NULL ,1 ); - -/* Callback into for arch code for setup */ -vgic_arch_setup (vgic); - -return 0 ; - -out_free_irq: -free_percpu_irq (vgic->maint_irq,kvm_get_running_vcpus ()); -return ret; -} -/** * kvm_vgic_init - Initialize global VGIC state before running any VCPUs * @kvm: pointer to the kvm struct @@ -2042,7 +1965,7 @@ static int vgic_create(struct kvm_device *dev, u32 type)return kvm_vgic_create (dev->kvm); } -struct kvm_device_ops kvm_arm_vgic_v2_ops = { +static struct kvm_device_ops kvm_arm_vgic_v2_ops = { .name ="kvm-arm-vgic" , .create = vgic_create, .destroy = vgic_destroy,@@ -2050,3 +1973,80 @@ struct kvm_device_ops kvm_arm_vgic_v2_ops = { .get_attr = vgic_get_attr, .has_attr = vgic_has_attr, }; + +static void vgic_init_maintenance_interrupt (void *info) +{ +enable_percpu_irq (vgic->maint_irq,0 ); +} + +static int vgic_cpu_notify (struct notifier_block *self, +unsigned long action,void *cpu) +{ +switch (action) { +case CPU_STARTING : +case CPU_STARTING_FROZEN : +vgic_init_maintenance_interrupt (NULL ); +break ; +case CPU_DYING : +case CPU_DYING_FROZEN : +disable_percpu_irq (vgic->maint_irq); +break ; + } + +return NOTIFY_OK ; +} + +static struct notifier_block vgic_cpu_nb = { + .notifier_call = vgic_cpu_notify, +}; + +static const struct of_device_id vgic_ids[] = { + { .compatible ="arm,cortex-a15-gic" , .data = vgic_v2_probe, }, + { .compatible ="arm,gic-v3" , .data = vgic_v3_probe, }, + {}, +}; + +int kvm_vgic_hyp_init (void ) +{ +const struct of_device_id *matched_id; +int (*vgic_probe)(struct device_node *,const struct vgic_ops **, +const struct vgic_params **); +struct device_node *vgic_node; +int ret; + + vgic_node =of_find_matching_node_and_match (NULL , + vgic_ids, &matched_id); +if (!vgic_node) { +kvm_err ("error: no compatible GIC node found\n" ); +return -ENODEV ; + } + + vgic_probe = matched_id->data; + ret =vgic_probe (vgic_node, &vgic_ops, &vgic); +if (ret) +return ret; + + ret =request_percpu_irq (vgic->maint_irq, vgic_maintenance_handler, +"vgic" ,kvm_get_running_vcpus ()); +if (ret) { +kvm_err ("Cannot register interrupt %d\n" , vgic->maint_irq); +return ret; + } + + ret =__register_cpu_notifier (&vgic_cpu_nb); +if (ret) { +kvm_err ("Cannot register vgic CPU notifier\n" ); + goto out_free_irq; + } + +on_each_cpu (vgic_init_maintenance_interrupt,NULL ,1 ); + +/* Callback into for arch code for setup */ +vgic_arch_setup (vgic); +return kvm_register_device_ops (&kvm_arm_vgic_v2_ops, +KVM_DEV_TYPE_ARM_VGIC_V2 ); + +out_free_irq: +free_percpu_irq (vgic->maint_irq,kvm_get_running_vcpus ()); +return ret; +}virt/kvm/kvm_main.c +0
-0@@ -2271,10 +2271,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { [KVM_DEV_TYPE_VFIO] = &kvm_vfio_ops,#endif
Quoted 10 lines
virt/kvm/kvm_main.c static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { · line 2276
Quoted 8 lines
virt/kvm/kvm_main.c +0
-4-#ifdef CONFIG_KVM_ARM_VGIC - [KVM_DEV_TYPE_ARM_VGIC_V2 ] = &kvm_arm_vgic_v2_ops, -#endif - #ifdef CONFIG_S390 [KVM_DEV_TYPE_FLIC] = &kvm_flic_ops,#endif Christopher, Marc, can you review/ack this?
I though I had replied already, but apparently not... The proximity effect, probably! ;-)
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [PATCH v2 2/4] KVM: ARM: vgic: register kvm_device_ops dynamically
In reply to Will DeaconQuoted 187 lines · Will Deacon
Now that we have a dynamic means to register
kvm_device_ops, use that for the ARM VGIC, instead of relying on the static table.Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Marc Zyngier <[email protected]>Cc Christoffer Dall <[email protected]>Signed-off-by Will Deacon <[email protected]>--- include/linux/kvm_host.h | 1 - virt/kvm/arm/vgic.c | 156 +++++++++++++++++++++++------------------------ virt/kvm/kvm_main.c | 4 -- 3 files changed, 78 insertions(+), 83 deletions(-)include/linux/kvm_host.h +0
-1@@ -1088,7 +1088,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);extern struct kvm_device_ops kvm_mpic_ops;extern struct kvm_device_ops kvm_xics_ops;extern struct kvm_device_ops kvm_vfio_ops; -extern struct kvm_device_ops kvm_arm_vgic_v2_ops;extern struct kvm_device_ops kvm_flic_ops;#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT virt/kvm/arm/vgic.c +61
-78@@ -1502,83 +1502,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)return 0 ; } -static void vgic_init_maintenance_interrupt (void *info) -{ -enable_percpu_irq (vgic->maint_irq,0 ); -} - -static int vgic_cpu_notify (struct notifier_block *self, -unsigned long action,void *cpu) -{ -switch (action) { -case CPU_STARTING : -case CPU_STARTING_FROZEN : -vgic_init_maintenance_interrupt (NULL ); -break ; -case CPU_DYING : -case CPU_DYING_FROZEN : -disable_percpu_irq (vgic->maint_irq); -break ; - } - -return NOTIFY_OK ; -} - -static struct notifier_block vgic_cpu_nb = { - .notifier_call = vgic_cpu_notify, -}; - -static const struct of_device_id vgic_ids[] = { - { .compatible ="arm,cortex-a15-gic" , .data = vgic_v2_probe, }, - { .compatible ="arm,gic-v3" , .data = vgic_v3_probe, }, - {}, -}; - -int kvm_vgic_hyp_init (void ) -{ -const struct of_device_id *matched_id; -int (*vgic_probe)(struct device_node *,const struct vgic_ops **, -const struct vgic_params **); -struct device_node *vgic_node; -int ret; - - vgic_node =of_find_matching_node_and_match (NULL , - vgic_ids, &matched_id); -if (!vgic_node) { -kvm_err ("error: no compatible GIC node found\n" ); -return -ENODEV ; - } - - vgic_probe = matched_id->data; - ret =vgic_probe (vgic_node, &vgic_ops, &vgic); -if (ret) -return ret; - - ret =request_percpu_irq (vgic->maint_irq, vgic_maintenance_handler, -"vgic" ,kvm_get_running_vcpus ()); -if (ret) { -kvm_err ("Cannot register interrupt %d\n" , vgic->maint_irq); -return ret; - } - - ret =__register_cpu_notifier (&vgic_cpu_nb); -if (ret) { -kvm_err ("Cannot register vgic CPU notifier\n" ); - goto out_free_irq; - } - -on_each_cpu (vgic_init_maintenance_interrupt,NULL ,1 ); - -/* Callback into for arch code for setup */ -vgic_arch_setup (vgic); - -return 0 ; - -out_free_irq: -free_percpu_irq (vgic->maint_irq,kvm_get_running_vcpus ()); -return ret; -} -/** * kvm_vgic_init - Initialize global VGIC state before running any VCPUs * @kvm: pointer to the kvm struct @@ -2042,7 +1965,7 @@ static int vgic_create(struct kvm_device *dev, u32 type)return kvm_vgic_create (dev->kvm); } -struct kvm_device_ops kvm_arm_vgic_v2_ops = { +static struct kvm_device_ops kvm_arm_vgic_v2_ops = { .name ="kvm-arm-vgic" , .create = vgic_create, .destroy = vgic_destroy,@@ -2050,3 +1973,80 @@ struct kvm_device_ops kvm_arm_vgic_v2_ops = { .get_attr = vgic_get_attr, .has_attr = vgic_has_attr, }; + +static void vgic_init_maintenance_interrupt (void *info) +{ +enable_percpu_irq (vgic->maint_irq,0 ); +} + +static int vgic_cpu_notify (struct notifier_block *self, +unsigned long action,void *cpu) +{ +switch (action) { +case CPU_STARTING : +case CPU_STARTING_FROZEN : +vgic_init_maintenance_interrupt (NULL ); +break ; +case CPU_DYING : +case CPU_DYING_FROZEN : +disable_percpu_irq (vgic->maint_irq); +break ; + } + +return NOTIFY_OK ; +} + +static struct notifier_block vgic_cpu_nb = { + .notifier_call = vgic_cpu_notify, +}; + +static const struct of_device_id vgic_ids[] = { + { .compatible ="arm,cortex-a15-gic" , .data = vgic_v2_probe, }, + { .compatible ="arm,gic-v3" , .data = vgic_v3_probe, }, + {}, +}; + +int kvm_vgic_hyp_init (void ) +{ +const struct of_device_id *matched_id; +int (*vgic_probe)(struct device_node *,const struct vgic_ops **, +const struct vgic_params **); +struct device_node *vgic_node; +int ret; + + vgic_node =of_find_matching_node_and_match (NULL , + vgic_ids, &matched_id); +if (!vgic_node) { +kvm_err ("error: no compatible GIC node found\n" ); +return -ENODEV ; + } + + vgic_probe = matched_id->data; + ret =vgic_probe (vgic_node, &vgic_ops, &vgic); +if (ret) +return ret; + + ret =request_percpu_irq (vgic->maint_irq, vgic_maintenance_handler, +"vgic" ,kvm_get_running_vcpus ()); +if (ret) { +kvm_err ("Cannot register interrupt %d\n" , vgic->maint_irq); +return ret; + } +
virt/kvm/arm/vgic.c struct kvm_device_ops kvm_arm_vgic_v2_ops = { · line 2045
Quoted 10 lines
virt/kvm/arm/vgic.c +10
-0+ ret =__register_cpu_notifier (&vgic_cpu_nb); +if (ret) { +kvm_err ("Cannot register vgic CPU notifier\n" ); + goto out_free_irq; + } + +on_each_cpu (vgic_init_maintenance_interrupt,NULL ,1 ); + +/* Callback into for arch code for setup */ +vgic_arch_setup (vgic);
close to ridiculous nit: but I would add a newline here since the comment doesn't really apply to the kvm_register_device_ops, but please don't make another revision just for this.
Quoted 25 lines
virt/kvm/arm/vgic.c +7
-0+return kvm_register_device_ops (&kvm_arm_vgic_v2_ops, +KVM_DEV_TYPE_ARM_VGIC_V2 ); + +out_free_irq: +free_percpu_irq (vgic->maint_irq,kvm_get_running_vcpus ()); +return ret; +}virt/kvm/kvm_main.c +0
-4@@ -2271,10 +2271,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { [KVM_DEV_TYPE_VFIO] = &kvm_vfio_ops,#endif -#ifdef CONFIG_KVM_ARM_VGIC - [KVM_DEV_TYPE_ARM_VGIC_V2 ] = &kvm_arm_vgic_v2_ops, -#endif - #ifdef CONFIG_S390 [KVM_DEV_TYPE_FLIC] = &kvm_flic_ops,#endif Signature · 1 line
2.0.0
Re: [PATCH v2 2/4] KVM: ARM: vgic: register kvm_device_ops dynamically
Hi Christoffer,
Quoted 14 lines · Christoffer Dall
Quoted 13 lines · Will Deacon
Now that we have a dynamic means to register
kvm_device_ops, use that for the ARM VGIC, instead of relying on the static table.Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Marc Zyngier <[email protected]>Cc Christoffer Dall <[email protected]>Signed-off-by Will Deacon <[email protected]>--- include/linux/kvm_host.h | 1 - virt/kvm/arm/vgic.c | 156 +++++++++++++++++++++++------------------------ virt/kvm/kvm_main.c | 4 -- 3 files changed, 78 insertions(+), 83 deletions(-)
[...]
Quoted 5 lines
Quoted 5 lines
virt/kvm/arm/vgic.c +5
-0+if (ret) { +kvm_err ("Cannot register vgic CPU notifier\n" ); + goto out_free_irq; + } +
Quoted 8 lines
virt/kvm/arm/vgic.c struct kvm_device_ops kvm_arm_vgic_v2_ops = { · line 2045
Quoted 4 lines
virt/kvm/arm/vgic.c +4
-0+on_each_cpu (vgic_init_maintenance_interrupt,NULL ,1 ); + +/* Callback into for arch code for setup */ +vgic_arch_setup (vgic);close to ridiculous nit: but I would add a newline here since the comment doesn't really apply to the
kvm_register_device_ops, but please don't make another revision just for this.
I'll repost this after the merge window anyway, so there's plenty of room for pedantic, cosmetic changes!
Thanks,
Will
PATCH v2 3/4 KVM: s390: register flic ops dynamically
In reply to Will DeaconFrom: Cornelia Huck <[email protected]>
Using the new kvm_register_device_ops() interface makes us get rid of an #ifdef in common code.
--- arch/s390/kvm/kvm-s390.c | 3 ++- arch/s390/kvm/kvm-s390.h | 1 + include/linux/kvm_host.h | 1 - virt/kvm/kvm_main.c | 4 ---- 4 files changed, 3 insertions(+), 6 deletions(-)
arch/s390/kvm/kvm-s390.c +2 -1
@@ -130,7 +130,8 @@ void kvm_arch_check_processor_compat(void *rtn)int kvm_arch_init (void *opaque) { -return 0 ; +/* Register floating interrupt controller interface. */ +return kvm_register_device_ops (&kvm_flic_ops,KVM_DEV_TYPE_FLIC ); }void kvm_arch_exit (void )
arch/s390/kvm/kvm-s390.h +1 -0
@@ -222,6 +222,7 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu);int psw_extint_disabled (struct kvm_vcpu *vcpu);void kvm_s390_destroy_adapters (struct kvm *kvm);int kvm_s390_si_ext_call_pending (struct kvm_vcpu *vcpu); +extern struct kvm_device_ops kvm_flic_ops;/* implemented in guestdbg.c */ void kvm_s390_backup_guest_per_regs (struct kvm_vcpu *vcpu);
include/linux/kvm_host.h +0 -1
@@ -1088,7 +1088,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);extern struct kvm_device_ops kvm_mpic_ops;extern struct kvm_device_ops kvm_xics_ops;extern struct kvm_device_ops kvm_vfio_ops; -extern struct kvm_device_ops kvm_flic_ops;#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
virt/kvm/kvm_main.c +0 -4
@@ -2270,10 +2270,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { #ifdef CONFIG_KVM_VFIO [KVM_DEV_TYPE_VFIO] = &kvm_vfio_ops,#endif - -#ifdef CONFIG_S390 - [KVM_DEV_TYPE_FLIC] = &kvm_flic_ops, -#endif };int kvm_register_device_ops (struct kvm_device_ops *ops,u32 type)
Signature · 1 line
2.0.0
PATCH v2 4/4 KVM: VFIO: register kvm_device_ops dynamically
In reply to Will DeaconNow that we have a dynamic means to register kvm_device_ops, use that for the VFIO kvm device, instead of relying on the static table.
This is achieved by a module_init call to register the ops with KVM.
--- include/linux/kvm_host.h | 1 - virt/kvm/kvm_main.c | 4 ---- virt/kvm/vfio.c | 22 +++++++++++++++------- 3 files changed, 15 insertions(+), 12 deletions(-)
include/linux/kvm_host.h +0 -1
@@ -1087,7 +1087,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);extern struct kvm_device_ops kvm_mpic_ops;extern struct kvm_device_ops kvm_xics_ops; -extern struct kvm_device_ops kvm_vfio_ops;#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
virt/kvm/kvm_main.c +0 -4
@@ -2266,10 +2266,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { #ifdef CONFIG_KVM_XICS [KVM_DEV_TYPE_XICS] = &kvm_xics_ops,#endif - -#ifdef CONFIG_KVM_VFIO - [KVM_DEV_TYPE_VFIO] = &kvm_vfio_ops, -#endif };int kvm_register_device_ops (struct kvm_device_ops *ops,u32 type)
virt/kvm/vfio.c +15 -7
@@ -246,6 +246,16 @@ static void kvm_vfio_destroy(struct kvm_device *dev)kfree (dev);/* alloc by kvm_ioctl_create_device, free by .destroy */ } +static int kvm_vfio_create (struct kvm_device *dev,u32 type); + +static struct kvm_device_ops kvm_vfio_ops = { + .name ="kvm-vfio" , + .create = kvm_vfio_create, + .destroy = kvm_vfio_destroy, + .set_attr = kvm_vfio_set_attr, + .has_attr = kvm_vfio_has_attr, +}; +static int kvm_vfio_create (struct kvm_device *dev,u32 type) {struct kvm_device *tmp;
@@ -268,10 +278,8 @@ static int kvm_vfio_create(struct kvm_device *dev, u32 type)return 0 ; } -struct kvm_device_ops kvm_vfio_ops = { - .name ="kvm-vfio" , - .create = kvm_vfio_create, - .destroy = kvm_vfio_destroy, - .set_attr = kvm_vfio_set_attr, - .has_attr = kvm_vfio_has_attr, -}; +static int __init kvm_vfio_ops_init (void ) +{ +return kvm_register_device_ops (&kvm_vfio_ops,KVM_DEV_TYPE_VFIO ); +} +module_init (kvm_vfio_ops_init);
Signature · 1 line
2.0.0
Paolo Bonzini
maintainerRe: [PATCH v2 4/4] KVM: VFIO: register kvm_device_ops dynamically
Il 01/07/2014 16:45, Will Deacon ha scritto:
Quoted 70 lines
Now that we have a dynamic means to register
kvm_device_ops, use that for the VFIO kvm device, instead of relying on the static table.This is achieved by a
module_initcall to register the ops with KVM.Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Alex Williamson <[email protected]>Signed-off-by Will Deacon <[email protected]>--- include/linux/kvm_host.h | 1 - virt/kvm/kvm_main.c | 4 ---- virt/kvm/vfio.c | 22 +++++++++++++++------- 3 files changed, 15 insertions(+), 12 deletions(-)include/linux/kvm_host.h +0
-1@@ -1087,7 +1087,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);extern struct kvm_device_ops kvm_mpic_ops;extern struct kvm_device_ops kvm_xics_ops; -extern struct kvm_device_ops kvm_vfio_ops;#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT virt/kvm/kvm_main.c +0
-4@@ -2266,10 +2266,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { #ifdef CONFIG_KVM_XICS [KVM_DEV_TYPE_XICS] = &kvm_xics_ops,#endif - -#ifdef CONFIG_KVM_VFIO - [KVM_DEV_TYPE_VFIO] = &kvm_vfio_ops, -#endif };int kvm_register_device_ops (struct kvm_device_ops *ops,u32 type)virt/kvm/vfio.c +10
-2@@ -246,6 +246,16 @@ static void kvm_vfio_destroy(struct kvm_device *dev)kfree (dev);/* alloc by kvm_ioctl_create_device, free by .destroy */ } +static int kvm_vfio_create (struct kvm_device *dev,u32 type); + +static struct kvm_device_ops kvm_vfio_ops = { + .name ="kvm-vfio" , + .create = kvm_vfio_create, + .destroy = kvm_vfio_destroy, + .set_attr = kvm_vfio_set_attr, + .has_attr = kvm_vfio_has_attr, +}; +static int kvm_vfio_create (struct kvm_device *dev,u32 type) {struct kvm_device *tmp;@@ -268,10 +278,8 @@ static int kvm_vfio_create(struct kvm_device *dev, u32 type)return 0 ; } -struct kvm_device_ops kvm_vfio_ops = { - .name ="kvm-vfio" ,
virt/kvm/vfio.c static int kvm_vfio_create(struct kvm_device *dev, u32 type) · line 285
Quoted 10 lines
virt/kvm/vfio.c +5
-5- .create = kvm_vfio_create, - .destroy = kvm_vfio_destroy, - .set_attr = kvm_vfio_set_attr, - .has_attr = kvm_vfio_has_attr, -}; +static int __init kvm_vfio_ops_init (void ) +{ +return kvm_register_device_ops (&kvm_vfio_ops,KVM_DEV_TYPE_VFIO ); +} +module_init (kvm_vfio_ops_init);
Alex, can you review/ack this?
Paolo
Re: [PATCH v2 4/4] KVM: VFIO: register kvm_device_ops dynamically
In reply to Will DeaconQuoted 50 lines · Will Deacon
Now that we have a dynamic means to register
kvm_device_ops, use that for the VFIO kvm device, instead of relying on the static table.This is achieved by a
module_initcall to register the ops with KVM.Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Alex Williamson <[email protected]>Signed-off-by Will Deacon <[email protected]>--- include/linux/kvm_host.h | 1 - virt/kvm/kvm_main.c | 4 ---- virt/kvm/vfio.c | 22 +++++++++++++++------- 3 files changed, 15 insertions(+), 12 deletions(-)include/linux/kvm_host.h +0
-1@@ -1087,7 +1087,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);extern struct kvm_device_ops kvm_mpic_ops;extern struct kvm_device_ops kvm_xics_ops; -extern struct kvm_device_ops kvm_vfio_ops;#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT virt/kvm/kvm_main.c +0
-4@@ -2266,10 +2266,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { #ifdef CONFIG_KVM_XICS [KVM_DEV_TYPE_XICS] = &kvm_xics_ops,#endif - -#ifdef CONFIG_KVM_VFIO - [KVM_DEV_TYPE_VFIO] = &kvm_vfio_ops, -#endif };int kvm_register_device_ops (struct kvm_device_ops *ops,u32 type)virt/kvm/vfio.c +0
-0@@ -246,6 +246,16 @@ static void kvm_vfio_destroy(struct kvm_device *dev)kfree (dev);/* alloc by kvm_ioctl_create_device, free by .destroy */ }
virt/kvm/vfio.c static void kvm_vfio_destroy(struct kvm_device *dev) · line 258
Quoted 10 lines
virt/kvm/vfio.c +10
-0+static int kvm_vfio_create (struct kvm_device *dev,u32 type); + +static struct kvm_device_ops kvm_vfio_ops = { + .name ="kvm-vfio" , + .create = kvm_vfio_create, + .destroy = kvm_vfio_destroy, + .set_attr = kvm_vfio_set_attr, + .has_attr = kvm_vfio_has_attr, +}; +
Why move the struct? We wouldn't need the prototype if it was left in place and it seems like the only change we're making to set it static. Functionally the change is fine, but the ordering was cleaner before imho. Thanks,
Alex
Quoted 19 lines
virt/kvm/vfio.c +5
-7static int kvm_vfio_create (struct kvm_device *dev,u32 type) {struct kvm_device *tmp;@@ -268,10 +278,8 @@ static int kvm_vfio_create(struct kvm_device *dev, u32 type)return 0 ; } -struct kvm_device_ops kvm_vfio_ops = { - .name ="kvm-vfio" , - .create = kvm_vfio_create, - .destroy = kvm_vfio_destroy, - .set_attr = kvm_vfio_set_attr, - .has_attr = kvm_vfio_has_attr, -}; +static int __init kvm_vfio_ops_init (void ) +{ +return kvm_register_device_ops (&kvm_vfio_ops,KVM_DEV_TYPE_VFIO ); +} +module_init (kvm_vfio_ops_init);
Re: [PATCH v2 4/4] KVM: VFIO: register kvm_device_ops dynamically
Hi Alex,
Quoted 9 lines · Alex Williamson
Quoted 8 lines · Will Deacon
virt/kvm/vfio.c +0
-0@@ -246,6 +246,16 @@ static void kvm_vfio_destroy(struct kvm_device *dev)kfree (dev);/* alloc by kvm_ioctl_create_device, free by .destroy */ }
Quoted 15 lines
virt/kvm/vfio.c static void kvm_vfio_destroy(struct kvm_device *dev) · line 258
Quoted 10 lines
virt/kvm/vfio.c +10
-0+static int kvm_vfio_create (struct kvm_device *dev,u32 type); + +static struct kvm_device_ops kvm_vfio_ops = { + .name ="kvm-vfio" , + .create = kvm_vfio_create, + .destroy = kvm_vfio_destroy, + .set_attr = kvm_vfio_set_attr, + .has_attr = kvm_vfio_has_attr, +}; +Why move the struct? We wouldn't need the prototype if it was left in place and it seems like the only change we're making to set it static. Functionally the change is fine, but the ordering was cleaner before imho. Thanks,
The problem is that kvm_vfio_create takes the address of kvm_vfio_ops:
/* Only one VFIO "device" per VM */
list_for_each_entry(tmp, &dev->kvm->devices, vm_node)
if (tmp->ops == &kvm_vfio_ops)
return -EBUSY;so you have a circular dependency, which I just resolved in the most obvious way to me. I'm happy to solve it a better way, if you have a preference?
Will
--->8
arch/arm64/kvm/../../../virt/kvm/vfio.c: In function ‘kvm_vfio_create’:arch/arm64/kvm/../../../virt/kvm/vfio.c:256:20: error: ‘kvm_vfio_ops’ undeclared (first use in this function)
if (tmp->ops == &kvm_vfio_ops)
^
arch/arm64/kvm/../../../virt/kvm/vfio.c:256:20: note: each undeclared identifier is reported only once for each function it appears in
Re: [PATCH v2 4/4] KVM: VFIO: register kvm_device_ops dynamically
Quoted 30 lines · Will Deacon
Hi Alex,
Quoted 9 lines · Alex Williamson
Quoted 8 lines · Will Deacon
virt/kvm/vfio.c +0
-0@@ -246,6 +246,16 @@ static void kvm_vfio_destroy(struct kvm_device *dev)kfree (dev);/* alloc by kvm_ioctl_create_device, free by .destroy */ }Quoted 15 lines
virt/kvm/vfio.c static void kvm_vfio_destroy(struct kvm_device *dev) · line 258
Quoted 10 lines
virt/kvm/vfio.c +10
-0+static int kvm_vfio_create (struct kvm_device *dev,u32 type); + +static struct kvm_device_ops kvm_vfio_ops = { + .name ="kvm-vfio" , + .create = kvm_vfio_create, + .destroy = kvm_vfio_destroy, + .set_attr = kvm_vfio_set_attr, + .has_attr = kvm_vfio_has_attr, +}; +Why move the struct? We wouldn't need the prototype if it was left in place and it seems like the only change we're making to set it static. Functionally the change is fine, but the ordering was cleaner before imho. Thanks,
The problem is that
kvm_vfio_createtakes the address ofkvm_vfio_ops:
Quoted 7 lines
/* Only one VFIO "device" per VM */ list_for_each_entry(tmp, &dev->kvm->devices, vm_node) if (tmp->ops == &kvm_vfio_ops) return -EBUSY;so you have a circular dependency, which I just resolved in the most obvious way to me. I'm happy to solve it a better way, if you have a preference?
Ok, that seems reasonable then. Thanks,
Alex
Re: [PATCH v2 4/4] KVM: VFIO: register kvm_device_ops dynamically
In reply to Will DeaconQuoted 9 lines · Will Deacon
Now that we have a dynamic means to register
kvm_device_ops, use that for the VFIO kvm device, instead of relying on the static table.This is achieved by a
module_initcall to register the ops with KVM.Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Alex Williamson <[email protected]>Signed-off-by Will Deacon <[email protected]>
Quoted 5 lines
--- include/linux/kvm_host.h | 1 - virt/kvm/kvm_main.c | 4 ---- virt/kvm/vfio.c | 22 +++++++++++++++------- 3 files changed, 15 insertions(+), 12 deletions(-)
Quoted 8 lines · On Tue, 1 Jul 2014 15:45:15 +0100 Will Deacon <[email protected]> wrote:
kvm_ioctl_create_devicecurrently has knowledge of all the device types and their associated ops. This is fairly inflexible when adding support for new in-kernel device emulations, so move what we currently have out into a table, which can support dynamic registration of ops by new drivers for virtual hardware.I didn't try to port all current drivers over, as it's not always clear which initialisation hook the ops should be registered from.
I think that last paragraph should rather go into a cover letter :)
Quoted 9 lines
Cc Cornelia Huck <[email protected]>Cc Alex Williamson <[email protected]>Cc Alex Graf <[email protected]>Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Marc Zyngier <[email protected]>Cc Christoffer Dall <[email protected]>Signed-off-by Will Deacon <[email protected]>
Quoted 5 lines
---
v1 -> v2: Added enum for KVM_DEV_TYPE* IDs, changed limits to
ARRAY_SIZE,
removed stray semicolon, had a crack at porting VFIO, included Cornelia's s390 FLIC patch.
...and the changelog as well (or keep changelogs for individual patches).
Quoted 29 lines
include/linux/kvm_host.h | 1 + include/uapi/linux/kvm.h | 22 +++++++++++----- virt/kvm/kvm_main.c | 65 ++++++++++++++++++++++++++++-------------------- 3 files changed, 55 insertions(+), 33 deletions(-)include/uapi/linux/kvm.h +5
-6@@ -940,15 +940,25 @@ struct kvm_device_attr {__u64 addr;/* userspace address of attr data */ }; -#define KVM_DEV_TYPE_FSL_MPIC_20 1 -#define KVM_DEV_TYPE_FSL_MPIC_42 2 -#define KVM_DEV_TYPE_XICS 3 -#define KVM_DEV_TYPE_VFIO 4#define KVM_DEV_VFIO_GROUP 1#define KVM_DEV_VFIO_GROUP_ADD 1#define KVM_DEV_VFIO_GROUP_DEL 2 -#define KVM_DEV_TYPE_ARM_VGIC_V2 5 -#define KVM_DEV_TYPE_FLIC 6 + +enum kvm_device_type { +KVM_DEV_TYPE_FSL_MPIC_20 =1 , +#define KVM_DEV_TYPE_FSL_MPIC_20 KVM_DEV_TYPE_FSL_MPIC_20 + KVM_DEV_TYPE_FSL_MPIC_42,
include/uapi/linux/kvm.h struct kvm_device_attr { · line 960
Quoted 10 lines
include/uapi/linux/kvm.h +10
-0+#define KVM_DEV_TYPE_FSL_MPIC_42 KVM_DEV_TYPE_FSL_MPIC_42 + KVM_DEV_TYPE_XICS, +#define KVM_DEV_TYPE_XICS KVM_DEV_TYPE_XICS + KVM_DEV_TYPE_VFIO, +#define KVM_DEV_TYPE_VFIO KVM_DEV_TYPE_VFIO + KVM_DEV_TYPE_ARM_VGIC_V2, +#define KVM_DEV_TYPE_ARM_VGIC_V2 KVM_DEV_TYPE_ARM_VGIC_V2 + KVM_DEV_TYPE_FLIC, +#define KVM_DEV_TYPE_FLIC KVM_DEV_TYPE_FLIC + KVM_DEV_TYPE_MAX,
Do you want to add the individual values to the enum? A removal of a type would be an API break (so we should be safe against renumbering), but it's sometimes helpful if one can get the numeric value at a glance.
Quoted 4 lines
include/uapi/linux/kvm.h +1
-0+};/* * ioctls for VM fds
Quoted 25 lines · Cornelia Huck
Quoted 8 lines · On Tue, 1 Jul 2014 15:45:15 +0100 Will Deacon <[email protected]> wrote:
kvm_ioctl_create_devicecurrently has knowledge of all the device types and their associated ops. This is fairly inflexible when adding support for new in-kernel device emulations, so move what we currently have out into a table, which can support dynamic registration of ops by new drivers for virtual hardware.I didn't try to port all current drivers over, as it's not always clear which initialisation hook the ops should be registered from.
I think that last paragraph should rather go into a cover letter :)
Quoted 11 lines
Cc Cornelia Huck <[email protected]>Cc Alex Williamson <[email protected]>Cc Alex Graf <[email protected]>Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Marc Zyngier <[email protected]>Cc Christoffer Dall <[email protected]>Signed-off-by Will Deacon <[email protected]>---
Quoted 6 lines
Quoted 3 lines
v1 -> v2: Added enum for KVM_DEV_TYPE* IDs, changed limits to
ARRAY_SIZE,
removed stray semicolon, had a crack at porting VFIO, included Cornelia's s390 FLIC patch....and the changelog as well (or keep changelogs for individual patches).
Yeah... this has grown to be bigger than one patch now. I can include that for v3.
Quoted 28 lines
Quoted 28 lines
include/uapi/linux/kvm.h +11
-6@@ -940,15 +940,25 @@ struct kvm_device_attr {__u64 addr;/* userspace address of attr data */ }; -#define KVM_DEV_TYPE_FSL_MPIC_20 1 -#define KVM_DEV_TYPE_FSL_MPIC_42 2 -#define KVM_DEV_TYPE_XICS 3 -#define KVM_DEV_TYPE_VFIO 4#define KVM_DEV_VFIO_GROUP 1#define KVM_DEV_VFIO_GROUP_ADD 1#define KVM_DEV_VFIO_GROUP_DEL 2 -#define KVM_DEV_TYPE_ARM_VGIC_V2 5 -#define KVM_DEV_TYPE_FLIC 6 + +enum kvm_device_type { +KVM_DEV_TYPE_FSL_MPIC_20 =1 , +#define KVM_DEV_TYPE_FSL_MPIC_20 KVM_DEV_TYPE_FSL_MPIC_20 + KVM_DEV_TYPE_FSL_MPIC_42, +#define KVM_DEV_TYPE_FSL_MPIC_42 KVM_DEV_TYPE_FSL_MPIC_42 + KVM_DEV_TYPE_XICS, +#define KVM_DEV_TYPE_XICS KVM_DEV_TYPE_XICS + KVM_DEV_TYPE_VFIO, +#define KVM_DEV_TYPE_VFIO KVM_DEV_TYPE_VFIO + KVM_DEV_TYPE_ARM_VGIC_V2,
Quoted 8 lines
include/uapi/linux/kvm.h struct kvm_device_attr { · line 960
Quoted 4 lines
include/uapi/linux/kvm.h +4
-0+#define KVM_DEV_TYPE_ARM_VGIC_V2 KVM_DEV_TYPE_ARM_VGIC_V2 + KVM_DEV_TYPE_FLIC, +#define KVM_DEV_TYPE_FLIC KVM_DEV_TYPE_FLIC + KVM_DEV_TYPE_MAX,Do you want to add the individual values to the enum? A removal of a type would be an API break (so we should be safe against renumbering), but it's sometimes helpful if one can get the numeric value at a glance.
Could do, but then I think the advantage of the enum is questionable over the #defines, since you could just as easily have two entries in the enum with the same ID value as forgetting to update a KVM_DEV_TYPE_MAX #define (which was the reason for the enum in the first place).
So I'd be inclined to keep the patch as-is, unless you have really strong objections?
Will
Cornelia Huck
Acked-byQuoted 41 lines · On Wed, 2 Jul 2014 10:32:41 +0100 Will Deacon <[email protected]> wrote:
Quoted 31 lines · Cornelia Huck
Quoted 28 lines · On Tue, 1 Jul 2014 15:45:15 +0100 Will Deacon <[email protected]> wrote:
include/uapi/linux/kvm.h +11
-6@@ -940,15 +940,25 @@ struct kvm_device_attr {__u64 addr;/* userspace address of attr data */ }; -#define KVM_DEV_TYPE_FSL_MPIC_20 1 -#define KVM_DEV_TYPE_FSL_MPIC_42 2 -#define KVM_DEV_TYPE_XICS 3 -#define KVM_DEV_TYPE_VFIO 4#define KVM_DEV_VFIO_GROUP 1#define KVM_DEV_VFIO_GROUP_ADD 1#define KVM_DEV_VFIO_GROUP_DEL 2 -#define KVM_DEV_TYPE_ARM_VGIC_V2 5 -#define KVM_DEV_TYPE_FLIC 6 + +enum kvm_device_type { +KVM_DEV_TYPE_FSL_MPIC_20 =1 , +#define KVM_DEV_TYPE_FSL_MPIC_20 KVM_DEV_TYPE_FSL_MPIC_20 + KVM_DEV_TYPE_FSL_MPIC_42, +#define KVM_DEV_TYPE_FSL_MPIC_42 KVM_DEV_TYPE_FSL_MPIC_42 + KVM_DEV_TYPE_XICS, +#define KVM_DEV_TYPE_XICS KVM_DEV_TYPE_XICS + KVM_DEV_TYPE_VFIO, +#define KVM_DEV_TYPE_VFIO KVM_DEV_TYPE_VFIO + KVM_DEV_TYPE_ARM_VGIC_V2,Quoted 8 lines
include/uapi/linux/kvm.h struct kvm_device_attr { · line 960
Quoted 4 lines
include/uapi/linux/kvm.h +4
-0+#define KVM_DEV_TYPE_ARM_VGIC_V2 KVM_DEV_TYPE_ARM_VGIC_V2 + KVM_DEV_TYPE_FLIC, +#define KVM_DEV_TYPE_FLIC KVM_DEV_TYPE_FLIC + KVM_DEV_TYPE_MAX,Do you want to add the individual values to the enum? A removal of a type would be an API break (so we should be safe against renumbering), but it's sometimes helpful if one can get the numeric value at a glance.
Quoted 7 lines
Could do, but then I think the advantage of the enum is questionable over the #defines, since you could just as easily have two entries in the enum with the same ID value as forgetting to update a
KVM_DEV_TYPE_MAX#define (which was the reason for the enum in the first place).So I'd be inclined to keep the patch as-is, unless you have really strong objections?
I don't really have a strong opinion on that, so
Quoted 17 lines · Will Deacon
kvm_ioctl_create_devicecurrently has knowledge of all the device types and their associated ops. This is fairly inflexible when adding support for new in-kernel device emulations, so move what we currently have out into a table, which can support dynamic registration of ops by new drivers for virtual hardware.I didn't try to port all current drivers over, as it's not always clear which initialisation hook the ops should be registered from.
Cc Cornelia Huck <[email protected]>Cc Alex Williamson <[email protected]>Cc Alex Graf <[email protected]>Cc Gleb Natapov <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Marc Zyngier <[email protected]>Cc Christoffer Dall <[email protected]>Signed-off-by Will Deacon <[email protected]>
Quoted 2 lines
---