Re: [Qemu-devel] [PATCH V5 2/2] arm: virt: add PMU property to mach-virt machine type

[Andrea Bolognani]

On Thu, 2016-09-22 at 11:13 -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 
> ---
>  hw/arm/virt.c | 16 
>  1 file changed, 16 insertions(+)

Tested-by: Andrea Bolognani 

-- 
Andrea Bolognani / Red Hat / Virtualization

Re: [Qemu-devel] [PATCH V5 2/2] arm: virt: add PMU property to mach-virt machine type

[Andrew Jones]

On Thu, Sep 22, 2016 at 11:13:23AM -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 
> ---
>  hw/arm/virt.c | 16 
>  1 file changed, 16 insertions(+)
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index a781ad0..a211b22 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 {
> @@ -1287,6 +1288,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
> @@ -1317,6 +1320,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", _abort);
> @@ -1514,6 +1523,9 @@ 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));
> +
> +vmc->pmu_default_on = true;
>  }
>  DEFINE_VIRT_MACHINE_AS_LATEST(2, 7)
>  
> @@ -1532,5 +1544,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
> 
>

Reviewed-by: Andrew Jones 

I'll send the 2.8 machine type patch.

[Qemu-devel] [PATCH V5 2/2] arm: virt: add PMU property to mach-virt machine type

[Wei Huang]

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 
---
 hw/arm/virt.c | 16 
 1 file changed, 16 insertions(+)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index a781ad0..a211b22 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 {
@@ -1287,6 +1288,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
@@ -1317,6 +1320,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", _abort);
@@ -1514,6 +1523,9 @@ 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));
+
+vmc->pmu_default_on = true;
 }
 DEFINE_VIRT_MACHINE_AS_LATEST(2, 7)
 
@@ -1532,5 +1544,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