| Message ID | 1434540121-21283-11-git-send-email-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 17/06/15 12:22, Andre Przywara wrote: > Currently we unconditionally create a virtual GICv2 in the guest. > Add a --irqchip= parameter to let the user specify a different GIC > type for the guest. > For now we the only other supported type is GICv3. Superfluous "we". Also, spelling out the expected values would be a good thing (--irqchip=GICv3 would fail). > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > arm/aarch64/arm-cpu.c | 2 +- > arm/gic.c | 17 +++++++++++++++++ > arm/include/arm-common/kvm-config-arch.h | 9 ++++++++- > arm/kvm.c | 2 +- > 4 files changed, 27 insertions(+), 3 deletions(-) > > diff --git a/arm/aarch64/arm-cpu.c b/arm/aarch64/arm-cpu.c > index f702b9e..3dc8ea3 100644 > --- a/arm/aarch64/arm-cpu.c > +++ b/arm/aarch64/arm-cpu.c > @@ -12,7 +12,7 @@ > static void generate_fdt_nodes(void *fdt, struct kvm *kvm, u32 gic_phandle) > { > int timer_interrupts[4] = {13, 14, 11, 10}; > - gic__generate_fdt_nodes(fdt, gic_phandle, IRQCHIP_GICV2); > + gic__generate_fdt_nodes(fdt, gic_phandle, kvm->cfg.arch.irqchip); > timer__generate_fdt_nodes(fdt, kvm, timer_interrupts); > } > > diff --git a/arm/gic.c b/arm/gic.c > index efe4b42..5b49416 100644 > --- a/arm/gic.c > +++ b/arm/gic.c > @@ -22,6 +22,23 @@ static int gic_fd = -1; > static u64 gic_redists_base; > static u64 gic_redists_size; > > +int irqchip_parser(const struct option *opt, const char *arg, int unset) > +{ > + enum irqchip_type *type = opt->value; > + > + *type = IRQCHIP_GICV2; > + if (!strcmp(arg, "gicv2")) { > + *type = IRQCHIP_GICV2; > + } else if (!strcmp(arg, "gicv3")) { > + *type = IRQCHIP_GICV3; > + } else if (strcmp(arg, "default")) { > + fprintf(stderr, "irqchip: unknown type \"%s\"\n", arg); > + return -1; > + } > + > + return 0; > +} > + > static int gic__create_device(struct kvm *kvm, enum irqchip_type type) > { > int err; > diff --git a/arm/include/arm-common/kvm-config-arch.h b/arm/include/arm-common/kvm-config-arch.h > index a8ebd94..9529881 100644 > --- a/arm/include/arm-common/kvm-config-arch.h > +++ b/arm/include/arm-common/kvm-config-arch.h > @@ -8,8 +8,11 @@ struct kvm_config_arch { > unsigned int force_cntfrq; > bool virtio_trans_pci; > bool aarch32_guest; > + enum irqchip_type irqchip; > }; > > +int irqchip_parser(const struct option *opt, const char *arg, int unset); > + > #define OPT_ARCH_RUN(pfx, cfg) \ > pfx, \ > ARM_OPT_ARCH_RUN(cfg) \ > @@ -21,6 +24,10 @@ struct kvm_config_arch { > "updated to program CNTFRQ correctly*"), \ > OPT_BOOLEAN('\0', "force-pci", &(cfg)->virtio_trans_pci, \ > "Force virtio devices to use PCI as their default " \ > - "transport"), > + "transport"), \ > + OPT_CALLBACK('\0', "irqchip", &(cfg)->irqchip, \ > + "[gicv2|gicv3]", \ Looks like "default" is also an acceptable string, which you don't document. I'd be inclined to remove the "default" handling altogether, and document that without --irqchip, you get a GICv2. At some point, it would be good to have a --irqchip=host, but we need some additional kernel support for this. > + "type of interrupt controller to emulate in the guest", \ > + irqchip_parser, NULL), > > #endif /* ARM_COMMON__KVM_CONFIG_ARCH_H */ > diff --git a/arm/kvm.c b/arm/kvm.c > index f9685c2..d0e4a20 100644 > --- a/arm/kvm.c > +++ b/arm/kvm.c > @@ -82,6 +82,6 @@ void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) > MADV_MERGEABLE | MADV_HUGEPAGE); > > /* Create the virtual GIC. */ > - if (gic__create(kvm, IRQCHIP_GICV2)) > + if (gic__create(kvm, kvm->cfg.arch.irqchip)) > die("Failed to create virtual GIC"); > } > Thanks, M.
diff --git a/arm/aarch64/arm-cpu.c b/arm/aarch64/arm-cpu.c index f702b9e..3dc8ea3 100644 --- a/arm/aarch64/arm-cpu.c +++ b/arm/aarch64/arm-cpu.c @@ -12,7 +12,7 @@ static void generate_fdt_nodes(void *fdt, struct kvm *kvm, u32 gic_phandle) { int timer_interrupts[4] = {13, 14, 11, 10}; - gic__generate_fdt_nodes(fdt, gic_phandle, IRQCHIP_GICV2); + gic__generate_fdt_nodes(fdt, gic_phandle, kvm->cfg.arch.irqchip); timer__generate_fdt_nodes(fdt, kvm, timer_interrupts); } diff --git a/arm/gic.c b/arm/gic.c index efe4b42..5b49416 100644 --- a/arm/gic.c +++ b/arm/gic.c @@ -22,6 +22,23 @@ static int gic_fd = -1; static u64 gic_redists_base; static u64 gic_redists_size; +int irqchip_parser(const struct option *opt, const char *arg, int unset) +{ + enum irqchip_type *type = opt->value; + + *type = IRQCHIP_GICV2; + if (!strcmp(arg, "gicv2")) { + *type = IRQCHIP_GICV2; + } else if (!strcmp(arg, "gicv3")) { + *type = IRQCHIP_GICV3; + } else if (strcmp(arg, "default")) { + fprintf(stderr, "irqchip: unknown type \"%s\"\n", arg); + return -1; + } + + return 0; +} + static int gic__create_device(struct kvm *kvm, enum irqchip_type type) { int err; diff --git a/arm/include/arm-common/kvm-config-arch.h b/arm/include/arm-common/kvm-config-arch.h index a8ebd94..9529881 100644 --- a/arm/include/arm-common/kvm-config-arch.h +++ b/arm/include/arm-common/kvm-config-arch.h @@ -8,8 +8,11 @@ struct kvm_config_arch { unsigned int force_cntfrq; bool virtio_trans_pci; bool aarch32_guest; + enum irqchip_type irqchip; }; +int irqchip_parser(const struct option *opt, const char *arg, int unset); + #define OPT_ARCH_RUN(pfx, cfg) \ pfx, \ ARM_OPT_ARCH_RUN(cfg) \ @@ -21,6 +24,10 @@ struct kvm_config_arch { "updated to program CNTFRQ correctly*"), \ OPT_BOOLEAN('\0', "force-pci", &(cfg)->virtio_trans_pci, \ "Force virtio devices to use PCI as their default " \ - "transport"), + "transport"), \ + OPT_CALLBACK('\0', "irqchip", &(cfg)->irqchip, \ + "[gicv2|gicv3]", \ + "type of interrupt controller to emulate in the guest", \ + irqchip_parser, NULL), #endif /* ARM_COMMON__KVM_CONFIG_ARCH_H */ diff --git a/arm/kvm.c b/arm/kvm.c index f9685c2..d0e4a20 100644 --- a/arm/kvm.c +++ b/arm/kvm.c @@ -82,6 +82,6 @@ void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) MADV_MERGEABLE | MADV_HUGEPAGE); /* Create the virtual GIC. */ - if (gic__create(kvm, IRQCHIP_GICV2)) + if (gic__create(kvm, kvm->cfg.arch.irqchip)) die("Failed to create virtual GIC"); }
Currently we unconditionally create a virtual GICv2 in the guest. Add a --irqchip= parameter to let the user specify a different GIC type for the guest. For now we the only other supported type is GICv3. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- arm/aarch64/arm-cpu.c | 2 +- arm/gic.c | 17 +++++++++++++++++ arm/include/arm-common/kvm-config-arch.h | 9 ++++++++- arm/kvm.c | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-)