[PATCH 2/2] arm64: pmu: Wire-up L2 cache events for ARMv8 PMUv3

[Will Deacon]

On Fri, Apr 28, 2017 at 03:15:01PM +0100, Catalin Marinas wrote:
> On Thu, Apr 27, 2017 at 06:36:42PM +0100, Will Deacon wrote:
> > On Tue, Apr 25, 2017 at 10:13:51AM -0700, Florian Fainelli wrote:
> > > On 04/25/2017 05:44 AM, Will Deacon wrote:
> > > > On Thu, Apr 20, 2017 at 12:05:46PM -0700, Florian Fainelli wrote:
> > > >> The ARMv8 PMUv3 cache map did not include the L2 cache events, add
> > > >> them.
> > > >>
> > > >> Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
> > > >> ---
> > > >>  arch/arm64/kernel/perf_event.c | 5 +++++
> > > >>  1 file changed, 5 insertions(+)
> > > >>
> > > >> diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
> > > >> index 4f011cdd756d..a664c575f3fd 100644
> > > >> --- a/arch/arm64/kernel/perf_event.c
> > > >> +++ b/arch/arm64/kernel/perf_event.c
> > > >> @@ -264,6 +264,11 @@ static const unsigned armv8_pmuv3_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
> > > >>  	[C(L1I)][C(OP_READ)][C(RESULT_ACCESS)]	= ARMV8_PMUV3_PERFCTR_L1I_CACHE,
> > > >>  	[C(L1I)][C(OP_READ)][C(RESULT_MISS)]	= ARMV8_PMUV3_PERFCTR_L1I_CACHE_REFILL,
> > > >>  
> > > >> +	[C(LL)][C(OP_READ)][C(RESULT_ACCESS)]	= ARMV8_PMUV3_PERFCTR_L2D_CACHE,
> > > >> +	[C(LL)][C(OP_READ)][C(RESULT_MISS)]	= ARMV8_PMUV3_PERFCTR_L2D_CACHE_REFILL,
> > > >> +	[C(LL)][C(OP_WRITE)][C(RESULT_ACCESS)]	= ARMV8_PMUV3_PERFCTR_L2D_CACHE,
> > > >> +	[C(LL)][C(OP_WRITE)][C(RESULT_MISS)]	= ARMV8_PMUV3_PERFCTR_L2D_CACHE_REFILL,
> > > > 
> > > > I don't think this is correct in general. 'LL' stands for "last-level",
> > > > which may be L3 or even a system cache in the interconnect. Tying that to L2
> > > > is the wrong thing to do from perf's generic event perspective.
> > > > 
> > > > I'm ok with what you're proposing for A53 (where the PMU can only count
> > > > events out to the L2), but I'm reluctant to make this change for the generic
> > > > PMUv3 events.
> > > 
> > > That makes sense, shall I resubmit the first patch by itself or can you
> > > or Catalin take it as-is?
> > 
> > I'll talk to Catalin tomorrow and try to get the A53 bit queued.
> 
> I queued patch 1/2. Shall I add your ack?

Yes, please.

Will