Skip to contentSkip to conversation

perf pmu: Fix parser error for uncore event alias

PATCH In review [email protected] 4 participants 5 messages Mar 15, 2019 – Mar 29, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf pmu: Fix parser error for uncore event alias

From: Kan Liang <[email protected]>

Perf fails to parse uncore event alias, for example:

  #perf stat -e unc_m_clockticks -a --no-merge sleep 1
  event syntax error: 'unc_m_clockticks'
                       \___ parser error

Current code assumes that the event alias is from one specific PMU. To find the PMU, perf strcmp the pmu name of event alias with the real pmu name on the system.
However, the uncore event alias may be from multiple PMUs with common prefix. The pmu name of uncore event alias is the common prefix. For example, UNC_M_CLOCKTICKS is clock event for iMC, which include 6 PMUs with the same prefix "uncore_imc" on a skylake server. The real pmu names on the system for iMC are uncore_imc_0 ... uncore_imc_5.
The strncmp is used to only check the common prefix for uncore event alias.

With the patch,
#perf stat -e unc_m_clockticks -a --no-merge sleep 1 Performance counter stats for 'system wide':

       723,594,722      unc_m_clockticks [uncore_imc_5]
       724,001,954      unc_m_clockticks [uncore_imc_3]
       724,042,655      unc_m_clockticks [uncore_imc_1]
       724,161,001      unc_m_clockticks [uncore_imc_4]
       724,293,713      unc_m_clockticks [uncore_imc_2]
       724,340,901      unc_m_clockticks [uncore_imc_0]
       1.002090060 seconds time elapsed
Cc Thomas Richter <[email protected]>
Fixes ea1fa48c055f ("perf stat: Handle different PMU names with common prefix")
---
 tools/perf/util/pmu.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
tools/perf/util/pmu.c +10 -0
index 51d437f..395308f 100644
@@ -732,10 +732,20 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
 
 		if (!is_arm_pmu_core(name)) {
 			pname = pe->pmu ? pe->pmu : "cpu";
+
+			/*
+			 * uncore alias may be from different PMU
+			 * with common prefix
+			 */
+			if (pmu_is_uncore(name) &&
+			    !strncmp(pname, name, strlen(pname)))
+				goto new_alias;
+
 			if (strcmp(pname, name))
 				continue;
 		}
 
