| Message ID | 1475617134-28180-3-git-send-email-wei@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 04, 2016 at 05:38:54PM -0400, Wei Huang wrote: > CPU vPMU is now turned off by default, but it was ON in virt-2.7 > machine type. To solve this problem, this patch adds a PMU option > in machine state, which is used to control CPU's vPMU status. This > PMU option is not exposed to command line and is turned on in > virt-2.7 machine type to make sure it is backward compatible. > > Signed-off-by: Wei Huang <wei@redhat.com> > --- > hw/arm/virt.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index d348b02..43832f3 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -84,6 +84,7 @@ typedef struct { > MachineClass parent; > VirtBoardInfo *daughterboard; > bool disallow_affinity_adjustment; > + bool pmu_default_on; > } VirtMachineClass; > > typedef struct { > @@ -1322,6 +1323,8 @@ static void machvirt_init(MachineState *machine) > > for (n = 0; n < smp_cpus; n++) { > Object *cpuobj = object_new(typename); > + ARMCPU *cpu = ARM_CPU(cpuobj); > + > if (!vmc->disallow_affinity_adjustment) { > /* Adjust MPIDR like 64-bit KVM hosts, which incorporate the > * GIC's target-list limitations. 32-bit KVM hosts currently > @@ -1352,6 +1355,12 @@ static void machvirt_init(MachineState *machine) > } > } > > + if (cpu->has_pmu == ON_OFF_AUTO_AUTO && > + object_property_find(cpuobj, "pmu", NULL)) { > + cpu->has_pmu = vmc->pmu_default_on && kvm_enabled() ? > + ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; > + } > + > if (object_property_find(cpuobj, "reset-cbar", NULL)) { > object_property_set_int(cpuobj, vbi->memmap[VIRT_CPUPERIPHS].base, > "reset-cbar", &error_abort); > @@ -1562,8 +1571,12 @@ static void virt_2_7_instance_init(Object *obj) > > static void virt_machine_2_7_options(MachineClass *mc) > { > + VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); > + > virt_machine_2_8_options(mc); > SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_7); > + nit: no need for the above blank line > + vmc->pmu_default_on = true; > } > DEFINE_VIRT_MACHINE(2, 7) > > @@ -1582,5 +1595,9 @@ static void virt_machine_2_6_options(MachineClass *mc) > virt_machine_2_7_options(mc); > SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_6); > vmc->disallow_affinity_adjustment = true; > + /* Disable PMU for 2.6 and down as PMU support was first introduced > + * and enabled in 2.7. > + */ > + vmc->pmu_default_on = false; > } > DEFINE_VIRT_MACHINE(2, 6) > -- > 1.8.3.1 > > Besides the nit Reviewed-by: Andrew Jones <drjones@redhat.com>
On Tue, 2016-10-04 at 17:38 -0400, Wei Huang wrote: > CPU vPMU is now turned off by default, but it was ON in virt-2.7 > machine type. To solve this problem, this patch adds a PMU option > in machine state, which is used to control CPU's vPMU status. This > PMU option is not exposed to command line and is turned on in > virt-2.7 machine type to make sure it is backward compatible. > > Signed-off-by: Wei Huang <wei@redhat.com> > --- > hw/arm/virt.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) On both Moonshot and ThunderX, Tested-by: Andrea Bolognani <abologna@redhat.com>
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d348b02..43832f3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -84,6 +84,7 @@ typedef struct { MachineClass parent; VirtBoardInfo *daughterboard; bool disallow_affinity_adjustment; + bool pmu_default_on; } VirtMachineClass; typedef struct { @@ -1322,6 +1323,8 @@ static void machvirt_init(MachineState *machine) for (n = 0; n < smp_cpus; n++) { Object *cpuobj = object_new(typename); + ARMCPU *cpu = ARM_CPU(cpuobj); + if (!vmc->disallow_affinity_adjustment) { /* Adjust MPIDR like 64-bit KVM hosts, which incorporate the * GIC's target-list limitations. 32-bit KVM hosts currently @@ -1352,6 +1355,12 @@ static void machvirt_init(MachineState *machine) } } + if (cpu->has_pmu == ON_OFF_AUTO_AUTO && + object_property_find(cpuobj, "pmu", NULL)) { + cpu->has_pmu = vmc->pmu_default_on && kvm_enabled() ? + ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; + } + if (object_property_find(cpuobj, "reset-cbar", NULL)) { object_property_set_int(cpuobj, vbi->memmap[VIRT_CPUPERIPHS].base, "reset-cbar", &error_abort); @@ -1562,8 +1571,12 @@ static void virt_2_7_instance_init(Object *obj) static void virt_machine_2_7_options(MachineClass *mc) { + VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); + virt_machine_2_8_options(mc); SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_7); + + vmc->pmu_default_on = true; } DEFINE_VIRT_MACHINE(2, 7) @@ -1582,5 +1595,9 @@ static void virt_machine_2_6_options(MachineClass *mc) virt_machine_2_7_options(mc); SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_6); vmc->disallow_affinity_adjustment = true; + /* Disable PMU for 2.6 and down as PMU support was first introduced + * and enabled in 2.7. + */ + vmc->pmu_default_on = false; } DEFINE_VIRT_MACHINE(2, 6)
CPU vPMU is now turned off by default, but it was ON in virt-2.7 machine type. To solve this problem, this patch adds a PMU option in machine state, which is used to control CPU's vPMU status. This PMU option is not exposed to command line and is turned on in virt-2.7 machine type to make sure it is backward compatible. Signed-off-by: Wei Huang <wei@redhat.com> --- hw/arm/virt.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)