From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
To: John Garry <john.garry@huawei.com>
Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
alexander.shishkin@linux.intel.com, jolsa@redhat.com,
namhyung@kernel.org, ak@linux.intel.com, wcohen@redhat.com,
linux-kernel@vger.kernel.org, linuxarm@huawei.com
Subject: Re: [PATCH] perf vendor events: fix processing for xfs
Date: Wed, 14 Mar 2018 10:42:51 -0700 [thread overview]
Message-ID: <20180314174251.GA28324@us.ibm.com> (raw)
In-Reply-To: <1521047452-28565-1-git-send-email-john.garry@huawei.com>
John Garry [john.garry@huawei.com] wrote:
> In the recently introduced support for vendor subdirectory,
> the checking for directory entries under xfs (or any other fs
> which does not support dirent.d_type) is missing the check
> for links for current and parent directory. This can result
> in a broken pmu_events.c being generated.
I run into the problem on a 4.15-based kernel/xfs but not on a
3.10-based kernel! Have not investigated, but this fix is good.
>
> Fix this by adding the appropriate check in is_leaf_dir().
>
> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
> Signed-off-by: John Garry <john.garry@huawei.com>
Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Thanks John.
Sukadev
>
> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> index 1c01844..db3a594 100644
> --- a/tools/perf/pmu-events/jevents.c
> +++ b/tools/perf/pmu-events/jevents.c
> @@ -873,7 +873,10 @@ static int is_leaf_dir(const char *fpath)
> return 0;
>
> while ((dir = readdir(d)) != NULL) {
> - if (dir->d_type == DT_DIR && dir->d_name[0] != '.') {
> + if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
> + continue;
> +
> + if (dir->d_type == DT_DIR) {
> res = 0;
> break;
> } else if (dir->d_type == DT_UNKNOWN) {
> --
> 1.9.1
next prev parent reply other threads:[~2018-03-14 17:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-08 10:58 [PATCH v3 00/11] perf events patches for improved ARM64 support John Garry
2018-03-08 10:58 ` [PATCH v3 01/11] perf vendor events: drop incomplete multiple mapfile support John Garry
2018-03-20 6:21 ` [tip:perf/core] perf vendor events: Drop " tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 02/11] perf vendor events: fix error code in json_events() John Garry
2018-03-20 6:21 ` [tip:perf/core] perf vendor events: Fix " tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 03/11] perf vendor events: drop support for unused topic directories John Garry
2018-03-20 6:22 ` [tip:perf/core] perf vendor events: Drop " tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 04/11] perf vendor events: add support for pmu events vendor subdirectory John Garry
2018-03-12 18:28 ` Arnaldo Carvalho de Melo
2018-03-13 9:36 ` John Garry
2018-03-14 17:10 ` [PATCH] perf vendor events: fix processing for xfs John Garry
2018-03-14 17:42 ` Sukadev Bhattiprolu [this message]
2018-03-14 18:53 ` Arnaldo Carvalho de Melo
2018-03-14 19:39 ` John Garry
2018-03-14 20:26 ` Arnaldo Carvalho de Melo
2018-03-14 20:58 ` John Garry
2018-03-20 6:22 ` [tip:perf/core] perf vendor events: Add support for pmu events vendor subdirectory tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 05/11] perf vendor events arm64: Relocate ThunderX2 JSON to cavium subdirectory John Garry
2018-03-20 6:23 ` [tip:perf/core] " tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 06/11] perf vendor events arm64: Relocate Cortex A53 JSONs to arm subdirectory John Garry
2018-03-20 6:23 ` [tip:perf/core] " tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 07/11] perf vendor events: add support for arch standard events John Garry
2018-03-20 6:24 ` [tip:perf/core] perf vendor events: Add " tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 08/11] perf vendor events arm64: add armv8-recommended.json John Garry
2018-03-20 6:24 ` [tip:perf/core] perf vendor events arm64: Add armv8-recommended.json tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 09/11] perf vendor events arm64: fixup ThunderX2 to use recommended events John Garry
2018-03-09 14:36 ` Ganapatrao Kulkarni
2018-03-20 6:25 ` [tip:perf/core] perf vendor events arm64: Fixup " tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 10/11] perf vendor events arm64: fixup A53 " John Garry
2018-03-20 6:25 ` [tip:perf/core] " tip-bot for John Garry
2018-03-08 10:58 ` [PATCH v3 11/11] perf vendor events arm64: add HiSilicon hip08 JSON file John Garry
2018-03-20 6:26 ` [tip:perf/core] " tip-bot for John Garry
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=20180314174251.GA28324@us.ibm.com \
--to=sukadev@linux.vnet.ibm.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=wcohen@redhat.com \
/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).