* [PATCH] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI
@ 2022-11-28 2:54 Anshuman Khandual
2022-11-28 3:06 ` Anshuman Khandual
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Anshuman Khandual @ 2022-11-28 2:54 UTC (permalink / raw)
To: linux-arm-kernel, will
Cc: Anshuman Khandual, Arnaldo Carvalho de Melo, Mark Rutland,
Catalin Marinas, linux-perf-users, linux-kernel
__armv8pmu_probe_pmu() returns if detected PMU is either not implemented or
implementation defined. Extracted ID_AA64DFR0_EL1_PMUVer value, when PMU is
not implemented is '0' which can be replaced with ID_AA64DFR0_EL1_PMUVer_NI
defined as '0b0000'.
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-perf-users@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
This applies on v6.1-rc6
arch/arm64/kernel/perf_event.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index 85a3aaefc0fb..b638f584b4dd 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -1188,7 +1188,8 @@ static void __armv8pmu_probe_pmu(void *info)
dfr0 = read_sysreg(id_aa64dfr0_el1);
pmuver = cpuid_feature_extract_unsigned_field(dfr0,
ID_AA64DFR0_EL1_PMUVer_SHIFT);
- if (pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF || pmuver == 0)
+ if (pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF ||
+ pmuver == ID_AA64DFR0_EL1_PMUVer_NI)
return;
cpu_pmu->pmuver = pmuver;
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI
2022-11-28 2:54 [PATCH] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI Anshuman Khandual
@ 2022-11-28 3:06 ` Anshuman Khandual
2022-11-28 8:28 ` Marc Zyngier
2022-11-28 12:06 ` Mark Rutland
2022-11-29 19:52 ` Will Deacon
2 siblings, 1 reply; 5+ messages in thread
From: Anshuman Khandual @ 2022-11-28 3:06 UTC (permalink / raw)
To: linux-arm-kernel, will, Marc Zyngier
Cc: Arnaldo Carvalho de Melo, Mark Rutland, Catalin Marinas,
linux-perf-users, linux-kernel
On 11/28/22 08:24, Anshuman Khandual wrote:
> __armv8pmu_probe_pmu() returns if detected PMU is either not implemented or
> implementation defined. Extracted ID_AA64DFR0_EL1_PMUVer value, when PMU is
> not implemented is '0' which can be replaced with ID_AA64DFR0_EL1_PMUVer_NI
> defined as '0b0000'.
>
> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: linux-perf-users@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
> ---
> This applies on v6.1-rc6
>
> arch/arm64/kernel/perf_event.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
> index 85a3aaefc0fb..b638f584b4dd 100644
> --- a/arch/arm64/kernel/perf_event.c
> +++ b/arch/arm64/kernel/perf_event.c
> @@ -1188,7 +1188,8 @@ static void __armv8pmu_probe_pmu(void *info)
> dfr0 = read_sysreg(id_aa64dfr0_el1);
> pmuver = cpuid_feature_extract_unsigned_field(dfr0,
> ID_AA64DFR0_EL1_PMUVer_SHIFT);
> - if (pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF || pmuver == 0)
> + if (pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF ||
> + pmuver == ID_AA64DFR0_EL1_PMUVer_NI)
> return;
>
> cpu_pmu->pmuver = pmuver;
> --
+ Marc Zyngier <maz@kernel.org>
There are some KVM related pmuver not-implemented check as well, should they be
replaced in this patch or rather in a separate patch ?
arch/arm64/kvm/pmu-emul.c: if (pmu->pmuver == 0 || pmu->pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF)
arch/arm64/kvm/pmu-emul.c: if (pmu->pmuver == 0 ||
arch/arm64/kvm/pmu-emul.c: pmu->pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF)
- Anshuman
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI
2022-11-28 3:06 ` Anshuman Khandual
@ 2022-11-28 8:28 ` Marc Zyngier
0 siblings, 0 replies; 5+ messages in thread
From: Marc Zyngier @ 2022-11-28 8:28 UTC (permalink / raw)
To: Anshuman Khandual
Cc: linux-arm-kernel, will, Arnaldo Carvalho de Melo, Mark Rutland,
Catalin Marinas, linux-perf-users, linux-kernel
On Mon, 28 Nov 2022 03:06:15 +0000,
Anshuman Khandual <anshuman.khandual@arm.com> wrote:
>
>
>
> On 11/28/22 08:24, Anshuman Khandual wrote:
> > __armv8pmu_probe_pmu() returns if detected PMU is either not implemented or
> > implementation defined. Extracted ID_AA64DFR0_EL1_PMUVer value, when PMU is
> > not implemented is '0' which can be replaced with ID_AA64DFR0_EL1_PMUVer_NI
> > defined as '0b0000'.
> >
> > Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
> > Cc: Mark Rutland <mark.rutland@arm.com>
> > Cc: Will Deacon <will@kernel.org>
> > Cc: Catalin Marinas <catalin.marinas@arm.com>
> > Cc: linux-perf-users@vger.kernel.org
> > Cc: linux-kernel@vger.kernel.org
> > Cc: linux-arm-kernel@lists.infradead.org
> > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
> > ---
> > This applies on v6.1-rc6
> >
> > arch/arm64/kernel/perf_event.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
> > index 85a3aaefc0fb..b638f584b4dd 100644
> > --- a/arch/arm64/kernel/perf_event.c
> > +++ b/arch/arm64/kernel/perf_event.c
> > @@ -1188,7 +1188,8 @@ static void __armv8pmu_probe_pmu(void *info)
> > dfr0 = read_sysreg(id_aa64dfr0_el1);
> > pmuver = cpuid_feature_extract_unsigned_field(dfr0,
> > ID_AA64DFR0_EL1_PMUVer_SHIFT);
> > - if (pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF || pmuver == 0)
> > + if (pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF ||
> > + pmuver == ID_AA64DFR0_EL1_PMUVer_NI)
> > return;
> >
> > cpu_pmu->pmuver = pmuver;
> > --
>
> + Marc Zyngier <maz@kernel.org>
>
> There are some KVM related pmuver not-implemented check as well, should they be
> replaced in this patch or rather in a separate patch ?
>
> arch/arm64/kvm/pmu-emul.c: if (pmu->pmuver == 0 || pmu->pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF)
> arch/arm64/kvm/pmu-emul.c: if (pmu->pmuver == 0 ||
> arch/arm64/kvm/pmu-emul.c: pmu->pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF)
Separate patch please, as I have a large KVM PMU rework already
queued.
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI
2022-11-28 2:54 [PATCH] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI Anshuman Khandual
2022-11-28 3:06 ` Anshuman Khandual
@ 2022-11-28 12:06 ` Mark Rutland
2022-11-29 19:52 ` Will Deacon
2 siblings, 0 replies; 5+ messages in thread
From: Mark Rutland @ 2022-11-28 12:06 UTC (permalink / raw)
To: Anshuman Khandual
Cc: linux-arm-kernel, will, Arnaldo Carvalho de Melo,
Catalin Marinas, linux-perf-users, linux-kernel
On Mon, Nov 28, 2022 at 08:24:49AM +0530, Anshuman Khandual wrote:
> __armv8pmu_probe_pmu() returns if detected PMU is either not implemented or
> implementation defined. Extracted ID_AA64DFR0_EL1_PMUVer value, when PMU is
> not implemented is '0' which can be replaced with ID_AA64DFR0_EL1_PMUVer_NI
> defined as '0b0000'.
>
> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: linux-perf-users@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
This looks fine to me, so:
Acked-by: Mark Rutland <mark.rutland@arm.com>
I'll leave it to Will to pick this as his convenience.
Mark.
> ---
> This applies on v6.1-rc6
>
> arch/arm64/kernel/perf_event.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
> index 85a3aaefc0fb..b638f584b4dd 100644
> --- a/arch/arm64/kernel/perf_event.c
> +++ b/arch/arm64/kernel/perf_event.c
> @@ -1188,7 +1188,8 @@ static void __armv8pmu_probe_pmu(void *info)
> dfr0 = read_sysreg(id_aa64dfr0_el1);
> pmuver = cpuid_feature_extract_unsigned_field(dfr0,
> ID_AA64DFR0_EL1_PMUVer_SHIFT);
> - if (pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF || pmuver == 0)
> + if (pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF ||
> + pmuver == ID_AA64DFR0_EL1_PMUVer_NI)
> return;
>
> cpu_pmu->pmuver = pmuver;
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI
2022-11-28 2:54 [PATCH] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI Anshuman Khandual
2022-11-28 3:06 ` Anshuman Khandual
2022-11-28 12:06 ` Mark Rutland
@ 2022-11-29 19:52 ` Will Deacon
2 siblings, 0 replies; 5+ messages in thread
From: Will Deacon @ 2022-11-29 19:52 UTC (permalink / raw)
To: Anshuman Khandual, linux-arm-kernel
Cc: catalin.marinas, kernel-team, Will Deacon, linux-perf-users,
Arnaldo Carvalho de Melo, linux-kernel, Mark Rutland
On Mon, 28 Nov 2022 08:24:49 +0530, Anshuman Khandual wrote:
> __armv8pmu_probe_pmu() returns if detected PMU is either not implemented or
> implementation defined. Extracted ID_AA64DFR0_EL1_PMUVer value, when PMU is
> not implemented is '0' which can be replaced with ID_AA64DFR0_EL1_PMUVer_NI
> defined as '0b0000'.
>
>
Applied to will (for-next/perf), thanks!
[1/1] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI
https://git.kernel.org/will/c/cc91b9481605
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-29 19:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-28 2:54 [PATCH] arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI Anshuman Khandual
2022-11-28 3:06 ` Anshuman Khandual
2022-11-28 8:28 ` Marc Zyngier
2022-11-28 12:06 ` Mark Rutland
2022-11-29 19:52 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).