+new_alias:
 		/* need type casts to override 'const' */
 		__perf_pmu__new_alias(head, NULL, (char *)pe->name,
 				(char *)pe->desc, (char *)pe->event,
Signature · 1 line
2.7.4
Acked-by on v1 1/1
#1 lore raw
Quoted 31 lines · On Fri, Mar 15, 2019 at 11:00:14AM -0700, [email protected] wrote:

From: Kan Liang <[email protected]>

Perf fails to parse uncore event alias, for example:

  #perf stat -e unc_m_clockticks -a --no-merge sleep 1
  event syntax error: 'unc_m_clockticks'
                       \___ parser error

Current code assumes that the event alias is from one specific PMU. To find the PMU, perf strcmp the pmu name of event alias with the real pmu name on the system.
However, the uncore event alias may be from multiple PMUs with common prefix. The pmu name of uncore event alias is the common prefix. For example, UNC_M_CLOCKTICKS is clock event for iMC, which include 6 PMUs with the same prefix "uncore_imc" on a skylake server. The real pmu names on the system for iMC are uncore_imc_0 ... uncore_imc_5.
The strncmp is used to only check the common prefix for uncore event alias.

With the patch,
#perf stat -e unc_m_clockticks -a --no-merge sleep 1 Performance counter stats for 'system wide':

       723,594,722      unc_m_clockticks [uncore_imc_5]
       724,001,954      unc_m_clockticks [uncore_imc_3]
       724,042,655      unc_m_clockticks [uncore_imc_1]
       724,161,001      unc_m_clockticks [uncore_imc_4]
       724,293,713      unc_m_clockticks [uncore_imc_2]
       724,340,901      unc_m_clockticks [uncore_imc_0]
Quoted 6 lines
       1.002090060 seconds time elapsed
Cc Thomas Richter <[email protected]>
Fixes ea1fa48c055f ("perf stat: Handle different PMU names with common prefix")

thanks,
jirka

Quoted 32 lines
---
 tools/perf/util/pmu.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
tools/perf/util/pmu.c +10 -0
index 51d437f..395308f 100644
@@ -732,10 +732,20 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
 
 		if (!is_arm_pmu_core(name)) {
 			pname = pe->pmu ? pe->pmu : "cpu";
+
+			/*
+			 * uncore alias may be from different PMU
+			 * with common prefix
+			 */
+			if (pmu_is_uncore(name) &&
+			    !strncmp(pname, name, strlen(pname)))
+				goto new_alias;
+
 			if (strcmp(pname, name))
 				continue;
 		}
 
+new_alias:
 		/* need type casts to override 'const' */
 		__perf_pmu__new_alias(head, NULL, (char *)pe->name,
 				(char *)pe->desc, (char *)pe->event,
Signature · 1 line
2.7.4
author
#2 lore raw
Quoted 32 lines · Jiri Olsa
Quoted 31 lines · On Fri, Mar 15, 2019 at 11:00:14AM -0700, [email protected] wrote:

From: Kan Liang <[email protected]>

Perf fails to parse uncore event alias, for example:

   #perf stat -e unc_m_clockticks -a --no-merge sleep 1
   event syntax error: 'unc_m_clockticks'
                        \___ parser error

Current code assumes that the event alias is from one specific PMU. To find the PMU, perf strcmp the pmu name of event alias with the real pmu name on the system.
However, the uncore event alias may be from multiple PMUs with common prefix. The pmu name of uncore event alias is the common prefix. For example, UNC_M_CLOCKTICKS is clock event for iMC, which include 6 PMUs with the same prefix "uncore_imc" on a skylake server. The real pmu names on the system for iMC are uncore_imc_0 ... uncore_imc_5.
The strncmp is used to only check the common prefix for uncore event alias.

With the patch,
#perf stat -e unc_m_clockticks -a --no-merge sleep 1 Performance counter stats for 'system wide':

        723,594,722      unc_m_clockticks [uncore_imc_5]
        724,001,954      unc_m_clockticks [uncore_imc_3]
        724,042,655      unc_m_clockticks [uncore_imc_1]
        724,161,001      unc_m_clockticks [uncore_imc_4]
        724,293,713      unc_m_clockticks [uncore_imc_2]
        724,340,901      unc_m_clockticks [uncore_imc_0]
Quoted 9 lines
Quoted 6 lines
        1.002090060 seconds time elapsed
Cc Thomas Richter <[email protected]>
Fixes ea1fa48c055f ("perf stat: Handle different PMU names with common prefix")

Hi Arnaldo,

Could you please apply the fix?

Thanks,
Kan

Quoted 35 lines

thanks,
jirka

Quoted 32 lines
---
  tools/perf/util/pmu.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
tools/perf/util/pmu.c +10 -0
index 51d437f..395308f 100644
@@ -732,10 +732,20 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
 
  		if (!is_arm_pmu_core(name)) {
  			pname = pe->pmu ? pe->pmu : "cpu";
+
+			/*
+			 * uncore alias may be from different PMU
+			 * with common prefix
+			 */
+			if (pmu_is_uncore(name) &&
+			    !strncmp(pname, name, strlen(pname)))
+				goto new_alias;
+
  			if (strcmp(pname, name))
  				continue;
  		}
 
+new_alias:
  		/* need type casts to override 'const' */
  		__perf_pmu__new_alias(head, NULL, (char *)pe->name,
  				(char *)pe->desc, (char *)pe->event,
Signature · 1 line
2.7.4
#3 lore raw

Em Wed, Mar 27, 2019 at 03:53:30PM -0400, Liang, Kan escreveu:

Quoted 11 lines · Jiri Olsa
Quoted 8 lines · On Fri, Mar 15, 2019 at 11:00:14AM -0700, [email protected] wrote:
Quoted 5 lines

From: Kan Liang <[email protected]>

Cc Thomas Richter <[email protected]>
Fixes ea1fa48c055f ("perf stat: Handle different PMU names with common prefix")

Could you please apply the fix?

yeah, applied.

- Arnaldo

#4 lore raw
In reply to [email protected]
perf pmu: Fix parser error for uncore event alias
Commit-ID:  e94d6b7f615e6dfbaf9fba7db6011db561461d0c
Gitweb:     https://git.kernel.org/tip/e94d6b7f615e6dfbaf9fba7db6011db561461d0c
Author:     Kan Liang <[email protected]>
AuthorDate: Fri, 15 Mar 2019 11:00:14 -0700
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 28 Mar 2019 15:53:27 -0300

perf pmu: Fix parser error for uncore event alias

Perf fails to parse uncore event alias, for example:

  # perf stat -e unc_m_clockticks -a --no-merge sleep 1
  event syntax error: 'unc_m_clockticks'
                       \___ parser error

Current code assumes that the event alias is from one specific PMU.

To find the PMU, perf strcmps the PMU name of event alias with the real PMU name on the system.

However, the uncore event alias may be from multiple PMUs with common prefix. The PMU name of uncore event alias is the common prefix.

For example, UNC_M_CLOCKTICKS is clock event for iMC, which include 6 PMUs with the same prefix "uncore_imc" on a skylake server.

The real PMU names on the system for iMC are uncore_imc_0 ... uncore_imc_5.

The strncmp is used to only check the common prefix for uncore event alias.

With the patch:

  # perf stat -e unc_m_clockticks -a --no-merge sleep 1
  Performance counter stats for 'system wide':
       723,594,722      unc_m_clockticks [uncore_imc_5]
       724,001,954      unc_m_clockticks [uncore_imc_3]
       724,042,655      unc_m_clockticks [uncore_imc_1]
       724,161,001      unc_m_clockticks [uncore_imc_4]
       724,293,713      unc_m_clockticks [uncore_imc_2]
       724,340,901      unc_m_clockticks [uncore_imc_0]
       1.002090060 seconds time elapsed
Cc Andi Kleen <[email protected]>
Cc Thomas Richter <[email protected]>
Fixes ea1fa48c055f ("perf stat: Handle different PMU names with common prefix")
---
 tools/perf/util/pmu.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
tools/perf/util/pmu.c +10 -0
index 6199a3174ab9..e0429f4ef335 100644
@@ -732,10 +732,20 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
 
 		if (!is_arm_pmu_core(name)) {
 			pname = pe->pmu ? pe->pmu : "cpu";
+
+			/*
+			 * uncore alias may be from different PMU
+			 * with common prefix
+			 */
+			if (pmu_is_uncore(name) &&
+			    !strncmp(pname, name, strlen(pname)))
+				goto new_alias;
+
 			if (strcmp(pname, name))
 				continue;
 		}
 
+new_alias:
 		/* need type casts to override 'const' */
 		__perf_pmu__new_alias(head, NULL, (char *)pe->name,
 				(char *)pe->desc, (char *)pe->event,