linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org,
	eranian@google.com, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 01/12] perf, tools: Dont stop PMU parsing on alias parse error
Date: Tue, 19 Jan 2016 18:27:33 -0800	[thread overview]
Message-ID: <1453256864-24192-2-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1453256864-24192-1-git-send-email-andi@firstfloor.org>

From: Andi Kleen <ak@linux.intel.com>

When an error happens during alias parsing currently the complete
parsing of all attributes of the PMU is stopped. This is breaks
old perf on a newer kernel that may have not-yet-know
alias attributes (such as .scale or .per-pkg).

Continue when some attribute is unparseable.

This is IMHO a stable candidate and should be backported
to older versions to avoid problems with newer kernels.

v2: Print warnings when something goes wrong.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 tools/perf/util/pmu.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index b597bcc..0d228d1 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -284,13 +284,12 @@ static int pmu_aliases_parse(char *dir, struct list_head *head)
 {
 	struct dirent *evt_ent;
 	DIR *event_dir;
-	int ret = 0;
 
 	event_dir = opendir(dir);
 	if (!event_dir)
 		return -EINVAL;
 
-	while (!ret && (evt_ent = readdir(event_dir))) {
+	while ((evt_ent = readdir(event_dir))) {
 		char path[PATH_MAX];
 		char *name = evt_ent->d_name;
 		FILE *file;
@@ -306,17 +305,19 @@ static int pmu_aliases_parse(char *dir, struct list_head *head)
 
 		snprintf(path, PATH_MAX, "%s/%s", dir, name);
 
-		ret = -EINVAL;
 		file = fopen(path, "r");
-		if (!file)
-			break;
+		if (!file) {
+			pr_warning("Cannot open %s\n", path);
+			continue;
+		}
 
-		ret = perf_pmu__new_alias(head, dir, name, file);
+		if (perf_pmu__new_alias(head, dir, name, file) < 0)
+			pr_warning("Cannot set up %s\n", name);
 		fclose(file);
 	}
 
 	closedir(event_dir);
-	return ret;
+	return 0;
 }
 
 /*
-- 
2.4.3

  reply	other threads:[~2016-01-20  2:28 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-20  2:27 Add top down metrics to perf stat Andi Kleen
2016-01-20  2:27 ` Andi Kleen [this message]
2016-01-20  2:27 ` [PATCH 02/12] perf, tools: Parse an .aggr-per-core event attribute Andi Kleen
2016-01-20  2:27 ` [PATCH 03/12] perf, tools, stat: Force --per-core mode for .aggr-per-core aliases Andi Kleen
2016-01-20  2:27 ` [PATCH 04/12] perf, tools, stat: Avoid fractional digits for integer scales Andi Kleen
2016-01-20  2:27 ` [PATCH 05/12] perf, tools, stat: Scale values by unit before metrics Andi Kleen
2016-01-20  2:27 ` [PATCH 06/12] perf, tools, stat: Basic support for TopDown in perf stat Andi Kleen
2016-01-20  2:27 ` [PATCH 07/12] perf, tools, stat: Add computation of TopDown formulas Andi Kleen
2016-01-20  2:27 ` [PATCH 08/12] perf, tools, stat: Add extra output of counter values with -v Andi Kleen
2016-01-20  2:27 ` [PATCH 09/12] x86, perf: Support sysfs files depending on SMT status Andi Kleen
2016-01-20  2:27 ` [PATCH 10/12] x86, perf: Add Top Down events to Intel Core Andi Kleen
2016-01-20  2:27 ` [PATCH 11/12] x86, perf: Add Top Down events to Intel Atom Andi Kleen
2016-01-20  2:27 ` [PATCH 12/12] x86, perf: Use new ht_on flag in HT leak workaround Andi Kleen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1453256864-24192-2-git-send-email-andi@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=eranian@google.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).